rebase to DEV300_m100

1 files changed, 7 insertions, 7 deletions

diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index aaacf074a802..4d1c77ab09b5 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -129,7 +129,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType )
 
 // -----------------------------------------------------------------------
 
-BOOL DockingAreaWindow::IsHorizontal() const
+sal_Bool DockingAreaWindow::IsHorizontal() const
 {
     return ( mpImplData->meAlign == WINDOWALIGN_TOP || mpImplData->meAlign == WINDOWALIGN_BOTTOM );
 }
@@ -152,7 +152,7 @@ WindowAlign DockingAreaWindow::GetAlign() const
 
 void DockingAreaWindow::Paint( const Rectangle& )
 {
-    EnableNativeWidget( TRUE ); // only required because the toolkit curently switches this flag off
+    EnableNativeWidget( sal_True ); // only required because the toolkit curently switches this flag off
     if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
     {
         ToolbarValue        aControlValue;
@@ -161,7 +161,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
         {
             // give NWF a hint that this dockingarea is adjacent to the menubar
             // useful for special gradient effects that should cover both windows
-            aControlValue.mbIsTopDockingArea = TRUE;
+            aControlValue.mbIsTopDockingArea = sal_True;
         }
         ControlState        nState = CTRL_STATE_ENABLED;
 
@@ -175,8 +175,8 @@ void DockingAreaWindow::Paint( const Rectangle& )
                                aCtrlRegion, nState, aControlValue, rtl::OUString() );
 
             // each toolbar gets a thin border to better recognize its borders on the homogeneous docking area
-            USHORT nChildren = GetChildCount();
-            for( USHORT n = 0; n < nChildren; n++ )
+            sal_uInt16 nChildren = GetChildCount();
+            for( sal_uInt16 n = 0; n < nChildren; n++ )
             {
                 Window* pChild = GetChild( n );
                 if ( pChild->IsVisible() )
@@ -200,8 +200,8 @@ void DockingAreaWindow::Paint( const Rectangle& )
             // create map to find toolbar lines
             Size aOutSz = GetOutputSizePixel();
             std::map< int, int > ranges;
-            USHORT nChildren = GetChildCount();
-            for( USHORT n = 0; n < nChildren; n++ )
+            sal_uInt16 nChildren = GetChildCount();
+            for( sal_uInt16 n = 0; n < nChildren; n++ )
             {
                 Window* pChild = GetChild( n );
                 Point aPos = pChild->GetPosPixel();