diff options
| author | Andre Fischer <af@apache.org> | 2013-05-14 15:21:57 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:35 +0100 |
| commit | a9626f143a1466591764b03baa2d15905487b692 (patch) | |
| tree | 410958c92408356de4f510b022518be4a5e187d8 /svx/source/sidebar/PanelFactory.cxx | |
| parent | 6e6f8cb2b7f2173eafb988f78e9704ed1bbc4b0a (diff) | |
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
Diffstat (limited to 'svx/source/sidebar/PanelFactory.cxx')
| -rw-r--r-- | svx/source/sidebar/PanelFactory.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 7b75844cc16e..4ac410df6e8d 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -114,6 +114,9 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( Reference<ui::XSidebar> xSidebar (aArguments.getOrDefault("Sidebar", Reference<ui::XSidebar>())); const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); + ::sfx2::sidebar::EnumContext aContext ( + aArguments.getOrDefault("ApplicationName", OUString()), + aArguments.getOrDefault("ContextName", OUString())); ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) @@ -135,7 +138,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( #define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s)) if (DoesResourceEndWith("/TextPropertyPanel")) { - pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings); + pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings, aContext); } else if (DoesResourceEndWith("/ParaPropertyPanel")) { |