AgeCommit message (Collapse)AuthorFilesLines
2013-07-31Resolves: fdo#67378 merge the label into the disclosure buttonCaolán McNamara5-1/+54
(cherry picked from commit 479bba2cdcda8dbd86861ea62c8c25bfef633148) (cherry picked from commit 06ac689a8d3887519d98a616f9a1727fcc7d0bf6) (cherry picked from commit 5718ffbf0e3e68e43f87541ce0368a15de8ec90e) Change-Id: I11c9a35e3d50a827127e4542a40f6f29580d4e8b 8b65b4986bf316e352131e737ebf736d91173d16 43df94c16a178c90da9c006565390a81c2fda29b Related: fdo#67378 rows missing HIG 6pixel spacing Change-Id: I6d4767c3159c1e9ebef19978a94ad994aab6ff4b (cherry picked from commit c2ce9bf0c2bfd2b38262de8571257c8f02b076b4) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-31fdo#66715: fontconfig: try harder to ignore duplicate fontsMichael Stahl1-14/+21
The thin space not being displayed correctly is caused by using the wrong font, namely /usr/share/fonts/liberation/LiberationSerif-Regular.ttf, which (on Fedora 18) is version 1 and does not contain u2006 etc. glyphs, whereas the LiberationSerif-Regular.ttf bundled with LO is version 2 and does contain these. There is already isPreviouslyDuplicateOrObsoleted() function to ignore older fonts but it does not work for this case because: 1) Only the previous element was looked at, but there may be several fonts with different weight/slant that need to be checked. 2) The LiberationSerif-Regular.ttf differ in the "lang" entry. Change-Id: I2f9e8d50a1f8155b65f8f07c9259dd988c32992a (cherry picked from commit 1c48e4efa2369e5708798bdefb46b74a86415d00) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-31fdo#67547 fix access to methods (getScript) of MasterScriptProvider from VBNoel Power1-1/+3
access to libreoffice objects ( and methods/properties of those objects ) from VB all goes through the ole automation bridge. There has been a long standing issue where the bridge falls over trying to access methods of the scripting framework MasterScriptProvider object. Change-Id: I3b9391286e1030bef2a12d6e546a5c47a4f68edb (cherry picked from commit 92500896a9d0ba873c06a4a2728eb5a1b9d8f68d) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-31fdo#67430 Keep original order of entry positions, not alphabetically sortedStephan Bergmann1-229/+232
...turns out ca0600f0c9022d631317423ab5a59493b41906ab "multiple unsequenced modifications to 'nPos' [-Werror,-Wunsequenced]" was wrong in assuming that the order of getPropertyPos had no meaning, as it determines the order in which form property dialogs display items. So, reintroduced a fixed order, but without resorting to undefined behavior due to repeated uses of ++ with no sequence points in between. This is rather sluggish, but gets the job done. (cherry picked from commit a6fe1fde409ff1accdea49ff9de69658de1e6f5f) Conflicts: extensions/source/propctrlr/formmetadata.cxx Change-Id: If9c5f4130fe6523eebd3a13e5a685fc9c0f53fc0 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-31fix for fdo#60883 ( macros disabled for documents opened from templates )Noel Power1-1/+4
Change-Id: I5d4478176bd18a5d7a08dd4472393ea56e1ea280 (cherry picked from commit 4bc42b6d7140144f5e17528276e8ddc80c033d6d) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-31fdo#67387 skip separating space between date and time in timestampLionel Elie Mamane1-0/+6
Change-Id: I3c38d179f8b2f59e79cd889fa88f4582f650c09e Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-07-30Related: fdo#67395 adjust height of font name tabpage, etc.Caolán McNamara6-334/+259
+ put the language label beside the language listbox which reduces height by a line + use standard spacing between frames in position tabpage + use standard spacing horizonally between elements (cherry picked from commit 1d33fc35f787061c9440ba44dfd53de405bd430a) Related: fdo#67395 drop 'Preview' frame title it's clear that it's a preview, move that string into its Accessible name for those that can't see the preview (cherry picked from commit 1193dc782f4479a81f3d283c99df2f5c7e022682) Related: fdo#67395 drop 'Font' frame title + promote the family, style, size to frame titles and drop the surrounding 'Font' one + bottom align the previews again + drop empty spacing labels in favour of 6pixel spacing (cherry picked from commit 63ced8e54f1786e5814f082c9fb87c89e5c850a9) Related: fdo#67395 add border to preview to cut up whitespace (cherry picked from commit 167416c3ed3ed52249559ff3548c0fc06d0d0eef) Change-Id: I1191db7aaf0922978bf6dd8da17ec4f133944b94 684f451542f5300cc206c9ade7f3b130b1c3c876 2c0b78163894c5283162c37bd71fa1bbc3c341c7 c66bf59294f7c9fb4059574765734749a40b043f Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30Advertized shortcuts somehow don't work well with Windows 7 shellFridrich Štrba1-0/+3
Change-Id: Ifc216cef7091bffe5971bed0b0e0ef65a26e87e0 (cherry picked from commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6) Reviewed-on: Reviewed-by: Jesús Corrius <> Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <>
2013-07-30tweak background fill color preview to be half-full heightCaolán McNamara1-16/+44
Change-Id: I44a9fc676129dda206e525ee89809f84d77aff48 (cherry picked from commit 3e787929d86ba9c306d54363a06de121fbe5c7aa) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30Related: fdo#66817 pressing space on a DisclosureButton should toggle itCaolán McNamara1-1/+1
Change-Id: Ib0f03e4389a35f1eb66c3c5951e89a9f70ec7145 (cherry picked from commit 9f7eab01a65c39b07afb1fba8819593694a3fef3) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30fdo#54264: Fix multi-argument ApplicationEvent::TYPE_OPEN/PRINTStephan Bergmann6-63/+113
...that had been broken when 5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5> "Cleaned up CommandLineArgs" changed the representation of those multi-arguments from a single string with \n delimiters to vector<string> in desktop/soruce/app/cmdlineargs.hxx, but missed updating other producers of such ApplicationEvents. (cherry picked from commit 787940e0ac285aa1101ca8964d252faaab3ea8c1, plus 04f4d4bfb708ef477618fa47d5f17779f4e4cf3c "Add TODO comment expressing doubts about existing code") Conflicts: sfx2/source/appl/appdde.cxx Change-Id: I527d620c60a87f3a01d970927c521163fb6df192 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30rhbz#989246: Honor user's JavaDriverClass override in mysql driverStephan Bergmann1-11/+25
Change-Id: Ic7dbddb5b17af0bd23864fd19ab2bd815969d008 (cherry picked from commit 63897351fc4fd31305bef43b649be74e2b6006c4) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30Avoid crash on OS X: guarded fd exceptionTor Lillqvist1-1/+4
On OS X, a file descriptor that shows up as being of type "KQUEUE" in lsof output is apparently created behind the scenes when starting a thread. (Related to BSD kernel event queues: see man kqueue.) When we re-exec ourselves on OS X, and then close all file descriptors >= 3, closing such a KQUEUE fd causes a crash. Guard against this by closing only regular files. (cherry picked from commit 73a508f574995f09559c003cb810e5d2ff2691c2) Change-Id: I5011bfbaed156b04248b6bddb2a1a58624bee3d4 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30Resolves: rhbz#989686 Fix crash with ooo120774-1.docFridrich Štrba1-0/+2
Do not try to remove line breaks from empty string Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> (cherry picked from commit 2cb9aaf44dc589af79d62d7b1136b5d65e9f47d4) Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-30fdo#55955 select first column if possibleLionel Elie Mamane1-0/+6
Change-Id: I131cb0395c481d9cc1de210abc207221dab14bf4 Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-07-30sanitize system clucene includesDavid Tardon1-0/+1
Apparently clucene bundles pieces of a very old version of boost (1.42) in CLucene/ext/boost, which breaks build with boost 1.54. (cherry picked from commit 24add548ac163651de5e3372798f0d4db347de77) Signed-off-by: David Tardon <> Conflicts: Change-Id: Ib244222f8f048aefe0484060f9ad5f41bfd24def Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-07-30fdo#67361 Prevent out-of-range values coming from ListBox GetSelectEntryPos.Javier Fernandez2-1/+7
Applied to master (LibreOffice 4.2.0.alpha) as: Change-Id: Ia787c412408ef53db3c8458f54c7843c669c81ad Reviewed-on: Reviewed-by: Lionel Elie Mamane <> Tested-by: Lionel Elie Mamane <> (without the fdo#67361 reference) Squash with subsequent fixups: 1) -Werror=sign-compare (ListBox::GetSelectEntryPos returns sal_uInt16) Change-Id: Ia6e4bf4354523f5112ee3ade1d3da6db0f9ab2c4 2) Fix previous fix Change-Id: I2d7ea38b743d78327fd19886019c1106bc1316d6 Also fix discrepancy between log-areas.dox and SAL_WARN argument. Change-Id: I03fc1014da0be8335689954725ac605e32fbbee8 Reviewed-on: Reviewed-by: Tomáš Chvátal <> Tested-by: Tomáš Chvátal <> Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <>
2013-07-29fdo#67467: fix crash when renaming table in AutoFormat dialogIvan Timofeev3-8/+6
this reverts 5031e17d4b11181be94448702b1026bd38e0b3c4 and uses ptr_vector::release instead of ptr_vector::erase to prevent object deletion. The use of "transfer" leads to "Assertion `(void*)&from != (void*)this' failed". Change-Id: I77467ce9e1d9dd4b833032ebbe920cbb34d36675 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <> (cherry picked from commit 2f527be5513159c0aebd93f356cbd2b1dc04b253) Signed-off-by: Michael Stahl <>
2013-07-29Avoid an unnecessary static initialisationTor Lillqvist1-3/+1
(cherry picked from commit 70f56860e4a9ee2a25abf64142a7f0ed4d446bfb) Change-Id: I204158ef6965cc9aa19c458f514e265ede8587f4 Reviewed-on: Reviewed-by: Stephan Bergmann <> Tested-by: Stephan Bergmann <>
2013-07-29fdo#66006 Convert to PNG for JPEG that can't be losslessly rotatedTomaž Vajngerl1-30/+35
If a JPEG image has a width or height which is not a multiple of 16 (width/heigh % 16 != 0) then it can't be completelly lossleessly rotated (the last uncomplete MCUs can't be rotated) and the image is cropped on the lower size. To prevent this such JPEG images must be rotated to PNG to prevent loss. Afterwards image can still be compressed with "Compress Graphic Dialog". Change-Id: Ie2803512a93bba55573bf66c547f132f37cba711 Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-07-29fdo#66025: Improve accuracy of ImportError traceback and messageDavid Bolen1-9/+41
The ImportError raised on an import failure with the uno module loaded now includes a complete traceback and the original Python exception message text, combined with the most relevant (nearest to failure if imports are nested) uno lookup that also failed. Cherry-picked from 948b6ea02ea9de7fb4e1e2baf95ecae3ba1cd54e plus previous patches leading up to that, 7fd81244c21ad54a8b9766902fd7c34e8055b165 "fdo#66025: Improve ImportError raised from _uno_import," 329125abb63061214897e4f215d41cfa4b13b4b0 "fdo#66025: Minor clean-up of previous patch," and fbe28de6fbfdce41544e4e93168d32661add8285 "fdo#66025: Simplify new ImportError logic." Change-Id: I8c22f22c2d96bdd7fb99a87273ba574e22a86923 Signed-off-by: Stephan Bergmann <>
2013-07-29Adapt gdb python pretty-printer to time nano-second precision API changeLionel Elie Mamane1-10/+10
Change-Id: I416d98a298f00ae445a480c738a47758544d317c Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-07-29protect against past-the-end access of empty stringLionel Elie Mamane1-4/+4
Change-Id: I4518d1a2795f4775aec7f3eb495e39afe30ec7be Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-07-29Use the Win7 semantics of SHAddToRecentDocs when possibleJesús Corrius3-3/+65
Change-Id: I7cf0dfaec408800f3c682b3ef56799818b805881 (cherry picked from commit e62fec4075e55fd62a3f0d25b230498e5705dd26) Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-07-29Make AddToRecentDocumentList aware of the DocumentServiceFridrich Štrba15-19/+23
This information helps to map a document with an application ID needed for Windows 7 shell integration. (cherry picked from commit a9ae9aefe8384a81dd79827cb76daa9ed8b58dbc) Conflicts: helpcontent2 Change-Id: I1224f566037ab7597a29b16f310f93d9f5441cce WaE: unused rDocumentService in one ifdef branch Change-Id: I542cf23c8077d9f867a2d890dc326465fce8c3a3 (cherry picked from commit 0354b4335b5c4fcf65d954e03116c44aabe7fa1d) Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-07-29update pchThorsten Behrens1-1/+0
Change-Id: I2509f22be4f853bdf0ba78804a0052864ec7ee94
2013-07-28Fix problem in German UI with cutoff label in options pageStefan Knorr1-4/+1
Change-Id: I8943aa1576f859db7e7f98fa0fa7d751116f0a8e (cherry picked from commit 5eeef5cb0814db643d31e3c5f0f4c4332e36f822) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-28fdo#54320: VoiceOver does not follow keyboard focusBoris Dušek1-1/+1
The AXFocusedUIElementChanged notification must have the application object as its parameter, as it is the application object whose AXFocusedUIElement attribute value is changing (and because the docs say so). Change-Id: Ife63a1e59d8a24256ace38fb98b69fd1544f9c96 Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2013-07-28fdo#67397: don't bother to create BlendFrame for width == 1 or height == 1Ivan Timofeev1-1/+1
... because: 1) frame painted as a line doesn't make sense to me anyway; 2) it leads to x = 1 or y = 1 in createBlendFrame, while the max value for that variable is "width (or height) - 1", i.e. 0. Change-Id: I7437bce6681e42cb57458c012927cf5d6bfc154f (cherry picked from commit dd6518d42fce1416fa00f80a7b7dead113c37752) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-07-28surely this is a typoLionel Elie Mamane1-2/+2
Change-Id: Ic7a6b330094c597aaed09377cde55c2e7be1b08f Reviewed-on: Reviewed-by: Norbert Thiebaud <> Tested-by: Norbert Thiebaud <>
2013-07-28fdo#67303: sw: speed up setting IsHidden property on stylesMichael Stahl3-3/+24
Importing an ODF document with 4089 styles is ridiculously slow, spending most of the time in SwStyleSheetIterator::First() to reset an existing iterator. Since the SwStyleSheetIterator can handle the case when First() has not been called anyway, just add a new method that resets the bFirstCalled flag, which takes next to no time. (regression from a0dcf961879ab644a52f801f65466756cb144b72) (cherry picked from commit 8fb210a2ddc0b09288316cf459bebfe196ea94fb) Conflicts: include/svl/style.hxx Change-Id: I8741b4c0cd51f8c244462ce28a754abc427d0df3 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-28fdo#67365 fix RTF import of inherited row props wrt unusual group stackMiklos Vajna3-2/+58
Inheriting row properties (in particular, the number of cells) should be independent from the RTF parser stack, but they were not. Also fix two more problems once the lost rows reappeared: - unequal cell widths were equal - some cells were aligned to center instead of to left (cherry picked from commits 494937776956370eda868f91922c4cff34656050, 986ebb668d45a42bc1e8b744980619857e891ef5, 165cd8332a0844314e698cf59936799676257ea1 and 83e0489217fd4b0fcf3ab62d002257b47e7a6459) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I273d89a0708601a38dd8bda734a72b4c92da2cc4 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-28fdo#61201: Don't forget to calculate row offset for external single ref.Kohei Yoshida1-0/+1
Change-Id: Ie3dbf2eeba98a60aa2426b1db35ac885102d3821 (cherry picked from commit 8b96cfd6caedbad7b3b79e57421a834f18c5c511) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-28fdo#67246: Detect BIFF 2 (and 3) file format like we should.Kohei Yoshida1-4/+14
(cherry picked from commit b46688a663b8709e0e0795f25ef8961db1f46cba) Change-Id: I1421cca4b0ef8e9410aab5725cc5a8d9cffef7a9 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-28fdo#60282 fdo#66745 i#122509 Corrected typo in basegfxArmin Le Grand1-1/+1
(cherry picked from commit cdf48cfdbdb5348b259f4632790ffd178fcad1f7) (cherry picked from commit 744244997da79ca95278249eeadf716730fffd82) Change-Id: Iaa62acc4901c3edd31d0af7c642327dddf07f562 Signed-off-by: Michael Stahl <>
2013-07-26fdo#33605: Handle http etc. URLs with no path but fragmentStephan Bergmann2-2/+24
Change-Id: I8c47cc55e7ad53e514c0bd46130cbbe6a1bb0357 (cherry picked from commit 44ddacb232c4fd5cbb28867aa28d7d855788a511) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-07-26fix for fdo#62729 reference pos can point to non existing tableNoel Power3-0/+31
there is an existing function ( called at least from uno names api also ) that updates the tab pos, calling that seems to fix this problem (cherry picked from commit b5fffdb8d0438a2fe933a5742d41fe50a14b71f3) with squash of unit test for fdo#62729 (cherry picked from commit 7b3d8e0a7dcf6ae05e1de5c33ed382822cf52cce) Change-Id: I6f6f31895eda9c338eeabd3f3285bf2c9eb23b7e b9be75459aa49b8bab968dedae9e0760ccef9a26 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-07-26Resolves: fdo#67344 wrong relative menu positionCaolán McNamara1-1/+1
Change-Id: I4a0cc610cc3c6a9c4164a69d40a9b0230aa702a4 (cherry picked from commit b11d022aeba5f981a9a3e4d8322ca5797f16944a) Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-07-26fdo#67086 - clear device font list before re-fetching it.Michael Meeks1-18/+18
Seemingly if this is done in the other order, then ImplUpdateFontData reads the old font list into mpGraphics leaving pointers around that are then freed by ClearDevFontCache -> GlyphCache::ClearFontCache Change-Id: I06fdc428c782820dd9f98cf77dc0eef486a096ee Signed-off-by: Luboš Luňák <>
2013-07-26targetted clean of redundant header piece from 62badf3828Michael Meeks96-288/+0
Change-Id: Ic1240114d667fb7797afae4847427cc889f3cb48 (cherry picked from commit 03993b47c522dcc71f7cd73ee21df3de9650080d)
2013-07-26Miscellaneous belts and braces around MsiShortcutProperty tableFridrich Štrba8-9/+9
These two strings are non-nullable so fail if they are null Change-Id: I7ea1a8faff96aca54f6bad5e811841f58aadd382 (cherry picked from commit 60c19683b5897beefa0e799b7efdc3e2b4da528e) Shorten the idetifiers a bit not to be more the 32 chars Change-Id: I5ee50ae740aa113670dad97067e78e063cca1a61 (cherry picked from commit 4155bc56ad2910d8acc5d6468eb1ee2a3cffcd20) Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <>
2013-07-26Resolves: fdo#61544 improve handling of grid's not enough layout spaceCaolán McNamara2-12/+47
(cherry picked from commit b64adf65afb1cfe1bd48fed0d71ac333ad962776) Conflicts: vcl/source/window/layout.cxx Change-Id: I9a73e90f639bb853b67daa98d5daac155dab5900 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-07-26fdo#67258 catch error when calling mdfindChristian Lohmaier1-1/+6
This can be the case when spotlight is disabled. So just ignore any error when trying to locate installed versions and let the user continue with the manual selection instead of aborting. Change-Id: I2c4e12652b8cb3b43af3ca6d8d553f0558f91858 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> Reviewed-on:
2013-07-25fdo#67269 adapt checkTable to getTableName changeLionel Elie Mamane1-3/+4
getTableName used to return schema.table; now it returns just table But tables are indexed by schema.table in getTables(), so reconstruct that for the lookup. Change-Id: I53da1e43762b3a470e34b5dfdb0e1bb3dc914780 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-25Related: fdo#61544 convert save opt page from box to gridCaolán McNamara1-19/+21
grids compress better than boxes if there isn't enough available space Change-Id: I12ec10c556fbe80fc1b74b12df47d6fc4b626f6c (cherry picked from commit 767b02bd7614059dd80d0cd1be306d9b63291f31) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-25Related: fdo#61544 put help tips checkboxes side-by-sideCaolán McNamara1-2/+2
sucks some height out of the page Change-Id: If1aa064e2ca6515fdde55c077381806942a255bb (cherry picked from commit 4f2fa58f027707254cc6d8f076354787c252a26f) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-25Resolves: fdo#67113 split insert autotext and field controlsCaolán McNamara3-97/+186
autotext is a modal dialog and insert field is a modeless dialog so I don't want autotext to show a toggle in insert->autotext At the same time we want the autotext entry in the insert toolbar to have a dropdown and we appear to want to be able to close the insert field dialog from the toolbar. So split the combined handler class into two and remove the other if/else branch in each with the insert field a SfxBoolItem and the insert autotext an SfxVoidItem. Change-Id: I3d59052ee70a00d63f7706166290b00ad9ae22c0 (cherry picked from commit bb98778dbf761a0c88c96117add00a66e5cc6c95) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-25Related: fdo#67113 restore some code, it has side effectsIvan Timofeev1-0/+2
these lines were removed in 8275c8fc33b63aa40a0a8a8c215f32b9986edab6 fixes missing AutoText menu entries and AutoText insertion via menu Change-Id: Ifa498d1cbfc096cca7751de9c9667fda6f1b3b48 (cherry picked from commit a645a14cf46a1160c426052823772ad117f0bd8b) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-25Propagate change on COLUMN() and ROW() functions on position change.Kohei Yoshida5-0/+64
1) Insert =COLUMN() or =ROW() in arbitrary cell. 2) Have another cell reference that cell. 3) Insert or delete column or row to change the cell that contains COLUMN or ROW function. This will change the result of that cell. 4) Check the result of the 2nd cell that references the first. The value change is not propagated. This commit fixes that. NB: master has a similar but different fix. Due to the difference in cell storage between master and 4.1, I had to devise a different fix for the 4.1 branch. Change-Id: Ib1b730e7a4a70a11b967b88730a68362e061a8a0 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-07-25resolved fdo#67249 use ScFieldEditEngine to resolve field contentEike Rathke30-90/+167
ScEditUtil::GetString() iterated over the paragraphs of an EditTextObject where GetText() does not resolve field content but returns the embedded field markers. To resolve field content an ScFieldEditEngine is needed. This makes it necessary to pass an ScDocument* to obtain the ScFieldEditEngine from, or for cases where there is no ScDocument in the context use a static ScFieldEditEngine which unfortunately is not capable of resolving document specific fields of course, such as DOCINFO_TITLE and TABLE. Also added unit test. (cherry picked from commit 1ecdc7aaf661e97a33cf521f553481d79cd26de2) Conflicts: sc/qa/unit/subsequent_filters-test.cxx sc/qa/unit/ucalc.cxx sc/source/core/data/column.cxx sc/source/core/data/column2.cxx sc/source/core/data/column3.cxx sc/source/core/data/dociter.cxx sc/source/core/data/table3.cxx sc/source/core/data/table4.cxx Change-Id: Ife3c23b2fec2514b32303239d276c49869786eb5 Reviewed-on: Reviewed-by: Kohei Yoshida <> Tested-by: Kohei Yoshida <>