diff options
| author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
|---|---|---|
| committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
| commit | 8f9b8a80c32063ebe3d5d0e034e1d2432e87423e (patch) | |
| tree | 5572a7235419cd34d37cdb06d8c3ac5d0209d6d5 /framework/source/uielement/edittoolbarcontroller.cxx | |
| parent | 293b43ae4de478c550c8461de164f7cb8883daab (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
chart52: merge with DEV300_m100
Diffstat (limited to 'framework/source/uielement/edittoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/edittoolbarcontroller.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 387213d7c3eb..60ea9e7c0ce1 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -151,7 +151,7 @@ EditToolbarController::EditToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolbar, - USHORT nID, + sal_uInt16 nID, sal_Int32 nWidth, const ::rtl::OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) |