From 7799914b16ac11d59524a9e5aa1d2a2c06645185 Mon Sep 17 00:00:00 2001
From: Xiaofei Zhang <Zhangxiaofei@openoffice.org>
Date: Fri, 5 Nov 2010 10:31:15 +0800
Subject: removetooltypes01: #i112600# remove tooltypes from toolkit, svtools
 and framework

---
 framework/source/uielement/edittoolbarcontroller.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/source/uielement/edittoolbarcontroller.cxx')

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 )
-- 
cgit