summaryrefslogtreecommitdiff
path: root/svx/util
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2013-05-28 22:09:19 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-24 11:25:35 +0100
commit6b6ebeeaf94e1db3c90cfe3921ea6c956570a0c5 (patch)
tree51d75965c5e5b8be2ba95ae92518b3778bc86f27 /svx/util
parent53ef9fa167cc68969cdc953b4c0b9ad339f2d27e (diff)
svx::ExtrusionDepthController is a ToolbarController
This class is dereived from svt::PopupWindowController, derived in turn from svt::ToolboxController, the base class of all css.frame.ToolbarController's. Adapt getSupportedServiceNames() and the passive component registration to reflect that fact. (cherry picked from commit e0f9eb4cc5d2ea676a899c4cbecb97264a31fef3) Conflicts: svx/source/tbxctrls/extrusioncontrols.cxx Change-Id: I866c1dc43d31dc269ec72890041b87292b02b2f9
Diffstat (limited to 'svx/util')
-rw-r--r--svx/util/svxcore.component2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index 8c33d0b84a23..6190b54d3573 100644
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -19,7 +19,7 @@
<component loader="com.sun.star.loader.SharedLibrary" prefix="svxcore"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.svx.ExtrusionDepthController">
- <service name="com.sun.star.frame.PopupMenuController"/>
+ <service name="com.sun.star.frame.ToolbarController"/>
</implementation>
<implementation name="com.sun.star.comp.svx.ExtrusionDirectionController">
<service name="com.sun.star.frame.ToolbarController"/>