summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-23Version 4.1.0.4, tag libreoffice-4.1.0.4libreoffice-4.1.0.4Christian Lohmaier
Change-Id: I8076b366f9881f69a0e82f4952e1823f8772708c
2013-07-23bump product version to 4.1.0.4Christian Lohmaier
Change-Id: Ia09b47df6f8206192f25d03c864bbd881ddccc99
2013-07-23it is not possible to sign libs that are in useDavid Tardon
... so we have to make sure they are not, by delaying the signing after all unit tests have been run. This is just a workaround; IMHO the real fix is fdo#63315 "sign windows binaries during build". Change-Id: Ia26826ec7d324f840f2606b1928bea71cb4f0c48 (cherry picked from commit 6872ad4764b5924a32f0929cbdbd13fb25ead885) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch> (cherry picked from commit edecaede4288a661a32b50ae6816b9fb5a77ace7) Reviewed-on: https://gerrit.libreoffice.org/5045 Reviewed-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-23Updated coreChristian Lohmaier
Project: translations 62f4929b2a7eec3fc5ba39d236c77ed1dccb0f56 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 Reviewed-on: https://gerrit.libreoffice.org/5038 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5043 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-on: https://gerrit.libreoffice.org/5044 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-07-22Updated coreArnaud Versini
Project: translations 4ad59c5fbe4386773ed4e8c33a0550a6385caf6b fdo#67093 Change traduction of Title in french to avoid conflict with Heading Change-Id: Ia87132d3593097cc9d7b81a254c300de8b9fa3a5 Reviewed-on: https://gerrit.libreoffice.org/4996 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-07-22avoid file conflict in debian-menus package (fdo#67031)Petr Mladek
Use versioned file name for Debian specific /usr/lib/menu/libreoffice. All the other files have been versioned for years when we did this for RPMs. Heh, nobody noticed this with DEBs because people were used to that conflict and did not complain ;-) Change-Id: I1195279ff4825ed9154cf497ff3cc702f7309b6a Reviewed-on: https://gerrit.libreoffice.org/5026 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-22fdo#65761 yet another gbuildification bugDavid Ostrovsky
Change-Id: I88bdd3f0e1cc49b21579043ceaf42616fe2f2493 Reviewed-on: https://gerrit.libreoffice.org/4973 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5033 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-22option dialog isn't fully layout aware yet, so always calculateCaolán McNamara
otherwise the font subst opt page has overlapping entries (cherry picked from commit 84e5cdce3ed58c663109bb557b75cd6e45bb2dbc) Change-Id: Ifed85cf8c1c2da70eae2d18b9ef32b61ce278c4a Reviewed-on: https://gerrit.libreoffice.org/4936 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com> Reviewed-on: https://gerrit.libreoffice.org/5032 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-22fix fdo#66586 Revert "fdo#46808, create IDL fortree::DefaultTreeDataModel"Noel Power
This reverts commit fcd01fba69db6de6cfc983fae65b6ba6764de0d6. Service DefaultTreeDataModel actually doens't exist ( and we can't find when/where it used to :-( ) The treecontrolpeer.cxx change to use the new service also had the undesired effect of throwing an exception when the UnoTreeControl model is inserted ( previously this failed silently ) The net effect is the dialog control is malformed and not initialised correctly (cherry picked from commit df9f26c22a59ae2309201d2709ea5f8a0ecbf247) also partial revert of f50553593613cbefb7f197fed66498bb6556a39a on DefaultTreeDataModel.idl so the revert above would apply Change-Id: Id76cc12a5360f6435bd39ca86020655feba20c9f Reviewed-on: https://gerrit.libreoffice.org/4865 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/5031 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-22fix crash when use increase font on table in impressFaisal M. Al-Otaibi
Change-Id: Id6c8cac4543d97657cb66b979f5dc4b5f903473a Reviewed-on: https://gerrit.libreoffice.org/4797 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5030 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-22use correct package name in libreofficeX.Y-debian-menus package (fdo#67041)Petr Mladek
Add back the missing "-debian-menus" suffix. It was lost during gbuildisation. Also add the X.Y version. The files and menu entries have been versioned since LO 4.1 but we did not versioned the package name ;-) Finally, fix typo in the package version definition and mention the release number again. Change-Id: I26e1664349c326db199905e6c5b1efb5d2d1723c Reviewed-on: https://gerrit.libreoffice.org/4970 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-on: https://gerrit.libreoffice.org/5020 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-22debian-menus packages should not conflict with older versions (fdo#67031)Petr Mladek
All the files and menu entries have been versioned since LO 3.4. There are not real conflicts with older versions or native Debian packages any longer. Change-Id: Ie3afb8b506cb23767b52a5f9cf1c721521e60ec3 Reviewed-on: https://gerrit.libreoffice.org/4965 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/5019 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-22Partially revert "Resolves: fdo#66924 switching to master view is broken"Miklos Vajna
This partially reverts commit e5726f0578223cdd2b706c73be931364c57d477c. The dictionaries hunk wasn't intentional.
2013-07-22Resolves: fdo#66924 switching to master view is brokenCaolán McNamara
It seems 0143805a565418d2a114c16b7eeba3b784176d9e wanted to not call SfxShell::Activate from ViewShell::Activate and removed that call and added an explicit SfxShell::BroadcastContextForActivation(true) (which is the body of SfxShell::Activate) to OutlineViewShell::Activate for the case where it was apparently wanted. Then DrawViewShell::Deactivate had the call to ViewShell::Deactivate removed persumably to avoid calling SfxShell::Deactivate via ViewShell::Deactivate But with ViewShell::Deactivate omitted switching to master view is broken, it does quite a lot more than call just SfxShell::Deactivate Restore the call of ViewShell::Deactivate from DrawViewShell::Deactivate and remove the call of SfxShell::Deactivate from ViewShell::Deactivate and put its equivalent of SfxShell::BroadcastContextForActivation(false) into OutlineViewShell::Deactivate to balance OutlineViewShell::Activate regression since 0143805a565418d2a114c16b7eeba3b784176d9e (cherry picked from commit 4a578dc9c7b9c5697f624807790565c99ccb919d) Reviewed-on: https://gerrit.libreoffice.org/4974 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Change-Id: I5175378af6a6527a8be4d5011f13029d028b4304 Signed-off-by: Michael Meeks <michael.meeks@suse.com> Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-07-22Resolves: #i122418# Added workaround to not use GetBitmap on windowsNorbert Thiebaud
(cherry picked from commit 136976efb17b8617a83c7f26601cd04031b51e7f) Change-Id: I2500a13a80c6be7b038187ea87fdf179da25ebe5 Reviewed-on: https://gerrit.libreoffice.org/5012 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-17bnc#829017 fix issue with negative seeks in win32 shell extensionFridrich Štrba
Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b (cherry picked from commit 2a4c55f6d46aec5164ec2ec189ee39cf71c9308c) Reviewed-on: https://gerrit.libreoffice.org/4941 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com> (cherry picked from commit 57cc8bcb701de4291be5ed4c4b2de57eef049730) Reviewed-on: https://gerrit.libreoffice.org/4945 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-07-17i#122752 check iterator in each iteration of the loopHerbert Dürr
Don't trust nextFormatEtc()'s aNum argument not to mislead the iterator beyond the container bounds. The comparable loop in CFormatEtcContainer::skipFormatEtc() already checks the iterator against the container end in each iteration. (cherry picked from commit a609daa146c5588c6a35c2c145e9573c625ec123) Signed-off-by: Jan Holesovsky <kendy@suse.cz> (cherry picked from commit 8201fd59b41700947e4a550208251b2537617358) Change-Id: I856f5915ea2e062acb43ef21c3e49ff92e719697 Reviewed-on: https://gerrit.libreoffice.org/4946 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-16bump product version to 4.1.0.3.0+Christian Lohmaier
Change-Id: I032b5cd2f807fb399a00de2509c3c4f667f2505c
2013-07-16fdo#63998: Filtering by page fields to work again.Kohei Yoshida
Change-Id: I267ccb30cfa6347313fa1de96e18731f0e22d57d (cherry picked from commit 76488b00ed75bf7915d6d57af9875c6434e740d6) Reviewed-on: https://gerrit.libreoffice.org/4894 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit eb426753811befc69b3929146ac68cb97f92f7b0) Reviewed-on: https://gerrit.libreoffice.org/4925 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-16fdo#66811: vcl: fix broken OUString with length STRING_LENMichael Stahl
ImplSalGetUniString was wrongly converted and constructs OUString with invalid length in WinSalGraphics::CreateFontSubset; this is then implicitly converted to an empty UniString so the font names are missing in the PDF files generated on Windows. (regression from 9e310cc32923ceb4b18d97ce68d54a339b935f01) Change-Id: I1603e62cf18f353f3d7de322b9111a173dc6b225 (cherry picked from commit 82f742f65d35896c69be38fa3b1c78a22226f71c) Reviewed-on: https://gerrit.libreoffice.org/4875 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6089121ebd075bb6422d33d6bff69dff2e88efb2) Reviewed-on: https://gerrit.libreoffice.org/4932 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-16fdo#57631 fix collection of property statesDavid Tardon
Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25 (cherry picked from commit d3d95afe5856ef06659d61c3572c7682e5a03766) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4911 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-16Enable sidebar by default when the Experimental Sidebar is put to 'on'.Jan Holesovsky
Change-Id: I525f15bc3f6b40522bf0dce754dd8e99386cd775 Reviewed-on: https://gerrit.libreoffice.org/4927 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Andras Timar <atimar@suse.com>
2013-07-16WaE: pOldRanges may be used uninitializedIvan Timofeev
Change-Id: I22ff60e30b8c5697f648fcd6b7b22a302c6a2135 (cherry picked from commit 7c7ca0d0028cacad15a4fdc3dc02bc5f038c9f3c) Signed-off-by: Eike Rathke <erack@redhat.com> (cherry picked from commit a33edacf6b477e661f96c00c9fc03450be31123c) Signed-off-by: Eike Rathke <erack@redhat.com>
2013-07-15Updated coreAndras Timar
Project: translations abf9df6fa0748b60511662c8c62e99d3e052307d
2013-07-15sc: fix Date/DateTime ambiguityMichael Stahl
(cherry picked from commit 585d4c165f25a6acb19b5f0d05cbb1623283717f) Change-Id: I99908a73d38b0d4b9919ac9c627b849b1d7de0d8 Signed-off-by: Eike Rathke <erack@redhat.com> Signed-off-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit bb19a11fa9a52512bf16cc6cace4c5c10fdb8eb6)
2013-07-15Updated coreAndras Timar
Project: translations 1edbc96c685441994848d67ca384062c8b60c0be
2013-07-15ucb: fix DateTime in gvfsMichael Stahl
(cherry picked from commit 5ff4ccc6c49b0d69a3a9f80f9abdc65fe60f8aec) Change-Id: I5733e1490f3f162045fa5040efaabb6550d235a7 Signed-off-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit b9228ac1e94b24a44828e4cecf26ee5faf178cd6)
2013-07-15API change: osl/time.h take const pointers where appropriateLionel Elie Mamane
Should be backwards-compatible... Change-Id: I6b04bec2c032ff8c57a1b5192b2d3962dcc96c84 Reviewed-on: https://gerrit.libreoffice.org/4736 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-15API change: oslDateTime signed yearLionel Elie Mamane
to match the rest of our date-related data structures, which were recently switched to signed year. Change-Id: Ic4f1e424b130fd2ccca379adbe0a66836b6cac41 Reviewed-on: https://gerrit.libreoffice.org/4735 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> (cherry picked from commit 51745327e55ad5ffb5df620142c27c0ad956ef1d)
2013-07-15i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.Michael Stahl
Add IsUTC member to: com.sun.star.util.DateTime com.sun.star.util.DateTimeRange com.sun.star.util.Time Add new stucts with explicit time zones: com.sun.star.util.DateTimeWithTimezone com.sun.star.util.DateWithTimezone com.sun.star.util.TimeWithTimezone Adapt the sax::Converter to read/write timezones, and fix the unit test. Everything else just uses default (no time zone), this commit is just to fix the API. STRUCT: /UCR/com/sun/star/util/DateTime nFields1 = 7 != nFields2 = 8 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/DateTimeRange nFields1 = 14 != nFields2 = 15 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/Time nFields1 = 4 != nFields2 = 5 Registry2 contains 1 more fields Conflicts: sc/source/filter/oox/unitconverter.cxx Reviewed-on: https://gerrit.libreoffice.org/4833 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 652ccbdf3111766fadc379a8cf4650b744e1e19c) i#108348: fix TimeZone -> Timezone in struct names (cherry picked from commit 604aae1fd240254fe851d93dc35b5408bd13296c) Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu> Signed-off-by: Michael Meeks <michael.meeks@suse.com> Conflicts: forms/source/xforms/convert.cxx offapi/type_reference/offapi.rdb reportdesign/source/core/sdr/RptObject.cxx sc/source/filter/oox/unitconverter.cxx (cherry picked from commit dd780228cca25dc818ca7fdb628ff607c109618e)
2013-07-15i#108348 sax::Converter: support negative date and dateTimeMichael Stahl
Change-Id: Ie2726c7ec941a5690e053d39212d7f516e2c27ba (cherry picked from commit 56dc79822d5c464b33b1d0199558ca684e94c069) Reviewed-on: https://gerrit.libreoffice.org/4920 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit f6dab88453fc2cec29f0fe95663452d98a74fd17)
2013-07-15Resolves: fdo#66761 Macro controlled Python Mailmerge brokenCaolán McNamara
Change-Id: Id8bbf06a5571534aa5eef8624e89565fe3715938 (cherry picked from commit c4aa13c931da11164835a7aafbfd7e44bd5714ca) Related: fdo#66761 the double-encoding bug appears gone in python 3.3.2 i.e. I see the bug in our built-in python3 3.3.0 but not in my system python 3.3.2 and there's a raft of email related bug fixes in the 3.3.2/3.3.1 python Changelog Change-Id: I257770cd0ec41fc3b2f2a638009b075b9a2f325f (cherry picked from commit 24078e3501042e8693ef1f9d3edebbc47e37ce12) Related: fdo#66761 we want the bytes, not a str representation of them Change-Id: I3c268b0c51f7e1ddd2fa6588f40412a33f316b52 (cherry picked from commit f460556bfa6bd55df3cd4b2288524d63db284d7e) Reviewed-on: https://gerrit.libreoffice.org/4909 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit c71f67198cd6fc98f77289c4f0276a45d19700d8) Reviewed-on: https://gerrit.libreoffice.org/4915 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-15fdo#66655: Get GETPIVOTDATA to work again.Kohei Yoshida
1) Compare data field name as it is displayed in the table output. 2) In the result tree, store field member names as strings as displayed in the table output, instead of as ScDPItemData. GETPIVOTDATA operates on displayed cell values and do textural comparison. There is no use storing ScDPItemData which screws up value lookup in the result tree. Change-Id: I31bc03a6800f4fadf2ba1180d1958354d43e8a07 Reviewed-on: https://gerrit.libreoffice.org/4853 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com> Reviewed-on: https://gerrit.libreoffice.org/4869 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2013-07-15fdo#66745: drawinglayer: properly restore anti-aliasing modeMichael Stahl
VclPixelProcessor2D: the constructor changes the anti-aliasing mode of the given output device, and the destructor restores a hard-coded mode instead of what was there before. Due to this commit 5913506b2193e93ca2767ab7365ab2e76ed7848f turned off anti-aliasing for FontWork objects simply by creating a temporary VclPixelProcessor2D. Change-Id: I7f7fcbf86b0dd425f599cd8e62fce3c69a2744bb (cherry picked from commit 420aa16af0bbab4bdef80ceeb8d44cabe65840e0) Reviewed-on: https://gerrit.libreoffice.org/4872 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit 56ed1221d4d578260d9e20715d073b70a099efa4) Reviewed-on: https://gerrit.libreoffice.org/4903 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-15fdo#64448: Don't get type name from incorrect filter.Kohei Yoshida
This causes wrong format type to get "detected" when testing for a completely different file format type. Change-Id: I230759e2be432beeae2db24c12369ccb4585f334 Reviewed-on: https://gerrit.libreoffice.org/4877 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: David Tardon <dtardon@redhat.com>
2013-07-15bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributesMiklos Vajna
Paragraph attributes were set directly on the SwTxtNodes, instead of going through SwWrtShell::SetAttr(), which handles undo/redo. Regression from 357fac9713875302d30185feabaf5c165e040ca4. (cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61) Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6 Reviewed-on: https://gerrit.libreoffice.org/4868 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5156749cde88c5274b36a22dab7b561d59b93cf1) Reviewed-on: https://gerrit.libreoffice.org/4871 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-15Fix some runtime exceptions with msvc-built libvisioFridrich Štrba
The previous code was causing silent exceptions in some particular cases. Passing through a temporary works well. Change-Id: I71a9a58b98b5f392da4d8a4c8d08ddc1487ec79f (cherry picked from commit ae9003af4c3942aa184b67c3cb7687f9dfc7dd5e) Reviewed-on: https://gerrit.libreoffice.org/4880 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-07-12fdo#66072 do not end auto_*_ALL by a commaDavid Tardon
Reviewed-on: https://gerrit.libreoffice.org/4829 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit bd3aa6983796f9dedf85c446a0ce5e5505583809) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: scp2/source/base/module_base.scp scp2/source/calc/module_calc.scp scp2/source/gnome/module_gnome.scp scp2/source/graphicfilter/module_graphicfilter.scp scp2/source/impress/module_impress.scp scp2/source/kde/module_kde.scp scp2/source/math/module_math.scp scp2/source/onlineupdate/module_onlineupdate.scp scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/ure.scp scp2/source/tde/module_tde.scp scp2/source/writer/module_writer.scp solenv/gbuild/AutoInstall.mk Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939 (cherry picked from commit 2f40865f544edd18ca6832ad94f22aa3be373245) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4832 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Andras Timar <atimar@suse.com>
2013-07-12tab traversal order wrongCaolán McNamara
Change-Id: If3b46a1f41cfdde7e6ae04c2aba48fc49d6f2230 (cherry picked from commit 76789dd61c750b5655fc4dcd7629b12e1ff5d17b) Reviewed-on: https://gerrit.libreoffice.org/4860 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com> (cherry picked from commit a109cf6ab5d208ff6bfc6de180ed0aaa776815c7) Reviewed-on: https://gerrit.libreoffice.org/4864 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-12ORDER BY columns are prioritarily *SELECT* columnsLionel Elie Mamane
as opposed to *table* columns, and notwithstanding HSQLDB 1.8 (our embedded database) bugs. Actually, supporting ORDER BY on non-select (but table) columns is OPTIONAL for DBMSs (but quite common) Conflicts: connectivity/source/parse/sqliterator.cxx Change-Id: I6725dfda36b09429a78262bff6f3d3e3dd9032b6 Reviewed-on: https://gerrit.libreoffice.org/4842 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Andras Timar <atimar@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-12sort is ascending by defaultLionel Elie Mamane
Change-Id: I38354405acbbdb27b9e7ce1d19e862b7b352c850 Reviewed-on: https://gerrit.libreoffice.org/4840 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Andras Timar <atimar@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz>
2013-07-12delete in destructor checkbox created in constructorLionel Elie Mamane
Change-Id: Ifceae4c7ffe15bfc62ce34f4463fd4e071403359 fixes: debug build aborts when closing that window Reviewed-on: https://gerrit.libreoffice.org/4841 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Andras Timar <atimar@suse.com>
2013-07-12Resolves: fdo#66524 string conversion gone wrongCaolán McNamara
Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0 (cherry picked from commit 019a8f3f74ec778d5fead4d2b4d47e75cf750bf7) Reviewed-on: https://gerrit.libreoffice.org/4849 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Andras Timar <atimar@suse.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-11fdo#66718: Revert "fdo#46808, Adapt SystemClipboard UNO service to new style"Stephan Bergmann
This reverts commit 2fe852386c9450014f84910b0a282d684f40b56a, see <https://bugs.freedesktop.org/show_bug.cgi?id=66718#c8> for details. (On master towards LO 4.2, this will be addressed differently, by modifying 2fe852386c9450014f84910b0a282d684f40b56a instead of reverting it, so this libreoffice-4-1 commit is not a cherry-pick of any master commit.) Conflicts: dtrans/source/win32/clipb/WinClipboard.cxx offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl offapi/type_reference/types.rdb vcl/ios/source/dtrans/ios_clipboard.cxx vcl/ios/source/dtrans/ios_clipboard.hxx vcl/source/window/window.cxx (cherry picked from commit 60455c972b09ca02b18660c6fb3dafc03b30b2b5, plus bd115a62bb3d1b741a035ace9d9c2608acd95c47 "fdo#66718: Remove XSystemClipboard from reference rdb again") Change-Id: Idb804196bc5693e4e8674d805edefd9d1ae7c178 Reviewed-on: https://gerrit.libreoffice.org/4817 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-11Uploading new libvisio 0.0.30Fridrich Štrba
with huge performance/memory consumption improvements with NURBS and B-Splines Change-Id: I5f338d6c70f948dd2192ec7147efdc1bdeef1e05 (cherry picked from commit 0f978a88c618af59e77aeba920093c5e67559c88) Reviewed-on: https://gerrit.libreoffice.org/4811 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> (cherry picked from commit 55be2ef39353de434600fac0611747177ab9da30) Reviewed-on: https://gerrit.libreoffice.org/4819 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-11fix reading fonts from .odp using style::font-name (fdo#65338)Luboš Luňák
b40bcde076f9fabf24810d2520e878d604d99637 made writing .odp use style:font-name and office:font-face-decls, instead of using fo:font-family . But the reading back was broken, as xFontDecls is not set in XMLTextImportPropertyMapper::handleSpecialItem(), so the font data was ignored. And xFontDecls was not set because it's set while reading office:font-face-decls, which is at the top of the xml document, but even before the xml is parsed, the call to SdXMLImport::setTargetDocument() calls GetShapeImport(), which creates XMLShapeImportHelper instance, which calls XMLTextImportHelper::CreateParaExtPropMapper(), and XMLTextImportPropertyMapper is created with rImport.GetFontDecls() still being NULL at that point. And it actually doesn't seem to make any sense to just pass around all the pointers to XMLFontStylesContext, as eventually it's always just the one from SvXMLImport. So simply dump all that and make the one single place that actually uses it (i.e. XMLTextImportPropertyMapper::handleSpecialItem()) refer directly to SvXMLImport::GetFontDecls(). Change-Id: Ib1b3e4b1bcaf87ca3e4703d1cc1563ad6b3f9ce7 Reviewed-on: https://gerrit.libreoffice.org/4816 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit cc3293b94ab58b196bc2786eb4012d64351e8fa4) Reviewed-on: https://gerrit.libreoffice.org/4820 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-10fdo#58644 fix handling of subqueriesLionel Elie Mamane
don't remove parentheses around subqueries (without the parentheses, it is not valid SQL) Change-Id: I4e9c55cea0276f10b0f97e31bc329949aba5b989 Reviewed-on: https://gerrit.libreoffice.org/4791 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-10don't use empty table nameLionel Elie Mamane
Change-Id: I9c8c3882f659747d53a047481ccabf1785835c99 Reviewed-on: https://gerrit.libreoffice.org/4793 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-10fdo#65589: Treat legacy types.rdb w/o /UCR key as emptyStephan Bergmann
...as they are encountered in the wild. Change-Id: Iae46d3b4b4aca18a09680caabc0e343f8a534989 (cherry picked from commit 87bad231d6f81c611ba145aea483a568623ca42e) Reviewed-on: https://gerrit.libreoffice.org/4789 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-10fdo#65932: sw: remove SwDoc::ShareLayoutMichael Stahl
It is a crude hack that is no longer necessary because the underlying problems that caused crashes when deleting the layout have been fixed. Also it appears to cause crashes now. (cherry picked from commit f8dfa3a81a5382b2f18a705bd512625754167573) Reviewed-on: https://gerrit.libreoffice.org/4706 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 076bc3ce70b9254e00547de34a86dafd76ed1e51) Change-Id: I601bdb0dc0aff5f4ddb8b8f4ba4c8d1f72c76666 Signed-off-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4768 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>