1 files changed, 44 insertions, 44 deletions

diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 1bd17f9d584c..479ae4a5df6b 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include "ivctrl.hxx"
+#include <svtools/ivctrl.hxx>
 #include "imivctl.hxx"
 #include <vcl/bitmapex.hxx>
 #include <vcl/controllayout.hxx>
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::accessibility;
 |
 \*****************************************************************************/
 
-SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT _nFlags )
+SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 _nFlags )
 {
     aText = rText;
     aImage = rImage;
@@ -54,7 +54,7 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image
     pflink = 0;
 }
 
-SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( USHORT _nFlags )
+SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( sal_uInt16 _nFlags )
 {
     pUserData = NULL;
 
@@ -64,7 +64,7 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( USHORT _nFlags )
     pflink = 0;
 }
 
-void SvxIconChoiceCtrlEntry::SetMoved( BOOL bMoved )
+void SvxIconChoiceCtrlEntry::SetMoved( sal_Bool bMoved )
 {
     if( bMoved )
         nFlags |= ICNVIEW_FLAG_POS_MOVED;
@@ -72,7 +72,7 @@ void SvxIconChoiceCtrlEntry::SetMoved( BOOL bMoved )
         nFlags &= ~ICNVIEW_FLAG_POS_MOVED;
 }
 
-void SvxIconChoiceCtrlEntry::LockPos( BOOL bLock )
+void SvxIconChoiceCtrlEntry::LockPos( sal_Bool bLock )
 {
     if( bLock )
         nFlags |= ICNVIEW_FLAG_POS_LOCKED;
@@ -108,7 +108,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) :
 
     _pCurKeyEvent   ( NULL ),
     _pImp           ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ),
-    _bAutoFontColor ( FALSE )
+    _bAutoFontColor ( sal_False )
 
 {
     SetLineColor();
@@ -123,7 +123,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ) :
 
     _pCurKeyEvent   ( NULL ),
     _pImp           ( new SvxIconChoiceCtrl_Impl( this, WB_BORDER ) ),
-    _bAutoFontColor ( FALSE )
+    _bAutoFontColor ( sal_False )
 
 {
     SetLineColor();
@@ -138,14 +138,14 @@ SvtIconChoiceCtrl::~SvtIconChoiceCtrl()
     delete _pImp;
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( ULONG nPos, const Point* pPos, USHORT nFlags  )
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( sal_uLong nPos, const Point* pPos, sal_uInt16 nFlags  )
 {
     SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( nFlags );
     _pImp->InsertEntry( pEntry, nPos, pPos );
     return pEntry;
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, ULONG nPos, const Point* pPos, USHORT nFlags  )
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, sal_uLong nPos, const Point* pPos, sal_uInt16 nFlags  )
 {
     SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, nFlags);
 
@@ -154,14 +154,14 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con
     return pEntry;
 }
 
-BOOL SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, BOOL )
+sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, sal_Bool )
 {
     return TRUE;
 }
 
-BOOL SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
+sal_Bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
 {
-    return TRUE;
+    return sal_True;
 }
 
 void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
@@ -169,29 +169,29 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po
     rDev.DrawImage( rPos, pEntry->GetImage() );
 }
 
-String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, BOOL )
+String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
 {
     return pEntry->GetText();
 }
 
-BOOL SvtIconChoiceCtrl::HasBackground() const
+sal_Bool SvtIconChoiceCtrl::HasBackground() const
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvtIconChoiceCtrl::HasFont() const
+sal_Bool SvtIconChoiceCtrl::HasFont() const
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvtIconChoiceCtrl::HasFontTextColor() const
+sal_Bool SvtIconChoiceCtrl::HasFontTextColor() const
 {
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvtIconChoiceCtrl::HasFontFillColor() const
+sal_Bool SvtIconChoiceCtrl::HasFontFillColor() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 void SvtIconChoiceCtrl::Paint( const Rectangle& rRect )
@@ -223,7 +223,7 @@ void SvtIconChoiceCtrl::ArrangeIcons()
         Size aFullSize;
         Rectangle aEntryRect;
 
-        for ( ULONG i = 0; i < GetEntryCount(); i++ )
+        for ( sal_uLong i = 0; i < GetEntryCount(); i++ )
         {
             SvxIconChoiceCtrlEntry* pEntry = GetEntry ( i );
             aEntryRect = _pImp->GetEntryBoundRect ( pEntry );
@@ -231,14 +231,14 @@ void SvtIconChoiceCtrl::ArrangeIcons()
             aFullSize.setWidth ( aFullSize.getWidth()+aEntryRect.GetWidth() );
         }
 
-        _pImp->Arrange ( FALSE, aFullSize.getWidth() );
+        _pImp->Arrange ( sal_False, aFullSize.getWidth() );
     }
     else if ( GetStyle() & WB_ALIGN_LEFT )
     {
         Size aFullSize;
         Rectangle aEntryRect;
 
-        for ( ULONG i = 0; i < GetEntryCount(); i++ )
+        for ( sal_uLong i = 0; i < GetEntryCount(); i++ )
         {
             SvxIconChoiceCtrlEntry* pEntry = GetEntry ( i );
             aEntryRect = _pImp->GetEntryBoundRect ( pEntry );
@@ -246,13 +246,13 @@ void SvtIconChoiceCtrl::ArrangeIcons()
             aFullSize.setHeight ( aFullSize.getHeight()+aEntryRect.GetHeight() );
         }
 
-        _pImp->Arrange ( FALSE, 0, aFullSize.getHeight() );
+        _pImp->Arrange ( sal_False, 0, aFullSize.getHeight() );
     }
     else
     {
         _pImp->Arrange();
     }
-    _pImp->Arrange( FALSE, 0, 1000 );
+    _pImp->Arrange( sal_False, 0, 1000 );
 }
 void SvtIconChoiceCtrl::Resize()
 {
@@ -288,7 +288,7 @@ void SvtIconChoiceCtrl::GetFocus()
 {
     _pImp->GetFocus();
     Control::GetFocus();
-    ULONG nPos;
+    sal_uLong nPos;
     SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry ( nPos );
     if ( pSelectedEntry )
         _pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry );
@@ -300,7 +300,7 @@ void SvtIconChoiceCtrl::LoseFocus()
     Control::LoseFocus();
 }
 
-void SvtIconChoiceCtrl::SetUpdateMode( BOOL bUpdate )
+void SvtIconChoiceCtrl::SetUpdateMode( sal_Bool bUpdate )
 {
     Control::SetUpdateMode( bUpdate );
     _pImp->SetUpdateMode( bUpdate );
@@ -322,7 +322,7 @@ void SvtIconChoiceCtrl::SetPointFont( const Font& rFont )
         _pImp->FontModified();
     }
 }
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, BOOL bHit ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, sal_Bool bHit ) const
 {
     Point aPos( rPixPos );
     aPos -= GetMapMode().GetOrigin();
@@ -353,25 +353,25 @@ SvxIconChoiceCtrlTextMode SvtIconChoiceCtrl::GetEntryTextMode( const SvxIconChoi
     return _pImp->GetEntryTextModeSmart( pEntry );
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetNextEntry( const Point& rPixPos, SvxIconChoiceCtrlEntry* pCurEntry, BOOL  ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetNextEntry( const Point& rPixPos, SvxIconChoiceCtrlEntry* pCurEntry, sal_Bool  ) const
 {
     Point aPos( rPixPos );
     aPos -= GetMapMode().GetOrigin();
     return ((SvtIconChoiceCtrl*)this)->_pImp->GetNextEntry( aPos, pCurEntry );
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetPrevEntry( const Point& rPixPos, SvxIconChoiceCtrlEntry* pCurEntry, BOOL  ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetPrevEntry( const Point& rPixPos, SvxIconChoiceCtrlEntry* pCurEntry, sal_Bool  ) const
 {
     Point aPos( rPixPos );
     aPos -= GetMapMode().GetOrigin();
     return ((SvtIconChoiceCtrl*)this)->_pImp->GetPrevEntry( aPos, pCurEntry );
 }
-ULONG SvtIconChoiceCtrl::GetEntryCount() const
+sal_uLong SvtIconChoiceCtrl::GetEntryCount() const
 {
     return _pImp->GetEntryCount();
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( ULONG nPos ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( sal_uLong nPos ) const
 {
     return _pImp->GetEntry( nPos );
 }
@@ -391,30 +391,30 @@ void SvtIconChoiceCtrl::RemoveEntry( SvxIconChoiceCtrlEntry* pEntry )
     _pImp->RemoveEntry( pEntry );
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetSelectedEntry( ULONG& rPos ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetSelectedEntry( sal_uLong& rPos ) const
 {
     return _pImp->GetFirstSelectedEntry( rPos );
 }
 
 void SvtIconChoiceCtrl::ClickIcon()
 {
-    ULONG nPos;
+    sal_uLong nPos;
     GetSelectedEntry ( nPos );
     _aClickIconHdl.Call( this );
 }
-BOOL SvtIconChoiceCtrl::IsEntryEditing() const
+sal_Bool SvtIconChoiceCtrl::IsEntryEditing() const
 {
     return _pImp->IsEntryEditing();
 }
 
-BOOL SvtIconChoiceCtrl::SetChoiceWithCursor ( BOOL bDo )
+sal_Bool SvtIconChoiceCtrl::SetChoiceWithCursor ( sal_Bool bDo )
 {
     return _pImp->SetChoiceWithCursor (bDo);
 }
 
 void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
 {
-    BOOL bKeyUsed = DoKeyInput( rKEvt );
+    sal_Bool bKeyUsed = DoKeyInput( rKEvt );
     if ( !bKeyUsed )
     {
         _pCurKeyEvent = (KeyEvent*)&rKEvt;
@@ -422,17 +422,17 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
         _pCurKeyEvent = NULL;
     }
 }
-BOOL SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
+sal_Bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
 {
     // unter OS/2 bekommen wir auch beim Editieren Key-Up/Down
     if( IsEntryEditing() )
-        return TRUE;
+        return sal_True;
     _pCurKeyEvent = (KeyEvent*)&rKEvt;
-    BOOL bHandled = _pImp->KeyInput( rKEvt );
+    sal_Bool bHandled = _pImp->KeyInput( rKEvt );
     _pCurKeyEvent = NULL;
     return bHandled;
 }
-ULONG SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const
+sal_uLong SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const
 {
     return _pImp->GetEntryListPos( pEntry );
 }
@@ -537,7 +537,7 @@ void SvtIconChoiceCtrl::SetSelectionMode( SelectionMode eMode )
     _pImp->SetSelectionMode( eMode );
 }
 
-BOOL SvtIconChoiceCtrl::HandleShortCutKey( const KeyEvent& r )
+sal_Bool SvtIconChoiceCtrl::HandleShortCutKey( const KeyEvent& r )
 {
     return _pImp->HandleShortCutKey( r );
 }
@@ -591,7 +591,7 @@ void SvtIconChoiceCtrl::SetNoSelection()
     _pImp->SetNoSelection();
 }
 
-void SvtIconChoiceCtrl::CallImplEventListeners(ULONG nEvent, void* pData)
+void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong nEvent, void* pData)
 {
     CallEventListeners(nEvent, pData);
 }