removetooltypes01: #i112600# remove tooltypes from idl, and other small changes

1 files changed, 22 insertions, 22 deletions

diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 9122a1addc0a..2f388876a847 100755
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -74,7 +74,7 @@ class GrindApp : public Application
 {
 public:
     virtual void   Main();
-    virtual USHORT Exception( USHORT nError );
+    virtual sal_uInt16 Exception( sal_uInt16 nError );
 };
 
 class TestWindow : public Dialog
@@ -153,7 +153,7 @@ void setupMethodStubs( functor_vector_type& res )
     const Wallpaper   aWallpaper( aWhiteColor );
 
     GDIMetaFile       aMtf;
-    aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),TRUE) );
+    aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),sal_True) );
     aMtf.AddAction( new MetaRectAction(aRect) );
 
     /* void DrawText( const Point& rStartPt, const XubString& rStr,
@@ -165,7 +165,7 @@ void setupMethodStubs( functor_vector_type& res )
 //        boost::bind(
 //            &OutputDevice::DrawText,
 //            _1,
-//            aPt1, aString, (USHORT)0, aString.Len(), (MetricVector*)0, (String*)0, (vcl::ITextLayout*)0 ));
+//            aPt1, aString, (sal_uInt16)0, aString.Len(), (MetricVector*)0, (String*)0, (vcl::ITextLayout*)0 ));
 
     /* void DrawTextArray( const Point& rStartPt, const XubString& rStr,
                                        const sal_Int32* pDXAry = NULL,
@@ -177,7 +177,7 @@ void setupMethodStubs( functor_vector_type& res )
         boost::bind(
             &OutputDevice::DrawTextArray,
             _1,
-            aPt1, aString, (const sal_Int32*)0, (USHORT)0, aString.Len() ));
+            aPt1, aString, (const sal_Int32*)0, (sal_uInt16)0, aString.Len() ));
 
     /* void DrawPixel( const Point& rPt, const Color& rColor ); */
     add(res,
@@ -256,12 +256,12 @@ void setupMethodStubs( functor_vector_type& res )
             aRect ));
 
     /* void DrawRect( const Rectangle& rRect,
-                                  ULONG nHorzRount, ULONG nVertRound );
+                                  sal_uIntPtr nHorzRount, sal_uIntPtr nVertRound );
     */
     add(res,
         "DrawRect(round corners)",
         boost::bind(
-            (void (OutputDevice::*)( const Rectangle&, ULONG nHorzRount, ULONG nVertRound ))(
+            (void (OutputDevice::*)( const Rectangle&, sal_uIntPtr nHorzRount, sal_uIntPtr nVertRound ))(
                 &OutputDevice::DrawRect),
             _1,
             aRect2,
@@ -352,14 +352,14 @@ void setupMethodStubs( functor_vector_type& res )
 
     /* void CopyArea( const Point& rDestPt,
                                   const Point& rSrcPt,  const Size& rSrcSize,
-                                  USHORT nFlags = 0 );
+                                  sal_uInt16 nFlags = 0 );
     */
     add(res,
         "CopyArea",
         boost::bind(
             &OutputDevice::CopyArea,
             _1,
-            aPt1,aPt3,aRect2.GetSize(),(USHORT)0 ));
+            aPt1,aPt3,aRect2.GetSize(),(sal_uInt16)0 ));
 
     /* void DrawBitmap( const Point& rDestPt,
                                     const Bitmap& rBitmap );
@@ -696,20 +696,20 @@ void setupMethodStubs( functor_vector_type& res )
             aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmap,aBlackColor ));
 
     /* void DrawImage( const Point& rPos,
-                                   const Image& rImage, USHORT nStyle = 0 );
+                                   const Image& rImage, sal_uInt16 nStyle = 0 );
     */
     add(res,
         "DrawImage",
         boost::bind(
             (void (OutputDevice::*)( const Point&,
                                      const Image&,
-                                     USHORT nStyle ))(
+                                     sal_uInt16 nStyle ))(
                 &OutputDevice::DrawImage),
             _1,
-            aPt1,aImage,(USHORT)0 ));
+            aPt1,aImage,(sal_uInt16)0 ));
 
     /* void DrawImage( const Point& rPos, const Size& rSize,
-                                   const Image& rImage, USHORT nStyle = 0 );
+                                   const Image& rImage, sal_uInt16 nStyle = 0 );
     */
     add(res,
         "DrawImage(scaled)",
@@ -717,10 +717,10 @@ void setupMethodStubs( functor_vector_type& res )
             (void (OutputDevice::*)( const Point&,
                                      const Size&,
                                      const Image&,
-                                     USHORT nStyle ))(
+                                     sal_uInt16 nStyle ))(
                 &OutputDevice::DrawImage),
             _1,
-            aPt1,aRect.GetSize(),aImage,(USHORT)0 ));
+            aPt1,aRect.GetSize(),aImage,(sal_uInt16)0 ));
 
     /* void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); */
     add(res,
@@ -756,15 +756,15 @@ void setupMethodStubs( functor_vector_type& res )
             _1,
             aRect2,aWallpaper ));
 
-    /* void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, USHORT nStyle ); */
+    /* void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, sal_uInt16 nStyle ); */
     add(res,
         "DrawWaveLine",
         boost::bind(
             &OutputDevice::DrawWaveLine,
             _1,
-            aPt1,aPt2,(USHORT)WAVE_NORMAL ));
+            aPt1,aPt2,(sal_uInt16)WAVE_NORMAL ));
 
-    /* void DrawGrid( const Rectangle& rRect, const Size& rDist, ULONG nFlags ); */
+    /* void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uIntPtr nFlags ); */
     add(res,
         "DrawGrid",
         boost::bind(
@@ -773,15 +773,15 @@ void setupMethodStubs( functor_vector_type& res )
             aRect,Size(10,20),GRID_HORZLINES|GRID_VERTLINES ));
 
     /* void DrawTransparent( const PolyPolygon& rPolyPoly,
-                                         USHORT nTransparencePercent );
+                                         sal_uInt16 nTransparencePercent );
     */
     add(res,
         "DrawTransparent",
         boost::bind(
-            (void (OutputDevice::*)( const PolyPolygon&, USHORT ))(
+            (void (OutputDevice::*)( const PolyPolygon&, sal_uInt16 ))(
                 &OutputDevice::DrawTransparent),
             _1,
-            aPoly3,(USHORT)50 ));
+            aPoly3,(sal_uInt16)50 ));
 
     /* void DrawTransparent( const GDIMetaFile& rMtf,
                                          const Point& rPos, const Size& rSize,
@@ -902,7 +902,7 @@ void TestWindow::Paint( const Rectangle& )
     fflush( stdout );
 }
 
-USHORT GrindApp::Exception( USHORT nError )
+sal_uInt16 GrindApp::Exception( sal_uInt16 nError )
 {
     switch( nError & EXC_MAJORTYPE )
     {
@@ -918,7 +918,7 @@ void GrindApp::Main()
 {
     bool bHelp = false;
 
-    for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
+    for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
     {
         ::rtl::OUString aParam = GetCommandLineParam( i );