summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-02-25fdo#54087 build npsoplugin on Windows, it does not depend on GTK+ thereAndras Timar1-1/+1
Change-Id: I033ee2316337dab549f1beddbfb7919a35d73c8e Reviewed-on: https://gerrit.libreoffice.org/2381 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Petr Mladek <pmladek@suse.cz>
2013-02-25Fix scan for central directory end signature in ODF in Spotlight importerTor Lillqvist1-5/+22
Once this was fixed it seems to work nicely. Add keywords in File:Properties and they show up in Finder's Properties, and Spotlight finds text from the document contents. (cherry picked from commit b8da61acb2bb887a7335a5db82b8b5ae1e0fab69) (cherry picked from commit 95e6a0885e65cc57b11719cc0658be9d8b78fba9) Change-Id: I9adc65d1821d0920ce3a39d05697557c4303ff68 Reviewed-on: https://gerrit.libreoffice.org/2266 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-25fdo#61376 librelogo: fix missing Asian and CTL support, etc.László Németh2-45/+136
Change-Id: If2d15d7b299d0b05e9fd3171d51c1f0e947ef561 Reviewed-on: https://gerrit.libreoffice.org/2354 Reviewed-by: Andras Timar <atimar@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-25Uploading libvisio-0.0.25 fixing fdo#60433Fridrich Štrba1-2/+2
Change-Id: I854fd87a21fc63a5c274b38831589b3d76379e25 (cherry picked from commit 392691c91fbfa96f1805f1cd556dc115b9a486e3) Reviewed-on: https://gerrit.libreoffice.org/2377 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 0f203c99fac3778500dbf664e34ac4cd2d6455de) Reviewed-on: https://gerrit.libreoffice.org/2378 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-25Allow specifying of page namesFridrich Štrba1-1/+4
Allow specifying of page names (cherry picked from commit bee8ed6772f420f9eefc57fee01da29ff466a8e9) We need to escape special characters in slide names (cherry picked from commit ea4581a914cb1aad29f16b73e35350f05f8adc1c) Change-Id: I5f523642b980469afa46e1895cfd39aa08b9941d Reviewed-on: https://gerrit.libreoffice.org/2333 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> (cherry picked from commit 4c0e53e6530c5590f7123f506a1a58bcbd04e13d) Reviewed-on: https://gerrit.libreoffice.org/2337 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-24Updated coreAndras Timar1-0/+0
Project: translations 5c4232fce18abab021c94bb603d1fe73e82d3945
2013-02-22Avoid infinite recursionTor Lillqvist1-1/+1
(cherry picked from commit 0d05957cf0c38abab45030ba172025e4ef318f43) Change-Id: I3085b82a80228211951b5230b7e8d3bcf535e052 Reviewed-on: https://gerrit.libreoffice.org/2269 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-20Don't cripple the icu dataFridrich Štrba1-1/+2
CorelDraw and MS Publisher importers use icu for conversions between 8-bit character sets and UTF8. In some cases even between UTF16 and UTF8. Thus we need the relevant data. Use the default icu-provided data for the while. Change-Id: I0f0f838cc3a0ce88b2d2a1bfd62b6c4ae98de9d3 Reviewed-on: https://gerrit.libreoffice.org/2296 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi> (cherry picked from commit aeaa4fb859e2422a4952bda022e7a40ccbd86b9f) Reviewed-on: https://gerrit.libreoffice.org/2297 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Bump android remote version to 1.0.3+, version code to 5Petr Mladek1-2/+2
Change-Id: Id6ce687c7925f6d9ebca446be16b5ae237ca97f8
2013-02-19bump product version to 4.0.1.1+, release number to 1Petr Mladek2-22/+22
Change-Id: I3e3ece8c4383af8eef23d1fd51bfd1b7575113df
2013-02-19Resolves: fdo#52519 crash on typing some MalayalamCaolán McNamara2-0/+12
(cherry picked from commit eea3634b2bd85e7f290e0504da1b8906c7d33ca4) Conflicts: icu/UnpackedTarball_icu.mk Change-Id: Ie31da5896d98908fd540146d1105ecc4257fa071 Reviewed-on: https://gerrit.libreoffice.org/2264 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Surely we want closesocket() on WindowsTor Lillqvist1-0/+4
(cherry picked from commit 49db90342f193f31500b2717cc27bdf2f25e2d95) Change-Id: I91461ae31c9934e6b3176402e2772ba7371f0fdb Reviewed-on: https://gerrit.libreoffice.org/2263 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Branch libreoffice-4-0-1Petr Mladek3-0/+0
This is 'libreoffice-4-0-1' - the stable branch for the 4.0.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I80a7ba7cc65ed9ffe97f3b98656291dabe172df1
2013-02-19fix dependencies of the obsolete stdlibs package on linuxPetr Mladek2-15/+34
The old version should get repalced by the ure package. It should also conflict with the new ure package. This commit adds support for %incompat epm tag. It produces conflicts in rpm and deb. It can be defined in setup_native/source/packinfo by linuxincompat. This commit also removes obsolete hack for debian dependencies. libreoffice-bundled conflict is mentioned in the desktop-integration package these day. The hack in epmfile.pm was not used because no package used "replace" tag. Change-Id: I5e9cb89a6108c22c61287fce1ffc6baf3f618d15 Reviewed-on: https://gerrit.libreoffice.org/2260 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-19bin also copying stdlibs into solverPetr Mladek1-3/+0
related to the removal of --without-system-stdlibs option Change-Id: I46291a2cd648505c47c6f4222aeb73bfbbd3fdc4 Reviewed-on: https://gerrit.libreoffice.org/2259 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-19Fix crashes in sdremote after suspend/resume cycles.Thorsten Behrens2-4/+5
Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-19sdremote: fix linux conditional.Michael Meeks1-1/+1
Change-Id: I911863f07b08e771d78a4a98d9a4f82c93a7d55e (cherry picked from commit da8cf16796b916552e4aa0ab294359f91a9b8c0e) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: listening to dynamic changes to adapters.Michael Meeks7-34/+124
Allows LibreOffice to start with no bluetooth, and for it to appear and disappear dynamically at run-time, cleaning up stale bluetooth sockets, and re-binding successfully each time. Change-Id: Ifa04c8cc1859c98adca94ac0e57c7ebd85f2f31f (cherry picked from commit 93abe8688a4700c04b5ab045eb296298e1b49031) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: re-work discoverable property get/set to use libdbus.Michael Meeks2-198/+248
Change-Id: I5e11a0fcfd8db648a40c738cbc8181889cb36136 (cherry picked from commit 618fe83d6e8aeabc309540fae998aeb78465bb4d) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: switch to a non-blocking socket, and polling glib mainloop.Michael Meeks2-20/+77
Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: I84c0a522fe16fbc8fc86a8e4bccb84aec0a1acd1 (cherry picked from commit 0d89d814055d5c267a2cc57e302a23e9f0b521e3) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: re-write SDP registration to use raw dbus-1 not dbus-glib.Michael Meeks1-84/+161
Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: I65ff5e603b6719df69b3c2aef7ff438ad54d23e2 (cherry picked from commit 5a90716b802d281c111e1f4f43f3fefded2c1f81) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19improve bluetooth discoverability toggling API.Michael Meeks6-40/+52
Change-Id: I289d43fcb173b64b01183a41f780bc74d2ba0abe (cherry picked from commit 21979643e47e503a20113b1e8e98814717c71ac5) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19No need of gcc3_specific eitherFridrich Štrba2-44/+0
Change-Id: Ia71e77dbde3d4fe791ca9cdd093951e708e53f32 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-02-19No need to copy the gcc libraries anymoreFridrich Štrba3-80/+0
Change-Id: I6dbf44bb78f14ab71a48a9cd4e9ebba60bfc97d2 (cherry picked from commit 8ff09509d725ce18814d5d77794f227d0c72037b) Reviewed-on: https://gerrit.libreoffice.org/2254 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-02-19fdo#60719 : fix crash on scaling bmp with target/source width/height = 1Norbert Thiebaud1-23/+71
The rendering is quite ugly compared to the same pdf opened with pdf reader. but at least it does not crash anymore. The function ImplCreateRotatedScaled seems quite sub-optimal for one thing it is called even when there is no rotation and still bother with doing a lot of work to 'rotate' things. It was assuming Width and Height > 1 for both the source and the target The patch tries to 'hide' the misery... but I'm not convinced that this is 'right'. Change-Id: I9aec5eb6655ea3678aa018ae5928dabb8058bec6 Reviewed-on: https://gerrit.libreoffice.org/2195 Reviewed-by: Arnaud Versini <arnaud.versini@gmail.com> Tested-by: Arnaud Versini <arnaud.versini@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/2248 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Make sure MetadataImporterPluginFactory has external linkageTor Lillqvist1-0/+1
Otherwise, in a LO built with hidden visibility (as gcc terminology, not ELF, Mac OS X does not use ELF), Spotlight won't be able to use our importer. (cherry picked from commit 7c6b42851bc0a94f6aa8c3e28892d1ab4b297c25) Change-Id: Ie19082f9f14e4cc75ae6f7583031b929b7b75330 Reviewed-on: https://gerrit.libreoffice.org/2247 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-02-19Kill the --without-system-stdlibs optionFridrich Štrba9-78/+4
(cherry picked from commit 3708fe8434ad6f64d527215f4619556b0a5701ff) Conflicts: external/Module_external.mk scp2/Module_scp2.mk Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f Reviewed-on: https://gerrit.libreoffice.org/2252 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-02-19fdo#34548 don't crash on undoing text frame removalDavid Tardon2-1/+70
Change-Id: I48b95c6c0cbfb2f4c4b09cc90b254b96de40b3e9 (cherry picked from commit 115054fef08998c56cba8f14472df1d15007f635) Reviewed-on: https://gerrit.libreoffice.org/2232 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19Fix fdo#59970 slowless of about box renderingThorsten Behrens2-21/+103
Prevent creation of transparent bitmap at arbitrary scale, and subsequent scaling down. For remote X, that even has to fetch pixel back from remote side for manual scaling. Change-Id: I58e011231f2b81b913a6b02dd973385ef5664379 Signed-off-by: Petr Mladek <pmladek@suse.cz>
2013-02-19apparently there's no ssize_t on windowsLuboš Luňák1-4/+4
Change-Id: Ic9aef7fe5295b7dae6f5b7ee7f28378d393cbfe4
2013-02-19Fix the Ignore system input language label truncated in translationsAndras Timar1-1/+1
Change-Id: I3d05135f7973d6ca9cb3e554a4c80544a17e6f60 Reviewed-on: https://gerrit.libreoffice.org/2246 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-19fdo#60732: check max size in SwTxtNode::ReplaceTextOnlyMichael Stahl1-2/+15
Change-Id: I1ca2075ab99fe1b09df700f55645b44f38cf5bcc (cherry picked from commit 0e49d87d92a3f1aeeeda547f1a7e710dcd4fee95) Reviewed-on: https://gerrit.libreoffice.org/2182 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: check max size in SwTxtNode::ReplaceTextMichael Stahl3-19/+25
Also adjust SwUndoReplace to not assume that everything was inserted and use the stored indexes instead in Undo. Change-Id: I52f3aaf063c2b1bd52381bdc19e29a41a12c3847 (cherry picked from commit b6d45f26ea5bcc848737921b59a16253eb1d8587) Reviewed-on: https://gerrit.libreoffice.org/2181 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: make callers of SwTxtNode::InsertText more robust:Michael Stahl8-39/+83
Return the actually inserted string from InsertText(), so callers can check if the insertion was actually successful. Especially InsertHint() will likely cause problems if it cannot insert its CH_TXTATR; also Undo objects should not Undo more than was actually inserted. Change-Id: I87c9ea8b226ae4a2a6c20c112da76db07051a1bf (cherry picked from commit d47218d79a2440e71efb66b2224063801ba6623b) Reviewed-on: https://gerrit.libreoffice.org/2180 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: SwTxtNode: limit to less than STRING_LEN charsMichael Stahl3-13/+34
It's not a good idea to have STRING_LEN characters in a SwTxtNode because then there is no valid SwPosition at the end of the paragraph. Also it turns out that LO 3.6 and 4.0 do rather stupid things with a full SwTxtNode. So enforce a limit, at first in the usual places that are used during file import, SwTxtNode::InsertText() and SwCntntNode::CanJoinPrev()/CanJoinNext(). Change-Id: Icb0f44acd20aa81635d42b84d4ae0f9b693a661c (cherry picked from commit 549c0f785d4b6d4bc1b39b22827d77d66f48430a) Reviewed-on: https://gerrit.libreoffice.org/2179 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Enable dbus in LibreOfficeLinux configurationFridrich Štrba1-1/+1
Change-Id: I959437dd440c0eec4fdfa75498a95295bb85cda0 (cherry picked from commit 706d193698eda2ef81ab7b9301d3b0240bc588b9) Reviewed-on: https://gerrit.libreoffice.org/2251 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Merge in Bluetooth code for the Impress Remote for OS XTor Lillqvist16-24/+515
Thirteen commits from master squashed into one commit. Original commit messages in order below, so note that claims are in many cases overridden by later commits. === This is the 1st commit message: Work in progress. It sets up the SDP service record and registers it, and that seems to work. Does not do anything with it yet. I wonder if the current approach to use the standard SerialPort service class will work for Macs, as they by default have one SerialPort service running, "Bluetooth-PDA-Sync", whatever that is. There is no code in the Android app to handle the case of there being several Serial Port services on the computer it wants to connect to, so what happens then when there are two will be interesting to see. (I can't find in the Android API any way to enumerate services that use the same service class. If there was, the app could choose the correct one based on its name.) So probably we should pretty soon switch to using a dedicated service class UUID instead of using the standard serial port one. As we already have the app out in the wild it will probably have to be modified to look for both Serial Port and our own service then? Sigh. === This is the 2nd commit message: Add this single-line file === This is the 3rd commit message: Fix build against Mac OS X SDK 10.4 === This is the 4th commit message: More work on the Impress Remote Control Bluetooth code for OS X Mostly the work of Thorsten, from December, adapted to compile against the current remote control code, and with one or two crucial things added. Plus lots of SAL_INFO calls added; once it works well many of them can be dropped. Does not work properly yet, do not cherry-pick just this to 4.0. === This is the 5th commit message: Nothing in the C standard about sockets === This is the 6th commit message: Fix compilation for Linux and hopefully Windows, too === This is the 7th commit message: Blind fix for WaE: class does not fully implement protocol The Xcode 3 compiler warns: class 'ChannelDelegate' does not fully implement the 'IOBluetoothRFCOMMChannelDelegate' protocol. === This is the 8th commit message: pragma GCC diagnostic is not available for 4.0.1 === This is the 9th commit message: std::vector::data() is C++11 === This is the 10th commit message: WaE: comparison is always true due to limited range of data type === This is the 11th commit message: Be specific in the logging as multiple threads involved Sure, each SAL_INFO output line includes the thread ID, but still, good to avoid confusion from where this line is coming. === This is the 12th commit message: Plug autorelease leak === This is the 13th commit message: Handle gracefully the remote end closing the RFCOMM channel Avoids a crash if one presses the "back" key on the Android remote control. (cherry picked from commit 100ac0876f1038aea7e7ef56f95d008ecc6aea3d) (cherry picked from commit c30e94a9cfc05ca8882fe78749b41207611910fb) (cherry picked from commit bc96a84370fb167ab2c63582c10535992f31768c) (cherry picked from commit f9685dc555cc79fe3a52caf9da39df37da750cd4) (cherry picked from commit dca5d2b1677ebffd1a4ff791c47b33a6252210b2) (cherry picked from commit bd6201ee4df1b7f54b1e768167a88ea5faa38fcc) (cherry picked from commit 05dbe2dda095aee2b595a29b95b5952acbe55e67) (cherry picked from commit c21916ad8a315a9dd7f23bf9aef0576975470a5a) (cherry picked from commit 730cff74c04dc6ec2cfc9cf9dcec172392f50616) (cherry picked from commit 21bec368ad670e368d4b5cadae1c07962710f115) (cherry picked from commit da3d37b968a79ff59fcc4103174b5b6bc3ec74c0) (cherry picked from commit b008101fd754b6b81c4f31e3079f01a21434601d) (cherry picked from commit 6ce04df28c8b5d6043340efe6fdc229b51dd8c36) Change-Id: Ic72b432b2174e2ad31225a1b5fa97c1a79330e48 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-18fdo#60710 SwXTextPortionEnumeration: filter out fields from the undo stackMiklos Vajna1-1/+2
The UNO API provides the annotation field associated to a comment range fieldmark when the fieldmark starts. To achieve this, it looks up the annotation field by name, but it failed to ignore the fields which are present only because the undo stack still holds a reference to them, making the ODF export filter fail to export the document. (cherry picked from commit f6a02947896e19160c137032a7fc2e56277656af) Change-Id: Ia3b738a1eca7ed9981e1963b3d70ea8e3dbe8db8 Reviewed-on: https://gerrit.libreoffice.org/2231 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-18fdo#60738 SwPostItMgr: let the cursor know if we're in annotation modeMiklos Vajna8-10/+21
This solves the conflicting requirements: If the annotation has focus ("in annotation mode"), then we want to be read-only only in case the comment anchor is inside a protected section, or so. Ignoring the fact that in the main document, the cursor is right before the annotation anchor, which is a read-only position. OTOH, if the annotation has no focus and the cursor position is before the annotation anchor position, then we do want to be read-only. With this commit, the first case passes around a boolean flag, so the annotation frame won't be read-only without a reason. (cherry picked from commit 9104d5e8905c2ec2b576b5ca452d3e23d5555e49) Conflicts: sw/inc/pam.hxx sw/source/core/crsr/pam.cxx Change-Id: I25781a4501f752f7c4d024795d57b884cb800547 Reviewed-on: https://gerrit.libreoffice.org/2163 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-18Upload libmspub 0.0.4Fridrich Štrba10-101/+104
Change-Id: Icb47740815fabff2338196ec194a51a23f7adadd (cherry picked from commit 093a5c95a3724eb4795713c5cb4472611ca22324) add boost dependency and header-finding hackery to libmspub Change-Id: I5206cb1719164c6adc0dee46db40a8a63a45c19b (cherry picked from commit 61ab813abf4d2b1d02987535c5920d0328422203) Fix internal boost variables Change-Id: Id0011bf9b40cfaf02887edf6fdbee9cf51cefc86 Use the BOOST_INCLUDE_DIR variable in Windows build (cherry picked from commit a8fd6b51e96999bea19904f183ccb2bf847c5e4f) Conflicts: libmspub/ExternalProject_libmspub.mk Change-Id: I2f86aea9177f2f3d24aea40c47d530fd7d96d21c Silence some warnings (cherry picked from commit 6d850419434c5df8cfdcd7682d49bc3d92b8de83) Conflicts: libmspub/ExternalProject_libmspub.mk Change-Id: I5a644fbe698b31bded3a5bf0fc96f1bf2be415e2 Update the internal libmspub to 0.0.5 Change-Id: Ia1e2807a9f8d624e734afa93102fb6ff27eee091 (cherry picked from commit ede5fccc348986528d52149426d344f880790637) Reviewed-on: https://gerrit.libreoffice.org/2234 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-18Update Branding for 4.0 (.1)Stefan Knorr13-112/+78
(c) Maxim Darak, Mirek Mazel 2013 Change-Id: I30fdb3234152e746e8a2a565310ab1b22115315c Signed-off-by: Petr Mladek <pmladek@suse.cz>
2013-02-18avoid space in the version of the update information providerPetr Mladek1-1/+2
LO-4.0.0.3 sends "4.0 .0.3" to the server. Change-Id: I2cda062778ac3632f89eb5c0d1cc85e57d8d1870 Reviewed-on: https://gerrit.libreoffice.org/2228 Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-02-18fix basic access to nested uno structures fdo#60117Noel Power2-8/+250
Although basic might appear to correctly change nested struct elements fdo#60117 shows that basic can be fooled ( and even the watch(ed) variable in the debugger shows the expected values ). The problem stems from the fact that the uno object held by basic isn't infact modified when changed via the introspection uno service. Additionally pimp the existing tests to check the actual uno struct to see if the changes made are *really* reflected in the object also includes commit:0ee3d79b98af3c249f47c77a0298a80f01300be5 blind wae fix for CPPUNIT_ASSERT_EQUAL Change-Id: Iff007e17df87148ea81e69d3567c8cf9857fdcaa Reviewed-on: https://gerrit.libreoffice.org/2099 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-02-18Fix typoJulien Nabet1-1/+1
Change-Id: Id5aff315b1d52ac5a869a17b3a654c2d1e670b08 Reviewed-on: https://gerrit.libreoffice.org/2216 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-02-18Fix fdo#60754 - no translations for langs sorting after qtzThorsten Behrens3-4/+7
Adjust check to not rely on lexicographical order. This amends 8ae3ddca7e99d2bdbaadd5e0c82de2f0fbd30f91. Change-Id: I0e9ea916f2efaf21a8f44df4483a55ce7f6be33f Reviewed-on: https://gerrit.libreoffice.org/2196 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-02-18SwDoc::Overwrite: probably a bad idea to overwrite fieldmarksMichael Stahl1-2/+12
Change-Id: Iba94df67c21514cf4f5361bab28629c6d5d9d3e8 (cherry picked from commit 447bb5b5006051672ec526b75bec7db02d2db82e) Reviewed-on: https://gerrit.libreoffice.org/2175 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-18fdo#60842: sw ODF import: support value-type="string" on cells:Michael Stahl2-21/+64
According to ODF 1.2 part 1 19.385 office:value-type, the attributes of table:table-cell, namely office:value-type="string" and office:string-value="foo", should override the element content of the cell. Change-Id: Ic580307effb046d127c4d64a4f963f0e91b3a2d1 (cherry picked from commit 1b5839f49c07beb6fbde6c7370a5636d22f9ab77) Reviewed-on: https://gerrit.libreoffice.org/2177 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-18sw: do not crash when it's not possible to insert flyMichael Stahl1-3/+14
Change-Id: Idfcf54013107ba6b7ce3de0d0bddbef306698f33 (cherry picked from commit 5a80c24b145c8efe0dd384ef88e7d31173522fb8) Reviewed-on: https://gerrit.libreoffice.org/2176 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-17Updated coreAndras Timar1-0/+0
Project: translations cf576bff556326dcf418d6781c1b71637ce08217
2013-02-17fdo#38451: Disable Sender and Recipient stepXisco Fauli1-1/+2
Change-Id: I5ab0989ed4e5e30b97170cbba0d516eff4befc59