summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-21Resolves: #i122310# page property panel, page size controlOliver-Rainer Wittmann1-2/+2
display page size as Width x Height (cherry picked from commit b83fb522809c9b54427f60200164f878ae7f4658) Conflicts: sw/source/ui/sidebar/PageSizeControl.cxx Change-Id: I150eb045366ee1a712f2a7fc992d5ac76b7e19d7
2013-05-21avoid static OUStrings hereCaolán McNamara1-2/+2
Change-Id: Idd53eeaccc7d99b35ce16e30ee6d531e0cf6c34c
2013-05-21Resolvs: #i122082# React to changes read-only <-> read-write more reliablyAndre Fischer2-2/+10
(cherry picked from commit a30912ea805a74f2ef47e10511d6e85ed4600b73) Change-Id: I735ea32a498413f663efaf0e22051ab4d2d92ef5
2013-05-21restore missing XUIControllerRegistration from listCaolán McNamara1-1/+2
Change-Id: I733a6e94e28c08779303d8b720602c71791b5bd6
2013-05-21Related: #i122315# Include the Tools.hxx header alwaysAndre Fischer1-3/+1
(cherry picked from commit e65bf3376ec742e2d5e69cad097d17f77fb19a73) Change-Id: I5ba72f2e30e4e3a306fafc45dfc2c38997f07f0f
2013-05-21Resolves: #i122315# Disable 'More Options' buttons when...Andre Fischer12-58/+164
their commands are disabled (cherry picked from commit 10e1831ad2e9597c5197bafb6e03b098f8e81454) Conflicts: sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx sfx2/source/sidebar/SidebarToolBox.cxx sfx2/source/sidebar/TitleBar.cxx Change-Id: Iff83e024bd58ce4a6f27a8cde66b287d3bf710a3
2013-05-21Resolves: #i121960# Improve creation of toolbox/toolbar controllersAndre Fischer13-66/+224
(cherry picked from commit 3608a33d8362cbc44a2eb7203b7d1bffe481c7ab) Conflicts: sfx2/inc/sfx2/sidebar/ControlFactory.hxx sfx2/inc/sfx2/sidebar/ControllerFactory.hxx sfx2/inc/sfx2/sidebar/SidebarToolBox.hxx sfx2/inc/sfx2/sidebar/Tools.hxx sfx2/source/sidebar/ToolBoxBackground.cxx Change-Id: I833a33bbc58ebe46bd28c6d97a4d76329f1f0186
2013-05-21add missing filesCaolán McNamara2-0/+370
Change-Id: I94dc9b99d243adf21f0439911899354781467da4
2013-05-21UI Controller Factory fixesAriel Constenla-Haile27-787/+268
- "ModuleName" --> "ModuleIdentifier": the IDL definition for css::frame::PopupMenuControllerFactory and css::frame::StatusbarControllerFactory tells to use a property named "ModuleIdentifier", but in the code it is named "ModuleName" - Undocumented css::frame::ToolbarControllerFactory - Fix service name of ToolbarControllerFactory (ToolbarControllerFactory instead of ToolBarControllerFactory) - Convert the three service factories to new style, and use these new-style services in the source code - Implement multiple inheritance: added new css::frame::XUIControllerFactory - Added a (true) base class and implemented the three factories in a single file (cherry picked from commit acc7fed28f54f836b0923180431a0c180f91e98c) Conflicts: framework/inc/pch/precompiled_framework.hxx framework/inc/uielement/toolbarmanager.hxx framework/inc/uifactory/popupmenucontrollerfactory.hxx framework/inc/uifactory/statusbarcontrollerfactory.hxx framework/inc/uifactory/uicontrollerfactory.hxx framework/source/uielement/addonstoolbarmanager.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/popupmenucontroller.cxx framework/source/uielement/statusbarmanager.cxx framework/source/uielement/toolbarmanager.cxx framework/source/uifactory/popupmenucontrollerfactory.cxx framework/source/uifactory/statusbarcontrollerfactory.cxx framework/source/uifactory/uicontrollerfactory.cxx framework/source/unotypes/fwk.xml offapi/com/sun/star/frame/PopupMenuControllerFactory.idl offapi/com/sun/star/frame/StatusbarControllerFactory.idl offapi/com/sun/star/frame/makefile.mk svtools/source/uno/toolboxcontroller.cxx Change-Id: Ia8580539badf650a84bc6e57a6b832071e011f0a
2013-05-21Revert "fdo#46808, Adapt frame::PopupMenuControllerFactory UNO service"Caolán McNamara10-115/+93
This reverts commit e93a0018871ebea4da1959c72c06f3c7f4dc7b27. Conflicts: desktop/source/app/app.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/popupmenucontroller.cxx offapi/UnoApi_offapi.mk Change-Id: I3d4d49f98603e75357fb315a603a10851b3a7090
2013-05-21Revert "fdo#46808, Create new-style frame::ToolBarControllerFactory service"Caolán McNamara5-44/+2
This reverts commit ecae523d9603eaf7ff0acc98682576813e50c94a. Conflicts: framework/source/uielement/toolbarmanager.cxx offapi/UnoApi_offapi.mk Change-Id: I9f5fe49ffdf3176f0d742d28277c4ec2afbc1ed4
2013-05-21Redundant checkStephan Bergmann1-1/+1
Change-Id: Ifc53652e4ad4e4a0505480ab155e0352aedc9b26
2013-05-21Clean upStephan Bergmann1-4/+3
Change-Id: I9f58a08ec0867237b80da6787bc1840f0a6bbba8
2013-05-21Missing dependenciesStephan Bergmann1-1/+5
cf. the various ext.ooo.*.lib in the tarball's build.xml Change-Id: If58534c78b04768ab2d0524079d70bdd8ad16c00
2013-05-21Revert "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
2013-05-21-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
2013-05-21WaE: unused variablesTor Lillqvist2-5/+0
Change-Id: I52d43a35e621636175e6c56bc068837d3a84bec4
2013-05-21Fix warning: statement aligned ... [loplugin]Tor Lillqvist1-1/+1
Change-Id: Ie092f3e1a6362089feec90f6aef6c73f23d13935
2013-05-21fdo#64826: fix for exporting to DOCX that didnt save track 'changes state'Adam Co2-0/+23
Change-Id: If5b3198769a08cc751d542f8305fd7f41c73ec26 Reviewed-on: https://gerrit.libreoffice.org/3991 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-21Remove dead log-areaMarcos Paulo de Souza1-1/+0
The nullcanvas was removed in 1cd9b5d859a6468164b043b0fcaaf49c1907500c Change-Id: I2d718d1a18bb405e72b198ced548fc7cb885c6d7 Reviewed-on: https://gerrit.libreoffice.org/3992 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-05-21Updated corePetr Mladek1-0/+0
Project: translations 66306b922014c7941665d67e1310a88e3e85f99d
2013-05-21WaE: unused variablesTor Lillqvist1-9/+3
Change-Id: Ib46ec040c4adc5bdab3c5219157ae60582604c63
2013-05-21Fix warning: statement aligned as second statement in if body ... [loplugin]Tor Lillqvist1-1/+1
Change-Id: Ic3ef17414cbae5fea5a62d61d33e64727603d058
2013-05-21WaE: 'AddonStatusbarItemData' struct/class confusionTor Lillqvist1-1/+1
Change-Id: I20b0b17dffe98ec27b686e0adfe8aaf6e10068ab
2013-05-21Add tl for DbgUnhandledException()Tor Lillqvist1-0/+1
Change-Id: I612f0e473280342f4e406ebee7002a40622fbbf0
2013-05-21Add "canvas.vcl"Tor Lillqvist1-0/+1
Change-Id: I761217ac3791b631c58ccead73b7c45818db0589
2013-05-21bnc#818997 RTF import: don't ignore page breaks between shapesMiklos Vajna7-0/+120
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a
2013-05-21Also plain "tools" is used as a sal logging areaTor Lillqvist1-0/+1
Change-Id: I98a578f3934fda9ed49c31d1a1d171d4b6f6ed91
2013-05-21Remove unused commented codeAriel Constenla-Haile1-11/+0
(cherry picked from commit d8933b9c61e3e15f788f43043975f48d9d5b6cfd) Change-Id: I9856e1f26f9467c281ebaabe3d520e4fa59163c4
2013-05-21Fix build breaker: missing css::uno::XInterface includeAriel Constenla-Haile1-0/+1
(cherry picked from commit 9a421d5c9c0fd4f04c08c10e24275255fdf34f83) Change-Id: I27c4602a5144fddb18190698d0928b9b96af8a9b
2013-05-21Related: #i121442# Remove unused UNO StatusbarControllersAriel Constenla-Haile14-828/+2
(cherry picked from commit 06b91eb4cc81dde86875445c5acaa5c57111333b) Conflicts: framework/inc/uielement/logoimagestatusbarcontroller.hxx framework/inc/uielement/logotextstatusbarcontroller.hxx framework/inc/uielement/simpletextstatusbarcontroller.hxx framework/source/classes/resource.src framework/source/register/registerservices.cxx framework/source/uielement/logoimagestatusbarcontroller.cxx framework/source/uielement/logotextstatusbarcontroller.cxx framework/source/uielement/simpletextstatusbarcontroller.cxx officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu Change-Id: I799bd0fa29191efce4fe9a09f74247e38d8f8873
2013-05-21Related: #i121442# - Refactor UNO StatusbarControllersAriel Constenla-Haile2-153/+45
(cherry picked from commit 3f1dd0f6b392c104e0a7c7c2623d5d688f8622c0) Conflicts: framework/source/uielement/langselectionstatusbarcontroller.cxx Change-Id: I1e8f87d1fbd12bab98b38282cedc730ac23694c3
2013-05-21Related: #i121442# Adapt existing code in other modulesAriel Constenla-Haile6-90/+92
(cherry picked from commit 6c640ee420df6f7c9f3ab981e49ee304f1d2319e) Conflicts: reportdesign/source/ui/misc/statusbarcontroller.cxx sfx2/inc/sfx2/stbitem.hxx svtools/inc/svtools/statusbarcontroller.hxx svtools/source/uno/statusbarcontroller.cxx Change-Id: If03a201214a4afe09efa4e3e996aded9b6a57bdf
2013-05-21Related: #i121442# support status bar merging and StatusbarControllersAriel Constenla-Haile10-94/+1118
framework refactoring and new code to support status bar merging and UNO StatusbarControllers (cherry picked from commit 0b3a77478cf2cfd245a87bc528f851e959a2e6c7) Conflicts: framework/source/uielement/statusbarmanager.cxx framework/source/uielement/toolbarmerger.cxx Change-Id: I334a220ff27bb365e98a0ebd8bc6e55d65e76d64
2013-05-21Related: #i121442# Read Statusbar merging configurationAriel Constenla-Haile2-10/+248
(cherry picked from commit b2db8c4c68553100b64af8f51bce2d496b12e882) Conflicts: framework/inc/framework/addonsoptions.hxx framework/source/fwe/classes/addonsoptions.cxx Change-Id: I3cd8f310990098fc61adb8287ef53596f4038fdc
2013-05-21Related: #i121442# - StatusbarController API ModificationsAriel Constenla-Haile2-81/+73
Modify the current StatusbarController API so that it can be used by pure UNO implementations (cherry picked from commit 059f35d0ce96ccf14d02c6f33e25192d0c926b3f) Conflicts: offapi/com/sun/star/frame/StatusbarController.idl offapi/com/sun/star/frame/XStatusbarController.idl Change-Id: I664a104bff35a35d4406d98f96bdf8983b452ebd
2013-05-21Related: #i121442# API wrapping StatusBar functionalityAriel Constenla-Haile2-0/+111
In the current implementation and its API design, it is impossible to implement a StatusbarController in UNO, because there is no way in UNO for the controller to manipulate its status bar item; the current implementation of UNO based StatusbarController have to access directly the VCL StatusBar through the AWT XWindow in order to manipulate its item. Designing an API that wraps the VCL StatusBar does not make sense: a StatusbarController should only have access to the status bar item it controls, not the whole status bar. Therefore this new interface represents only the functionality of an item in a status bar, to be controlled by a StatusbarController (cherry picked from commit f556d8d542b069778e9b9d2bf25575e740602a6f) Conflicts: offapi/com/sun/star/ui/makefile.mk Change-Id: I197d49ac4516370f0d352ee03f86519016bf030c
2013-05-21de-break published API changeCaolán McNamara4-66/+106
Change-Id: I86c2a3d8897278b47eb6b81327469cfae2f41fd5
2013-05-21Related: #i121442# - Extend css::awt::XGraphic to draw imagesAriel Constenla-Haile5-137/+294
A StatusbarController that draws its status bar item may need to draw a graphic representing the feature state. css::awt::XGraphics API should be extended to include VCL's OuptDevice::DrawImage (cherry picked from commit 3ca8e86d4489f023160d69ba621a819a89ab90d5) Conflicts: offapi/com/sun/star/awt/XGraphics.idl offapi/com/sun/star/awt/makefile.mk offapi/type_reference/types.rdb toolkit/inc/toolkit/awt/vclxgraphics.hxx toolkit/source/awt/vclxgraphics.cxx Change-Id: If2c37022e60e8a3c9fce51dac84f4a2af001b5c5
2013-05-21Related: #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
2013-05-21restore StatusBar::GetItemData, etc. because we need it againCaolán McNamara2-0/+190
revert c95fa19f7c7b58a2beb65ad52335322ec2ae6f18 Conflicts: vcl/source/window/status.cxx Change-Id: I976802cde23892e7a3b2f6ad75d34a52bc7b2739
2013-05-21absoletely guarantee there is no mem leakCaolán McNamara1-9/+5
Change-Id: If6960dea479bb8970cb94aa05a3c9d44bf60cfc5
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
2013-05-21fdo#46808, Convert more XMultiServiceFactory to XComponentContextNoel Grandin5-45/+38
Change-Id: Ia9fe1a95aab5f466ce212e442eba791f265488b5
2013-05-21more linking fixNoel Grandin1-0/+1
for my diagose_ex.h change Change-Id: I6f9224942b5ccac0ae6b61a595bfe6a3c7463b7b
2013-05-21remove unused member and methodNoel Grandin3-8/+4
Change-Id: I325acbb98797f5feb4f5dbeb400d00b11e911d10
2013-05-21fdo#46808, Convert oox::PowerPointExport service to new styleNoel Grandin5-17/+57
The service already existed, it just needed an IDL file Change-Id: I1404f4f60abafd489ddfb7294affcc7ff33885ce
2013-05-21fix for linkingNoel Grandin8-2/+9
caused by my commit 863d38fbfa4fb4861e476828c46410602100919e "move DBG_UNHANDLED_EXCEPTION out of line" Change-Id: Idfd84d987ba9151ba476ce0516a9e5fbdb2003ec
2013-05-21fdo#46808, Convert oox.ExcelFilterExport service to new styleNoel Grandin6-19/+58
Service already existed, just needed an IDL file Change-Id: I397296e5ad7b32febb63e74f8ee9a0db53ba5a81
2013-05-21fdo#46808, Remove unnecessary XMultiServiceFactory memberNoel Grandin8-29/+14
.. and associated methods Change-Id: Iec01b4615decc1616e405166088d7d1d844ac0ae
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 16:03:52 +0000