summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-22Related: #i121442# Add support for StatusBar merging via configurationAriel Constenla-Haile1-0/+107
(cherry picked from commit 5c795df0452046ad2aa8d0ec05092133e3e4ebc3) Conflicts: officecfg/registry/schema/org/openoffice/Office/Addons.xcs Change-Id: Ica40d4f68054a3adcf460531c06cd1792ba4a6c4 (cherry picked from commit 5dd32f76a9c0f924e6a514e309e7661ad5537e86)
2013-05-22restore StatusBar::GetItemData, etc. because we need it againCaolán McNamara2-0/+190
revert c95fa19f7c7b58a2beb65ad52335322ec2ae6f18 Conflicts: vcl/source/window/status.cxx Change-Id: I976802cde23892e7a3b2f6ad75d34a52bc7b2739 (cherry picked from commit c4ae127b6063b53df4592d6b37ea0f38a892d8c1)
2013-05-22Fix exception specificationsStephan Bergmann1-12/+12
Change-Id: Ic2384073bba833224815582d4b9fee88c1ead782 (cherry picked from commit 697a007c61b9cabceb9767fad87cd5822b300452)
2013-05-22Adjust a bit.Kohei Yoshida1-1/+1
Change-Id: I74be2d40d9eb92813836a35892f461fe27b79aeb (cherry picked from commit 563f15a609f5c637cd73d831830a68bdb61fb4d8)
2013-05-22Hopefully this will disable testPerf for Windows too... Untested.Kohei Yoshida1-1/+1
Change-Id: I6d06b8e2b3cdb22948e606a7d928c57ea9347cea (cherry picked from commit 80648e06cac011c01e624cba91ce71fdf431e78a)
2013-05-22Disable the perf test for dbgutil build.Kohei Yoshida1-0/+2
Change-Id: Ifd95ea4f88175b9010f93a4a064be5d908b2a224 (cherry picked from commit df4d6b134bfe45e380416f0d9eecb482843e8a47)
2013-05-22make calc tests use some sort of pseudo-cycle measurementMichael Meeks1-79/+71
Change-Id: I9f58a7b00a6e4441c08254ef99829fab805beef8 (cherry picked from commit 7141c7517db5bbb9814308aa4c68bc95beb4de8c)
2013-05-22WaE: signed/unsigned comparisonCaolán McNamara1-1/+1
Change-Id: Iaa439c268eda24d700471560927d8f4c0f2e017b (cherry picked from commit 6a0a33444255fcdbe16500de24fc5bfd74adca4b)
2013-05-22fdo#52540 fix hyphenation of Graphite ligaturesLászló Németh1-0/+1
Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf Reviewed-on: https://gerrit.libreoffice.org/4000 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-22fdo#63840 lp#1182082: disable internal unity integration against glib<2.36Bjoern Michaelsen1-1/+1
* that is: use internal unity integration from Ubuntu 13.04 raring upwards only Change-Id: I08b9d950245b21e8d92c1e76905d53e97afdf685
2013-05-22Try not to crash in mdds when _GLIBCXX_DEBUG is defined.Kohei Yoshida2-0/+32
Change-Id: Id3a5ca97129177cae27cc38ec044f4fa62f08477
2013-05-22Fix nss library paths for Mac OS XStephan Bergmann2-1/+68
nss uses hard-coded @executable_path (which is wrong, consider e.g. the case of the URE uno executable), so patch it to use @_..._OOO instead (and no need to set --prefix), and pass the resulting libs through macosx-change-install-names (which requires the generated libs to be writable). Change-Id: I0f04533f0f0581ee7b9dfd8929b8629c0842cc1b (cherry picked from commit 2bb3500284182756116890e24fa12be8dace0753)
2013-05-22Clean upStephan Bergmann1-4/+3
Change-Id: I9f58a08ec0867237b80da6787bc1840f0a6bbba8 (cherry picked from commit 355180f3e574b069fcd68df08f4909521fa7e6a0)
2013-05-22Missing dependenciesStephan Bergmann1-1/+5
cf. the various ext.ooo.*.lib in the tarball's build.xml Change-Id: If58534c78b04768ab2d0524079d70bdd8ad16c00 (cherry picked from commit 90e2ad99a594c185ccc578c36121da83eaf8885f)
2013-05-22Revert "Java cleanup, AccessibilityTools.."Stephan Bergmann3-90/+18
This reverts commit d702dd4396161f8e2e7396f5c24554088b752fcb, which reproducibly broke JunitTest_sc_unoapi: java.lang.NullPointerException at util.AccessibilityTools.getAccessibleObjectForRole_(AccessibilityTools.java:177) at util.AccessibilityTools.getAccessibleObjectForRole(AccessibilityTools.java:95) at mod._sc.AccessibleEditableTextPara_PreviewCell.createTestEnvironment(AccessibleEditableTextPara_PreviewCell.java:149) at lib.TestCase.getTestEnvironment(TestCase.java:121) at base.java_fat.getTestEnvironment(java_fat.java:319) at base.java_fat.executeTest(java_fat.java:167) at org.openoffice.Runner.run(Runner.java:234) at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:45) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:263) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:68) at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:47) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222) at org.junit.runners.ParentRunner.run(ParentRunner.java:300) at org.junit.runners.Suite.runChild(Suite.java:128) at org.junit.runners.Suite.runChild(Suite.java:24) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:50) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:222) at org.junit.runners.ParentRunner.run(ParentRunner.java:300) at org.junit.runner.JUnitCore.run(JUnitCore.java:157) at org.junit.runner.JUnitCore.run(JUnitCore.java:136) at org.junit.runner.JUnitCore.run(JUnitCore.java:117) at org.junit.runner.JUnitCore.runMain(JUnitCore.java:98) at org.junit.runner.JUnitCore.runMainAndExit(JUnitCore.java:53) at org.junit.runner.JUnitCore.main(JUnitCore.java:45) Change-Id: I3601fe24db21bd63f7dc6cdf0a1eb69f447d962a (cherry picked from commit 89fbed7e29104bf189dc3d75dc11a8aadd362322)
2013-05-22-Werror,-WuninitializedStephan Bergmann2-15/+14
Bogus uno::Reference< awt::XControlModel > xControlModel = xControlModel; introduced with 6c61b20a8d4a6dcac28801cde82a211fb7e30654 "fdo#46808, Convert awt::UnoControlDialogModel to new style." Correct fix involves adding missing "const" in declaration of UpdateHandler::insertControlModel, so implicit Reference up-cast works. Change-Id: I8f6d679a38d99188eb893366e9b552974b3c1bf2 (cherry picked from commit cb4b6dde8fda2a5848e11063028bf44d72f85431)
2013-05-21fdo#62483 missing default button in format -> aligment dialog at mathJoren De Cuyper1-2/+2
The default button was missing because the dialog was to small (it "fell off"). Also the default button was placed a bit to far from the help button IMHO. Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181 Reviewed-on: https://gerrit.libreoffice.org/3995 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/3996
2013-05-21Some more linking fixingFridrich Štrba1-0/+1
Change-Id: I92fbd3839fea6c730039259ce6f56d8082ffd19b (cherry picked from commit 303b6fe5bacd782dafbe370b472a9b724d782f2f)
2013-05-21bnc#818997 RTF import: don't ignore page breaks between shapesMiklos Vajna7-0/+120
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a (cherry picked from commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9)
2013-05-21Revert "Adapt to new com/sun/star/oox/"Fridrich Štrba1-1/+0
This reverts commit 4b44ca511900772da30b5a938250789d80d24dfe.
2013-05-21absoletely guarantee there is no mem leakCaolán McNamara1-9/+5
Change-Id: If6960dea479bb8970cb94aa05a3c9d44bf60cfc5 (cherry picked from commit 1704b1200d39eba8e235ca5c13c5a931d07a98b3)
2013-05-21Adapt to new com/sun/star/oox/Stephan Bergmann1-0/+1
...introduced by a986eddb9b9d1de71ae1c6f73246e493cc449c21 "fdo#46808, Convert oox.ExcelFilterExport service to new style." Change-Id: Ie44688f02ffb73ff5967b66e649827058236614e (cherry picked from commit 6aa19bf090ac03fcb55479155abb0d59f43d766a) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2013-05-21Updated corePetr Mladek1-0/+0
Project: translations fe52a1bfe9f6ca11a1e19c150fe9550aa13ea40d
2013-05-21Add tl for DbgUnhandledException()Tor Lillqvist1-0/+1
Change-Id: I612f0e473280342f4e406ebee7002a40622fbbf0 (cherry picked from commit 0dfa58bdd9bd2ee12fe00674e7a9a1b55939a84b) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2013-05-21more linking fixNoel Grandin1-0/+1
for my diagose_ex.h change Change-Id: I6f9224942b5ccac0ae6b61a595bfe6a3c7463b7b (cherry picked from commit dbcc5bc9d936533794c194d7d33c59c840e76b68) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2013-05-21fix for linkingNoel Grandin8-2/+9
caused by my commit 863d38fbfa4fb4861e476828c46410602100919e "move DBG_UNHANDLED_EXCEPTION out of line" Change-Id: Idfd84d987ba9151ba476ce0516a9e5fbdb2003ec (cherry picked from commit 6bf00f0f94394c62bddcd77b776e4e3592160201) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2013-05-21Branch libreoffice-4-1Petr Mladek3-0/+0
This is 'libreoffice-4-1' - the stable branch for the 4.1.x releases. The commit rules are different according to the development phase: + 4.1.0 beta phase: + any bug fixes are allowed without review + late features need approval by 3 people with different affiliation + 4.1.0 rc phase and later: + fixes need approval by one reviewer + late features need approval by 3 more people with different affiliation IMPORTANT: Every developer is responsible for pushing the fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable release. If you want to build something cool, unstable, and risky, use master. Change-Id: Idcf54b9239d25f17e3d85d08c72138142e5d1f00
2013-05-21Little cleanup in image loader internal functionslibreoffice-4-1-branch-pointRodolfo Ribeiro Gomes1-43/+22
Change-Id: I6def704dc22d7a536849a9e4b51a08bf68778329 Signed-off-by: Rodolfo Ribeiro Gomes <rodolforg@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/3950 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-21move DBG_UNHANDLED_EXCEPTION out of lineNoel Grandin2-39/+54
makes it easier to set a breakpoint on it. Plus it's getting a little big to be a macro. Change-Id: I2827aa3618ba966fbc85a4a56e0e794a55630730 Reviewed-on: https://gerrit.libreoffice.org/3988 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-21do not second-guess help langs for installationDavid Tardon2-10/+3
Change-Id: I48484ca81008fe650aa9fa0eb561e3b2ff33399c
2013-05-21Re-add PNG file that used to have a pathological (LF) filenameIsamu Mogi1-0/+0
This is a cherry-pick of 4aa27cc3b98d455379f7c97a215d557d646fa08e . Author: Andrea Pescetti <pescetti@apache.org> Date: Sat May 11 11:42:03 2013 +0000 Change-Id: Id91c9d5cd462e73a243d9c5670572a9c2293798e Reviewed-on: https://gerrit.libreoffice.org/3985 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-21Avoid pathological filename, breaking checkout on some systems.Isamu Mogi1-0/+0
This is a cherry-pick of 8cb45ee0b8d744c282b76be8b26b1196b9d91b44 . Author: Andrea Pescetti <pescetti@apache.org> Date: Sat May 11 11:39:07 2013 +0000 Conflicts: icon-themes/galaxy/svx/res/symphony/ Change-Id: I125e506531248c167cda20714228777e102a24e9 Reviewed-on: https://gerrit.libreoffice.org/3984 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-21Fix two SfxFilterMatcher_Impl memory leaks.Mark Wielaard1-1/+9
First SfxFilterMatcher_Impl::InitForIterating() will set pList to either the global filter array matcher pFilterArr, or to a new SfxFilterList_Impl. This new SfxFilterList_Impl should be deleted in the destructor. Second getSfxFilterMatcher_Impl() keeps a cache of SfxFilterMatcher_Impls. If a SfxFilterMatcher_Impl for a given name doesn't exist yet a new one will be created. But the cache stored objects by service name (aName), but looked object up by factory name (rName). So it always created a new SfxFilterMatcher_Impl instead of using the one from the aImplArr cache. Change-Id: I7840aaddc861f609fbe14d5b6c0ea20d997f690f Reviewed-on: https://gerrit.libreoffice.org/3989 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-21fdo#64011 fix the position and the drawing from left to right in RTL sheetFaisal M. Al-Otaibi1-0/+7
this will fix the start position for drawing and you can draw shapes from left to right when the Sheet are RTL Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e Reviewed-on: https://gerrit.libreoffice.org/3912 Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa> Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
2013-05-21Updated corePetr Mladek0-0/+0
Project: help cfcc32824c195ca37339ef33c99a099f9b7afe1e
2013-05-21helpcontent2: add missing auxiliary helpcontent files for bn-INPetr Mladek1-0/+0
Change-Id: I90e4eb02e2f4e672681ff8fe1305eaa08b1769fd
2013-05-21allow to create new database using the wizard again (fdo#62937)Petr Mladek1-7/+3
To be honest, I do not userstand the code much. Julien pointed out that the setParentTitle and onTypeSelected were newer called. The condition looked like an optimisation and it helped to remove it. It would be great to put it back. It might be enough to hand the intial values. Change-Id: Id06cc9c63a9e578cb3c698c8526851fec71ef9da
2013-05-21fdo#46808, fix unit testNoel Grandin1-0/+1
...after my PrimitiveFactory2D changes Change-Id: I994d2dd0aebed67643f749dc43bcd4e744601885
2013-05-21fdo#46808, Use service constructorsNoel Grandin2-28/+16
Change-Id: Ib428bb78751e9707c89dcf311b8ab86ad8184775
2013-05-21fdo#46808, Convert chart2::Title service to new styleNoel Grandin30-220/+309
API CHANGE: The chart2::XTitled interface now takes and returns a XTitle2 instead of an XTitle. Change-Id: I96c35909d3a13f1abb544296a782a0b6a7a58ec6
2013-05-21fdo#46808, Convert various chart2:*Scaling services to new styleNoel Grandin10-42/+30
Change-Id: I93294be4c822160e609ae6aab552edd64478e34b
2013-05-21fdo#46808, GetStorageFromURL now takes an XComponentContextNoel Grandin1-1/+1
Change-Id: I300748914c913ecd9d433cb6f549a000717b538d
2013-05-21remove unnecessary macrosNoel Grandin1-20/+12
Change-Id: Ie73092fa6fc4fa7a95900ef4ba772af0c27d0f39
2013-05-21Remove unnecessary namespacingNoel Grandin2-21/+22
Change-Id: I0ea52709f9a77d928a6704797ebd5be4c375e964
2013-05-21fix alignment in codeNoel Grandin1-8/+10
Change-Id: I0272e46cf34b52f578810ad0d17f33dd78accdd3
2013-05-21fdo#46808, Clean up old usages of ExtToolkitNoel Grandin3-10/+7
This service no longer exists in LO, and no-one seems to know what this service was, so convert it to use the awt::Toolkit service, since that service returns the interface the code expects. Change-Id: I761effbd49a9a3a15ec9c8716c72d4220a3e987e
2013-05-21fdo#46808, Convert awt::XUnoControlDialog to new styleNoel Grandin15-139/+213
Change-Id: I40d2e2ddd92186a2ba22ebfbdda8367391e8d355
2013-05-21fdo#46808, Convert awt::UnoControlDialogModel to new styleNoel Grandin28-519/+627
Change-Id: I4b912034ef3f4855b87d6d6f18ff13bd1ecc8f72
2013-05-21Bypass for now an OSL_ENSURE that doesn't compileTor Lillqvist1-1/+3
Change-Id: I8f6a74251cea70e7fd100e1ab233cf0033de4e50
2013-05-20Rehash the 0.8.1 package due to a last minute oops.Kohei Yoshida1-1/+1
Change-Id: Idea947e8b6674d436cc1a1d92f29279d2c03fc58