diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-28 22:09:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 11:25:35 +0100 |
| commit | 6b6ebeeaf94e1db3c90cfe3921ea6c956570a0c5 (patch) | |
| tree | 51d75965c5e5b8be2ba95ae92518b3778bc86f27 /svx | |
| parent | 53ef9fa167cc68969cdc953b4c0b9ad339f2d27e (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')
| -rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 2 | ||||
| -rw-r--r-- | svx/util/svxcore.component | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 38ca5144011c..2d70333e0759 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -533,7 +533,7 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.PopupMenuController" ); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } 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"/> |