1 files changed, 11 insertions, 18 deletions
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index ade1cf9dc4..2c4c3bc927 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -71,11 +71,6 @@
 #include <shells.hrc>
 
 #define SwWebView
-#define SearchAttributes
-#define ReplaceAttributes
-#define SearchSettings
-#define _ExecSearch ExecSearch
-#define _StateSearch StateSearch
 #define Frames
 #define Graphics
 #define OLEObjects
@@ -90,7 +85,6 @@
 #define ListInText
 #define ListInTable
 #define Page
-#include <svx/svxslots.hxx>
 #include <swslots.hxx>
 
 
@@ -99,7 +93,6 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default")
     SFX_VIEW_REGISTRATION(SwWebDocShell);
 }
 
-
 SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) )
 {
     SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
@@ -123,11 +116,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!
@@ -137,7 +130,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!
@@ -158,8 +151,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 ) ||
@@ -171,15 +164,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;
@@ -251,7 +244,7 @@ void SwWebView::SelectShell()
         }
         else
         {
-            bSetExtInpCntxt = TRUE;
+            bSetExtInpCntxt = sal_True;
             eShellMode = SHELL_MODE_TEXT;
             if ( _nSelectionType & nsSelectionType::SEL_NUM )
             {
@@ -275,7 +268,7 @@ void SwWebView::SelectShell()
         if( !GetDocShell()->IsReadOnly() )
         {
             if( bSetExtInpCntxt && GetWrtShell().HasReadonlySel() )
-                bSetExtInpCntxt = FALSE;
+                bSetExtInpCntxt = sal_False;
 
             InputContext aCntxt( GetEditWin().GetInputContext() );
             aCntxt.SetOptions( bSetExtInpCntxt
@@ -309,7 +302,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)