1 files changed, 11 insertions, 17 deletions

diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index d1e7fe672a38..9f8c73faf152 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -70,11 +70,6 @@
 #include <shells.hrc>
 
 #define SwWebView
-#define SearchAttributes
-#define ReplaceAttributes
-#define SearchSettings
-#define _ExecSearch ExecSearch
-#define _StateSearch StateSearch
 #define Frames
 #define Graphics
 #define OLEObjects
@@ -89,7 +84,6 @@
 #define ListInText
 #define ListInTable
 #define Page
-#include <svx/svxslots.hxx>
 #include <swslots.hxx>
 
 
@@ -136,11 +130,11 @@ SwWebView::~SwWebView()
 void SwWebView::SelectShell()
 {
     // Entscheidung, ob UpdateTable gerufen werden muss
-    BOOL bUpdateTable = FALSE;
+    sal_Bool bUpdateTable = sal_False;
     const SwFrmFmt* pCurTableFmt = GetWrtShell().GetTableFmt();
     if(pCurTableFmt && pCurTableFmt != GetLastTblFrmFmt())
     {
-        bUpdateTable = TRUE; // kann erst spaeter ausgefuehrt werden
+        bUpdateTable = sal_True; // kann erst spaeter ausgefuehrt werden
     }
     SetLastTblFrmFmt(pCurTableFmt);
     //SEL_TBL und SEL_TBL_CELLS koennen verodert sein!
@@ -150,7 +144,7 @@ void SwWebView::SelectShell()
     int _nSelectionType = GetSelectionType();
     if ( nNewSelectionType == _nSelectionType )
     {
-        GetViewFrame()->GetBindings().InvalidateAll( FALSE );
+        GetViewFrame()->GetBindings().InvalidateAll( sal_False );
         if ( _nSelectionType & nsSelectionType::SEL_OLE ||
              _nSelectionType & nsSelectionType::SEL_GRF )
             //Fuer Grafiken und OLE kann sich natuerlich das Verb aendern!
@@ -173,8 +167,8 @@ void SwWebView::SelectShell()
                 pBarCfg->SetTopToolbar( _nSelectionType, nId );
 
             SfxShell *pSfxShell;
-            USHORT i;
-            for ( i = 0; TRUE; ++i )
+            sal_uInt16 i;
+            for ( i = 0; sal_True; ++i )
             {
                 pSfxShell = rDispatcher.GetShell( i );
                 if ( !( pSfxShell->ISA( SwBaseShell ) ||
@@ -186,15 +180,15 @@ void SwWebView::SelectShell()
             rDispatcher.Pop( *pSfxShell, SFX_SHELL_POP_UNTIL | SFX_SHELL_POP_DELETE);
         }
 
-        BOOL bInitFormShell = FALSE;
+        sal_Bool bInitFormShell = sal_False;
         if( !GetFormShell() )
         {
-            bInitFormShell = TRUE;
+            bInitFormShell = sal_True;
             SetFormShell( new FmFormShell( this ) );
             rDispatcher.Push( *GetFormShell() );
         }
 
-        BOOL bSetExtInpCntxt = FALSE;
+        sal_Bool bSetExtInpCntxt = sal_False;
         _nSelectionType = nNewSelectionType;
         SetSelectionType( _nSelectionType );
         ShellModes eShellMode;
@@ -266,7 +260,7 @@ void SwWebView::SelectShell()
         }
         else
         {
-            bSetExtInpCntxt = TRUE;
+            bSetExtInpCntxt = sal_True;
             eShellMode = SHELL_MODE_TEXT;
             if ( _nSelectionType & nsSelectionType::SEL_NUM )
             {
@@ -290,7 +284,7 @@ void SwWebView::SelectShell()
         if( !GetDocShell()->IsReadOnly() )
         {
             if( bSetExtInpCntxt && GetWrtShell().HasReadonlySel() )
-                bSetExtInpCntxt = FALSE;
+                bSetExtInpCntxt = sal_False;
 
             InputContext aCntxt( GetEditWin().GetInputContext() );
             aCntxt.SetOptions( bSetExtInpCntxt
@@ -324,7 +318,7 @@ void SwWebView::SelectShell()
 
     //Guenstiger Zeitpunkt fuer die Kommunikation mit OLE-Objekten?
     if ( GetDocShell()->GetDoc()->IsOLEPrtNotifyPending() )
-        GetDocShell()->GetDoc()->PrtOLENotify( FALSE );
+        GetDocShell()->GetDoc()->PrtOLENotify( sal_False );
 
     //jetzt das Tabellen-Update
     if(bUpdateTable)