LibreOffice.git
6 years agoDon't merge this branch, a less intrusive approach was pushed to master.feature/table-style-rebased
Jan Holesovsky [Mon, 28 Sep 2015 09:59:00 +0000 (28 11:59 +0200)]
Don't merge this branch, a less intrusive approach was pushed to 

Commit ac6f8bc92b1abe995694602f43d8ad108b7030fb was inspired by the work done
in this branch, but used a less intrusive & safer approach.  This branch is
still kept in the repo for historical reasons, but probably can be removed
soon.

Change-Id: I75ced30052b60d26d38d81a3aeb296a9dcd690c1

6 years agogetLength() -> !isEmpty().
Jan Holesovsky [Fri, 25 Sep 2015 15:12:43 +0000 (25 17:12 +0200)]
getLength() -> !isEmpty().

Change-Id: Iab205adca1a6bca306d04f2f3dead8b66369d139

6 years agosal_Bool -> bool.
Jan Holesovsky [Fri, 25 Sep 2015 14:38:50 +0000 (25 16:38 +0200)]
sal_Bool -> bool.

Change-Id: I3abfa76e4bd15edf517f85bb3dbff4088c316095

6 years agoFix indentation.
Jan Holesovsky [Thu, 24 Sep 2015 20:43:58 +0000 (24 22:43 +0200)]
Fix indentation.

Change-Id: I664ec7985e1b670496262596e62360517e291963

6 years agoRemove SwTableAutoFmt from implementation
Alex Ivan [Mon, 16 Sep 2013 20:45:34 +0000 (16 23:45 +0300)]
Remove SwTableAutoFmt from implementation

Remove the aforementioned class from the implementation, replacing
it completely with SwTableFmt. May require further testing, but
there seems to be no loss in functionality.

Some of the functions of the AutoFormat dialog do not work completely,
but the dialog needs to be modified alltogheter, so it is not a major
issue.
Also, saving/loading tables with styles applied does not work, but
it will be remedied with the implementation of the the styles import/
export using the filters.

Change-Id: I985655344ec88ecc33dae1d15e112d7e2302c700

6 years agoRemove obsolete UpdateTo/FromSet methods
Alex Ivan [Thu, 12 Sep 2013 13:19:51 +0000 (12 16:19 +0300)]
Remove obsolete UpdateTo/FromSet methods

These should have been removed some time ago, since they
were not used any more. Seems they somehow escaped.

Change-Id: I958de698f96a6c48e4cb41dc5226f96134d2886b

6 years agoRemove boolean members from SwTableAutoFmt
Alex Ivan [Thu, 12 Sep 2013 12:58:47 +0000 (12 15:58 +0300)]
Remove boolean members from SwTableAutoFmt

Remove members made obsolete by previous patch.
As a side-effect, the checkboxes in the AutoFormat dialog
which selected what properties from the style to apply no longer have
any effect. Should not be a problem, since the dialog will have to be
reworked anyway.

Change-Id: Ib5f19808ca90187007f13c1c8c65e003fe6c715f

6 years agoUse items in attrset to determine properties stored in table style
Alex Ivan [Thu, 12 Sep 2013 12:32:06 +0000 (12 15:32 +0300)]
Use items in attrset to determine properties stored in table style

Replace the current bool methods of SwTableAutoFmt with methods
that check whether specific items are in the SwTableFmt's attrset
or in one of the cells attrset.

Change-Id: I5088cb933ca9e619bfebeb0180f8fd4667bb7744

6 years agoFix SwAttrHandler::Init to take parent attribute set into account
Alex Ivan [Sat, 7 Sep 2013 16:29:59 +0000 (7 19:29 +0300)]
Fix SwAttrHandler::Init to take parent attribute set into account

The new implementation might not be as efficient as the previous, but
the functionality is preserved. The change allows the correct text
properties from the table style to be taken into consideration.

Change-Id: Icf1460a40baa0c10c6234b05113b1c75848cb4da

6 years agoReapply table style after merging tables
Alex Ivan [Thu, 29 Aug 2013 16:02:57 +0000 (29 19:02 +0300)]
Reapply table style after merging tables

The undo part was inadvertedly already fixed since it used the
same mechanics as some of the previously fixed undo actions.

Change-Id: I75380513945a6b84fa8f18ab77c756b4e8c358c1

6 years agoReapply table style after spliting table and undo
Alex Ivan [Thu, 29 Aug 2013 15:15:44 +0000 (29 18:15 +0300)]
Reapply table style after spliting table and undo

Change-Id: I32fea8b4679809070a47368de65d57ce5df7ed9d

6 years agoReapply table styles after merging/spliting cells and corresponding undos
Alex Ivan [Thu, 29 Aug 2013 12:26:02 +0000 (29 15:26 +0300)]
Reapply table styles after merging/spliting cells and corresponding undos

Change-Id: I0a0f1cd1ec05487230af568ab3350de04d98bfb6

6 years agoFix copy-pasting table with no table style
Alex Ivan [Wed, 28 Aug 2013 15:52:39 +0000 (28 18:52 +0300)]
Fix copy-pasting table with no table style

Change-Id: I11eee9b3a7762dd2500129994e4da61b5b149520

6 years agoApply table style copying from writer to writer
Alex Ivan [Wed, 28 Aug 2013 12:40:28 +0000 (28 15:40 +0300)]
Apply table style copying from writer to writer

After the table is copied to the new doc, we search for a style
with the same name in this doc, and, if one exists, we apply that
one, else, we apply the one from the clipboard.

Change-Id: I8e3b6b15efa9d7a267cb48223a6f0d62dde46d6f

6 years agoLoad predifined table styles at document creation
Alex Ivan [Tue, 27 Aug 2013 12:12:23 +0000 (27 15:12 +0300)]
Load predifined table styles at document creation

Until now, the styles were loaded and deleted every time the
AutoFormat dialog was opened/closed. Now, they are loaded once
at document creation, and unloaded when in the document dtor.

Change-Id: I7cc8cfa38c7c8c196e303e542736e937ac0023a8

6 years agoAdd some more security to format parent assigning
Alex Ivan [Fri, 23 Aug 2013 13:33:36 +0000 (23 16:33 +0300)]
Add some more security to format parent assigning

Change-Id: I3f250f88ae68d6604bb4da0e9ae78ccefabf96e9

6 years agoProper undo for row/column insertion/deletion
Alex Ivan [Thu, 22 Aug 2013 16:14:40 +0000 (22 19:14 +0300)]
Proper undo for row/column insertion/deletion

Change-Id: If0de2939334ecf10d96e26d5a5c3d99dfa3deba2

6 years agoReapply table style after row/column deletion
Alex Ivan [Thu, 22 Aug 2013 15:10:34 +0000 (22 18:10 +0300)]
Reapply table style after row/column deletion

Change-Id: I24c851a2d1674aec96ca7577dfc92302e226fe4e

6 years agoFix build.
Jan Holesovsky [Tue, 22 Sep 2015 16:32:08 +0000 (22 18:32 +0200)]
Fix build.

Change-Id: I118a01366ef36e5bc1f3c2270eb013ea51af6489

6 years agoReapply table style after inserting rows
Alex Ivan [Thu, 22 Aug 2013 12:47:23 +0000 (22 15:47 +0300)]
Reapply table style after inserting rows

Change-Id: I56cc24f80a3812f9a04fcb639cc38eaa628fc95e

6 years agoAdjust format parent assigning
Alex Ivan [Thu, 22 Aug 2013 12:43:00 +0000 (22 15:43 +0300)]
Adjust format parent assigning

Modify format parent assigning mechanism so that the format
is claimed when assigning the parent, if it has other dependencies,
instead of attempting to have each element created with its own
Sw*Fmt on insertion.

Change-Id: I569b2a865d41fa6da57e0a0cb090a0fbccddb13c

6 years agoFix build.
Jan Holesovsky [Tue, 22 Sep 2015 16:21:16 +0000 (22 18:21 +0200)]
Fix build.

Change-Id: I78533d646a087898d0181be613709abd86d40c81

6 years agoReapply table style after inserting columns
Alex Ivan [Thu, 22 Aug 2013 10:03:04 +0000 (22 13:03 +0300)]
Reapply table style after inserting columns

Change-Id: If0550caf8d020623654eda05efc20d382f050275

6 years agoParent assigning cleanup
Alex Ivan [Tue, 13 Aug 2013 18:17:34 +0000 (13 21:17 +0300)]
Parent assigning cleanup

Another place where I had previously not modified to
the correct function.

Change-Id: I1a2d024fcacf9d1de6eb8f5c3cd2e70bcd1771a9

6 years agoFix borders update with table style application
Alex Ivan [Tue, 13 Aug 2013 14:42:13 +0000 (13 17:42 +0300)]
Fix borders update with table style application

Change-Id: I9d794d96f3542bd3597ab38586df58edff62a16d

6 years agoFix undo resize table causing lose of table style
Alex Ivan [Mon, 12 Aug 2013 17:59:41 +0000 (12 20:59 +0300)]
Fix undo resize table causing lose of table style

_SaveTable class now memorizes the name of the table style
applied to the table and it is reapplied after undoing.

Not the most elegant solution, but given how the _Save* classes
currently store data on the table, this solution avoids modifying
too much and possibly breaking other things.

Change-Id: I5c2afb0cdd5eb447f548249e9afa1dd6d648e3a9

6 years agoStore table style in Undo by name
Alex Ivan [Mon, 12 Aug 2013 17:02:17 +0000 (12 20:02 +0300)]
Store table style in Undo by name

Undo object no longer stores a pointer to the
style, but rather the name of the respective table style.

Change-Id: I1f6f196569d33353a9075489d136df9e5075d36b

6 years agoFix undo for applying table style
Alex Ivan [Fri, 9 Aug 2013 14:10:10 +0000 (9 17:10 +0300)]
Fix undo for applying table style

Undo now works for applying a new table style. There is an issue
where other undo commands i.e. resizing a cell will undo the
table style, probably due to not setting the parents correctly.

Change-Id: Ia7955e6303be57ec9ea10bd61a355a888818c420

6 years agoFix borders on Text to table method
Alex Ivan [Fri, 9 Aug 2013 14:05:19 +0000 (9 17:05 +0300)]
Fix borders on Text to table method

Default borders no longer mask the ones from the table style if
borders checkbox is checked in Text to Table dialog and an
autoformat is selected. In other words, it bypasses the state of
said checkbox. May instead want to default its state to unchecked
in order to be clearer to the user.

Also, there is a strange crash on the undo operation. (Somehow,
a pointer ends up pointing to 0x99..9)

Change-Id: I4fe5ebec5ea2470d6b27869f043b5110d5fc0c3a

6 years agoCorrect previously skipped function in parent assigning cleanup
Alex Ivan [Wed, 7 Aug 2013 11:23:21 +0000 (7 14:23 +0300)]
Correct previously skipped function in parent assigning cleanup

Change-Id: I12edb436caabd1f74943e77da69b03e17f56f196

6 years agoPartially fix properties update
Alex Ivan [Wed, 7 Aug 2013 09:23:05 +0000 (7 12:23 +0300)]
Partially fix properties update

Invalidating and setting complete paint for the SwTabFrms of the
table causes immediate update of the properties, with the
exception of the borders.

Font properties yet to be fixed.

Change-Id: Ie28a2f802ed9a2ad7f7d04ed283ea308b82e5b02

6 years agoFix column width in TextToTable
Alex Ivan [Mon, 5 Aug 2013 11:15:04 +0000 (5 14:15 +0300)]
Fix column width in TextToTable

Change-Id: Ibe6321e5c79a7b1081087b0ae7d24a22ca676c4c

6 years agoFix borders on insert table
Alex Ivan [Mon, 5 Aug 2013 09:19:52 +0000 (5 12:19 +0300)]
Fix borders on insert table

Checking borders in Insert Table dialog will no longer
prevent the borders of the table style from being correctly
displayed.

Change-Id: Ie9fd2ca19e7ba6355e2de6b9f8d7c954ca3a9c76

6 years agoSome cleanup of the parent assigning
Alex Ivan [Mon, 5 Aug 2013 08:54:04 +0000 (5 11:54 +0300)]
Some cleanup of the parent assigning

Change-Id: If7b0e0a06e6ffa3a1739be1422548ff0c6460b4f

6 years agoRemove default attribute values from Sw*Fmt
Alex Ivan [Fri, 2 Aug 2013 15:13:24 +0000 (2 18:13 +0300)]
Remove default attribute values from Sw*Fmt

These values, because they were being set in the Sw*Fmts from the
hard format, were "blocking" the attributes from the table style.

All atributes are not yet correctly propagated.

Also, the changes are not instant. There needs to be some other
interaction with the document before they come into effect.

Change-Id: I0c9775c5e988862d67067ac3bc9869851d85945b

6 years agoSet coresponding parent to attribute set
Alex Ivan [Fri, 2 Aug 2013 15:05:09 +0000 (2 18:05 +0300)]
Set coresponding parent to attribute set

Changing style on a table now also changes the parent of the
attribute set of the format of each element.

Change-Id: I6bdc69bfe385932690851a18a47901e77e57bbec

6 years agoRegister SwFmts to correct parents for each element of table
Alex Ivan [Thu, 1 Aug 2013 17:39:52 +0000 (1 20:39 +0300)]
Register SwFmts to correct parents for each element of table

Insert table, text to table and set autoformat methods now set the
parent of each SwFmt to the correct element in the table style.
For more complex tables, i.e. boxes contain other lines and so on,
the parents for these are set to the same as the line/box in which
they are found.

Change-Id: I24bc35323414bc8bdceda610da7ba53da043f09b

6 years agoFix missing font attributes in AutoFormat window
Alex Ivan [Tue, 30 Jul 2013 15:32:05 +0000 (30 18:32 +0300)]
Fix missing font attributes in AutoFormat window

The attribute range associated with the SwTableBoxFmt did not
include the necessary ids for character attributes, and as a
result, these were not stored and not used correctly.

The solution should not have any side-effects, but, to be sure
there should be further testing of other features where this
range came into use.

Change-Id: I8cb1ac881b2746ae3ec7958a958167de6f140a7f

6 years agoTemporary disable of AutoFormat save mechanism
Alex Ivan [Mon, 29 Jul 2013 16:37:51 +0000 (29 19:37 +0300)]
Temporary disable of AutoFormat save mechanism

Temporarily disabled saving any modification to the existing
table format file upon closing the AutoFormat window.
Most likely, further modifications will be made to this once
it is clear how the table styles will be stored.

Change-Id: I894d10003876044ba0b08c462fc0b6622bbb2595

6 years agoFix resizing of AutoFormat window crashing
Alex Ivan [Mon, 29 Jul 2013 16:17:21 +0000 (29 19:17 +0300)]
Fix resizing of AutoFormat window crashing

An incorrect modification of the pointer to the currently
selected style caused a crash if a resize of the respective
window was attempted.

Change-Id: Ibb66f1256268820db5440871c30a9697a0634f87

6 years agoFix build.
Jan Holesovsky [Sun, 20 Sep 2015 21:31:52 +0000 (20 23:31 +0200)]
Fix build.

Change-Id: Ie24f05bfe47f1bab08fc7a939b010c677db3da44

6 years agoFix RepeatHeading storage in SwTableFmt
Alex Ivan [Mon, 29 Jul 2013 10:57:47 +0000 (29 13:57 +0300)]
Fix RepeatHeading storage in SwTableFmt

Fixed an issue where improper storage of the RepeatHeading value
in SwTableFmt would cause a crash upon attempting to retrieve
the value.

Change-Id: I655d4f1f9760bc9e95c53c8fe292ea761e25fefd

6 years agoFurther changes on separating hard formatting from style
Alex Ivan [Fri, 26 Jul 2013 16:51:15 +0000 (26 19:51 +0300)]
Further changes on separating hard formatting from style

Changes have been made to better distinguish table style from the
table's hard format. These concern setting the table style on
a certain table and the associated Undo/Redo operation.

Some errors still need to be sorted out.

Change-Id: Id7593616b89234301fb33352d46a83aca7c3ac90

6 years agoFix missing name for Default Style in AutoFormat dialog
Alex Ivan [Thu, 25 Jul 2013 12:50:24 +0000 (25 15:50 +0300)]
Fix missing name for Default Style in AutoFormat dialog

Fixed the missing name for the default style in the AutoFormat dialog.
The String argument of SwStyleNameMapper::GetUIName is not modified
in the method, so the actual return value needs to be used to get the
desired result.

Change-Id: I29b29c11343920dc69a5bc104f65536a26e17d67

6 years agoFix table styles not loading
Alex Ivan [Wed, 24 Jul 2013 17:09:45 +0000 (24 20:09 +0300)]
Fix table styles not loading

Some unused properties were no longer loaded and that messed
up the styles, breaking the first and not loading the others.

Information about font is not loaded properly and selecting one
of the styles for a table causes an error.

Things will most likely be changed again since the targeted ideal
is to create the styles with the document.

Change-Id: I17a2c2c2f4eff36265489f725a83a4317b27339e

6 years agoAdded some properties back into hard format
Alex Ivan [Wed, 24 Jul 2013 17:04:22 +0000 (24 20:04 +0300)]
Added some properties back into hard format

In ligth of recent changes, some of the properties that had
been previously removed were now added back into the hard
format.

Change-Id: I4b25cc8415a19e84d9391f59a132b63d38a55188

6 years agoMore protection for pCurData: NULL means default, not much to do then
Cédric Bosdonnat [Tue, 23 Jul 2013 15:53:36 +0000 (23 17:53 +0200)]
More protection for pCurData: NULL means default, not much to do then

Change-Id: Ied3a04a7b7be4f4f7b6174e3d6d2a6e53848afd0

6 years agoFix hard format/table style separation issue
Alex Ivan [Tue, 23 Jul 2013 14:00:46 +0000 (23 17:00 +0300)]
Fix hard format/table style separation issue

Fixed the failed unit test brought by the previous
patch which attempted to correctly separate the hard
format from the table style in table insertion and
text to table methods.

Change-Id: I5eb7ddf074c8c8aaf2b2ec58aa7a94db8792a309

6 years agoSeparated hardformatting/styles in table insertion
Alex Ivan [Sun, 21 Jul 2013 16:19:43 +0000 (21 19:19 +0300)]
Separated hardformatting/styles in table insertion

Had previously overlooked where the table style information was
stored when inserting a new table into the document.

Change-Id: I8b285951c76fabe9b3b24006bba8592a3a6e5364

6 years agoModify undo mechanism for applying table format
Alex Ivan [Thu, 18 Jul 2013 15:45:14 +0000 (18 18:45 +0300)]
Modify undo mechanism for applying table format

Undo object no longer reconstructs table, but changes the table
style back to the original. The actual modification _should_
become visible once the proper modifications to the rendering of
the table are done.

Change-Id: Ife10f52077c9b13d5cf4f44fa1194fe414661cd1

6 years agoTable style stored separately from hard format
Alex Ivan [Thu, 18 Jul 2013 11:15:58 +0000 (18 14:15 +0300)]
Table style stored separately from hard format

Store/RestoreTableProperties methods used in Set/GetTableAutoFmt now
save/apply properties to/from the table's GetRegisteredIn's
GetRegisteredIn, thus separating the table style from the actual
hard format of the current table.

Change-Id: Iac3b73ad4388a9d73446c24d2fb50d96b7d1c380

6 years agoRemoved no longer used helper functions
Alex Ivan [Mon, 15 Jul 2013 16:13:14 +0000 (15 19:13 +0300)]
Removed no longer used helper functions

lcl_SetAFmtBox/Line helper functions and structure _SetAFmtTabPara
have been removed since they are no longer used because table styles
are now stored in order to get the relevant properties at render time.

Change-Id: I8a6824d30f9cfd997ac29b94638cdc37400f7976

6 years agoTable style applied at table level
Alex Ivan [Mon, 15 Jul 2013 16:05:31 +0000 (15 19:05 +0300)]
Table style applied at table level

SetTableAutoFmt method has been modified to store the style at table
level rather than apply it to the range of selected cells.

Similarly, the GetTableAutoFmt does not create a set of properties
from the selected range, but uses the info stored at table level.

Change-Id: Iacfc6bd38d4f952255358d540edc696f47449baa

6 years agoModify InsertTable and TableToText methods
Alex Ivan [Sat, 13 Jul 2013 16:41:47 +0000 (13 19:41 +0300)]
Modify InsertTable and TableToText methods

The mentioned methods have been modified in order to use the
table style provided as parameter, if present, and the default
frame format if not.

Furthermore, the style is just assigned to the table, rather than
applying the properties immediately. Currently, the style is not
applied, but it will be at render time once the neccesary modifications
are made.

Change-Id: I982ad0539da27e87f3d7443e6a9756503d83be27

6 years agoMinor fixes
Alex Ivan [Fri, 12 Jul 2013 11:29:10 +0000 (12 14:29 +0300)]
Minor fixes

Add const GetTableStyle function to SwTableAutoFmt.
Initialize line pointer in Get/SetBoxFmt functions.

Change-Id: Ia70fd9e60ced7aaeaacd8be37cec9c65d6ea5594

6 years agoAdd Load function to SwTableFmt
Alex Ivan [Thu, 4 Jul 2013 15:08:46 +0000 (4 18:08 +0300)]
Add Load function to SwTableFmt

Added a Load function to SwTableFmt to take over
part of the functionality of the one in SwTableAutoFmt.

Change-Id: I58fbe24e2d1914d2c89b2f86bb5b5fadc786b76c

6 years agoRemove SwAutoBoxFmt class from implementation
Alex Ivan [Thu, 4 Jul 2013 11:01:17 +0000 (4 14:01 +0300)]
Remove SwAutoBoxFmt class from implementation

SwAutoBoxFmt class has been completely removed from the
current implementation. All the functionality has been moved
to SwTableBoxFmt.

Change-Id: I4d4486a7819c125cf5ef6785eb4af39fff3cf145

6 years agoMove format info from SwTableAutoFmt to SwTableFmt
Alex Ivan [Thu, 4 Jul 2013 10:40:33 +0000 (4 13:40 +0300)]
Move format info from SwTableAutoFmt to SwTableFmt

Moved almost all information regarding format from SwTableAutoFmt
into SwTableFmt. Most methods of the former now redirect to
methods of the latter.

Change-Id: Ia5621643e7bcb5d921799d71dc89d1582f77d501

6 years agoRemove aBoxAutoFmt member from SwTableAutoFmt
Alex Ivan [Mon, 1 Jul 2013 14:24:13 +0000 (1 17:24 +0300)]
Remove aBoxAutoFmt member from SwTableAutoFmt

Removed array of box autoformats from SwTableAutoFmt and
adapted GetBoxFmt, SetBoxFmt, Save and Load methods.

Change-Id: I9bf32f799ec386494a7fba4a520285ddb23cddaf

6 years agoSave/Load of SwBoxAutoFmt move to SwTableBoxFmt
Alex Ivan [Sun, 30 Jun 2013 20:10:21 +0000 (30 23:10 +0300)]
Save/Load of SwBoxAutoFmt move to SwTableBoxFmt

Save and Load methods have been moved to SwTableBoxFmt.
Should now be safe to begin removing Sw*AutoFmt.

Change-Id: I3bca20af4fb540f2923e17d2a1c115f39097b44d

6 years agoReplace bare pointer with boost::scoped_ptr
Alex Ivan [Sun, 30 Jun 2013 15:16:09 +0000 (30 18:16 +0300)]
Replace bare pointer with boost::scoped_ptr

Members of SwTable*Fmt classes are now boost::scoped_ptr.
Also, incorrect implementation of operator= has been corrected.

Change-Id: I0b73c6351e3fa71d14dcb20b82fa2165969c6c27

6 years agoStore/RestoreTableProperties handle components
Alex Ivan [Sat, 29 Jun 2013 17:21:07 +0000 (29 20:21 +0300)]
Store/RestoreTableProperties handle components

Methods now also store/apply information regarding
the format of components.

Change-Id: Id6b1b255974e593f373e43972214e451f5ba7047

6 years agoFix stylistic issue
Alex Ivan [Sat, 29 Jun 2013 13:30:42 +0000 (29 16:30 +0300)]
Fix stylistic issue

Added "m_" prefix to member variables of SwTable*Fmt.

Change-Id: I80c6311d91f243298d56cb9da4ab80ff606b075b

6 years agoProper initilization of members in SwTable*Fmt
Alex Ivan [Fri, 28 Jun 2013 16:46:02 +0000 (28 19:46 +0300)]
Proper initilization of members in SwTable*Fmt

Modified initilization of members in SwTableFmt and SwTableLineFmt
in order to properly create formats for lines and, respectively, boxes.

Change-Id: I5e7e1a57b6745ac60a8167b3e0968202657fb4ef

6 years agoAdd cell format info into SwTableBoxFmt
Alex Ivan [Fri, 28 Jun 2013 15:56:54 +0000 (28 18:56 +0300)]
Add cell format info into SwTableBoxFmt

Migrated cell format information into SwTableBoxFmt.
Will remove info from SwTableBoxAutoFmt and try to remove the
class entirely as progress is made.

Change-Id: I4d5d0bc19aa80dfd1f8157eb0c05d54695cd9c8e

6 years agoStore RowSplit and RepeatHeading in item pool
Alex Ivan [Fri, 28 Jun 2013 10:44:54 +0000 (28 13:44 +0300)]
Store RowSplit and RepeatHeading in item pool

Removed m_aRepeatHeading and m_bRowSplit members from SwTableFmt.
Now stored in SfxItemPool.

Change-Id: I83f46ee38ce01db5dfae02e821d8e0a902a9cfc0

6 years agoUse inherited methods in SwTableFmt
Alex Ivan [Thu, 27 Jun 2013 18:25:13 +0000 (27 21:25 +0300)]
Use inherited methods in SwTableFmt

Removed methods of SwTableFmt which corresponded in name and
functionality with those defined in base class SwFmt.

Change-Id: I3a70194b2f2d8c50a090ae201b8e65cf8556cd16

6 years agoMove table format information into SwTableFmt
Alex Ivan [Thu, 27 Jun 2013 12:28:29 +0000 (27 15:28 +0300)]
Move table format information into SwTableFmt

Moved the information currently stored in SwTableAutoFmt
into SwTableFmt class

Change-Id: If0d0cf82a2ea14995410bcf03957d9a85b6e8e17

6 years agoMove constructors from sw/inc/swtblfmt.hxx
Alex Ivan [Wed, 26 Jun 2013 09:51:27 +0000 (26 12:51 +0300)]
Move constructors from sw/inc/swtblfmt.hxx

Moved the constructors for SwTableFmt and SwTableLineFmt
from the header file for clarity.

Change-Id: If33d48feefcb712fe745c6d2c87e5bb3aa83d8cc

6 years agoAdd structure for format classes
Alex Ivan [Tue, 25 Jun 2013 15:44:36 +0000 (25 18:44 +0300)]
Add structure for format classes

SwTableFmt now stores data about the lines/columns.
These, in turn, store information about the boxes.

Not yet integrated with the current implementation.

Change-Id: Ibc936f68c20905fca1cd636977eb47850eb0faa9

6 years agoRun bin/rename-sw-abbreviations.sh again.
Jan Holesovsky [Thu, 17 Sep 2015 03:23:19 +0000 (17 05:23 +0200)]
Run bin/rename-sw-abbreviations.sh again.

Change-Id: I43a4e711252262ad63e234af11c8cfa89879d2f7

6 years agoRevert prev changes; add SwTableFmt to Autoformat
Alex Ivan [Tue, 25 Jun 2013 11:22:06 +0000 (25 14:22 +0300)]
Revert prev changes; add SwTableFmt to Autoformat

Changes made in previous patch have been reverted.

A SwTableFmt memeber has been added to SwTableAutoFmt in
order to enable gradual transfer of items from one to
the other, while maintaining current functionality.

Change-Id: I844f77914277ed6f5e115aa82f41e753589c7057

6 years agotdf#86397 Bookmark: no consecutive name numbering applied when copied
Cor Nouws [Tue, 22 Sep 2015 22:40:06 +0000 (23 00:40 +0200)]
tdf#86397  Bookmark: no consecutive name numbering applied when copied

this partially changes behaviour introduced with commit bb00a0097900ae054401f7758a915047cfde4065
but without the performace problems from the old code
thanks to kendy for helping

Change-Id: I5dab81b58262f67db1c70223c612636a8b8c90ee

6 years agoReport nil-valued localized property as such
Stephan Bergmann [Wed, 23 Sep 2015 16:34:50 +0000 (23 18:34 +0200)]
Report nil-valued localized property as such

...regression introduced with 879aa54e895a56cb65f93ae98e6a9e7b08981a47
"configmgr: accelerate simple config key fetches."

Change-Id: Ifb732a25d902f58c76e06ebaad3a6178ff102f58

6 years agoboost::scoped_ptr->std::unique_ptr
Caolán McNamara [Wed, 23 Sep 2015 11:08:32 +0000 (23 12:08 +0100)]
boost::scoped_ptr->std::unique_ptr

Change-Id: I03020e3536ee692a96224a517794c0d0a294f607
Reviewed-on: https://gerrit.libreoffice.org/18793
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
6 years agostarmath: Use member initialization lists for SmToken
Takeshi Abe [Tue, 22 Sep 2015 10:34:20 +0000 (22 19:34 +0900)]
starmath: Use member initialization lists for SmToken

Change-Id: I3c5389135054ee866ebac3122edc71ec8c163124
Reviewed-on: https://gerrit.libreoffice.org/18785
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
6 years agono point in redeclaring methods with slightly different names
Noel Grandin [Wed, 23 Sep 2015 12:44:58 +0000 (23 14:44 +0200)]
no point in redeclaring methods with slightly different names

Change-Id: I446ca61415e998d1f325b602cb587815af5ff425
Reviewed-on: https://gerrit.libreoffice.org/18813
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 12:40:09 +0000 (23 14:40 +0200)]
convert Link<> to typed

Change-Id: I6a4fade1688dfce9aec1530da51ea874cddfcbc0
Reviewed-on: https://gerrit.libreoffice.org/18812
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 12:28:14 +0000 (23 14:28 +0200)]
convert Link<> to typed

Change-Id: If48dd5fd9ea87ca5c770424ce824998d842aacef
Reviewed-on: https://gerrit.libreoffice.org/18811
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 12:22:52 +0000 (23 14:22 +0200)]
convert Link<> to typed

Change-Id: Ib0f043cf40f2a1b4b9f0837a5c536994bff3aeef
Reviewed-on: https://gerrit.libreoffice.org/18810
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 11:30:21 +0000 (23 13:30 +0200)]
convert Link<> to typed

Change-Id: I245ba9e550c7b833fe184a24b63b55027aeecac9
Reviewed-on: https://gerrit.libreoffice.org/18809
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 10:57:27 +0000 (23 12:57 +0200)]
convert Link<> to typed

Change-Id: Ia647a53efa7bd8d0e0fe6937709b92c85a2e67a6
Reviewed-on: https://gerrit.libreoffice.org/18808
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 08:48:47 +0000 (23 10:48 +0200)]
convert Link<> to typed

Change-Id: Ibaab770dd369d07aeda70b5d5c6ff514350edacb
Reviewed-on: https://gerrit.libreoffice.org/18807
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 08:28:42 +0000 (23 10:28 +0200)]
convert Link<> to typed

Change-Id: I282ea95e748ea52099a84fd3e8e8151e03ce25f9
Reviewed-on: https://gerrit.libreoffice.org/18806
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 08:25:10 +0000 (23 10:25 +0200)]
convert Link<> to typed

Change-Id: If14f94ba6ba4732256747811ceb414b1424c4b1b
Reviewed-on: https://gerrit.libreoffice.org/18805
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoremove unused Link<> field
Noel Grandin [Wed, 23 Sep 2015 08:20:19 +0000 (23 10:20 +0200)]
remove unused Link<> field

Change-Id: Iea23f5edd60d5ac214afa89d051cd4f900564343
Reviewed-on: https://gerrit.libreoffice.org/18804
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 08:17:52 +0000 (23 10:17 +0200)]
convert Link<> to typed

Change-Id: I80bd798ea5d36fa94d6b3348be713dbe2cbeab14
Reviewed-on: https://gerrit.libreoffice.org/18803
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 07:55:11 +0000 (23 09:55 +0200)]
convert Link<> to typed

Change-Id: Ica5093e29630d6d6974ccba034609129887ac85b
Reviewed-on: https://gerrit.libreoffice.org/18802
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Wed, 23 Sep 2015 07:39:17 +0000 (23 09:39 +0200)]
convert Link<> to typed

Change-Id: Ie31b7f6ed89d684b6ec0ac8e6a144ef6024ba1d2
Reviewed-on: https://gerrit.libreoffice.org/18801
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Tue, 22 Sep 2015 20:00:22 +0000 (22 22:00 +0200)]
convert Link<> to typed

Change-Id: If1e53fee4b39daed44632b2395ddb42064c698fb
Reviewed-on: https://gerrit.libreoffice.org/18800
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Tue, 22 Sep 2015 19:53:44 +0000 (22 21:53 +0200)]
convert Link<> to typed

Change-Id: I9a7f38b2babf6c599f0c2709b32ecb8083fd32cc
Reviewed-on: https://gerrit.libreoffice.org/18799
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Tue, 22 Sep 2015 19:48:35 +0000 (22 21:48 +0200)]
convert Link<> to typed

Change-Id: I39f08451c546865327f2f1014cfa33c78cdcdc9b
Reviewed-on: https://gerrit.libreoffice.org/18798
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Tue, 22 Sep 2015 19:45:56 +0000 (22 21:45 +0200)]
convert Link<> to typed

Change-Id: I210ea5a66ebb78d6aa93c53e95ddf00e93fd81e0
Reviewed-on: https://gerrit.libreoffice.org/18797
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoconvert Link<> to typed
Noel Grandin [Tue, 22 Sep 2015 19:43:00 +0000 (22 21:43 +0200)]
convert Link<> to typed

Change-Id: I2b8ef243a82c39174c1102c2e75f38dcf7efd376
Reviewed-on: https://gerrit.libreoffice.org/18796
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoremove unused Link<> parameter
Noel Grandin [Tue, 22 Sep 2015 19:40:58 +0000 (22 21:40 +0200)]
remove unused Link<> parameter

Change-Id: I9d8916b69e2e986ee1e30091cb046e7812a68ed1
Reviewed-on: https://gerrit.libreoffice.org/18795
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
6 years agoBetter fail with E_EXIST if rename(3) fails
Stephan Bergmann [Wed, 23 Sep 2015 12:01:33 +0000 (23 14:01 +0200)]
Better fail with E_EXIST if rename(3) fails

...it leads to better handling of the failure downstream, if e.g. this is an
attempt to copy a file from the presets to an existing file of a previously
partly generated UserInstallation, and the presets and the UserInstallation are
on different drives and rename(3) fails with EXDEV.  (Without this fix, removing
the UserInstallation's registrymodifications.xcu caused restarting soffice to
fail with "User installation could not be completed" in this case; regression
introduced with 6edbcc1b231feb02f304ff646c323b5df051d9a4 "cid#1242936 handle
rename failure.")

Change-Id: I409698c4e2e6cc6ccd8b2be80a393c9657b5125d

6 years agoboost::shared_ptr->std::shared_ptr
Caolán McNamara [Fri, 18 Sep 2015 08:09:12 +0000 (18 09:09 +0100)]
boost::shared_ptr->std::shared_ptr

Change-Id: I2c6ac98f0984534894759cfbf4449eb554801cf8
Reviewed-on: https://gerrit.libreoffice.org/18678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
6 years agomemleak:clear self referring VclPtr in *Field and *Box classes
Dennis Francis [Fri, 18 Sep 2015 13:21:13 +0000 (18 18:51 +0530)]
memleak:clear self referring VclPtr in *Field and *Box classes

Clears self referring VclPtr called mpField via FormatterBase in :

1. MetricField, PatternField, NumericField, CurrencyField, DateField,
   TimeField
2. PatternBox, NumericBox, CurrencyBox, DateBox, TimeBox

via respective dispose() methods.

Change-Id: I7f92fefd49756cabe7db7d240781260a2d4cd298
Reviewed-on: https://gerrit.libreoffice.org/18701
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
6 years agoCppCheck : reduce variables scope
Michaël Lefèvre [Mon, 21 Sep 2015 13:11:57 +0000 (21 15:11 +0200)]
CppCheck : reduce variables scope

Change-Id: Ief402017b693a4337f330fb07bb7a6dc6e749f72
Reviewed-on: https://gerrit.libreoffice.org/18753
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
6 years agotdf#92124 DOCX import: don't add a dummy Suffix for an empty LabelFollowedBy
Miklos Vajna [Wed, 23 Sep 2015 05:49:49 +0000 (23 07:49 +0200)]
tdf#92124 DOCX import: don't add a dummy Suffix for an empty LabelFollowedBy

Change-Id: I0c4366ad0a2f81a198860869f670767343a392be