AgeCommit message (Collapse)AuthorFilesLines
2013-02-19Kill the --without-system-stdlibs optionFridrich Štrba9-78/+4
(cherry picked from commit 3708fe8434ad6f64d527215f4619556b0a5701ff) Conflicts: external/ scp2/ Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f Reviewed-on: Reviewed-by: Stephan Bergmann <> Tested-by: Stephan Bergmann <>
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: Reviewed-by: Thorsten Behrens <> Tested-by: Thorsten Behrens <>
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 <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-02-19fdo#60732: check max size in SwTxtNode::ReplaceTextOnlyMichael Stahl1-2/+15
Change-Id: I1ca2075ab99fe1b09df700f55645b44f38cf5bcc (cherry picked from commit 0e49d87d92a3f1aeeeda547f1a7e710dcd4fee95) Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
2013-02-19Enable dbus in LibreOfficeLinux configurationFridrich Štrba1-1/+1
Change-Id: I959437dd440c0eec4fdfa75498a95295bb85cda0 (cherry picked from commit 706d193698eda2ef81ab7b9301d3b0240bc588b9) Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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 <>
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: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
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: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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/ Change-Id: I2f86aea9177f2f3d24aea40c47d530fd7d96d21c Silence some warnings (cherry picked from commit 6d850419434c5df8cfdcd7682d49bc3d92b8de83) Conflicts: libmspub/ Change-Id: I5a644fbe698b31bded3a5bf0fc96f1bf2be415e2 Update the internal libmspub to 0.0.5 Change-Id: Ia1e2807a9f8d624e734afa93102fb6ff27eee091 (cherry picked from commit ede5fccc348986528d52149426d344f880790637) Reviewed-on: Reviewed-by: Petr Mladek <> Tested-by: Petr Mladek <>
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 <>
2013-02-18avoid space in the version of the update information providerPetr Mladek1-1/+2
LO- sends "4.0 .0.3" to the server. Change-Id: I2cda062778ac3632f89eb5c0d1cc85e57d8d1870 Reviewed-on: Reviewed-by: Jan Holesovsky <> Tested-by: Jan Holesovsky <>
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: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-02-18Fix typoJulien Nabet1-1/+1
Change-Id: Id5aff315b1d52ac5a869a17b3a654c2d1e670b08 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
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: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2013-02-18SwDoc::Overwrite: probably a bad idea to overwrite fieldmarksMichael Stahl1-2/+12
Change-Id: Iba94df67c21514cf4f5361bab28629c6d5d9d3e8 (cherry picked from commit 447bb5b5006051672ec526b75bec7db02d2db82e) Reviewed-on: Reviewed-by: Björn Michaelsen <> Tested-by: Miklos Vajna <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
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
2013-02-17fdo#60670: Create a new document in case there's noneXisco Fauli1-1/+6
Change-Id: I7e03481beb1d4e60601fd93d787bc7354495e41f
2013-02-16Resolves: rhbz#910176 cannot select directory with gnome folder pickerCaolán McNamara1-2/+11
<< gtk documentation gtk_file_chooser_get_current_folder_uri () Gets the current folder of chooser as an URI. Note that this is the folder that the file chooser is currently displaying ... which is not the same as the currently-selected folder if the chooser is in GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER mode ... to get the currently-selected folder in that mode, use gtk_file_chooser_get_uri() as the usual way to get the selection. >> << offapi documentation XFolderPicker getDisplayDirectory: Returns the root directory that the FolderPicker is showing. getDirectory Returns the selected directory >> so getDisplayDirectory <-> gtk_file_chooser_get_current_folder_uri and getDirectory <-> gtk_file_chooser_get_uri Change-Id: Iaa5ab16a250cd59fe5e8bd02149298eef6d1dec2 (cherry picked from commit 914de32b27c7fe164b21f9247275ee3117c0864b) Reviewed-on: Reviewed-by: Björn Michaelsen <> Tested-by: Björn Michaelsen <>
2013-02-16Only escape double-quotes for ulf files.Thorsten Behrens1-2/+2
On second thought, this was needlessly overbroad. Missed the fact that the code is strictly for ulf. Change-Id: I96773d6e2a9af473e8c8309421b4900c0b76667f Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2013-02-16Proper escaping of quotes for android xml resource files.Thorsten Behrens1-1/+1
Change-Id: I9f76986465af5798f1451d44af6765f4e5d1bb09 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
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 <>
2013-02-15sdremote: avoid crash when fiddling with elapsed time.Michael Meeks1-1/+1
(cherry picked from commit 03b941e9ae63626a3336aabdb6a3485835ec6f9d) Signed-off-by: Thorsten Behrens <>
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 <>
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 <>
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/ ...solved by resorting to the old -DHAVE_CXX11_PERFECT_FORWARDING logic spread across various solenv/.../*.mk instead. Change-Id: I3be22f59a8eb49d31458480c27f3ce15803c7fd4 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Caolán McNamara <> Reviewed-by: Caolán McNamara <>
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: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-02-15fdo#58283 produce all translations for desktop filesDavid Tardon1-11/+14
Change-Id: Ie97e1ae7b2cc059630cba682a051eefff3ca044b (cherry picked from commit 4a6f1853a2a15b938575406feada108443257536) Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
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: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
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 <>
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 <>
2013-02-14CMIS: URL-decode username or it won't be shown properly in dialogCédric Bosdonnat1-3/+3
Change-Id: Icb8eaf5d841cba0d0d7efc4146b33995cdbf46f3 Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <>
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: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-02-14don't use -notimestanp when using gjdoc as javadocRene Engelhard3-1/+10
Conflicts: Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 Reviewed-on: Reviewed-by: Björn Michaelsen <> Tested-by: Björn Michaelsen <>
2013-02-14link to 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: Reviewed-by: Björn Michaelsen <> Tested-by: Björn Michaelsen <>
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: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <>
2013-02-13fdo#60386 fix l10n of windows shell extensionDavid Tardon1-2/+11
(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf) Conflicts: shell/ Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2013-02-13Don't bother with unnamed computersTor Lillqvist1-0/+2
Change-Id: I4e912cab7ab252ef4c118fe63b02931eecd986aa Signed-off-by: Michael Meeks <>