summaryrefslogtreecommitdiff
path: root/framework/inc/uielement/edittoolbarcontroller.hxx
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-02-16 10:30:35 +0100
committerCarsten Driesner <cd@openoffice.org>2011-02-16 10:30:35 +0100
commit9fdc2716aada42ccb8f60e14555dab10de2c67eb (patch)
tree38fd489d7d0e4aaf5ef8dcf39ff013969fd7adf7 /framework/inc/uielement/edittoolbarcontroller.hxx
parentc696055fbc116a65aac158fe6747079a3af44be4 (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
fwk165: Rebase to DEV300m100
Diffstat (limited to 'framework/inc/uielement/edittoolbarcontroller.hxx')
-rw-r--r--framework/inc/uielement/edittoolbarcontroller.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index cdb22db98997..d8b48630da50 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -64,7 +64,7 @@ class EditToolbarController : public IEditListener,
EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
ToolBox* pToolBar,
- USHORT nID,
+ sal_uInt16 nID,
sal_Int32 nWidth,
const rtl::OUString& aCommand );
virtual ~EditToolbarController();