Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
comphelper/source/misc/servicedecl.cxx
i18npool/source/breakiterator/breakiteratorImpl.cxx
l10ntools/scripts/localize.pl
svl/source/items/itemset.cxx
svl/source/memtools/svarray.cxx
svl/source/numbers/zformat.cxx
svtools/source/brwbox/brwbox1.cxx
tools/source/stream/strmwnt.cxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/graphite_serverfont.hxx
vcl/source/control/imgctrl.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/window/winproc.cxx
vcl/unx/source/fontmanager/fontconfig.cxx

1 files changed, 98 insertions, 98 deletions

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index ebb63f07b11b..a71aadc3cdad 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::uno;
 
 // =======================================================================
 
-static void ImplGetPinImage( USHORT nStyle, BOOL bPinIn, Image& rImage )
+static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool bPinIn, Image& rImage )
 {
     // ImageListe laden, wenn noch nicht vorhanden
     ImplSVData* pSVData = ImplGetSVData();
@@ -71,7 +71,7 @@ static void ImplGetPinImage( USHORT nStyle, BOOL bPinIn, Image& rImage )
     }
 
     // Image ermitteln und zurueckgeben
-    USHORT nId;
+    sal_uInt16 nId;
     if ( nStyle & BUTTON_DRAW_PRESSED )
     {
         if ( bPinIn )
@@ -126,9 +126,9 @@ static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
 
 static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
                                         const Rectangle& rRect,
-                                        SymbolType eSymbol, USHORT nState )
+                                        SymbolType eSymbol, sal_uInt16 nState )
 {
-    BOOL bMouseOver = (nState & BUTTON_DRAW_HIGHLIGHT) != 0;
+    sal_Bool bMouseOver = (nState & BUTTON_DRAW_HIGHLIGHT) != 0;
     nState &= ~BUTTON_DRAW_HIGHLIGHT;
 
     Rectangle aTempRect;
@@ -141,8 +141,8 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
             pWin->SetFillColor( pDev->GetSettings().GetStyleSettings().GetWindowColor() );
             pWin->SetLineColor();
             pWin->DrawRect( rRect );
-            pWin->DrawSelectionBackground( rRect, 2, (nState & BUTTON_DRAW_PRESSED) ? TRUE : FALSE,
-                                            TRUE, FALSE );
+            pWin->DrawSelectionBackground( rRect, 2, (nState & BUTTON_DRAW_PRESSED) ? sal_True : sal_False,
+                                            sal_True, sal_False );
         }
         aTempRect = rRect;
         aTempRect.nLeft+=3;
@@ -171,23 +171,23 @@ ImplBorderWindowView::~ImplBorderWindowView()
 
 // -----------------------------------------------------------------------
 
-BOOL ImplBorderWindowView::MouseMove( const MouseEvent& )
+sal_Bool ImplBorderWindowView::MouseMove( const MouseEvent& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ImplBorderWindowView::MouseButtonDown( const MouseEvent& )
+sal_Bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ImplBorderWindowView::Tracking( const TrackingEvent& )
+sal_Bool ImplBorderWindowView::Tracking( const TrackingEvent& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -242,7 +242,7 @@ void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData )
 
 // -----------------------------------------------------------------------
 
-USHORT ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Point& rPos )
+sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Point& rPos )
 {
     ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
 
@@ -321,15 +321,15 @@ USHORT ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Poin
 
 // -----------------------------------------------------------------------
 
-BOOL ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
+sal_Bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
 {
-    USHORT oldCloseState = pData->mnCloseState;
-    USHORT oldMenuState = pData->mnMenuState;
+    sal_uInt16 oldCloseState = pData->mnCloseState;
+    sal_uInt16 oldMenuState = pData->mnMenuState;
     pData->mnCloseState &= ~BUTTON_DRAW_HIGHLIGHT;
     pData->mnMenuState &= ~BUTTON_DRAW_HIGHLIGHT;
 
     Point aMousePos = rMEvt.GetPosPixel();
-    USHORT nHitTest = ImplHitTest( pData, aMousePos );
+    sal_uInt16 nHitTest = ImplHitTest( pData, aMousePos );
     PointerStyle ePtrStyle = POINTER_ARROW;
     if ( nHitTest & BORDERWINDOW_HITTEST_LEFT )
         ePtrStyle = POINTER_WINDOW_WSIZE;
@@ -358,12 +358,12 @@ BOOL ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const Mous
     if( pData->mnMenuState != oldMenuState )
         pData->mpBorderWindow->Invalidate( pData->maMenuRect );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
+sal_Bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
 {
     ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
 
@@ -371,11 +371,11 @@ BOOL ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons
     {
         pData->maMouseOff = rMEvt.GetPosPixel();
         pData->mnHitTest = ImplHitTest( pData, pData->maMouseOff );
-        USHORT nDragFullTest = 0;
+        sal_uInt16 nDragFullTest = 0;
         if ( pData->mnHitTest )
         {
-            BOOL bTracking = TRUE;
-            BOOL bHitTest = TRUE;
+            sal_Bool bTracking = sal_True;
+            sal_Bool bHitTest = sal_True;
 
             if ( pData->mnHitTest & BORDERWINDOW_HITTEST_CLOSE )
             {
@@ -440,18 +440,18 @@ BOOL ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons
                 }
                 else
                 {
-                    bTracking = FALSE;
+                    bTracking = sal_False;
 
                     if ( (pData->mnHitTest & BORDERWINDOW_DRAW_TITLE) &&
                          ((rMEvt.GetClicks() % 2) == 0) )
                     {
                         pData->mnHitTest = 0;
-                        bHitTest = FALSE;
+                        bHitTest = sal_False;
 
                         if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
                         {
                             SystemWindow* pClientWindow = (SystemWindow*)(pBorderWindow->ImplGetClientWindow());
-                            if ( TRUE /*pBorderWindow->mbDockBtn*/ )   // always perform docking on double click, no button required
+                            if ( sal_True /*pBorderWindow->mbDockBtn*/ )   // always perform docking on double click, no button required
                                 pClientWindow->TitleButtonClick( TITLE_BUTTON_DOCKING );
                             else if ( pBorderWindow->GetStyle() & WB_ROLLABLE )
                             {
@@ -468,9 +468,9 @@ BOOL ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons
 
             if ( bTracking )
             {
-                pData->mbDragFull = FALSE;
+                pData->mbDragFull = sal_False;
                 if ( nDragFullTest )
-                    pData->mbDragFull = TRUE;   // always fulldrag for proper docking, ignore system settings
+                    pData->mbDragFull = sal_True;   // always fulldrag for proper docking, ignore system settings
                 pBorderWindow->StartTracking();
             }
             else if ( bHitTest )
@@ -478,18 +478,18 @@ BOOL ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt )
+sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt )
 {
     ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
 
     if ( rTEvt.IsTrackingEnded() )
     {
-        USHORT nHitTest = pData->mnHitTest;
+        sal_uInt16 nHitTest = pData->mnHitTest;
         pData->mnHitTest = 0;
 
         if ( nHitTest & BORDERWINDOW_HITTEST_CLOSE )
@@ -931,7 +931,7 @@ BOOL ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -940,9 +940,9 @@ String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
                                               const Point& rPos,
                                               Rectangle& rHelpRect )
 {
-    USHORT nHelpId = 0;
+    sal_uInt16 nHelpId = 0;
     String aHelpStr;
-    USHORT nHitTest = ImplHitTest( pData, rPos );
+    sal_uInt16 nHitTest = ImplHitTest( pData, rPos );
     if ( nHitTest )
     {
         if ( nHitTest & BORDERWINDOW_HITTEST_CLOSE )
@@ -1062,7 +1062,7 @@ long ImplNoBorderWindowView::CalcTitleWidth() const
 
 // -----------------------------------------------------------------------
 
-void ImplNoBorderWindowView::DrawWindow( USHORT, OutputDevice*, const Point* )
+void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* )
 {
 }
 
@@ -1088,7 +1088,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
     mnHeight    = nHeight;
     mbNWFBorder = false;
 
-    USHORT nBorderStyle = mpBorderWindow->GetBorderStyle();
+    sal_uInt16 nBorderStyle = mpBorderWindow->GetBorderStyle();
     if ( nBorderStyle & WINDOW_BORDER_NOBORDER )
     {
         mnLeftBorder    = 0;
@@ -1164,16 +1164,16 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
                     if( mnWidth && mnHeight )
                     {
 
-                        mpBorderWindow->SetPaintTransparent( TRUE );
+                        mpBorderWindow->SetPaintTransparent( sal_True );
                         mpBorderWindow->SetBackground();
-                        pCtrl->SetPaintTransparent( TRUE );
+                        pCtrl->SetPaintTransparent( sal_True );
 
                         Window* pCompoundParent = NULL;
                         if( pWin->GetParent() && pWin->GetParent()->IsCompoundControl() )
                             pCompoundParent = pWin->GetParent();
 
                         if( pCompoundParent )
-                            pCompoundParent->SetPaintTransparent( TRUE );
+                            pCompoundParent->SetPaintTransparent( sal_True );
 
                         if( mnWidth < aBounds.GetWidth() || mnHeight < aBounds.GetHeight() )
                         {
@@ -1196,7 +1196,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
 
         if( ! mbNWFBorder )
         {
-            USHORT nStyle = FRAME_DRAW_NODRAW;
+            sal_uInt16 nStyle = FRAME_DRAW_NODRAW;
             // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
             // ist, dann Border nach aussen
             if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder )
@@ -1237,13 +1237,13 @@ long ImplSmallBorderWindowView::CalcTitleWidth() const
 
 // -----------------------------------------------------------------------
 
-void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, const Point* )
+void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*, const Point* )
 {
-    USHORT nBorderStyle = mpBorderWindow->GetBorderStyle();
+    sal_uInt16 nBorderStyle = mpBorderWindow->GetBorderStyle();
     if ( nBorderStyle & WINDOW_BORDER_NOBORDER )
         return;
 
-    BOOL bNativeOK = FALSE;
+    sal_Bool bNativeOK = sal_False;
     // for native widget drawing we must find out what
     // control this border belongs to
     Window *pWin = NULL, *pCtrl = NULL;
@@ -1334,9 +1334,9 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
                 nState |= CTRL_STATE_FOCUSED;
         }
 
-        BOOL bMouseOver = FALSE;
+        sal_Bool bMouseOver = sal_False;
         Window *pCtrlChild = pCtrl->GetWindow( WINDOW_FIRSTCHILD );
-        while( pCtrlChild && (bMouseOver = pCtrlChild->IsMouseOver()) == FALSE )
+        while( pCtrlChild && (bMouseOver = pCtrlChild->IsMouseOver()) == sal_False )
             pCtrlChild = pCtrlChild->GetWindow( WINDOW_NEXT );
 
         if( bMouseOver )
@@ -1385,7 +1385,7 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
         }
         else
         {
-            USHORT nStyle = 0;
+            sal_uInt16 nStyle = 0;
             // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster
             // ist, dann Border nach aussen
             if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder )
@@ -1417,7 +1417,7 @@ void ImplSmallBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice*, co
 ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow )
 {
     maFrameData.mpBorderWindow  = pBorderWindow;
-    maFrameData.mbDragFull      = FALSE;
+    maFrameData.mbDragFull      = sal_False;
     maFrameData.mnHitTest       = 0;
     maFrameData.mnPinState      = 0;
     maFrameData.mnCloseState    = 0;
@@ -1444,21 +1444,21 @@ ImplStdBorderWindowView::~ImplStdBorderWindowView()
 
 // -----------------------------------------------------------------------
 
-BOOL ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt )
+sal_Bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt )
 {
     return ImplMouseMove( &maFrameData, rMEvt );
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt )
 {
     return ImplMouseButtonDown( &maFrameData, rMEvt );
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
+sal_Bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
 {
     return ImplTracking( &maFrameData, rTEvt );
 }
@@ -1654,7 +1654,7 @@ long ImplStdBorderWindowView::CalcTitleWidth() const
 
 // -----------------------------------------------------------------------
 
-void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset )
+void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset )
 {
     ImplBorderFrameData*    pData = &maFrameData;
     OutputDevice*           pDev = pOutDev ? pOutDev : pData->mpOutDev;
@@ -1666,7 +1666,7 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
     Color                   aFaceColor( rStyleSettings.GetFaceColor() );
     Color                   aFrameColor( aFaceColor );
 
-    aFrameColor.DecreaseContrast( (UINT8) (0.50 * 255));
+    aFrameColor.DecreaseContrast( (sal_uInt8) (0.50 * 255));
 
     // Draw Frame
     if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME )
@@ -1762,7 +1762,7 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
             if ( pOffset )
                 aInRect.Move( pOffset->X(), pOffset->Y() );
 
-            USHORT nTextStyle = TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER | TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_CLIP;
+            sal_uInt16 nTextStyle = TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER | TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_CLIP;
 
             // must show tooltip ?
             TextRectInfo aInfo;
@@ -1852,14 +1852,14 @@ void ImplStdBorderWindowView::DrawWindow( USHORT nDrawFlags, OutputDevice* pOutD
 
 // =======================================================================
 void ImplBorderWindow::ImplInit( Window* pParent,
-                                 WinBits nStyle, USHORT nTypeStyle,
+                                 WinBits nStyle, sal_uInt16 nTypeStyle,
                                  const ::com::sun::star::uno::Any& )
 {
     ImplInit( pParent, nStyle, nTypeStyle, NULL );
 }
 
 void ImplBorderWindow::ImplInit( Window* pParent,
-                                 WinBits nStyle, USHORT nTypeStyle,
+                                 WinBits nStyle, sal_uInt16 nTypeStyle,
                                  SystemParentData* pSystemParentData
                                  )
 {
@@ -1870,44 +1870,44 @@ void ImplBorderWindow::ImplInit( Window* pParent,
         nTestStyle |= WB_APP;
     nStyle &= nTestStyle;
 
-    mpWindowImpl->mbBorderWin       = TRUE;
-    mbSmallOutBorder    = FALSE;
+    mpWindowImpl->mbBorderWin       = sal_True;
+    mbSmallOutBorder    = sal_False;
     if ( nTypeStyle & BORDERWINDOW_STYLE_FRAME )
     {
         if( (nStyle & WB_SYSTEMCHILDWINDOW) )
         {
-            mpWindowImpl->mbOverlapWin  = TRUE;
-            mpWindowImpl->mbFrame       = TRUE;
-            mbFrameBorder               = FALSE;
+            mpWindowImpl->mbOverlapWin  = sal_True;
+            mpWindowImpl->mbFrame       = sal_True;
+            mbFrameBorder               = sal_False;
         }
         else if( (nStyle & (WB_OWNERDRAWDECORATION | WB_POPUP)) )
         {
-            mpWindowImpl->mbOverlapWin  = TRUE;
-            mpWindowImpl->mbFrame       = TRUE;
-            mbFrameBorder   = (nOrgStyle & WB_NOBORDER) ? FALSE : TRUE;
+            mpWindowImpl->mbOverlapWin  = sal_True;
+            mpWindowImpl->mbFrame       = sal_True;
+            mbFrameBorder   = (nOrgStyle & WB_NOBORDER) ? sal_False : sal_True;
         }
         else
         {
-            mpWindowImpl->mbOverlapWin  = TRUE;
-            mpWindowImpl->mbFrame       = TRUE;
-            mbFrameBorder   = FALSE;
+            mpWindowImpl->mbOverlapWin  = sal_True;
+            mpWindowImpl->mbFrame       = sal_True;
+            mbFrameBorder   = sal_False;
             // closeable windows may have a border as well, eg. system floating windows without caption
             if ( (nOrgStyle & (WB_BORDER | WB_NOBORDER | WB_MOVEABLE | WB_SIZEABLE/* | WB_CLOSEABLE*/)) == WB_BORDER )
-                mbSmallOutBorder = TRUE;
+                mbSmallOutBorder = sal_True;
         }
     }
     else if ( nTypeStyle & BORDERWINDOW_STYLE_OVERLAP )
     {
-        mpWindowImpl->mbOverlapWin  = TRUE;
-        mbFrameBorder   = TRUE;
+        mpWindowImpl->mbOverlapWin  = sal_True;
+        mbFrameBorder   = sal_True;
     }
     else
-        mbFrameBorder   = FALSE;
+        mbFrameBorder   = sal_False;
 
     if ( nTypeStyle & BORDERWINDOW_STYLE_FLOAT )
-        mbFloatWindow = TRUE;
+        mbFloatWindow = sal_True;
     else
-        mbFloatWindow = FALSE;
+        mbFloatWindow = sal_False;
 
     Window::ImplInit( pParent, nStyle, pSystemParentData );
     SetBackground();
@@ -1920,13 +1920,13 @@ void ImplBorderWindow::ImplInit( Window* pParent,
     mnMaxHeight     = SHRT_MAX;
     mnRollHeight    = 0;
     mnOrgMenuHeight = 0;
-    mbPined         = FALSE;
-    mbRollUp        = FALSE;
-    mbMenuHide      = FALSE;
-    mbDockBtn       = FALSE;
-    mbMenuBtn       = FALSE;
-    mbHideBtn       = FALSE;
-    mbHelpBtn       = FALSE;
+    mbPined         = sal_False;
+    mbRollUp        = sal_False;
+    mbMenuHide      = sal_False;
+    mbDockBtn       = sal_False;
+    mbMenuBtn       = sal_False;
+    mbHideBtn       = sal_False;
+    mbHelpBtn       = sal_False;
     mbDisplayActive = IsActive();
 
     if ( nTypeStyle & BORDERWINDOW_STYLE_FLOAT )
@@ -1941,7 +1941,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
 
 ImplBorderWindow::ImplBorderWindow( Window* pParent,
                                     SystemParentData* pSystemParentData,
-                                    WinBits nStyle, USHORT nTypeStyle
+                                    WinBits nStyle, sal_uInt16 nTypeStyle
                                     ) : Window( WINDOW_BORDERWINDOW )
 {
     ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData );
@@ -1950,14 +1950,14 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent,
 // -----------------------------------------------------------------------
 
 ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle ,
-                                    USHORT nTypeStyle ) :
+                                    sal_uInt16 nTypeStyle ) :
     Window( WINDOW_BORDERWINDOW )
 {
     ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() );
 }
 
 ImplBorderWindow::ImplBorderWindow( Window* pParent,
-                                    WinBits nStyle, USHORT nTypeStyle,
+                                    WinBits nStyle, sal_uInt16 nTypeStyle,
                                     const ::com::sun::star::uno::Any& aSystemToken ) :
     Window( WINDOW_BORDERWINDOW )
 {
@@ -2008,7 +2008,7 @@ void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Poin
 
 void ImplBorderWindow::Activate()
 {
-    SetDisplayActive( TRUE );
+    SetDisplayActive( sal_True );
     Window::Activate();
 }
 
@@ -2019,7 +2019,7 @@ void ImplBorderWindow::Deactivate()
     // Fenster die immer Active sind, nehmen wir von dieser Regel aus,
     // genauso, wenn ein Menu aktiv wird, ignorieren wir das Deactivate
     if ( GetActivateMode() && !ImplGetSVData()->maWinData.mbNoDeactivate )
-        SetDisplayActive( FALSE );
+        SetDisplayActive( sal_False );
     Window::Deactivate();
 }
 
@@ -2133,7 +2133,7 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
           (rDCEvt.GetFlags() & SETTINGS_STYLE)) )
     {
         if ( !mpWindowImpl->mbFrame || (GetStyle() & (WB_OWNERDRAWDECORATION | WB_POPUP)) )
-            UpdateView( TRUE, ImplGetWindow()->GetOutputSizePixel() );
+            UpdateView( sal_True, ImplGetWindow()->GetOutputSizePixel() );
     }
 
     Window::DataChanged( rDCEvt );
@@ -2162,7 +2162,7 @@ void ImplBorderWindow::InitView()
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::UpdateView( BOOL bNewView, const Size& rNewOutSize )
+void ImplBorderWindow::UpdateView( sal_Bool bNewView, const Size& rNewOutSize )
 {
     sal_Int32 nLeftBorder;
     sal_Int32 nTopBorder;
@@ -2238,7 +2238,7 @@ void ImplBorderWindow::InvalidateBorder()
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetDisplayActive( BOOL bActive )
+void ImplBorderWindow::SetDisplayActive( sal_Bool bActive )
 {
     if ( mbDisplayActive != bActive )
     {
@@ -2250,26 +2250,26 @@ void ImplBorderWindow::SetDisplayActive( BOOL bActive )
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetTitleType( USHORT nTitleType, const Size& rSize )
+void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize )
 {
     mnTitleType = nTitleType;
-    UpdateView( FALSE, rSize );
+    UpdateView( sal_False, rSize );
 }
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetBorderStyle( USHORT nStyle )
+void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle )
 {
     if ( !mbFrameBorder && (mnBorderStyle != nStyle) )
     {
         mnBorderStyle = nStyle;
-        UpdateView( FALSE, ImplGetWindow()->GetOutputSizePixel() );
+        UpdateView( sal_False, ImplGetWindow()->GetOutputSizePixel() );
     }
 }
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetPin( BOOL bPin )
+void ImplBorderWindow::SetPin( sal_Bool bPin )
 {
     mbPined = bPin;
     InvalidateBorder();
@@ -2277,11 +2277,11 @@ void ImplBorderWindow::SetPin( BOOL bPin )
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetRollUp( BOOL bRollUp, const Size& rSize )
+void ImplBorderWindow::SetRollUp( sal_Bool bRollUp, const Size& rSize )
 {
     mbRollUp = bRollUp;
     mnRollHeight = rSize.Height();
-    UpdateView( FALSE, rSize );
+    UpdateView( sal_False, rSize );
 }
 
 // -----------------------------------------------------------------------
@@ -2296,7 +2296,7 @@ void ImplBorderWindow::SetCloser()
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetDockButton( BOOL bDockButton )
+void ImplBorderWindow::SetDockButton( sal_Bool bDockButton )
 {
     mbDockBtn = bDockButton;
     Size aSize = GetOutputSizePixel();
@@ -2306,7 +2306,7 @@ void ImplBorderWindow::SetDockButton( BOOL bDockButton )
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetHideButton( BOOL bHideButton )
+void ImplBorderWindow::SetHideButton( sal_Bool bHideButton )
 {
     mbHideBtn = bHideButton;
     Size aSize = GetOutputSizePixel();
@@ -2316,7 +2316,7 @@ void ImplBorderWindow::SetHideButton( BOOL bHideButton )
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetHelpButton( BOOL bHelpButton )
+void ImplBorderWindow::SetHelpButton( sal_Bool bHelpButton )
 {
     mbHelpBtn = bHelpButton;
     Size aSize = GetOutputSizePixel();
@@ -2326,7 +2326,7 @@ void ImplBorderWindow::SetHelpButton( BOOL bHelpButton )
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetMenuButton( BOOL bMenuButton )
+void ImplBorderWindow::SetMenuButton( sal_Bool bMenuButton )
 {
     mbMenuBtn = bMenuButton;
     Size aSize = GetOutputSizePixel();
@@ -2353,7 +2353,7 @@ void ImplBorderWindow::SetMenuBarWindow( Window* pWindow )
 
 // -----------------------------------------------------------------------
 
-void ImplBorderWindow::SetMenuBarMode( BOOL bHide )
+void ImplBorderWindow::SetMenuBarMode( sal_Bool bHide )
 {
     mbMenuHide = bHide;
     UpdateMenuHeight();