|
|
edaca7c6e1
|
Resolves: #i121960# Improve creation of toolbox/toolbar controllers
(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-21 16:36:07 +01:00 |
|
|
|
a9626f143a
|
Resolves: #i122302# Use tool bar controls for color controls...
in text property panel
(cherry picked from commit 3b252796e1126b5ec1216082f55b8d12017eaeb1)
Conflicts:
sfx2/Package_inc.mk
sfx2/inc/sfx2/sidebar/ControlFactory.hxx
sfx2/inc/sfx2/sidebar/ControllerFactory.hxx
sfx2/inc/sfx2/sidebar/EnumContext.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
svx/source/sidebar/insert/InsertPropertyPanel.cxx
svx/source/sidebar/insert/InsertPropertyPanel.hxx
svx/source/sidebar/text/TextPropertyPanel.cxx
Change-Id: Ifa1947c9e9bfdc3635dbb5b0c7a79f8ead613a90
|
2013-05-20 11:33:35 +01:00 |
|
|
|
6e6f8cb2b7
|
getProcessServiceFactory->getProcessComponentContext
Change-Id: I2c4c44cb5758ef8fa2d83e0488fba65a390c466f
|
2013-05-20 11:33:35 +01:00 |
|
|
|
f79e0efb34
|
Related: #i122218# Replaced local tool box controller...
with existing GenericToolboxController (cleanup)
(cherry picked from commit 784ed0d2e9cc2de7e3de8420d4708ee5c4631a5c)
Conflicts:
svx/source/sidebar/insert/SimpleToolBoxController.cxx
svx/source/sidebar/insert/SimpleToolBoxController.hxx
Change-Id: I9c409c2979982ccd5d7a76c10db6c3f7dd59c307
|
2013-05-20 11:33:35 +01:00 |
|
|
|
16ed9f9638
|
Initialize variable to prevent compiler warning
(cherry picked from commit 4fba97b33858a6fc610b5540ab0277370e4147bf)
Change-Id: I470036762114017a971a35aba2c7f0f41f482fa8
|
2013-05-20 11:33:28 +01:00 |
|
|
|
1571b47603
|
Resolves: #i122218# Add new sidebar panel...
for inserting shapes into Draw documents
(cherry picked from commit 5e09229d726cbc288719c7466b277a4eb5bb244b)
Conflicts:
sd/source/ui/view/drviewsa.cxx
sfx2/Package_inc.mk
svx/inc/svx/dialogs.hrc
Related: #i122218# Added missing files to sfx2/inc/sfx2/sidebar
(cherry picked from commit 99572ff12af758a256703884811c7915c79f27ec)
Conflicts:
sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
Related: #i122218# Added more missing files
(cherry picked from commit cdc8cb702630938c673255638aecbd2dd5c53ed7)
fix up to build
Change-Id: I098976d787e6a91d36aac98a5917f48b50872087
9c6f4d957924e177922e26606173d1b238b8006e
ceb9b720c08fb1db5b418c618e280b9b68eda2cf
01712631eacbd3e58e2cd04d1903bbcb0ecb9301
|
2013-05-20 11:33:28 +01:00 |
|
