summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-02-16Proper escaping of quotes for android xml resource files.Thorsten Behrens1-1/+1
Change-Id: I9f76986465af5798f1451d44af6765f4e5d1bb09 Reviewed-on: https://gerrit.libreoffice.org/2173 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-02-15sdremote: hide TCP/IP server selection dialog menu itemMichael Meeks1-8/+18
Now shown only in experimental mode (ie. when TCP/IP is enabled) to reduce user-confusion. Said dialog is not needed for bluetooth. (cherry picked from commit 13cb088a2d8902822e3eb5607ba4cac81ad4d2f2) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-15sdremote: avoid crash when fiddling with elapsed time.Michael Meeks1-1/+1
(cherry picked from commit 03b941e9ae63626a3336aabdb6a3485835ec6f9d) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-15Ah, manually adding computers is for non-Bluetooth onesTor Lillqvist1-2/+2
So yeah, need to keep this feature. Spell Wi-Fi correctly, and mention Wi-Fi in the menu button. Change-Id: I4cd6f0689a6ff9647f355d4b1404be84ec0c0138 (cherry picked from commit ea264f0c8165eb0c62bf624af5f450b20898469f) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-15Use consistent terminologyTor Lillqvist1-5/+5
Why "Choose a Computer" but "Add Server"? Let's always call them "computers" in the UI. And in fact I think the feature to add a computer manually is kinda pointless; is it too much to ask people to have their machines discoverable? I doubt keeping a computer not discoverable through Bluetooth thwarts a determined attacker from finding it anyway. (I am not saying that just finding it would mean compromising it.) Change-Id: Ib8041a8a793d84bee24587adac582c5fad03d1be (cherry picked from commit 056968fae7fa598e8cb528fb6b45c999de33a102) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-15Bump android remote version on branch too.Thorsten Behrens1-2/+2
Change-Id: I33c49157e00c927e75819ff08a174fbe1162ef08
2013-02-15rhbz#908674: Adapt rtl::Allocator::construct to C++11Stephan Bergmann6-0/+51
...otherwise, at least with some --with-system-boost versions and C++11 compilers, like with Fedora's boost-1.50.0-4.fc18.x86_64 and gcc-c++-4.7.2-8.fc18.x86_64, using this to copy-construct an instance of boost::unordered::detail::ptr_node<std::pair<rtl::OUString,Bootstrap_Impl*>> in the call to p_bootstrap_map->insert(...) in rtl_bootstrap_args_open (sal/rtl/source/bootstrap.cxx) would memcopy the ptr_node and fail to call rtl_uString_acquire, leading to memory corruption later on when rtl_uString_release is called one time too often. It is not entirely clear to me whether this is a shortcoming of the given Boost version, but this patch solves the problem and brings rtl::Allocator::construct in line with the (changed) Allocator requirements of C++11 anyway. The problem potentially lurks with every use of rtl::Allocator, but only showed now begining with LO 4.0 where e5111574fd904b38a3980ca4ea3d21cfcb22dea6 "Revert 'sb140: sb140: #i116981# clean up memory upon exit'" re-introduced code into rtl_bootstrap_args_open that inserts into a boost::unordered_map that uses rtl::Allocator. (cherry picked from commit c91d353872b7d4e1a39192bff1444b46cab6e5eb) Conflicts: config_host/config_global.h.in ...solved by resorting to the old -DHAVE_CXX11_PERFECT_FORWARDING logic spread across various solenv/.../*.mk instead. Change-Id: I3be22f59a8eb49d31458480c27f3ce15803c7fd4 Reviewed-on: https://gerrit.libreoffice.org/2166 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2013-02-15CELL needs to be recalculated during import as well, fdo#60645Eike Rathke1-2/+6
(cherry picked from commit 9c55eab0309681991eae7382b682c26550786f56) use AddRecalcMode(RECALCMODE_ONLOAD), fdo#60645 related Instead of SetRecalcModeOnLoad() which sets the exclusive bit overriding RECALCMODE_ALWAYS use AddRecalcMode() that handles these cases. (cherry picked from commit ff319d052659974d1aa5d6ac8c468a7259a46cc4) ocColumn and ocRow do not need recalc on load, fdo#60645 related (cherry picked from commit 61c72ef4bebebdfa505176e7d5db82920ad3822e) Change-Id: I86e2d2c8156e50c14e4e9ae269e8b97e4560c68f Reviewed-on: https://gerrit.libreoffice.org/2168 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-02-15filter: svg: optimizeGradientStops: fix STL assertionMichael Stahl1-1/+5
Check that there is actually more than one element in maStops before tweaking its first 2 elements (can be reproduced with fdo#60471 Tux.svg) Change-Id: I7e6ffdf510bb590a9ea9e3782b30247b8fb46ed5 (cherry picked from commit 2f4bd9d44f8bc9e50cd4b1205fa53e0a15ce0954) Reviewed-on: https://gerrit.libreoffice.org/2139 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-15fdo#60471: svgio, sax: enable internal entity declarations for SVGMichael Stahl2-10/+41
Change-Id: I147acac61dfe0b626268fe1e600dcf641ca63a0c (cherry picked from commit fcb1e4d8433b49686cd8e53c699dd5d6503ea314) Reviewed-on: https://gerrit.libreoffice.org/2138 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-15fdo#58283 produce all translations for desktop filesDavid Tardon1-11/+14
Change-Id: Ie97e1ae7b2cc059630cba682a051eefff3ca044b (cherry picked from commit 4a6f1853a2a15b938575406feada108443257536) Reviewed-on: https://gerrit.libreoffice.org/2161 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-02-15bnc#802350: Cell validation is not a special (cell) content.Kohei Yoshida1-2/+1
Cell validation is stored as cell attributes which are stored with columns not with cells. When HasSpecialContent() is true, it flags the *cell* not empty, which in turns causes AddTextAndValueCell to iterate over every single cell position for all repeated columns and rows. That can very very slow when the number of repeated rows is very high. Since cell validation is stored with columns, skipping empty cells even when they have cell validation settings set won't cause any issues, and all cell validation settings are imported correctly even after this change. With the test document I have (confidential), this change alone reduces the load time from 30 seconds to 0.3 seconds. (cherry picked from commit f6acfb5fe41fb166b5b588ec73e2e9331489c632) Conflicts: sc/source/filter/xml/xmlcelli.cxx Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73 Reviewed-on: https://gerrit.libreoffice.org/2128 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-02-14fix buildLuboš Luňák1-0/+8
Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060, fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5. Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2013-02-14CMIS: made it work with Lotus LiveCédric Bosdonnat6-35/+259
Making libcmis and LibreOffice work with Lotus Live service needed a few hacks to either better implement CMIS or workaround some bad implementations. As a general improvement, the CheckOut InfoBar isn't shown if the document can't be checked out. Change-Id: I7bb4211db0506998cef40ac1fb6375e647234085
2013-02-14asynchronous word-count.Michael Meeks10-95/+166
Change-Id: Ie78819590bca52f36406022a3954651c42c52540 Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2013-02-14CMIS: URL-decode username or it won't be shown properly in dialogCédric Bosdonnat1-3/+3
Change-Id: Icb8eaf5d841cba0d0d7efc4146b33995cdbf46f3 Reviewed-on: https://gerrit.libreoffice.org/2147 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-02-14minimal change to fix fdo#57908 for backportLuke Deller1-4/+8
wwSectionManager::GetPageULData adjusts margins and header/footer heights according to whether there is a header/footer or not. It could be confused into thinking there was no header/footer when indeed there was, in the case where a first page header/footer was inherited from a previous section which contained but did not actually show that header. Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4 Reviewed-on: https://gerrit.libreoffice.org/2137 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-14don't use -notimestanp when using gjdoc as javadocRene Engelhard3-1/+10
Conflicts: config_host.mk.in Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 Reviewed-on: https://gerrit.libreoffice.org/2142 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-02-14link to java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in the odk java docsRene Engelhard1-1/+1
... as /1.4.1/ redirects to the generic Oracle Java page. 1.5 works. Change-Id: I4f721840bc0bb8146b42a4d91dac8b3621b4bf7e Reviewed-on: https://gerrit.libreoffice.org/2141 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-02-13Revert "resolve fdo#60379 Impress Remote: Options look disabled"Michael Meeks1-2/+2
Actually revert it as Thorsten mentioned on the list. This reverts commit 23e6ac150b217be70a80d42deb5b253059030783. Change-Id: Ib387017225040272095aff54d51a9767c73c7d1f
2013-02-13Let's try to enable compiling the Bluetooth code for WindowsTor Lillqvist1-10/+24
(cherry picked from commit 17f7ee8442472e3ef743891b4d4f1a6a8c063472) Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009 Reviewed-on: https://gerrit.libreoffice.org/2129 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13fdo#60386 fix l10n of windows shell extensionDavid Tardon1-2/+11
(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf) Conflicts: shell/CustomTarget_shlxthdl_res.mk Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7 Reviewed-on: https://gerrit.libreoffice.org/2135 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-02-13Don't bother with unnamed computersTor Lillqvist1-0/+2
Change-Id: I4e912cab7ab252ef4c118fe63b02931eecd986aa Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Don't return from the CommunicationService.run() methodTor Lillqvist1-5/+6
This fixes connecting to one computer after connecting to another failed. Change-Id: I5b13d186d32690a91e4290c81c8d2e12a0a1f2be Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Do display the computer name in the dialog when connection failedTor Lillqvist2-2/+1
The latestInstance lifecycle and mName initialisation was borked. Change-Id: If7ef8a15fdc297e0fe6e401399a3b94dcd8d08c5 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Add comments, logging, empty linesTor Lillqvist3-0/+11
Change-Id: Ife81ec74b36f71782997219e36ac926ea429c297 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Simplify and fix management of the server listsTor Lillqvist3-39/+34
The existing code in refreshLists() was somewhat hard to understand, and it actually crashed (if uncommented-out). Now it simply empties the maps and view lists and then rebuilds them. The visible end result, at least for me, is that I no longer get duplicate servers in the list... Change-Id: I1543292e219e666e7dcbc68473f40a11e2eb3381 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Emacs and vim mode line tweaksTor Lillqvist21-31/+52
These files are Java, not C++. Add empty line before the vim mode line. Change-Id: Ia94d18e9995ecfbbbfd1c9e6a4d2ce4e8ffb95f3 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Use android.util.Log instead of printing to System.outTor Lillqvist6-14/+40
Change-Id: I314066086827d283938c6f402733da3f801ad55b Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Use the remote control same service name on Windows, tooTor Lillqvist1-1/+1
Change-Id: I45ecc4a745722cc6bf1f5017429a3e532200bf03 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Use a more descriptive name for the Impress Remote Control Bluetooth serviceTor Lillqvist1-3/+3
No point in using a generic "Serial Port" name, or describe it as a "COM Port" (eek). The remote control app doesn't check what the service name is anyway. (It probably should?) Change-Id: I6098110e8c4f62e20c38cf7e6b2071f00dd00515 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13sdremote - fully annotate bluetooth SDP record.Michael Meeks1-8/+15
Change-Id: I3ddfb3e3f93782556ec7fd7a16afbb294d17c013 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13Tell what 00001101-0000-1000-8000-00805F9B34FB isTor Lillqvist1-1/+5
Fun that we have to reverse engineer and document magic numbers in our own code. Code written less than a year ago. Change-Id: I02b7697e7e02b85c8df78acda8f943c9b0628359 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13sdremote - cleanup and annotate bluetooth SDP record.Michael Meeks2-8/+77
Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: Ie6c3d12387cececce4e169482659cbcbbcfd0975 Signed-off-by: Tor Lillqvist <tml@iki.fi>
2013-02-13ugly workaround for msvc+ccache problem with gbuild MSC defineLuboš Luňák1-1/+3
and squash remove no longer needed hack Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: I06ab10df77e2b3598f7268173206429596a50217 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-13fdo#60491: embeddedobj: catch exception in fallback pathMichael Stahl1-1/+8
This allows the OLE object to at least be passed to the OS for opening... (cherry picked from commit 5a65ca67d9acefed399ed8706efa402c543bed87) Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52 Reviewed-on: https://gerrit.libreoffice.org/2096 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-13fdo#60092: fix STL regression in SwInsertDBColAutoPilot::DataToDocMichael Stahl1-2/+2
(regression from f7d681dc34e60eb8532403079d007ca1250f4941) Change-Id: Ida92854efe6ddffffb8fe10e5ef1f42c53747f40 (cherry picked from commit cbc722733bb272b0f26efec09b478bed9a3cdb96) Reviewed-on: https://gerrit.libreoffice.org/2119 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-13Templates Manager: if the title can't be edited, don't update it in UICédric Bosdonnat7-10/+12
Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1 Reviewed-on: https://gerrit.libreoffice.org/2109 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-13Templates Manager: UI for renaming templates and folders, fdo#60579Cédric Bosdonnat12-5/+257
After thinking this was a feature regression, I finally discovered that the old template manager couldn't rename templates. This commit is bringing back some previously unused code dropped in an ealier commit. Even though this is a UI change, no new string is added by this commit. Conflicts: sfx2/inc/sfx2/templateview.hxx sfx2/source/control/templatelocalview.cxx sfx2/source/control/templateview.cxx Change-Id: I2e4a89c2e68f7e04b0fca3fc161920505ac715b4 Reviewed-on: https://gerrit.libreoffice.org/2108 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-13fdo#60668: filter out fieldmark chars from Index entries:Michael Stahl1-13/+30
SwTxtNode::GetExpandTxt must filter out all dummy characters used to represent fields, footnotes, field marks, etc. Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93 (cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc) Reviewed-on: https://gerrit.libreoffice.org/2122 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-12prefer my own cjk char-as-word countingCaolán McNamara1-49/+0
Change-Id: I120acd40b83cad074869b404d4e74b5ec69d493d Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-12CMIS: proxy was setin to ":-1" is no proxy is defined in the UICédric Bosdonnat2-2/+6
Don't output the port number if that one is not valid. (cherry picked from commit 12ea70362f9b1234b4b1613872c8f07735dd386b) Change-Id: Ia533d189117227a25c2df2e639b7fbd854e1bc45 Reviewed-on: https://gerrit.libreoffice.org/2120 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-12migrate also custom accelerators setting (fdo#57061)Petr Mladek1-0/+1
I was not sure how this can be triggered util the comment 46 in fdo#57061. I was not brave enough to enable this without testing. It seems to work, people complain about it, let's enable this migration as well. Change-Id: I79fa4b95828a55619ce098dc8fd357af317a1d47 Reviewed-on: https://gerrit.libreoffice.org/2104 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-02-12migrate even more user setting (fdo#57061)Petr Mladek1-0/+100
- paths setting - recently opened files - recovery setting (enable/disable; time) - ODF import/export setting - font anti aliasing setting - windows and toolbars setting (visibility, position, docking) Change-Id: I01ee912a782f14ba0751659ad87863b749950793 Reviewed-on: https://gerrit.libreoffice.org/2103 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-02-12fdo#59573 position after fieldmark and before annotation anchor is read-onlyMiklos Vajna3-5/+44
Also revert "SwTxtPaintInfo::_DrawBackBrush: draw dark border around comment highlight" (commit 57c8c34fcdc2d594d2da3593eb9d86d0daf4e18c), as it draws confusing vertical lines inside the comment when it has multiple runs. (cherry picked from commit bd505fdb9f669f365ff39b0ef46f0742c638e333) Conflicts: sw/qa/core/swdoc-test.cxx Change-Id: If0f60e4a28878c2b31327ae3c04ae11470bc1f52 Reviewed-on: https://gerrit.libreoffice.org/2101 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-12add more missing adodb constantsNoel Power5-0/+100
Change-Id: Ia43e1c63aa3a1f72deaa20351f9fe59fcc021b62 (cherry picked from commit ed7012e9a324d322d68dac3cc9dda7bbbc3391ad) Reviewed-on: https://gerrit.libreoffice.org/2106 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-02-12Fixed SfxDocTplService_Impl::setTitleForURL to keep all streams.Cédric Bosdonnat1-2/+13
After commit 117fdb98, the setTitleForURL only wrote the meta.xml file to the odf container, dropping all the other streams. Use storeToStorage as in the old implementation to fix the problem. Even though marginal, this problem is important for templates renaming. Change-Id: Ia9b6abfc112f102e2bd2ae9d3080c4ed827200df Reviewed-on: https://gerrit.libreoffice.org/2107 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-02-12fdo#60703: MSDraw filter: fix import of flagsMichael Stahl1-1/+2
DffPropSet::IsHardAttribute needs to handle flag properties specially (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) Change-Id: If5c6b9cfac58a787527cd132f7fc80d392b8e677 (cherry picked from commit 658c35878c14044029ca7f708fbde32b98cb226a) Reviewed-on: https://gerrit.libreoffice.org/2114 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-12remove Basque autotext files, they were in EnglishAndras Timar11-964/+0
Change-Id: I01d30f2cc714e0b2e283e738abd7955919c070d2 Reviewed-on: https://gerrit.libreoffice.org/2116 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-02-11fdo#39370 - Fixed RTL/LTR and alignment buttons location on RTL interfaceIssa Alkurtass1-0/+17
Reversed the location of the RTL and LTR buttons as well as the align right and align left buttons on the RTL interface. It now matches the LTR interface. Done from toolboxdocumenthandler instead of modifying 20+ xml files. Change-Id: I6b3715e134bb45a7500b87a9e926d7940690a9af Reviewed-on: https://gerrit.libreoffice.org/2077 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 18:17:49 +0000