summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-22Document missing enumeration valueAriel Constenla-Haile1-0/+5
Add missing Key Tab in /org.openoffice.Office.Writer/AutoFunction/Completion/AcceptKey (cherry picked from commit 4ff43c2b8dbf361093ff2ffa683e117526771332) Conflicts: officecfg/registry/schema/org/openoffice/Office/Writer.xcs Change-Id: I3441a9b97f3e74c115bde84da9a1c85f9c901185 (cherry picked from commit 1d296f2b48827df13172e3b8c3fdf708807392e8)
2013-05-22Resolves: #i85426# - Document css::text::XAutoTextContainer paths handlingAriel Constenla-Haile1-36/+41
(cherry picked from commit 9314f61d6111280f2a02b09f9c2c0a7506cdbc79) Conflicts: offapi/com/sun/star/text/XAutoTextContainer.idl Change-Id: If775043efb6dae9832cbfd347f206278f3abb44c (cherry picked from commit 25c30d0a27aebe31dfb7c72971f95e569aa9577b)
2013-05-22Secured SlideSorterModel::DeleteSlide for negative page indicesArmin Le Grand1-6/+29
(cherry picked from commit f6bff98d6f13bf71fc4bce53c189598c002343c2) Change-Id: I8c7ca633043ec224df4e4ab08c20d44f969a8059 Corrected signed/unsigned mix (cherry picked from commit 20a3aee5359f143a6e4bf0bcb7fdef4675b3dd83) Change-Id: I6f8ffc6f541c2a06c9e97ef06711f312adc438f2 (cherry picked from commit 5481d32d285178dbf1a974389da1ee7c8ae19939)
2013-05-22Resolves: #i122354# Fix notification of slide change when...Andre Fischer1-0/+1
caused by slide sorter key event (cherry picked from commit a3d234a12b037327688d4743c82f76da732ec70e) Change-Id: I6ac1667d10b5ecd8cc3f96b7657d7ffe49a7ac3f (cherry picked from commit 0314533d3ba5a2601bc18037c4a1fbc6a54910d3)
2013-05-22Resolves: #i122366# Uncheck sidebar menu button after menu is closedAndre Fischer3-13/+6
(cherry picked from commit ac41d4c3e1972e3968ce9cf6949adc13e2b198e6) Change-Id: I4eef19a3b4ad9ea3ff7fd40b22c2854f569b69b6 (cherry picked from commit ff7bbe528aebedd41229e8d351a8c595e3627905)
2013-05-22Resolves: #ii122335# Disabling the old task paneAndre Fischer11-11/+0
(cherry picked from commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54) Change-Id: I084b132f3a2f2a103c16edab1de6196d3219b468 (cherry picked from commit 94b868141e5ad43f8e2affb77563ec0f999a2d60)
2013-05-22wrong libraries name againCaolán McNamara3-3/+3
Change-Id: I5ee490c4d08e703b5ed825d2d4d0c981e21a1b9f (cherry picked from commit 711135d2867dc2c53457fe7de7837c70873974b6)
2013-05-22setting max line count should allow extra values to be added laterCaolán McNamara2-2/+2
Change-Id: Ia693c83b8d27cacbd257f81b5eae2936fc5f8a6f (cherry picked from commit c19c9dfc69b73ae7dbd7d4b9e68ec0a7c7891913)
2013-05-22Disable Calc perf test by default & output both pseudo-cycles and real time.Kohei Yoshida1-47/+39
Change-Id: I35120e576208640976cdda0a5628e355bbe2dc7c (cherry picked from commit 4fa7a0ce8131106a038ba441bcc230d0377690ac)
2013-05-22Use the block position of the destination, not of the source.Kohei Yoshida2-1/+2
And a test to catch this. Change-Id: Ia73be239b4be96cbe029390efbbec5f49e429652 (cherry picked from commit 6958b6a3ce9f28bed2a529939e7740452929a5b3)
2013-05-22Blind attempt to fix HarfBuzz buildKhaled Hosny1-1/+7
Change-Id: Iaa61bc2c82ab6bd6391c8c81951ca55c5ce133ab
2013-05-22Update HarfBuzz to 0.9.17Khaled Hosny2-8/+2
Change-Id: If84a1eb7dbd54b4f1e3d876eb63cc3f2f8e51938 Reviewed-on: https://gerrit.libreoffice.org/3993 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-22Updated coreAndras Timar1-0/+0
Project: dictionaries 70970c63ec62b2fefac614f648a90c0e4162d38e
2013-05-22Revert "Thread-safe version of osl_getGlobalTime"Norbert Thiebaud4-83/+31
This reverts commit d8d55787b81cdc955b73c8befa4ab608f46e32aa. and 9b76439dff638d6fd773f2b63c377c2124810a39 as the change failed to work correctly on MacOSX causing a CPU-Loop in UpdateCheckThread::run() Change-Id: Ide86a5b7dce9550bbc15dfe691d4ed6199a88cc3 Reviewed-on: https://gerrit.libreoffice.org/4002 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-05-22Use implicit default constructorsStephan Bergmann3-18/+3
...instead of explicit ones without arguments. The former internally call css.lang.XMultiComponentFactory.createInstanceWithContext while the latter call css.lang.createInstanceWithArgumentsAndContext, which in turn uses css.lang.XInitialization.initialize, which could fail with a less forgiving factory than cppu::OSingleFactoryHelper (cppuhelper/source/factory.cxx) if the service implementation does not support XInitialization. Change-Id: Iff3b2ceacdd3d4e165004b841e5bbf9dbe0b98a5 (cherry picked from commit 66e39940d763586060c4bcc8c3cd213495c40b79)
2013-05-22Resolves: #i122336# Show docked tab bar after closing undocked sidebarAndre Fischer1-1/+1
(cherry picked from commit d8b17867f3c58d5623cca129d6459bae0eb11729) Change-Id: I5579c8f12cad696da94674c4f1a52bb2bed68cb5 (cherry picked from commit 88707ef9e8477784d0f5f9d679c5de4020b4ea40)
2013-05-22Resolves: #i122261# Calc Navigator - assure non-overlapping layoutOliver-Rainer Wittmann1-3/+7
(cherry picked from commit e7fa6ef1cbae2354078ec185c987e16e004e8a5d) Conflicts: sc/source/ui/navipi/navipi.cxx Change-Id: I91147e2c4f5647e719eb86d0b4b342ea0d9770a7 (cherry picked from commit 94a3dc9e47afc40be21838889a326489b133c2df)
2013-05-22Resolves: #i122260# Calc Navigator - assure that tool box is...Oliver-Rainer Wittmann1-3/+14
at least as wide as the tree list box to avoid 'bad' layout when the Navigator is resized. (cherry picked from commit 1aead9f230e3953f6049e1700d912d6c14c62e7f) Change-Id: Ie9aae42c42312777847fdb3261aa74ca7beaccbb (cherry picked from commit 9ffcc8516ceb5c3b9e522bae6542a9d0e606663e)
2013-05-22Resolves: #i122057# Fixed layouting of legacy sidebar panelsAndre Fischer5-3/+24
(cherry picked from commit ff4875ae18c417a74621559bd2d2e9ad05929a82) Change-Id: I6c97144981fbebc591fe595274c2f01055dd1979 (cherry picked from commit 57af6389b5e6cf9656edb96e987509ce84b45721)
2013-05-22Resolves: #i122291# Showing the right set of layouts for handout modeAndre Fischer3-0/+6
Fixed painting selection in layout panel (cherry picked from commit b89784c822670593cb253bcc0d260b93c9936e1c) Change-Id: I73d53bdcdec25753c8adb0f011f05868f82d35a5 (cherry picked from commit b8520e02d2b1b18ece5dbc6dbac12b9481643fdd)
2013-05-22Resolves: #i122352# Do not allow selection of disabled decks via menuAndre Fischer4-55/+53
(cherry picked from commit b27563ac5988d7ce407b045466e952114f54e07c) Change-Id: Id36b8fd12d0fce8f8717e5dd21538d1871a005b0 (cherry picked from commit d456545fb1215eda69f6970d4207b2b062384877)
2013-05-22Resolves; #i122219# Show 'Cell Appearance' and 'Number Format' panels...Andre Fischer3-18/+2
when editing cells.(cherry picked from commit 09d043596e8283dd6ced26d1e4ff0da530252df0) Change-Id: I2fe0f9655efa24fb99b566f5c515b0fd1f651f6b (cherry picked from commit 9a32ed36709cb03a8b5d3bcff0276bc31c934848)
2013-05-22Resolves: #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 (cherry picked from commit 2d00e944315ddbf25b1e566082ecbf576ea0dab6)
2013-05-22avoid static OUStrings hereCaolán McNamara1-2/+2
Change-Id: Idd53eeaccc7d99b35ce16e30ee6d531e0cf6c34c (cherry picked from commit 63fca6b8040f08f815378cd933e7cb66eee40346)
2013-05-22Resolvs: #i122082# React to changes read-only <-> read-write more reliablyAndre Fischer2-2/+10
(cherry picked from commit a30912ea805a74f2ef47e10511d6e85ed4600b73) Change-Id: I735ea32a498413f663efaf0e22051ab4d2d92ef5 (cherry picked from commit adb2d846e0912918708f2242997665dae5ed7478)
2013-05-22restore missing XUIControllerRegistration from listCaolán McNamara1-1/+2
Change-Id: I733a6e94e28c08779303d8b720602c71791b5bd6 (cherry picked from commit 8a8fee316a565c050ef1a8531ded130ff9959bfd)
2013-05-22Related: #i122315# Include the Tools.hxx header alwaysAndre Fischer1-3/+1
(cherry picked from commit e65bf3376ec742e2d5e69cad097d17f77fb19a73) Change-Id: I5ba72f2e30e4e3a306fafc45dfc2c38997f07f0f (cherry picked from commit b7d74cba368a682b275adcd5d533ad067d636016)
2013-05-22Resolves: #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 (cherry picked from commit 76ca8f7f178f5e9698d23ac0b1212922f2ddf39b)
2013-05-22Resolves: #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 (cherry picked from commit edaca7c6e1d1ade6bf6cdae753028ee62297f0b1)
2013-05-22add missing filesCaolán McNamara2-0/+370
Change-Id: I94dc9b99d243adf21f0439911899354781467da4 (cherry picked from commit aad035bd70b29253e9206de48259a9f0943bbc41)
2013-05-22UI 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 (cherry picked from commit 8b050d1e91a6623fb2770421e564a74d6259d816)
2013-05-22Revert "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 (cherry picked from commit f4bccae9eb48d36de9edd1fa5551e5e8de85b17e)
2013-05-22Revert "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 (cherry picked from commit e9679a4a769e1edcc9c41c96de5739286323be79)
2013-05-22fdo#46808, Convert more XMultiServiceFactory to XComponentContextNoel Grandin5-45/+38
Change-Id: Ia9fe1a95aab5f466ce212e442eba791f265488b5 (cherry picked from commit 884217479de20e2ff5217a0829d678f416fb8505)
2013-05-22WaE: unused variablesTor Lillqvist2-5/+0
Change-Id: I52d43a35e621636175e6c56bc068837d3a84bec4 (cherry picked from commit 66c315bcf2b78c4928d1e436d1a853f58f4cccdb)
2013-05-22Fix warning: statement aligned ... [loplugin]Tor Lillqvist1-1/+1
Change-Id: Ie092f3e1a6362089feec90f6aef6c73f23d13935 (cherry picked from commit ce575889b9c46e98544c9f6f30372ac7e05e20c5)
2013-05-22WaE: unused variablesTor Lillqvist1-9/+3
Change-Id: Ib46ec040c4adc5bdab3c5219157ae60582604c63 (cherry picked from commit 2b4b867304a666b8d412fd6ff0f88519a3db753b)
2013-05-22Fix warning: statement aligned as second statement in if body ... [loplugin]Tor Lillqvist1-1/+1
Change-Id: Ic3ef17414cbae5fea5a62d61d33e64727603d058 (cherry picked from commit 61493e499f44821405c10c4347038bde16a9072c)
2013-05-22WaE: 'AddonStatusbarItemData' struct/class confusionTor Lillqvist1-1/+1
Change-Id: I20b0b17dffe98ec27b686e0adfe8aaf6e10068ab (cherry picked from commit ff72e05c9f99ab694685536a2d05558021b14b14)
2013-05-22Remove unused commented codeAriel Constenla-Haile1-11/+0
(cherry picked from commit d8933b9c61e3e15f788f43043975f48d9d5b6cfd) Change-Id: I9856e1f26f9467c281ebaabe3d520e4fa59163c4 (cherry picked from commit f59d23fedc89890f47eac3b05f54bdcb7325f7af)
2013-05-22Fix build breaker: missing css::uno::XInterface includeAriel Constenla-Haile1-0/+1
(cherry picked from commit 9a421d5c9c0fd4f04c08c10e24275255fdf34f83) Change-Id: I27c4602a5144fddb18190698d0928b9b96af8a9b (cherry picked from commit 3f0dbd2cbe17f276ac3b2445ac76ff0cafc260c6)
2013-05-22Related: #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 (cherry picked from commit 4fcda14828d2fa65cc2541ed3e3cb93dd7bc9ac8)
2013-05-22Related: #i121442# - Refactor UNO StatusbarControllersAriel Constenla-Haile2-153/+45
(cherry picked from commit 3f1dd0f6b392c104e0a7c7c2623d5d688f8622c0) Conflicts: framework/source/uielement/langselectionstatusbarcontroller.cxx Change-Id: I1e8f87d1fbd12bab98b38282cedc730ac23694c3 (cherry picked from commit 819840979b82a7b19329eda63db0d5f8a291b9de)
2013-05-22Related: #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 (cherry picked from commit 25ec90bfa85ab829e47f442742c63dd41960b973)
2013-05-22Related: #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 (cherry picked from commit cfaac477e2a23880310070690beb3222b1c8227c)
2013-05-22Related: #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 (cherry picked from commit 1768904fd908e940a210e101c99a58ca1f7e3f27)
2013-05-22Related: #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 (cherry picked from commit 0d3b4f59fc43bc7aa9994195d55712aff87b3036)
2013-05-22Related: #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 (cherry picked from commit 418118e8be4d71f6359333961f9e4cbe9c12a246)
2013-05-22de-break published API changeCaolán McNamara4-66/+106
Change-Id: I86c2a3d8897278b47eb6b81327469cfae2f41fd5 (cherry picked from commit 7de47fe4ce076695a654198cf2c81ce3021d2cfb)
2013-05-22Related: #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 (cherry picked from commit f858fa266d8b33ccc27bb6a91f1923b9ea9cdaaa)