summaryrefslogtreecommitdiff
path: root/framework/inc/uielement/edittoolbarcontroller.hxx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
commit1fb042333fe6287756ff1fac11d18cd7c150730d (patch)
tree595de5d187177832ce656d7832af9dce9dce2d99 /framework/inc/uielement/edittoolbarcontroller.hxx
parent5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
rebase to DEV300_m100
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();