svtools: sal_Bool->bool

Change-Id: I2044e6c1f15579b6051fad5d36fcfa8795f88953

10 files changed, 283 insertions, 283 deletions

diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 4986350c8a61..a3d15babaadf 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2151,10 +2151,10 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
             ::svtools::VolumeInfo aVolInfo( (*aIt)->mbIsVolume, (*aIt)->mbIsRemote,
                                             (*aIt)->mbIsRemoveable, (*aIt)->mbIsFloppy,
                                             (*aIt)->mbIsCompactDisc );
-            (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
+            (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, false );
         }
         else
-            (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), sal_False );
+            (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), false );
     }
 }
 
@@ -2240,7 +2240,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
         if( aValue != SEPARATOR_STR )
         {
             INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL );
-            pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False );
+            pEntry->maImage = SvFileInformationManager::GetImage( aObj, false );
         }
         maContent.push_back( pEntry );
     }
@@ -2448,7 +2448,7 @@ OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString&
 
     ::svtools::VolumeInfo aVolInfo;
     pData->maType = SvFileInformationManager::GetFolderDescription( aVolInfo );
-    pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
+    pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, false );
 
     OUString aValue;
     OUString aTab( "\t" );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 690e9e42eff9..87c8c2461db1 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -386,7 +386,7 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, sal_Bo
             nFlags &= ~F_CLEARING_SELECTION;
         }
     }
-    if( pEntry->IsSelected() != bSelect )
+    if( (pEntry->IsSelected() ? 1 : 0) != bSelect )
     {
         pHdlEntry = pEntry;
         sal_uInt16 nEntryFlags = pEntry->GetFlags();
@@ -1672,7 +1672,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect,
     {
         OUString aText;
         if( !pStr )
-            aText = pView->GetEntryText( pEntry, sal_False );
+            aText = pView->GetEntryText( pEntry, false );
         else
             aText = *pStr;
 
@@ -1788,7 +1788,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P
     }
     */
 
-    OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) );
+    OUString aEntryText( pView->GetEntryText( pEntry, false ) );
     Rectangle aTextRect( CalcTextRect(pEntry,&rPos,sal_False,&aEntryText));
     Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) );
 
@@ -3197,7 +3197,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
     SetNoSelection();
 
     pCurEditedEntry = pEntry;
-    OUString aEntryText( pView->GetEntryText( pEntry, sal_True ) );
+    OUString aEntryText( pView->GetEntryText( pEntry, true ) );
     Rectangle aRect( CalcTextRect( pEntry, 0, sal_True, &aEntryText ) );
     MakeVisible( aRect );
     Point aPos( aRect.TopLeft() );
@@ -3672,7 +3672,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
         return sal_False;
 
     OUString sQuickHelpText = pEntry->GetQuickHelpText();
-    OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) );
+    OUString aEntryText( pView->GetEntryText( pEntry, false ) );
     Rectangle aTextRect( CalcTextRect( pEntry, 0, sal_False, &aEntryText ) );
     if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() )
         return sal_False;
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index e7992a587c59..0035f80225ba 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -77,7 +77,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) :
 
     _pCurKeyEvent   ( NULL ),
     _pImp           ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ),
-    _bAutoFontColor ( sal_False )
+    _bAutoFontColor ( false )
 
 {
     SetLineColor();
@@ -101,14 +101,14 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, c
     return pEntry;
 }
 
-sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, sal_Bool )
+bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, bool )
 {
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
+bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
 {
-    return sal_True;
+    return true;
 }
 
 void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
@@ -116,29 +116,29 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po
     rDev.DrawImage( rPos, pEntry->GetImage() );
 }
 
-OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
+OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool )
 {
     return pEntry->GetText();
 }
 
-sal_Bool SvtIconChoiceCtrl::HasBackground() const
+bool SvtIconChoiceCtrl::HasBackground() const
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SvtIconChoiceCtrl::HasFont() const
+bool SvtIconChoiceCtrl::HasFont() const
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SvtIconChoiceCtrl::HasFontTextColor() const
+bool SvtIconChoiceCtrl::HasFontTextColor() const
 {
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvtIconChoiceCtrl::HasFontFillColor() const
+bool SvtIconChoiceCtrl::HasFontFillColor() const
 {
-    return sal_True;
+    return true;
 }
 
 void SvtIconChoiceCtrl::Paint( const Rectangle& rRect )
@@ -178,7 +178,7 @@ void SvtIconChoiceCtrl::ArrangeIcons()
             aFullSize.setWidth ( aFullSize.getWidth()+aEntryRect.GetWidth() );
         }
 
-        _pImp->Arrange ( sal_False, aFullSize.getWidth() );
+        _pImp->Arrange ( false, aFullSize.getWidth() );
     }
     else if ( GetStyle() & WB_ALIGN_LEFT )
     {
@@ -193,13 +193,13 @@ void SvtIconChoiceCtrl::ArrangeIcons()
             aFullSize.setHeight ( aFullSize.getHeight()+aEntryRect.GetHeight() );
         }
 
-        _pImp->Arrange ( sal_False, 0, aFullSize.getHeight() );
+        _pImp->Arrange ( false, 0, aFullSize.getHeight() );
     }
     else
     {
         _pImp->Arrange();
     }
-    _pImp->Arrange( sal_False, 0, 1000 );
+    _pImp->Arrange( false, 0, 1000 );
 }
 void SvtIconChoiceCtrl::Resize()
 {
@@ -257,7 +257,7 @@ void SvtIconChoiceCtrl::SetPointFont( const Font& rFont )
         _pImp->FontModified();
     }
 }
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, sal_Bool bHit ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, bool bHit ) const
 {
     Point aPos( rPixPos );
     aPos -= GetMapMode().GetOrigin();
@@ -316,19 +316,19 @@ void SvtIconChoiceCtrl::ClickIcon()
     GetSelectedEntry ( nPos );
     _aClickIconHdl.Call( this );
 }
-sal_Bool SvtIconChoiceCtrl::IsEntryEditing() const
+bool SvtIconChoiceCtrl::IsEntryEditing() const
 {
     return _pImp->IsEntryEditing();
 }
 
-sal_Bool SvtIconChoiceCtrl::SetChoiceWithCursor ( sal_Bool bDo )
+bool SvtIconChoiceCtrl::SetChoiceWithCursor ( bool bDo )
 {
     return _pImp->SetChoiceWithCursor (bDo);
 }
 
 void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
 {
-    sal_Bool bKeyUsed = DoKeyInput( rKEvt );
+    bool bKeyUsed = DoKeyInput( rKEvt );
     if ( !bKeyUsed )
     {
         _pCurKeyEvent = (KeyEvent*)&rKEvt;
@@ -336,13 +336,13 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
         _pCurKeyEvent = NULL;
     }
 }
-sal_Bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
+bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
 {
     // under OS/2, we get key up/down even while editing
     if( IsEntryEditing() )
-        return sal_True;
+        return true;
     _pCurKeyEvent = (KeyEvent*)&rKEvt;
-    sal_Bool bHandled = _pImp->KeyInput( rKEvt );
+    bool bHandled = _pImp->KeyInput( rKEvt );
     _pCurKeyEvent = NULL;
     return bHandled;
 }
@@ -463,9 +463,9 @@ void SvtIconChoiceCtrl::FillLayoutData() const
 
         Point aPos = _pImp->GetEntryBoundRect( pEntry ).TopLeft();
         OUString sEntryText = pEntry->GetDisplayText( );
-        Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, sal_False, &sEntryText );
+        Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, false, &sEntryText );
 
-        sal_Bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
+        bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
         sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
 
         _pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, GetLayoutData() );
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 5032b0c5a09a..39d6a828aff7 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -167,7 +167,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
 
     aIconCtrl.SetAccessibleName( OUString( "Groups" ) );
     aIconCtrl.SetHelpId( HID_TEMPLATEDLG_ICONCTRL );
-    aIconCtrl.SetChoiceWithCursor( sal_True );
+    aIconCtrl.SetChoiceWithCursor( true );
     aIconCtrl.SetSelectionMode( SINGLE_SELECTION );
     aIconCtrl.Show();
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 5a2e8b822b73..34d55e1a7127 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -81,7 +81,7 @@ public:
     std::vector<OUString>      aCompletions;
     std::vector<WildCard>      m_aFilters;
 
-    static sal_Bool TildeParsing( OUString& aText, OUString& aBaseUrl );
+    static bool TildeParsing( OUString& aText, OUString& aBaseUrl );
 
     inline SvtURLBox_Impl( )
     {
@@ -100,8 +100,8 @@ class SvtMatchContext_Impl: public salhelper::Thread
     OUString                        aBaseURL;
     OUString                        aText;
     SvtURLBox*                      pBox;
-    sal_Bool                            bOnlyDirectories;
-    sal_Bool                            bNoSelection;
+    bool                            bOnlyDirectories;
+    bool                            bNoSelection;
 
     osl::Mutex mutex_;
     bool stopped_;
@@ -113,8 +113,8 @@ class SvtMatchContext_Impl: public salhelper::Thread
     virtual                         ~SvtMatchContext_Impl();
     virtual void                    execute();
     void                            doExecute();
-    void                            Insert( const OUString& rCompletion, const OUString& rURL, sal_Bool bForce = sal_False);
-    void                            ReadFolder( const OUString& rURL, const OUString& rMatch, sal_Bool bSmart );
+    void                            Insert( const OUString& rCompletion, const OUString& rURL, bool bForce = false);
+    void                            ReadFolder( const OUString& rURL, const OUString& rMatch, bool bSmart );
     void                            FillPicklist(std::vector<OUString>& rPickList);
 
 public:
@@ -221,7 +221,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
     }
 
     SvtURLBox* pBox = pThis->pBox;
-    pBox->bAutoCompleteMode = sal_True;
+    pBox->bAutoCompleteMode = true;
 
     // did we filter completions which otherwise would have been valid?
     // (to be filled below)
@@ -288,7 +288,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
 
 void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
                                    const OUString& rURL,
-                                   sal_Bool bForce )
+                                   bool bForce )
 {
     if( !bForce )
     {
@@ -304,18 +304,18 @@ void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
 
 void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
                                        const OUString& rMatch,
-                                       sal_Bool bSmart )
+                                       bool bSmart )
 {
     // check folder to scan
     if( !UCBContentHelper::IsFolder( rURL ) )
         return;
 
-    sal_Bool bPureHomePath = sal_False;
+    bool bPureHomePath = false;
 #ifdef UNX
     bPureHomePath = aText.startsWith( "~" ) && aText.indexOf( '/' ) == -1;
 #endif
 
-    sal_Bool bExectMatch = bPureHomePath
+    bool bExectMatch = bPureHomePath
                 || aText == "."
                 || aText.endsWith("/.")
                 || aText.endsWith("/..");
@@ -329,7 +329,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
 
         OUString aNewText( aText );
         aNewText += "/";
-        Insert( aNewText, rURL, sal_True );
+        Insert( aNewText, rURL, true );
 
         return;
     }
@@ -383,9 +383,9 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
             Sequence< NumberedSortingInfo > aSortInfo( 2 );
             NumberedSortingInfo* pInfo = aSortInfo.getArray();
             pInfo[ 0 ].ColumnIndex = 2;
-            pInfo[ 0 ].Ascending   = sal_False;
+            pInfo[ 0 ].Ascending   = false;
             pInfo[ 1 ].ColumnIndex = 1;
-            pInfo[ 1 ].Ascending   = sal_True;
+            pInfo[ 1 ].Ascending   = true;
 
             uno::Reference< XDynamicResultSet > xDynamicResultSet;
             xDynamicResultSet =
@@ -409,7 +409,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
                 {
                     OUString   aURL      = xContentAccess->queryContentIdentifierString();
                     OUString   aTitle    = xRow->getString(1);
-                    sal_Bool   bIsFolder = xRow->getBoolean(2);
+                    bool   bIsFolder = xRow->getBoolean(2);
 
                     // matching is always done case insensitive, but completion will be case sensitive and case preserving
                     aTitle = aTitle.toAsciiLowerCase();
@@ -454,7 +454,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
                         if ( bIsFolder )
                             aInput += OUString(aDelimiter);
 
-                        Insert( aInput, aObj.GetMainURL( INetURLObject::NO_DECODE ), sal_True );
+                        Insert( aInput, aObj.GetMainURL( INetURLObject::NO_DECODE ), true );
                     }
                 }
             }
@@ -704,7 +704,7 @@ void SvtMatchContext_Impl::doExecute()
         // don't scan history picklist if only directories are allowed, picklist contains only files
         return;
 
-    sal_Bool bFull = sal_False;
+    bool bFull = false;
 
     INetURLObject aCurObj;
     OUString aEmpty, aCurString, aCurMainURL;
@@ -802,7 +802,7 @@ void SvtMatchContext_Impl::doExecute()
         }
 
         if( !bFull )
-            bFull = sal_True;
+            bFull = true;
         else
             break;
     }
@@ -837,12 +837,12 @@ void SvtURLBox::TryAutoComplete()
 SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID )
     :   ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ),
         eSmartProtocol( eSmart ),
-        bAutoCompleteMode( sal_False ),
-        bOnlyDirectories( sal_False ),
-        bCtrlClick( sal_False ),
-        bHistoryDisabled( sal_False ),
-        bNoSelection( sal_False ),
-        bIsAutoCompleteEnabled( sal_True )
+        bAutoCompleteMode( false ),
+        bOnlyDirectories( false ),
+        bCtrlClick( false ),
+        bHistoryDisabled( false ),
+        bNoSelection( false ),
+        bIsAutoCompleteEnabled( true )
 {
     Init(bSetDefaultHelpID);
 
@@ -857,12 +857,12 @@ SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart,
     bool bSetDefaultHelpID )
     :   ComboBox( pParent, _nStyle ),
         eSmartProtocol( eSmart ),
-        bAutoCompleteMode( sal_False ),
-        bOnlyDirectories( sal_False ),
-        bCtrlClick( sal_False ),
-        bHistoryDisabled( sal_False ),
-        bNoSelection( sal_False ),
-        bIsAutoCompleteEnabled( sal_True )
+        bAutoCompleteMode( false ),
+        bOnlyDirectories( false ),
+        bCtrlClick( false ),
+        bHistoryDisabled( false ),
+        bNoSelection( false ),
+        bIsAutoCompleteEnabled( true )
 {
     Init(bSetDefaultHelpID);
 }
@@ -881,12 +881,12 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart
     bool bSetDefaultHelpID )
     :   ComboBox( pParent , _rResId ),
         eSmartProtocol( eSmart ),
-        bAutoCompleteMode( sal_False ),
-        bOnlyDirectories( sal_False ),
-        bCtrlClick( sal_False ),
-        bHistoryDisabled( sal_False ),
-        bNoSelection( sal_False ),
-        bIsAutoCompleteEnabled( sal_True )
+        bAutoCompleteMode( false ),
+        bOnlyDirectories( false ),
+        bCtrlClick( false ),
+        bHistoryDisabled( false ),
+        bNoSelection( false ),
+        bIsAutoCompleteEnabled( true )
 {
     Init(bSetDefaultHelpID);
 }
@@ -979,7 +979,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
 
                     if ( !aURL.isEmpty() )
                     {
-                        sal_Bool bFound = aURL.endsWith("/");
+                        bool bFound = aURL.endsWith("/");
                         if ( !bFound )
                         {
                             OUString aUpperURL( aURL );
@@ -1009,7 +1009,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
 }
 
 
-sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
+bool SvtURLBox::ProcessKey( const KeyCode& rKey )
 {
     // every key input stops the current matching thread
     if( pCtx.is() )
@@ -1028,7 +1028,7 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
         if ( bAutoCompleteMode )
         {
             // reset picklist
-            bAutoCompleteMode = sal_False;
+            bAutoCompleteMode = false;
             Selection aSelection( GetSelection() );
             SetSelection( Selection( aSelection.Min(), aSelection.Min() ) );
             if ( bOnlyDirectories )
@@ -1039,19 +1039,19 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
         }
 
         bCtrlClick = rKey.IsMod1();
-        sal_Bool bHandled = sal_False;
+        bool bHandled = false;
         if ( GetOpenHdl().IsSet() )
         {
-            bHandled = sal_True;
+            bHandled = true;
             GetOpenHdl().Call(this);
         }
         else if ( GetSelectHdl().IsSet() )
         {
-            bHandled = sal_True;
+            bHandled = true;
             GetSelectHdl().Call(this);
         }
 
-        bCtrlClick = sal_False;
+        bCtrlClick = false;
 
         ClearModifyFlag();
         return bHandled;
@@ -1059,9 +1059,9 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
     else if ( aCode == KEY_RETURN && GetText().isEmpty() && GetOpenHdl().IsSet() )
     {
         // for file dialog
-        bAutoCompleteMode = sal_False;
+        bAutoCompleteMode = false;
         GetOpenHdl().Call(this);
-        return sal_True;
+        return true;
     }
     else if( aCode == KEY_ESCAPE )
     {
@@ -1077,15 +1077,15 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
         }
         else
         {
-           return sal_False;
+           return false;
         }
 
-        bAutoCompleteMode = sal_False;
-        return sal_True;
+        bAutoCompleteMode = false;
+        return true;
     }
     else
     {
-        return sal_False;
+        return false;
     }
 }
 
@@ -1173,7 +1173,7 @@ void SvtURLBox::Select()
 }
 
 
-void SvtURLBox::SetOnlyDirectories( sal_Bool bDir )
+void SvtURLBox::SetOnlyDirectories( bool bDir )
 {
     bOnlyDirectories = bDir;
     if ( bOnlyDirectories )
@@ -1181,7 +1181,7 @@ void SvtURLBox::SetOnlyDirectories( sal_Bool bDir )
 }
 
 
-void SvtURLBox::SetNoURLSelection( sal_Bool bSet )
+void SvtURLBox::SetNoURLSelection( bool bSet )
 {
     bNoSelection = bSet;
 }
@@ -1242,7 +1242,7 @@ OUString SvtURLBox::GetURL()
             OUString aFileURL;
 
             Any aAny = UCBContentHelper::GetProperty(aURL, aPropName);
-            sal_Bool success = (aAny >>= aFileURL);
+            bool success = (aAny >>= aFileURL);
             OUString aTitle;
             if(success)
                 aTitle = INetURLObject(aFileURL).getName(
@@ -1267,7 +1267,7 @@ OUString SvtURLBox::GetURL()
 
 void SvtURLBox::DisableHistory()
 {
-    bHistoryDisabled = sal_True;
+    bHistoryDisabled = true;
     UpdatePicklistForSmartProtocol_Impl();
 }
 
@@ -1285,7 +1285,7 @@ void SvtURLBox::SetBaseURL( const OUString& rURL )
 /** Parse leading ~ for Unix systems,
     does nothing for Windows
  */
-sal_Bool SvtURLBox_Impl::TildeParsing(
+bool SvtURLBox_Impl::TildeParsing(
     OUString&
 #ifdef UNX
     aText
@@ -1300,7 +1300,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
     if( aText.startsWith( "~" ) )
     {
         OUString aParseTilde;
-        sal_Bool bTrailingSlash = sal_True; // use trailing slash
+        bool bTrailingSlash = true; // use trailing slash
 
         if( aText.getLength() == 1 || aText[ 1 ] == '/' )
         {
@@ -1314,7 +1314,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
             // in case the whole path is just "~" then there should
             // be no trailing slash at the end
             if( aText.getLength() == 1 )
-                bTrailingSlash = sal_False;
+                bTrailingSlash = false;
         }
         else
         {
@@ -1334,19 +1334,19 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
             if( !nRes && pPasswd )
                 aParseTilde = OUString::createFromAscii(pPasswd->pw_dir);
             else
-                return sal_False; // no such user
+                return false; // no such user
 #else
             pPasswd = getpwnam( OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ).getStr() );
             if( pPasswd )
                 aParseTilde = OUString::createFromAscii(pPasswd->pw_dir);
             else
-                return sal_False; // no such user
+                return false; // no such user
 #endif
 
             // in case the path is "~username" then there should
             // be no trailing slash at the end
             if( nNameEnd == -1 )
-                bTrailingSlash = sal_False;
+                bTrailingSlash = false;
         }
 
         if( !bTrailingSlash )
@@ -1375,7 +1375,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
     }
 #endif
 
-    return sal_True;
+    return true;
 }
 
 void SvtURLBox::SetFilter(const OUString& _sFilter)
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 615c96922d1b..767ab0e57c58 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -283,9 +283,9 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
     return aUIName;
 }
 
-sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat)
+bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( _nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || _nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE )
     {
         datatransfer::DataFlavor aFlavor;
@@ -335,7 +335,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat
             else
                 _rSource = SVT_RESSTR(STR_UNKNOWN_SOURCE);
         }
-        bRet = sal_True;
+        bRet = true;
     }
     return bRet;
 }
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 800ca8a2585c..3e01565a92aa 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -50,126 +50,126 @@
 struct SvtExtensionResIdMapping_Impl
 {
     const char*   _pExt;
-    sal_Bool    _bExt;
+    bool    _bExt;
     sal_uInt16  _nStrId;
     sal_uInt16  _nImgId;
 };
 
 static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
 {
-    { "awk",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "bas",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "bat",   sal_True,  STR_DESCRIPTION_BATCHFILE,             0 },
-    { "bmk",   sal_False, STR_DESCRIPTION_BOOKMARKFILE,          0 },
-    { "bmp",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_BITMAP },
-    { "c",     sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "cfg",   sal_False, STR_DESCRIPTION_CFGFILE,               0 },
-    { "cmd",   sal_True,  STR_DESCRIPTION_BATCHFILE,             0 },
-    { "cob",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "com",   sal_True,  STR_DESCRIPTION_APPLICATION,           0 },
-    { "cxx",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "dbf",   sal_True,  STR_DESCRIPTION_DATABASE_TABLE,        IMG_TABLE },
-    { "def",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "dll",   sal_True,  STR_DESCRIPTION_SYSFILE,               0 },
-    { "doc",   sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
-    { "dot",   sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITERTEMPLATE },
-    { "docx",  sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
-    { "dxf",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_DXF },
-    { "exe",   sal_True,  STR_DESCRIPTION_APPLICATION,           0 },
-    { "gif",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_GIF },
-    { "h",     sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "hlp",   sal_False, STR_DESCRIPTION_HELP_DOC,              0 },
-    { "hrc",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "htm",   sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "html",  sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "asp",   sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "hxx",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "ini",   sal_False, STR_DESCRIPTION_CFGFILE,               0 },
-    { "java",  sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "jpeg",  sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
-    { "jpg",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
-    { "lha",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "awk",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "bas",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "bat",   true,  STR_DESCRIPTION_BATCHFILE,             0 },
+    { "bmk",   false, STR_DESCRIPTION_BOOKMARKFILE,          0 },
+    { "bmp",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_BITMAP },
+    { "c",     true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "cfg",   false, STR_DESCRIPTION_CFGFILE,               0 },
+    { "cmd",   true,  STR_DESCRIPTION_BATCHFILE,             0 },
+    { "cob",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "com",   true,  STR_DESCRIPTION_APPLICATION,           0 },
+    { "cxx",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "dbf",   true,  STR_DESCRIPTION_DATABASE_TABLE,        IMG_TABLE },
+    { "def",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "dll",   true,  STR_DESCRIPTION_SYSFILE,               0 },
+    { "doc",   false, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
+    { "dot",   false, STR_DESCRIPTION_WORD_DOC,              IMG_WRITERTEMPLATE },
+    { "docx",  false, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
+    { "dxf",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_DXF },
+    { "exe",   true,  STR_DESCRIPTION_APPLICATION,           0 },
+    { "gif",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_GIF },
+    { "h",     true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "hlp",   false, STR_DESCRIPTION_HELP_DOC,              0 },
+    { "hrc",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "htm",   false, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "html",  false, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "asp",   false, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "hxx",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "ini",   false, STR_DESCRIPTION_CFGFILE,               0 },
+    { "java",  true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "jpeg",  true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
+    { "jpg",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_JPG },
+    { "lha",   true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
 #ifdef WNT
-    { "lnk",   sal_False, 0,                                     0 },
+    { "lnk",   false, 0,                                     0 },
 #endif
-    { "log",   sal_True,  STR_DESCRIPTION_LOGFILE,               0 },
-    { "lst",   sal_True,  STR_DESCRIPTION_LOGFILE,               0 },
-    { "met",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_MET },
-    { "mml",   sal_False, STR_DESCRIPTION_MATHML_DOC,            IMG_MATH },
-    { "mod",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "odb",   sal_False, STR_DESCRIPTION_OO_DATABASE_DOC,       IMG_OO_DATABASE_DOC },
-    { "odg",   sal_False, STR_DESCRIPTION_OO_DRAW_DOC,           IMG_OO_DRAW_DOC },
-    { "odf",   sal_False, STR_DESCRIPTION_OO_MATH_DOC,           IMG_OO_MATH_DOC },
-    { "odm",   sal_False, STR_DESCRIPTION_OO_GLOBAL_DOC,         IMG_OO_GLOBAL_DOC },
-    { "odp",   sal_False, STR_DESCRIPTION_OO_IMPRESS_DOC,        IMG_OO_IMPRESS_DOC },
-    { "ods",   sal_False, STR_DESCRIPTION_OO_CALC_DOC,           IMG_OO_CALC_DOC },
-    { "odt",   sal_False, STR_DESCRIPTION_OO_WRITER_DOC,         IMG_OO_WRITER_DOC },
-    { "otg",   sal_False, STR_DESCRIPTION_OO_DRAW_TEMPLATE,      IMG_OO_DRAW_TEMPLATE },
-    { "otp",   sal_False, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE,   IMG_OO_IMPRESS_TEMPLATE },
-    { "ots",   sal_False, STR_DESCRIPTION_OO_CALC_TEMPLATE,      IMG_OO_CALC_TEMPLATE },
-    { "ott",   sal_False, STR_DESCRIPTION_OO_WRITER_TEMPLATE,    IMG_OO_WRITER_TEMPLATE },
-    { "pas",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "pcd",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCD },
-    { "pct",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCT },
-    { "pict",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,          IMG_PCT },
-    { "pcx",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCX },
-    { "pl",    sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "png",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PNG },
-    { "rar",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "rtf",   sal_False, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
-    { "sbl",   sal_False, 0,                                     0 },
-    { "sch",   sal_False, 0,                                     0 },
-    { "sda",   sal_False, STR_DESCRIPTION_SDRAW_DOC,             IMG_DRAW },
-    { "sdb",   sal_False, STR_DESCRIPTION_SDATABASE_DOC,         IMG_DATABASE },
-    { "sdc",   sal_False, STR_DESCRIPTION_SCALC_DOC,             IMG_CALC },
-    { "sdd",   sal_False, STR_DESCRIPTION_SIMPRESS_DOC,          IMG_IMPRESS },
-    { "sdp",   sal_False, STR_DESCRIPTION_SIMPRESS_DOC,          0 },
-    { "sds",   sal_False, STR_DESCRIPTION_SCHART_DOC,            0 },
-    { "sdw",   sal_False, STR_DESCRIPTION_SWRITER_DOC,           IMG_WRITER },
-    { "sga",   sal_False, 0,                                     0 },
-    { "sgf",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGF },
-    { "sgl",   sal_False, STR_DESCRIPTION_GLOBALDOC,             IMG_GLOBAL_DOC },
-    { "sgv",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGV },
-    { "shtml", sal_False, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
-    { "sim",   sal_False, STR_DESCRIPTION_SIMAGE_DOC,            IMG_SIM },
-    { "smf",   sal_False, STR_DESCRIPTION_SMATH_DOC,             IMG_MATH },
-    { "src",   sal_True,  STR_DESCRIPTION_SOURCEFILE,            0 },
-    { "svh",   sal_False, STR_DESCRIPTION_HELP_DOC,              0 },
-    { "svm",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SVM },
-    { "stc",   sal_False, STR_DESCRIPTION_CALC_TEMPLATE,         IMG_CALCTEMPLATE },
-    { "std",   sal_False, STR_DESCRIPTION_DRAW_TEMPLATE,         IMG_DRAWTEMPLATE },
-    { "sti",   sal_False, STR_DESCRIPTION_IMPRESS_TEMPLATE,      IMG_IMPRESSTEMPLATE },
-    { "stw",   sal_False, STR_DESCRIPTION_WRITER_TEMPLATE,       IMG_WRITERTEMPLATE },
-    { "sxc",   sal_False, STR_DESCRIPTION_SXCALC_DOC,            IMG_CALC },
-    { "sxd",   sal_False, STR_DESCRIPTION_SXDRAW_DOC,            IMG_DRAW },
-    { "sxg",   sal_False, STR_DESCRIPTION_SXGLOBAL_DOC,          IMG_GLOBAL_DOC },
-    { "sxi",   sal_False, STR_DESCRIPTION_SXIMPRESS_DOC,         IMG_IMPRESS },
-    { "sxm",   sal_False, STR_DESCRIPTION_SXMATH_DOC,            IMG_MATH },
-    { "sxs",   sal_False, STR_DESCRIPTION_SXCHART_DOC,           0 },
-    { "sxw",   sal_False, STR_DESCRIPTION_SXWRITER_DOC,          IMG_WRITER },
-    { "sys",   sal_True,  STR_DESCRIPTION_SYSFILE,               0 },
-    { "tif",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
-    { "tiff",  sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
-    { "txt",   sal_False, STR_DESCRIPTION_TEXTFILE,              IMG_TEXTFILE },
-    { "url",   sal_False, STR_DESCRIPTION_LINK,                  0 },
-    { "vor",   sal_False, STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC,  IMG_WRITERTEMPLATE },
-    { "vxd",   sal_True,  STR_DESCRIPTION_SYSFILE,               0 },
-    { "wmf",   sal_True,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_WMF },
-    { "xls",   sal_False, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
-    { "xlt",   sal_False, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC,    IMG_CALCTEMPLATE },
-    { "xlsx",  sal_False, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
-    { "uu",    sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "uue",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "z",     sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "zip",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "zoo",   sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "gz",    sal_True,  STR_DESCRIPTION_ARCHIVFILE,            0 },
-    { "ppt",   sal_False, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
-    { "pot",   sal_False, STR_DESCRIPTION_POWERPOINT_TEMPLATE,   IMG_IMPRESSTEMPLATE },
-    { "pps",   sal_False, STR_DESCRIPTION_POWERPOINT_SHOW,       IMG_IMPRESS },
-    { "pptx",  sal_False, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
-    { "oxt",   sal_False, STR_DESCRIPTION_EXTENSION,             IMG_EXTENSION },
-    { 0, sal_False, 0, 0 }
+    { "log",   true,  STR_DESCRIPTION_LOGFILE,               0 },
+    { "lst",   true,  STR_DESCRIPTION_LOGFILE,               0 },
+    { "met",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_MET },
+    { "mml",   false, STR_DESCRIPTION_MATHML_DOC,            IMG_MATH },
+    { "mod",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "odb",   false, STR_DESCRIPTION_OO_DATABASE_DOC,       IMG_OO_DATABASE_DOC },
+    { "odg",   false, STR_DESCRIPTION_OO_DRAW_DOC,           IMG_OO_DRAW_DOC },
+    { "odf",   false, STR_DESCRIPTION_OO_MATH_DOC,           IMG_OO_MATH_DOC },
+    { "odm",   false, STR_DESCRIPTION_OO_GLOBAL_DOC,         IMG_OO_GLOBAL_DOC },
+    { "odp",   false, STR_DESCRIPTION_OO_IMPRESS_DOC,        IMG_OO_IMPRESS_DOC },
+    { "ods",   false, STR_DESCRIPTION_OO_CALC_DOC,           IMG_OO_CALC_DOC },
+    { "odt",   false, STR_DESCRIPTION_OO_WRITER_DOC,         IMG_OO_WRITER_DOC },
+    { "otg",   false, STR_DESCRIPTION_OO_DRAW_TEMPLATE,      IMG_OO_DRAW_TEMPLATE },
+    { "otp",   false, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE,   IMG_OO_IMPRESS_TEMPLATE },
+    { "ots",   false, STR_DESCRIPTION_OO_CALC_TEMPLATE,      IMG_OO_CALC_TEMPLATE },
+    { "ott",   false, STR_DESCRIPTION_OO_WRITER_TEMPLATE,    IMG_OO_WRITER_TEMPLATE },
+    { "pas",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "pcd",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCD },
+    { "pct",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCT },
+    { "pict",   true,  STR_DESCRIPTION_GRAPHIC_DOC,          IMG_PCT },
+    { "pcx",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PCX },
+    { "pl",    true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "png",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_PNG },
+    { "rar",   true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "rtf",   false, STR_DESCRIPTION_WORD_DOC,              IMG_WRITER },
+    { "sbl",   false, 0,                                     0 },
+    { "sch",   false, 0,                                     0 },
+    { "sda",   false, STR_DESCRIPTION_SDRAW_DOC,             IMG_DRAW },
+    { "sdb",   false, STR_DESCRIPTION_SDATABASE_DOC,         IMG_DATABASE },
+    { "sdc",   false, STR_DESCRIPTION_SCALC_DOC,             IMG_CALC },
+    { "sdd",   false, STR_DESCRIPTION_SIMPRESS_DOC,          IMG_IMPRESS },
+    { "sdp",   false, STR_DESCRIPTION_SIMPRESS_DOC,          0 },
+    { "sds",   false, STR_DESCRIPTION_SCHART_DOC,            0 },
+    { "sdw",   false, STR_DESCRIPTION_SWRITER_DOC,           IMG_WRITER },
+    { "sga",   false, 0,                                     0 },
+    { "sgf",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGF },
+    { "sgl",   false, STR_DESCRIPTION_GLOBALDOC,             IMG_GLOBAL_DOC },
+    { "sgv",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SGV },
+    { "shtml", false, STR_DESCRIPTION_HTMLFILE,              IMG_HTML },
+    { "sim",   false, STR_DESCRIPTION_SIMAGE_DOC,            IMG_SIM },
+    { "smf",   false, STR_DESCRIPTION_SMATH_DOC,             IMG_MATH },
+    { "src",   true,  STR_DESCRIPTION_SOURCEFILE,            0 },
+    { "svh",   false, STR_DESCRIPTION_HELP_DOC,              0 },
+    { "svm",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_SVM },
+    { "stc",   false, STR_DESCRIPTION_CALC_TEMPLATE,         IMG_CALCTEMPLATE },
+    { "std",   false, STR_DESCRIPTION_DRAW_TEMPLATE,         IMG_DRAWTEMPLATE },
+    { "sti",   false, STR_DESCRIPTION_IMPRESS_TEMPLATE,      IMG_IMPRESSTEMPLATE },
+    { "stw",   false, STR_DESCRIPTION_WRITER_TEMPLATE,       IMG_WRITERTEMPLATE },
+    { "sxc",   false, STR_DESCRIPTION_SXCALC_DOC,            IMG_CALC },
+    { "sxd",   false, STR_DESCRIPTION_SXDRAW_DOC,            IMG_DRAW },
+    { "sxg",   false, STR_DESCRIPTION_SXGLOBAL_DOC,          IMG_GLOBAL_DOC },
+    { "sxi",   false, STR_DESCRIPTION_SXIMPRESS_DOC,         IMG_IMPRESS },
+    { "sxm",   false, STR_DESCRIPTION_SXMATH_DOC,            IMG_MATH },
+    { "sxs",   false, STR_DESCRIPTION_SXCHART_DOC,           0 },
+    { "sxw",   false, STR_DESCRIPTION_SXWRITER_DOC,          IMG_WRITER },
+    { "sys",   true,  STR_DESCRIPTION_SYSFILE,               0 },
+    { "tif",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
+    { "tiff",  true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_TIFF },
+    { "txt",   false, STR_DESCRIPTION_TEXTFILE,              IMG_TEXTFILE },
+    { "url",   false, STR_DESCRIPTION_LINK,                  0 },
+    { "vor",   false, STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC,  IMG_WRITERTEMPLATE },
+    { "vxd",   true,  STR_DESCRIPTION_SYSFILE,               0 },
+    { "wmf",   true,  STR_DESCRIPTION_GRAPHIC_DOC,           IMG_WMF },
+    { "xls",   false, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
+    { "xlt",   false, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC,    IMG_CALCTEMPLATE },
+    { "xlsx",  false, STR_DESCRIPTION_EXCEL_DOC,             IMG_CALC },
+    { "uu",    true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "uue",   true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "z",     true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "zip",   true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "zoo",   true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "gz",    true,  STR_DESCRIPTION_ARCHIVFILE,            0 },
+    { "ppt",   false, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
+    { "pot",   false, STR_DESCRIPTION_POWERPOINT_TEMPLATE,   IMG_IMPRESSTEMPLATE },
+    { "pps",   false, STR_DESCRIPTION_POWERPOINT_SHOW,       IMG_IMPRESS },
+    { "pptx",  false, STR_DESCRIPTION_POWERPOINT,            IMG_IMPRESS },
+    { "oxt",   false, STR_DESCRIPTION_EXTENSION,             IMG_EXTENSION },
+    { 0, false, 0, 0 }
 };
 
 struct SvtFactory2ExtensionMapping_Impl
@@ -297,9 +297,9 @@ static sal_uInt16 GetImageId_Impl( const OUString& rExtension )
     return nImage;
 }
 
-static sal_Bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtools::VolumeInfo& rVolumeInfo )
+static bool GetVolumeProperties_Impl( ::ucbhelper::Content& rContent, svtools::VolumeInfo& rVolumeInfo )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     try
     {
@@ -351,7 +351,7 @@ static sal_uInt16 GetFolderImageId_Impl( const OUString& rURL )
     return nRet;
 }
 
-static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
+static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFolder )
 {
     OUString aExt, sURL = rObject.GetMainURL( INetURLObject::NO_DECODE );
     sal_uInt16 nImage = IMG_FILE;
@@ -406,7 +406,7 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetec
     return nImage;
 }
 
-static sal_uInt16 GetDescriptionId_Impl( const OUString& rExtension, sal_Bool& rbShowExt )
+static sal_uInt16 GetDescriptionId_Impl( const OUString& rExtension, bool& rbShowExt )
 {
     sal_uInt16 nId = 0;
     sal_Int32  nIndex = GetIndexOfExtension_Impl( rExtension );
@@ -477,7 +477,7 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL )
     return nRet;
 }
 
-static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
+static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
 {
     if ( !bBig && IMG_FOLDER == nImageId )
         // return our new small folder image (256 colors)
@@ -516,13 +516,13 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
     return Image();
 }
 
-OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
+OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder )
 {
     OUString sExtension(rObject.getExtension());
     OUString sDescription, sURL( rObject.GetMainURL( INetURLObject::NO_DECODE ) );
     sal_uInt16 nResId = 0;
-    sal_Bool bShowExt = sal_False, bDetected = sal_False, bOnlyFile = sal_False;
-    sal_Bool bFolder = bDetectFolder ? CONTENT_HELPER::IsFolder( sURL ) : sal_False;
+    bool bShowExt = false, bDetected = false, bOnlyFile = false;
+    bool bFolder = bDetectFolder && CONTENT_HELPER::IsFolder( sURL );
     if ( !bFolder )
     {
         if ( !bDetected )
@@ -534,7 +534,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
                 if ( aType == "factory" )
                 {
                     sDescription = GetDescriptionByFactory_Impl( aURLPath.copy( aURLPath.indexOf( INET_PATH_TOKEN ) + 1 ) );
-                    bDetected = sal_True;
+                    bDetected = true;
                 }
             }
 
@@ -562,7 +562,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
     {
         if ( bOnlyFile )
         {
-            bShowExt = sal_False;
+            bShowExt = false;
             sExtension = sExtension.toAsciiUpperCase();
             sDescription = sExtension;
             sDescription += "-";
@@ -583,23 +583,23 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
     return sDescription;
 }
 
-Image SvFileInformationManager::GetImage( const INetURLObject& rObject, sal_Bool bBig )
+Image SvFileInformationManager::GetImage( const INetURLObject& rObject, bool bBig )
 {
-    sal_uInt16 nImage = GetImageId_Impl( rObject, sal_True );
+    sal_uInt16 nImage = GetImageId_Impl( rObject, true );
     DBG_ASSERT( nImage, "invalid ImageId" );
     return GetImageFromList_Impl( nImage, bBig );
 }
 
-Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, sal_Bool bBig )
+Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, bool bBig )
 {
-    sal_Int16 nImage = GetImageId_Impl( rObject, sal_False );
+    sal_Int16 nImage = GetImageId_Impl( rObject, false );
     DBG_ASSERT( nImage, "invalid ImageId" );
     return GetImageFromList_Impl( nImage, bBig );
 }
 
-Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, sal_Bool bBig )
+Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, bool bBig )
 {
-    sal_uInt16 nImage = GetImageId_Impl( rObject, sal_True );
+    sal_uInt16 nImage = GetImageId_Impl( rObject, true );
     DBG_ASSERT( nImage, "invalid ImageId" );
 
     if ( nImage == IMG_FILE )
@@ -608,7 +608,7 @@ Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject,
     return GetImageFromList_Impl( nImage, bBig );
 }
 
-Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig )
+Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, bool bBig )
 {
     sal_uInt16 nImage = IMG_FOLDER;
     DBG_ASSERT( nImage, "invalid ImageId" );
@@ -627,12 +627,12 @@ Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo
 
 OUString SvFileInformationManager::GetDescription( const INetURLObject& rObject )
 {
-    return SvFileInformationManager::GetDescription_Impl( rObject, sal_True );
+    return SvFileInformationManager::GetDescription_Impl( rObject, true );
 }
 
 OUString SvFileInformationManager::GetFileDescription( const INetURLObject& rObject )
 {
-    return SvFileInformationManager::GetDescription_Impl( rObject, sal_False );
+    return SvFileInformationManager::GetDescription_Impl( rObject, false );
 }
 
 OUString SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo& rInfo )
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 4ec9146c24a6..6fce7f7952ae 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -53,7 +53,7 @@ IMapObject::IMapObject()
 }
 
 IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OUString& rDesc,
-                        const OUString& rTarget, const OUString& rName, sal_Bool bURLActive )
+                        const OUString& rTarget, const OUString& rName, bool bURLActive )
 : aURL( rURL )
 , aAltText( rAltText )
 , aDesc( rDesc )
@@ -119,7 +119,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
     rIStm.ReadUInt16( nTextEncoding );
     aURL = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
     aAltText = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
-    rIStm.ReadUChar( bActive );
+    rIStm.ReadCharAsBool( bActive );
     aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
 
     // make URL absolute
@@ -141,7 +141,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
     delete pCompat;
 }
 
-sal_Bool IMapObject::IsEqual( const IMapObject& rEqObj )
+bool IMapObject::IsEqual( const IMapObject& rEqObj )
 {
     return ( ( aURL == rEqObj.aURL ) &&
              ( aAltText == rEqObj.aAltText ) &&
@@ -157,14 +157,14 @@ IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect,
                                           const OUString& rDesc,
                                           const OUString& rTarget,
                                           const OUString& rName,
-                                          sal_Bool bURLActive,
-                                          sal_Bool bPixelCoords ) :
+                                          bool bURLActive,
+                                          bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
 {
     ImpConstruct( rRect, bPixelCoords );
 }
 
-void IMapRectangleObject::ImpConstruct( const Rectangle& rRect, sal_Bool bPixel )
+void IMapRectangleObject::ImpConstruct( const Rectangle& rRect, bool bPixel )
 {
     if ( bPixel )
         aRect = Application::GetDefaultDevice()->PixelToLogic( rRect, MapMode( MAP_100TH_MM ) );
@@ -215,12 +215,12 @@ sal_uInt16 IMapRectangleObject::GetType() const
 |*
 \******************************************************************************/
 
-sal_Bool IMapRectangleObject::IsHit( const Point& rPoint ) const
+bool IMapRectangleObject::IsHit( const Point& rPoint ) const
 {
     return aRect.IsInside( rPoint );
 }
 
-Rectangle IMapRectangleObject::GetRectangle( sal_Bool bPixelCoords ) const
+Rectangle IMapRectangleObject::GetRectangle( bool bPixelCoords ) const
 {
     Rectangle   aNewRect;
 
@@ -246,7 +246,7 @@ void IMapRectangleObject::Scale( const Fraction& rFracX, const Fraction& rFracY
     aRect = Rectangle( aTL, aBR );
 }
 
-sal_Bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
+bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
 {
     return ( IMapObject::IsEqual( rEqObj ) && ( aRect == rEqObj.aRect ) );
 }
@@ -257,14 +257,14 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadiu
                                     const OUString& rDesc,
                                     const OUString& rTarget,
                                     const OUString& rName,
-                                    sal_Bool bURLActive,
-                                    sal_Bool bPixelCoords ) :
+                                    bool bURLActive,
+                                    bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
 {
     ImpConstruct( rCenter, nCircleRadius, bPixelCoords );
 }
 
-void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel )
+void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uLong nRad, bool bPixel )
 {
     if ( bPixel )
     {
@@ -331,21 +331,21 @@ sal_uInt16 IMapCircleObject::GetType() const
 |*
 \******************************************************************************/
 
-sal_Bool IMapCircleObject::IsHit( const Point& rPoint ) const
+bool IMapCircleObject::IsHit( const Point& rPoint ) const
 {
     const Point aPoint( aCenter - rPoint );
-    sal_Bool        bRet = sal_False;
+    bool        bRet = false;
 
     if ( (sal_Int32) sqrt( (double) aPoint.X() * aPoint.X() +
                        aPoint.Y() * aPoint.Y() ) <= nRadius )
     {
-        bRet = sal_True;
+        bRet = true;
     }
 
     return bRet;
 }
 
-Point IMapCircleObject::GetCenter( sal_Bool bPixelCoords ) const
+Point IMapCircleObject::GetCenter( bool bPixelCoords ) const
 {
     Point aNewPoint;
 
@@ -357,7 +357,7 @@ Point IMapCircleObject::GetCenter( sal_Bool bPixelCoords ) const
     return aNewPoint;
 }
 
-sal_uLong IMapCircleObject::GetRadius( sal_Bool bPixelCoords ) const
+sal_uLong IMapCircleObject::GetRadius( bool bPixelCoords ) const
 {
     sal_uLong nNewRadius;
 
@@ -392,7 +392,7 @@ void IMapCircleObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
     nRadius = ( nRadius * aAverage.GetNumerator() ) / aAverage.GetDenominator();
 }
 
-sal_Bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
+bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
 {
     return ( IMapObject::IsEqual( rEqObj ) &&
              ( aCenter == rEqObj.aCenter ) &&
@@ -405,15 +405,15 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
                                       const OUString& rDesc,
                                       const OUString& rTarget,
                                       const OUString& rName,
-                                      sal_Bool bURLActive,
-                                      sal_Bool bPixelCoords ) :
+                                      bool bURLActive,
+                                      bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ),
-            bEllipse    ( sal_False )
+            bEllipse    ( false )
 {
     ImpConstruct( rPoly, bPixelCoords );
 }
 
-void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, sal_Bool bPixel )
+void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, bool bPixel )
 {
     if ( bPixel )
         aPoly = Application::GetDefaultDevice()->PixelToLogic( rPoly, MapMode( MAP_100TH_MM ) );
@@ -449,7 +449,7 @@ void IMapPolygonObject::ReadIMapObject( SvStream& rIStm )
     // Version >= 2 has additional ellipses information
     if ( nReadVersion >= 2 )
     {
-        rIStm.ReadUChar( bEllipse );
+        rIStm.ReadCharAsBool( bEllipse );
         ReadRectangle( rIStm, aEllipse );
     }
 }
@@ -473,12 +473,12 @@ sal_uInt16 IMapPolygonObject::GetType() const
 |*
 \******************************************************************************/
 
-sal_Bool IMapPolygonObject::IsHit( const Point& rPoint ) const
+bool IMapPolygonObject::IsHit( const Point& rPoint ) const
 {
     return aPoly.IsInside( rPoint );
 }
 
-Polygon IMapPolygonObject::GetPolygon( sal_Bool bPixelCoords ) const
+Polygon IMapPolygonObject::GetPolygon( bool bPixelCoords ) const
 {
     Polygon aNewPoly;
 
@@ -494,7 +494,7 @@ void IMapPolygonObject::SetExtraEllipse( const Rectangle& rEllipse )
 {
     if ( aPoly.GetSize() )
     {
-        bEllipse = sal_True;
+        bEllipse = true;
         aEllipse = rEllipse;
     }
 }
@@ -530,16 +530,16 @@ void IMapPolygonObject::Scale( const Fraction& rFracX, const Fraction& rFracY )
     }
 }
 
-sal_Bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
+bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if ( IMapObject::IsEqual( rEqObj ) )
     {
-        const Polygon&  rEqPoly = rEqObj.aPoly;
-        const sal_uInt16    nCount = aPoly.GetSize();
-        const sal_uInt16    nEqCount = rEqPoly.GetSize();
-        sal_Bool            bDifferent = sal_False;
+        const Polygon&   rEqPoly = rEqObj.aPoly;
+        const sal_uInt16 nCount = aPoly.GetSize();
+        const sal_uInt16 nEqCount = rEqPoly.GetSize();
+        bool             bDifferent = false;
 
         if ( nCount == nEqCount )
         {
@@ -547,13 +547,13 @@ sal_Bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
             {
                 if ( aPoly[ i ] != rEqPoly[ i ] )
                 {
-                    bDifferent = sal_True;
+                    bDifferent = true;
                     break;
                 }
             }
 
             if ( !bDifferent )
-                bRet = sal_True;
+                bRet = true;
         }
     }
 
@@ -686,15 +686,15 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap )
 |*
 \******************************************************************************/
 
-sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
+bool ImageMap::operator==( const ImageMap& rImageMap )
 {
     const size_t    nCount = maList.size();
     const size_t    nEqCount = rImageMap.GetIMapObjectCount();
-    sal_Bool        bRet = sal_False;
+    bool            bRet = false;
 
     if ( nCount == nEqCount )
     {
-        sal_Bool bDifferent = ( aName != rImageMap.aName );
+        bool bDifferent = ( aName != rImageMap.aName );
 
         for ( size_t i = 0; ( i < nCount ) && !bDifferent; i++ )
         {
@@ -708,21 +708,21 @@ sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
                     case( IMAP_OBJ_RECTANGLE ):
                     {
                         if ( !( (IMapRectangleObject*) pObj )->IsEqual( *(IMapRectangleObject*) pEqObj ) )
-                            bDifferent = sal_True;
+                            bDifferent = true;
                     }
                     break;
 
                     case( IMAP_OBJ_CIRCLE ):
                     {
                         if ( !( (IMapCircleObject*) pObj )->IsEqual( *(IMapCircleObject*) pEqObj ) )
-                            bDifferent = sal_True;
+                            bDifferent = true;
                     }
                     break;
 
                     case( IMAP_OBJ_POLYGON ):
                     {
                         if ( !( (IMapPolygonObject*) pObj )->IsEqual( *(IMapPolygonObject*) pEqObj ) )
-                            bDifferent = sal_True;
+                            bDifferent = true;
                     }
                     break;
 
@@ -731,11 +731,11 @@ sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
                 }
             }
             else
-                bDifferent = sal_True;
+                bDifferent = true;
         }
 
         if ( !bDifferent )
-            bRet = sal_True;
+            bRet = true;
     }
 
     return bRet;
@@ -748,7 +748,7 @@ sal_Bool ImageMap::operator==( const ImageMap& rImageMap )
 |*
 \******************************************************************************/
 
-sal_Bool ImageMap::operator!=( const ImageMap& rImageMap )
+bool ImageMap::operator!=( const ImageMap& rImageMap )
 {
     return !( *this == rImageMap );
 }
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index e8709576220f..e0a26d61fbcf 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -207,7 +207,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
     {
     case IMAP_OBJ_RECTANGLE:
         {
-            const Rectangle aRect( ((IMapRectangleObject*)&rMapObject)->GetRectangle(sal_False) );
+            const Rectangle aRect( ((IMapRectangleObject*)&rMapObject)->GetRectangle(false) );
             maBoundary.X = aRect.Left();
             maBoundary.Y = aRect.Top();
             maBoundary.Width = aRect.GetWidth();
@@ -216,8 +216,8 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
         break;
     case IMAP_OBJ_CIRCLE:
         {
-            mnRadius = (sal_Int32)((IMapCircleObject*)&rMapObject)->GetRadius(sal_False);
-            const Point aPoint( ((IMapCircleObject*)&rMapObject)->GetCenter(sal_False) );
+            mnRadius = (sal_Int32)((IMapCircleObject*)&rMapObject)->GetRadius(false);
+            const Point aPoint( ((IMapCircleObject*)&rMapObject)->GetCenter(false) );
 
             maCenter.X = aPoint.X();
             maCenter.Y = aPoint.Y();
@@ -226,7 +226,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
     case IMAP_OBJ_POLYGON:
     default:
         {
-            const Polygon aPoly( ((IMapPolygonObject*)&rMapObject)->GetPolygon(sal_False) );
+            const Polygon aPoly( ((IMapPolygonObject*)&rMapObject)->GetPolygon(false) );
 
             const sal_uInt16 nCount = aPoly.GetSize();
             maPolygon.realloc( nCount );
@@ -267,14 +267,14 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const
     case IMAP_OBJ_RECTANGLE:
         {
             const Rectangle aRect( maBoundary.X, maBoundary.Y, maBoundary.X + maBoundary.Width - 1, maBoundary.Y + maBoundary.Height - 1 );
-            pNewIMapObject = new IMapRectangleObject( aRect, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, sal_False );
+            pNewIMapObject = new IMapRectangleObject( aRect, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, false );
         }
         break;
 
     case IMAP_OBJ_CIRCLE:
         {
             const Point aCenter( maCenter.X, maCenter.Y );
-            pNewIMapObject = new IMapCircleObject( aCenter, mnRadius, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, sal_False );
+            pNewIMapObject = new IMapCircleObject( aCenter, mnRadius, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, false );
         }
         break;
 
@@ -291,7 +291,7 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const
             }
 
             aPoly.Optimize( POLY_OPTIMIZE_CLOSE );
-            pNewIMapObject = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, sal_False );
+            pNewIMapObject = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, aName, mbIsActive, false );
         }
         break;
     }
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index c4dc4beb81d3..582136bf1c85 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -25,9 +25,9 @@
 
 static const sal_Unicode TOKEN_SEPARATOR = '\001';
 
-sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
+bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     switch( nFormat )
     {
     case SOT_FORMATSTR_ID_INET_IMAGE:
@@ -57,9 +57,9 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
     return bRet;
 }
 
-sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
+bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     switch( nFormat )
     {
     case SOT_FORMATSTR_ID_INET_IMAGE: