summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-26Updated corelibreoffice-4-1-1Andras Timar1-0/+0
Project: translations c1cc180bf7eef188402e1fe02e1a134244a1993d
2013-08-21bump product version to 4.1.1.2.0+Christian Lohmaier1-1/+1
Change-Id: I55bb860ac817d4d291b3dc1c7d99b71dd85595c6
2013-08-21Resolves: rhbz#998136 different index to gWidgetData vs NWEnsureGTKNotebookCaolán McNamara1-2/+2
Change-Id: Ib3ebbfda09cd05477b65c1d81ac77e977b2a11e5 (cherry picked from commit 0aa3a73c9463f4d1e8918383b21131352635fe75) Reviewed-on: https://gerrit.libreoffice.org/5546 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2013-08-21NSAppKitVersionNumber10_7 is not defined in SDK 10.6Norbert Thiebaud1-0/+5
Change-Id: Ie52fdd9360bd8393baa733aed0d42f5cb9a57bf7 Reviewed-on: https://gerrit.libreoffice.org/5555 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi> Reviewed-on: https://gerrit.libreoffice.org/5564 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-08-21fdo#66145: revert change to CopyMasterHeaderMichael Stahl1-0/+4
Not copying the nodes for first page is not an option; the real problem with the fdo45183.rtf is that flys in the header are not copied along with the nodes, like it is done in SwDoc::CopyPageDescHeaderFooterImpl. Also, the same problem may occur for footers too (CopyMasterFooter). Conflicts: sw/source/core/doc/docdesc.cxx The comment above is for the master commit, but copyting the flys is actually necessary with e1a9a348a519a69f898c9c1e6d87a5837b8267f9 too, since that copying code is now executed when changing sharing flags in the UI so withtout this commit you lose any flys anchored in the header/footer. (cherry picked from commit bf206549228685a68e1504db05119d8fa1d354b3) Change-Id: I985a6b89f8cde96dc0fa0b489c44d77987f91a8a Reviewed-on: https://gerrit.libreoffice.org/5541 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-21fdo#66145: fix copying of header/footer when un-sharingMichael Stahl1-4/+12
SwDoc::CopyMasterHeader/Footer(): this could result in sharing the first-page header/footer with the left-page (!) when un-sharing via the dialog; the reason is that what actually happens here is that the left-page header/footer was never changed but the master one was copied in SwDocStyleSheet::SetItemSet(), so it sort of worked by accident before the first-page header/footer was added... Change-Id: Ia24df6ad59cda484559f2ca48ecaa7563878120b (cherry picked from commit e1a9a348a519a69f898c9c1e6d87a5837b8267f9) Reviewed-on: https://gerrit.libreoffice.org/5532 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-21fdo#66145: fix Undo invalidation in SwDoc::ChgPageDesc()Michael Stahl1-3/+3
SwDoc::ChgPageDesc(): make the invalidation of the Undo stack on change of IsFirstShared work by delaying ChgFirstShare() until after the check. Change-Id: Ifbefe446df8b6d785ed1bb6394ec5beb803fb1fe (cherry picked from commit 0b7a823bb6df79384939dda4de3b7f28e5e52758) Reviewed-on: https://gerrit.libreoffice.org/5531 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-21fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()Michael Stahl1-2/+2
... and GetRightFmt(). If the first format is requested it must be returned; the sharing works by copying the SwFmtHeader/Footer from aMaster to the other members. (regression from 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a) Change-Id: I1708f01c18b155ae75c14fc407e52ccd2bd798d7 (cherry picked from commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa) Reviewed-on: https://gerrit.libreoffice.org/5530 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-20Resolves: fdo#67665 font names filtered out on odp/odg exportCaolán McNamara1-18/+41
Change-Id: Ia529992d15152db981379a1e0a4dec63b2dad40c (cherry picked from commit 26dc5f2ee67342bd474640e1cc39b96d3220721b) Reviewed-on: https://gerrit.libreoffice.org/5540 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-08-20Updated coreAndras Timar1-0/+0
Project: translations 2aeef1e101f95039d4927e362bc0d0a32a68b6ba
2013-08-19Resolves: fdo#68220 wrong index into source tableCaolán McNamara1-1/+1
code in master is all very different, so 4-1-* only I think Change-Id: I9277faa462b66a38c7da3ba9a92b0381c67cfe23 Reviewed-on: https://gerrit.libreoffice.org/5515 Reviewed-by: Kohei Yoshida <kohei.yoshida@suse.de> Tested-by: Kohei Yoshida <kohei.yoshida@suse.de> (cherry picked from commit 48cfdaa4fa453af03d18832e3765ffd65a5e107f) Reviewed-on: https://gerrit.libreoffice.org/5517 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-19don't unconditionally enable buttons on switching to accept/reject pageCaolán McNamara2-5/+21
we want to disable all of them when switch to the options page and *restore* the original enable/disable state when switching back i.e. don't enable them if they were disabled due to change tracking password protection regression since 8655095a4910ca795dfd182e6796d9375727a694 Change-Id: I2dd6c83fd9613adf42571684a08bff81b86c9ee1 (cherry picked from commit 30ba8fa46aafb0868ada3b0092cd33524c145989) Reviewed-on: https://gerrit.libreoffice.org/5502 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit c373d4a7807581459a474ffc0a277d0d6c00447a) Reviewed-on: https://gerrit.libreoffice.org/5508 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Eike Rathke <erack@redhat.com>
2013-08-19fdo#67109: Order of XConstantsTypeDescription.getConstants is unspecifiedStephan Bergmann1-1/+24
...it looks like it used to be the order the constants appeared in the .idl file, while now it happens to be the lexicographical order of the constant's names. For all the constant groups in com.sun.star.report the order expected by the code appears to be the order of the constant's numeric values (which happens to coincide with the order of appearance in the .idl files), so explicitly sort them that way. Change-Id: I550401b2742fffb7c96a7787498967a7cd78fff8 (cherry picked from commit def066bb6559e8c77eeb924db1356f9848f5c8a2) Reviewed-on: https://gerrit.libreoffice.org/5513 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2013-08-19fdo#66827 sw: rename SID_ATTR_FILL_GRADIENT to SID_SW_ATTR_FILL_GRADIENTMiklos Vajna4-11/+13
Change-Id: Ieff7fc6a5b718e11de7d1e4ec2087d64a8a13cae (cherry picked from commit f694f14ab64f48e40365fd877e201a0382297368) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 823cab696bdaa059e5d1243a636e7d975b2110cc) Reviewed-on: https://gerrit.libreoffice.org/5464 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-18Updated coreAndras Timar1-0/+0
Project: translations 7eff5d70cd428d75e17c6a180465bfdb1e7e310a
2013-08-16Resolves: fdo#67539 intermittent crash on failed empty response during updateCaolán McNamara1-2/+2
version1 is empty and version2 is not, so on second segment of version2 the i1 is already -1 from the first segment check -> kaboom (cherry picked from commit 3bb28b5aaef5e85a981dc9411db1f05524aeedf6) Reviewed-on: https://gerrit.libreoffice.org/5436 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b6842e227d979c24b50fe5971d183f58df4788e3) Change-Id: Ic19511a3b150f40d3cd9cf66bf9d86c94f3f9187 Reviewed-on: https://gerrit.libreoffice.org/5451 Reviewed-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-08-16resolved fdo#67571 write flags and formula token array againEike Rathke1-33/+33
Regression introduced with 337066eb1fa395990b78d1032c399a4688d2a6f9, flags and formula token array weren't written if the formula result was an error value. Change-Id: I8ccd55a7b43d5ceb79002e01f0b3d33d36d85538 (cherry picked from commit 25763e59625ce83de4b82927359108f9e7878744) Reviewed-on: https://gerrit.libreoffice.org/5430 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Kohei Yoshida <kohei.yoshida@suse.de> Tested-by: Kohei Yoshida <kohei.yoshida@suse.de>
2013-08-15fdo#67799 read ending item also when assert is noopMatúš Kukan1-6/+3
Change-Id: I056212d0a01f7a647e846bbd1b605c04e1798a14 Reviewed-on: https://gerrit.libreoffice.org/5336 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 7d8ab35f1f4a069d08b57652f79870fdcfc649af) Reviewed-on: https://gerrit.libreoffice.org/5422 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-14Resolves: fdo#67743 user autocorr file not writtenCaolán McNamara1-5/+8
regression since c9c2fbe485de2bb831bd2e58faef87a19ceff622 revert the logic change and keep the OUString conversion Change-Id: Ia4f8c3be2b6e325122ae7b21c431c301b8afecad (cherry picked from commit d2c3297eed9917c110da67b2a4c19265aecb38ed) Reviewed-on: https://gerrit.libreoffice.org/5325 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 447c22283f7e7d592a5653925f9c1bbc7fa3766a) Reviewed-on: https://gerrit.libreoffice.org/5390 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-14Uploading libwpd-0.9.9 releaseFridrich Štrba1-1/+1
(cherry picked from commit 9b56ecd00f409000a3c703bfe291a06b77bfe943) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: download.lst Change-Id: If20156c48ec145389750a2283efad055d3b84363 (cherry picked from commit 9a0d1a3a5b81172a60dd6eefbedb9ea5d69859b8) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/5384 Reviewed-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Tor Lillqvist <tml@iki.fi>
2013-08-06bump product version to 4.1.1.1.0+Christian Lohmaier1-1/+1
Change-Id: I80f7ad12f1c8b1ea5a8895c0693870907d936d12
2013-08-06Branch libreoffice-4-1-1Christian Lohmaier3-0/+0
This is 'libreoffice-4-1-1' - the stable branch for the 4.1.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I463cf417b211b81c19f05807ca6cd4863acf7d44
2013-08-06fix build with debug STLDavid Tardon1-7/+17
Failed with: /usr/include/c++/4.8.1/debug/safe_iterator.h:510:error: attempt to compare iterators from different sequences. Objects involved in the operation: ... The problem is that miPos in _copied_ object points ot maAttrs in the original object, not in the copy (and std::for_each takes a copy of the functor). This could be solved by defining copy constructor and operator=, but given the limited usage of the class, it is simpler to let copies share the state. (cherry picked from commit 95d1b05430d0d6384c6910fa9dfdd3c703201d34) Conflicts: sc/source/core/data/documentimport.cxx Change-Id: Icf3f02ecd2fe4ce6dd77f3cde226d32beb4d4b3f Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-08-06Updated coreAndras Timar1-0/+0
Project: help 2fbadc6dc2dc9ffb22764a41ec58cffb8674f926 add sid auxiliary files Change-Id: Iec7caac1f2c3c4f96db69adb9ecd696f420e7e6c Reviewed-on: https://gerrit.libreoffice.org/5294 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2013-08-06Updated coreAndras Timar1-0/+0
Project: translations 11b12e4cd996eb813d285253ca6b0bfb8a4139d4
2013-08-06Adapt Dialog XML import/export codeLionel Elie Mamane6-12/+116
to: commit 8ee69b0ba13f74d1515fac71df92947eb6328ab1 fdo#67235 adapt form control code to time nanosecond API change, step 3. Change-Id: I57b549c9c1379154173bb50463171a60ce35ca0c
2013-08-06Adapt UnoControlModel::read/writeStephan Bergmann1-0/+28
...to 8ee69b0ba13f74d1515fac71df92947eb6328ab1 "fdo#67235 adapt form control code to time nanosecond API change, step 3." It is a bit unclear to me how exactly this code is used, so to be safe, just read and write in the old format (of using a single integer to represent a Date resp. Time) at least for now, loosing nanosecond precision and the UTC flag. Change-Id: Ib5148f750a420ad09366c79b68370ad0efd501f4
2013-08-06More little fixes for JunitTest_forms_unoapiStephan Bergmann2-2/+6
...needed since 8ee69b0ba13f74d1515fac71df92947eb6328ab1 "fdo#67235 adapt form control code to time nanosecond API change, step 3." Change-Id: If0fc8109d6da56c8e8df181ae0b35a4d9b34e767
2013-08-06Add cases for css.uno.Date/Time to ValueChangerStephan Bergmann1-0/+12
...needed since 8ee69b0ba13f74d1515fac71df92947eb6328ab1 "fdo#67235 adapt form control code to time nanosecond API change, step 3." Change-Id: Id561151ac4b57b972761ec19f0e8943b8d25a54f
2013-08-06Fix uses of Java == on css.uno.Date/TimeStephan Bergmann2-20/+20
...introduced with 8ee69b0ba13f74d1515fac71df92947eb6328ab1 "fdo#67235 adapt form control code to time nanosecond API change, step 3." Change-Id: Ifdd449715ce0be602b7bc2d304d503385195eb66
2013-08-06correct pointers in offapi documentationLionel Elie Mamane1-3/+3
Conflicts: offapi/com/sun/star/sdbc/XStatement.idl Change-Id: I24389f1d35514cd45bbe203dbb3af83e4174a2d4 Reviewed-on: https://gerrit.libreoffice.org/5284 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-06fdo#67685 open xSourceLibrariesStor only when neededLionel Elie Mamane1-15/+15
else it keeps loadLibrary from completing, because the latter cannot open the storage because it is already open in read/write mode. Change-Id: Icd0aabfff6e67af2c38a8f9185f8485b46ab1516 Reviewed-on: https://gerrit.libreoffice.org/5262 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-06Resolves: fdo#65609 restrict width of all user-controlled edis and listsCaolán McNamara2-35/+49
Change-Id: I1f15e17c903daee849c53a689a8bb3465bac5f74 (cherry picked from commit 4938d06ad251e8e57ff66b185189d98587ca5104) Reviewed-on: https://gerrit.libreoffice.org/5253 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-06let's own the packaged stuff by root:root again (fdo#67388)Petr Mladek2-1/+9
We have started to use -fvisibility=hidden globally with GCC. The hacky libgetuid.so does not work if the symbols are hidden. In addition, the library was renamed from getuid.so to libgetuid.so during gbuildisation; There was more location where it was not fixed; The result was that the packages and files in the Linux download tarballs were owned by some "ugly" user and group. Change-Id: I22f62b861c373f2553dcccc85a84dddabaf1f418 Reviewed-on: https://gerrit.libreoffice.org/5251 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-06Add AppUserModelID for all supported formatsJesús Corrius1-0/+11
Now only the ODF formats have AppUserModelID, but we need AppUserModelID for all supported formats so the Windows 7 recent documents works as expected. This patch only adds a few registry keys during the installation process on Windows. Change-Id: I2d7460c1ed8b4ba77da8bb1c5b0c696c521353c5 Reviewed-on: https://gerrit.libreoffice.org/5275 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-06SingleSelectQueryComposer: the name of a non-SELECT column is its "real" nameLionel Elie Mamane1-7/+15
That is, the name in the table. Change-Id: I95326915f381ec0cf72c66f13352ce76d82e9517 Reviewed-on: https://gerrit.libreoffice.org/5247 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-06fdo#64117 *always* set the filter name to the correct nameLionel Elie Mamane1-2/+1
the removed test made absolutely no sense: aliasName is a fully-qualified name, but columns is indexed by column name. That is, schemaName.tableName.columnName as opposed to only columnName. Change-Id: I9066b5183298e3e6ab63c367594f92bb3e00979d Reviewed-on: https://gerrit.libreoffice.org/5246 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-06fdo#67639 Rotate crop area when the image is rotated.Tomaž Vajngerl1-1/+23
Change-Id: Ifdd0080f278b67b815f15c71523497de59e615bd Reviewed-on: https://gerrit.libreoffice.org/5235 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-08-05fdo#67684: Store imported text style entries, else they won't get exported.Kohei Yoshida1-0/+5
Change-Id: Id784772e677e176622e75ff5ae33ab3eb78b1d9a Reviewed-on: https://gerrit.libreoffice.org/5263 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-08-05fdo#67099: Don't use edit engine for a single unformatted paragraph.Kohei Yoshida2-8/+38
which is most common, and using edit engine for it would decrease loading performance. Change-Id: I65c20eef96c88edd8eb07c73c27716c4f03c4cda Reviewed-on: https://gerrit.libreoffice.org/5259 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-08-05fdo#67099: Remove overheads on inserting cells during ods import.Kohei Yoshida10-260/+485
We will switch to using ScDocumentImport to populate the document from import filters, instead of using ScDocument directly. Conflicts: sc/inc/column.hxx sc/inc/documentimport.hxx sc/source/core/data/column2.cxx sc/source/core/data/column3.cxx sc/source/core/data/documentimport.cxx sc/source/filter/xml/xmlcelli.cxx and a whole bunch of changes backported in order retrofit this code in the 4.1 branch. Change-Id: Ie59d6877d1ac4fc04751a84b663772a9dc9a3efc Reviewed-on: https://gerrit.libreoffice.org/5258 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-08-05bnc#593612: workaround for grpFillFelix Zhang1-3/+2
Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc (cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-08-04Clean up documentation of XDate-/TimeFieldStephan Bergmann2-7/+0
...after 8ee69b0ba13f74d1515fac71df92947eb6328ab1 changed it from using integers with special interpretation to self-explaining data structures. Change-Id: Ib05dbde969fedcfb5f8c55a926bfef4120e38030 (cherry picked from commit 118aee93197e093bc853b69ec8557f3e9cd512f3)
2013-08-04fdo#67235 adapt form control code to time nanosecond API changeLionel Elie Mamane31-432/+441
squash of steps 1, 2 and 3 in master Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-08-031st step fix for exporting SheetProtection fdo#64753 is to import correctlyNoel Power6-6/+117
(cherry picked from commit 016e18680e471d9f0cea8ee35f9716ae0f9baa11) 2nd step to export SheetProtection fdo#64753, actually export the data (cherry picked from commit 8ce1124359783df750d176b8390b4eb0f54fb6ba) unit test for fdo#64753 ( import/export of sheetprotection ) Conflicts: sc/qa/unit/subsequent_export-test.cxx Change-Id: If420b386543c15c7b550a720b6e2db69bf372d7f Reviewed-on: https://gerrit.libreoffice.org/5229 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-08-02fdo#67470 Element Dock: Subset icon missing in Set Operation sectionJoren De Cuyper1-1/+1
RID_XSUPSETY wasn't just listed, RID_XSUPSETEQY (notice the Q) was. Adding it adds it to the dock. Change-Id: I4c621aab74b424aacd5421ed90f35b42ae6e0a14
2013-08-02Fix build.Thorsten Behrens1-1/+1
Change-Id: Ic1a6ce26e84982a617d9814645a7bfc3ccd3a63f
2013-08-02fdo#67489: Don't stop range search even when the first cell is empty.Kohei Yoshida2-2/+37
Because we aren't supposed to. Think of those formula cells that follow the empty one. Change-Id: I2cd04833d5e6c561e9ab6d83a984dbdceefa2e71 Reviewed-on: https://gerrit.libreoffice.org/5233 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-08-02fdo#67621: Delay populating the ranges until the dialog is shown.Kohei Yoshida2-5/+15
Otherwise the table widget won't have any idea which rows are displayed, and end up not populating the ranges. This is caused by the switch to the .ui dialog, which delays calculation of the dialog size until late. But the code that populates the ranges was execuated when the widget was instantiated, at which time the widget didn't have its size assigned. Change-Id: I22943b41b21b58cc67e872dff13ad3c25eee8438 (cherry picked from commit b8b807ae589a0b0daa101a0b00bcbe21aa138e2f) Reviewed-on: https://gerrit.libreoffice.org/5227 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-02libmerged needs -lrt tooMatúš Kukan1-0/+1
since 9830fd36dbdb72c79703b0c61efc027fba793c5a Change-Id: I2cf7e59676d36fb0fe1a1ea4b70fa96d2a9ba976 Reviewed-on: https://gerrit.libreoffice.org/5240 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>