summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-07-19debian-menus packages should not conflict with older versions (fdo#67031)Petr Mladek1-3/+0
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>
2013-07-19Resolves: fdo#66924 switching to master view is brokenCaolán McNamara3-4/+4
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 Change-Id: I5175378af6a6527a8be4d5011f13029d028b4304 (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>
2013-07-19fdo#65761 yet another gbuildification bugDavid Ostrovsky1-9/+9
Change-Id: I88bdd3f0e1cc49b21579043ceaf42616fe2f2493 Reviewed-on: https://gerrit.libreoffice.org/4973 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-19use correct package name in libreofficeX.Y-debian-menus package (fdo#67041)Petr Mladek1-2/+2
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>
2013-07-18librelogo: fix LibO SVG export for W3C Validator/WikipediaLászló Németh1-1/+11
Change-Id: I19b01b08ab08540cc8e9f7255d13663ba7ce1d02 Reviewed-on: https://gerrit.libreoffice.org/4969 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-07-18fdo#66762 - Other: com.sun.star.awt.DisplayAccess removedNoel Grandin2-4/+13
I removed the undocumented internal API "com.sun.star.awt.DisplayAccess" in commit dde234b6955a421d51d2b37e4fc3972c660146f0 "fdo#46808, remove awt::DisplayAccess service." However, it appears someone was actually using this. Now, at the same time, we have a method in XToolkit, getWorkArea(), which looks like it was designed to return this exact information, but which has been returning zero for as far back as our commit history goes. So, to kill two birds with one stone, this commit changes getWorkArea() to return the information the customer needs. Change-Id: I76300bac604e9e4b7be95b0872a7f95cb6781903 (cherry picked from commit 2aaaa5806021c52de1153ca2de0ca721e7eb73c0)
2013-07-18WaE: assuming signed overflow does not occur when assuming...Caolán McNamara1-2/+9
that (X + c) < X is always false [-Wstrict-overflow] (cherry picked from commit 37a3f9638315483114380a461f60abeab7809a3d) Change-Id: I63880bf27ab7e34eb9e0be682b39b80b71d65103 Reviewed-on: https://gerrit.libreoffice.org/4963 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-07-17fdo#39904, n#825976: implement hyperlinks for Illustrations indexCédric Bosdonnat7-6/+37
(cherry picked from commit 8bb2c7f1556c10508c8ac451c579539ccf5dacfb) Conflicts: sw/inc/swtypes.hxx Change-Id: I6f682c382e7ab0e06259b335247fdcebd7412942 (cherry picked from commit 2c10d784deb86501b5488044a61d9fc2efc6321a) Reviewed-on: https://gerrit.libreoffice.org/4957 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-17add gb_JunitTest_SOFFICEARG setting also for windowsLuboš Luňák1-0/+11
Needed since e352abc2e60abd21e383ebf971e545ca510ac4ed . Change-Id: I1f46a01f319703a2225386e89fc94ca286b301ca
2013-07-17Updated coreAndras Timar1-0/+0
Project: dictionaries 1d9c887b7b5cb045a65551193de1701eb2315653 update Swedish dictionary Change-Id: Ie67cea97508d45c69d4c2721396e50ffc924e2c9 Reviewed-on: https://gerrit.libreoffice.org/4950 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-17Updated coreAndras Timar1-0/+0
Project: dictionaries f3d5b8692fd9242eaa576b5bf21ab17ef3b546bc update pt-PT dictionary Change-Id: Ie4dbe9a0a5da536a8d2e3ce1b679c28376706b0c Reviewed-on: https://gerrit.libreoffice.org/4948 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-17#i122752# check iterator in each iteration of ↵Herbert Dürr1-3/+4
CFormatEtcContainer::nextFormatEtc()'s loop 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>
2013-07-16fdo#63273 sw: let word count not update stat. fieldsMiklos Vajna4-14/+20
Updating fields would generate loads of selection change events and it's not what we asked for. Regression from ce14342c4292628a641a72d4f63d9c048e030c6a. (cherry picked from commit e2484e3998f2c5036fb8e3584d4b1c72db19bfd3) Change-Id: If237df1f31436357022ca8d77b924681e403abd8 Reviewed-on: https://gerrit.libreoffice.org/4943 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-07-16fdo#66577: Cursor displaced in Web LayoutKhaled Hosny1-6/+6
Using lrint() helps a bit, but does not fix the issue entirely. Change-Id: Ib80e2c5a57d632f289e49322d3712c6321ae1ec2 Reviewed-on: https://gerrit.libreoffice.org/4907 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-16fix build with system poppler-0.23.0Petr Mladek2-2/+10
XRef *xref parameter has been added to the OutputDev::startPage method, see http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499 Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db Reviewed-on: https://gerrit.libreoffice.org/4939 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-07-16bnc#829017 fix issue with negative seeks in win32 shell extensionFridrich Štrba3-5/+5
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>
2013-07-16librelogo: hexa arguments fdo#66917 and cropped SVG savingLászló Németh2-9/+49
Change-Id: I12ad6b63221bce0ed7d988f5c0f91dce81055ec0 Reviewed-on: https://gerrit.libreoffice.org/4916 Reviewed-by: Németh László <nemeth@numbertext.org> Tested-by: Németh László <nemeth@numbertext.org>
2013-07-16option dialog isn't fully layout aware yet, so always calculateCaolán McNamara1-2/+1
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>
2013-07-15Updated coreAndras Timar1-0/+0
Project: translations 9ee1d9e42eeb75b893617ff6b7de99ac44169bc3
2013-07-15Updated coreAndras Timar1-0/+0
Project: translations 163b64b65b130ad4335ec6c1774644a50c72a4f6
2013-07-15sc: fix Date/DateTime ambiguityMichael Stahl1-8/+8
(cherry picked from commit 585d4c165f25a6acb19b5f0d05cbb1623283717f) Change-Id: I99908a73d38b0d4b9919ac9c627b849b1d7de0d8 Signed-off-by: Eike Rathke <erack@redhat.com> Signed-off-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-07-15ucb: fix DateTime in gvfsMichael Stahl1-1/+1
(cherry picked from commit 5ff4ccc6c49b0d69a3a9f80f9abdc65fe60f8aec) Change-Id: I5733e1490f3f162045fa5040efaabb6550d235a7 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-07-15build breaker: remove XSystemClipboard.hpp from pch againEike Rathke1-1/+0
Commit 60455c972b09ca02b18660c6fb3dafc03b30b2b5 reverted introduction of XSystemClipboard but not from pch. Change-Id: I2c59a575c0649cc3a2cfc3a4f2e812be9a902573
2013-07-15Enable sidebar by default when the Experimental Sidebar is put to 'on'.Jan Holesovsky1-0/+7
Change-Id: I525f15bc3f6b40522bf0dce754dd8e99386cd775 Reviewed-on: https://gerrit.libreoffice.org/4926 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-15API change: oslDateTime signed yearLionel Elie Mamane4-6/+6
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>
2013-07-15i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.Michael Stahl40-109/+446
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
2013-07-15fdo#63998: Filtering by page fields to work again.Kohei Yoshida3-116/+201
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>
2013-07-15i#108348 sax::Converter: support negative date and dateTimeMichael Stahl2-10/+18
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>
2013-07-15fdo#57631 fix collection of property statesDavid Tardon1-10/+2
Change-Id: I607518da26c9430916d922b8e36143cc6dd76f25 (cherry picked from commit d3d95afe5856ef06659d61c3572c7682e5a03766) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4910 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-15do not include UNO header that does not seem to exist(?) in 4.1Luboš Luňák1-1/+0
Change-Id: Iea8a41c8fac98eb647a2cd135d2ba9038d03ecaf
2013-07-15fix fdo#66586 Revert "fdo#46808, create IDL fortree::DefaultTreeDataModel"Noel Power3-43/+6
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>
2013-07-15fdo#54900 RTF import: support setting para align after textMiklos Vajna3-0/+31
Both Word and Writer typically write all paragraph properties before the first text in each paragraph, but at least for paragraph alignment, it's valid to write them at the end. (cherry picked from commit 431853bfae7dccd139804caf7ac2505a7c283e63) Change-Id: I0337e63678ad45c662a204ab2fc59378607abe74 Reviewed-on: https://gerrit.libreoffice.org/4913 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-15Related: fdo#66761 the double-encoding bug appears gone in python 3.3.2Caolán McNamara1-6/+14
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>
2013-07-13Fix some runtime exceptions with msvc-built libvisioFridrich Štrba2-0/+16
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/4878 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-07-13fdo#66745: drawinglayer: properly restore anti-aliasing modeMichael Stahl2-4/+21
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>
2013-07-13Resolves: fdo#66761 Macro controlled Python Mailmerge brokenCaolán McNamara1-1/+4
Change-Id: Id8bbf06a5571534aa5eef8624e89565fe3715938 (cherry picked from commit c4aa13c931da11164835a7aafbfd7e44bd5714ca) Reviewed-on: https://gerrit.libreoffice.org/4883 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-13fdo#66811: vcl: fix broken OUString with length STRING_LENMichael Stahl3-4/+5
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>
2013-07-13fdo#64448: Don't get type name from incorrect filter.Kohei Yoshida2-6/+3
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/4876 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-07-12bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributesMiklos Vajna1-12/+1
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>
2013-07-12allow to run smoketest in arbitrary installationDavid Tardon1-7/+1
Just set OOO_TEST_SOFFICE=path:/path/to/installation/program/soffice . Change-Id: Ic772a56328253f608a62a21923a74198fa29a136 (cherry picked from commit e352abc2e60abd21e383ebf971e545ca510ac4ed) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4863 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-12fdo#66072 do not end auto_*_ALL by a commaDavid Tardon8-13/+16
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 Reviewed-on: https://gerrit.libreoffice.org/4831 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-12tab traversal order wrongCaolán McNamara1-1/+1
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>
2013-07-12fdo#66655: Get GETPIVOTDATA to work again.Kohei Yoshida11-116/+114
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>
2013-07-12ORDER BY columns are prioritarily *SELECT* columnsLionel Elie Mamane5-35/+95
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/4836 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-12sort is ascending by defaultLionel Elie Mamane1-1/+1
Change-Id: I38354405acbbdb27b9e7ce1d19e862b7b352c850 Reviewed-on: https://gerrit.libreoffice.org/4839 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-11fdo#66826 - Allow parameters to be passed to patch such as --binaryMichael Meeks2-1/+11
Change-Id: I575b2721ffd08adabc3184b04ec302025a1feef2 Reviewed-on: https://gerrit.libreoffice.org/4850 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-07-11Resolves: fdo#66524 string conversion gone wrongCaolán McNamara1-4/+4
Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0 (cherry picked from commit 019a8f3f74ec778d5fead4d2b4d47e75cf750bf7) Reviewed-on: https://gerrit.libreoffice.org/4848 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-11delete in destructor checkbox created in constructorLionel Elie Mamane1-0/+1
Change-Id: Ifceae4c7ffe15bfc62ce34f4463fd4e071403359 fixes: debug build aborts when closing that window Reviewed-on: https://gerrit.libreoffice.org/4835 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2013-07-11fdo#66826 - Add DOS CR/LR line endings to please patch 2.7 under cygwinMichael Meeks1-47/+47
Change-Id: Iad6e6f69d2aa412cf14ef00c238ab458a239c627 Reviewed-on: https://gerrit.libreoffice.org/4838 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-07-11fdo#58577 DOCX export: handle multiple textframes anchored to the same paraMiklos Vajna4-9/+18
Also fixes ~SwIndexReg assertion on closing the document. (cherry picked from commit e5b145a46cd29c9428e6e1894f7b0bb8248a412f) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I7c1a9d3d646f2dacdbced2af355c076c1a1063ec Reviewed-on: https://gerrit.libreoffice.org/4826 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>