sw: ViewShell -> SwViewShell rename

It's a public class, so it should have the 'Sw' prefix.

Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4

39 files changed, 100 insertions, 100 deletions

diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index d73fcfb8edaf..8582adb97e48 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -793,7 +793,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
             if( pObjSh->IsA(TYPE(SwDocShell)) )
             {
                 const SwDoc* pDoc = ((SwDocShell*)pObjSh)->GetDoc();
-                ViewShell* pVSh = 0;
+                SwViewShell* pVSh = 0;
                 pDoc->GetEditShell( &pVSh );
                 if ( pVSh )
                     pVSh->ChgNumberDigits();
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 0a601cad2d80..7da8e090503b 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -790,7 +790,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
     pDev->SetBackground();
     sal_Bool bWeb = 0 != PTR_CAST(SwWebDocShell, this);
     SwPrintData aOpts;
-    ViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect );
+    SwViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect );
     pDev->Pop();
 
     if( pOrig )
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index d520ea76fca3..1afff5892a25 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -434,7 +434,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 if( nSlotId )
                 {
                     // PagePreview in the WebDocShell
-                    // is found under Id ViewShell2.
+                    // is found under Id VIEWSHELL2.
                     if( ISA(SwWebDocShell) && SID_VIEWSHELL1 == nSlotId )
                         nSlotId = SID_VIEWSHELL2;
 
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 6fd4075676b0..dfaf2892d369 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::lang;
 
 
-static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell* pSh )
+static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell* pSh )
 {
     // in FrameSets the actual visibility can differ from the ViewOption's setting
     bool bVScrollChanged = rPref.IsViewVScrollBar() != pSh->GetViewOptions()->IsViewVScrollBar();
@@ -143,7 +143,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
                             sal_uInt16 nDest )
 {
     SwView* pCurrView = pActView;
-    ViewShell* pSh = pCurrView ? &pCurrView->GetWrtShell() : 0;
+    SwViewShell* pSh = pCurrView ? &pCurrView->GetWrtShell() : 0;
 
     SwMasterUsrPref* pPref = (SwMasterUsrPref*)GetUsrPref( static_cast< sal_Bool >(
                                          VIEWOPT_DEST_WEB == nDest ? sal_True  :
@@ -192,7 +192,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
     xViewOpt->SetReadonly( bReadonly );
     if( !(*pSh->GetViewOptions() == *xViewOpt) )
     {
-        //is maybe only a ViewShell
+        //is maybe only a SwViewShell
         pSh->StartAction();
         pSh->ApplyViewOptions( *xViewOpt );
         ((SwWrtShell*)pSh)->SetReadOnlyAvailable(xViewOpt->IsCursorInProtectedArea());
@@ -622,7 +622,7 @@ void SwModule::CheckSpellChanges( bool bOnlineSpelling,
             if ( pTmp->GetCurrentViewShell() )
             {
                 pTmp->SpellItAgainSam( bInvalid, bOnlyWrong, bSmartTags );
-                ViewShell* pViewShell = 0;
+                SwViewShell* pViewShell = 0;
                 pTmp->GetEditShell( &pViewShell );
                 if ( bSmartTags && pViewShell && pViewShell->GetWin() )
                     pViewShell->GetWin()->Invalidate();
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 5d8a8df461d4..cacedeb9b8fd 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -452,7 +452,7 @@ sal_Bool SwNewDBMgr::Merge(SwWrtShell* pSh)
 {
     pSh->StartAllAction();
 
-    pSh->ViewShell::UpdateFlds(sal_True);
+    pSh->SwViewShell::UpdateFlds(sal_True);
     pSh->SetModified();
 
     pSh->EndAllAction();
@@ -2808,7 +2808,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                 rWorkShell.CalcLayout();
                 rWorkShell.UnlockExpFlds();
                 SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
-            rWorkShell.ViewShell::UpdateFlds();
+            rWorkShell.SwViewShell::UpdateFlds();
                 SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), rWorkShell.GetView().GetViewFrame()->GetObjectShell()));
 
             // strip invisible content and convert fields to text
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index a109c8af1258..be2f1133c39e 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -114,7 +114,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat)
 void SwDocStatPage::Update()
 {
     SfxViewShell *pVSh = SfxViewShell::Current();
-    ViewShell *pSh = 0;
+    SwViewShell *pSh = 0;
     if ( pVSh->ISA(SwView) )
         pSh = ((SwView*)pVSh)->GetWrtShellPtr();
     else if ( pVSh->ISA(SwPagePreview) )
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 50035a895a37..4bbd6225e323 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -43,7 +43,7 @@ IMPL_LINK_NOARG(SwWordCountFloatDlg, CloseHdl)
 
 SwWordCountFloatDlg::~SwWordCountFloatDlg()
 {
-    ViewShell::SetCareWin( 0 );
+    SwViewShell::SetCareWin( 0 );
 }
 
 namespace
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index dbf5f29fedf1..c34e8fe8d4f0 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -3470,7 +3470,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
 
 // Interfaces for Selection
 void SwTransferable::CreateSelection( SwWrtShell& rSh,
-                                      const ViewShell * _pCreatorView )
+                                      const SwViewShell * _pCreatorView )
 {
     SwModule *pMod = SW_MOD();
     SwTransferable* pNew = new SwTransferable( rSh );
@@ -3483,7 +3483,7 @@ void SwTransferable::CreateSelection( SwWrtShell& rSh,
 }
 
 void SwTransferable::ClearSelection( SwWrtShell& rSh,
-                                     const ViewShell * _pCreatorView)
+                                     const SwViewShell * _pCreatorView)
 {
     SwModule *pMod = SW_MOD();
     if( pMod->pXSelection &&
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index 27bc2462eed5..b1d3767c2474 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -241,9 +241,9 @@ void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt )
                 OUString sURL( pURL->GetURL() );
                 SvtSecurityOptions aSecOpts;
                 if ( aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK) )
-                    sURL = ViewShell::GetShellRes()->aLinkCtrlClick + ": " + sURL;
+                    sURL = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sURL;
                 else
-                    sURL = ViewShell::GetShellRes()->aLinkClick + ": " + sURL;
+                    sURL = SwViewShell::GetShellRes()->aLinkClick + ": " + sURL;
                 Help::ShowQuickHelp( this,PixelToLogic(Rectangle(GetPosPixel(),Size(50,10))),sURL);
             }
         }
diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/ui/docvw/SidebarWinAcc.cxx
index 283de1c22185..d977dadcfb93 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.cxx
+++ b/sw/source/ui/docvw/SidebarWinAcc.cxx
@@ -33,7 +33,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
 {
     public:
         explicit SidebarWinAccessibleContext( SwSidebarWin& rSidebarWin,
-                                              ViewShell& rViewShell,
+                                              SwViewShell& rViewShell,
                                               const SwFrm* pAnchorFrm )
             : VCLXAccessibleComponent( rSidebarWin.GetWindowPeer() )
             , mrViewShell( rViewShell )
@@ -86,7 +86,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
         }
 
     private:
-        ViewShell& mrViewShell;
+        SwViewShell& mrViewShell;
         const SwFrm* mpAnchorFrm;
 
         ::osl::Mutex maMutex;
@@ -94,7 +94,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
 
 // implementaion of accessible for <SwSidebarWin> instance
 SidebarWinAccessible::SidebarWinAccessible( SwSidebarWin& rSidebarWin,
-                                            ViewShell& rViewShell,
+                                            SwViewShell& rViewShell,
                                             const SwSidebarItem& rSidebarItem )
     : VCLXWindow()
     , mrSidebarWin( rSidebarWin )
diff --git a/sw/source/ui/docvw/SidebarWinAcc.hxx b/sw/source/ui/docvw/SidebarWinAcc.hxx
index 0b485906ad00..cd09fb3542ad 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.hxx
+++ b/sw/source/ui/docvw/SidebarWinAcc.hxx
@@ -22,7 +22,7 @@
 
 #include <toolkit/awt/vclxwindow.hxx>
 
-class ViewShell;
+class SwViewShell;
 class SwSidebarItem;
 class SwFrm;
 
@@ -34,7 +34,7 @@ class SidebarWinAccessible : public VCLXWindow
 {
     public:
         explicit SidebarWinAccessible( SwSidebarWin& rSidebarWin,
-                                       ViewShell& rViewShell,
+                                       SwViewShell& rViewShell,
                                        const SwSidebarItem& rSidebarItem );
         virtual ~SidebarWinAccessible();
 
@@ -45,7 +45,7 @@ class SidebarWinAccessible : public VCLXWindow
 
     private:
         SwSidebarWin& mrSidebarWin;
-        ViewShell& mrViewShell;
+        SwViewShell& mrViewShell;
         const SwFrm* mpAnchorFrm;
         bool bAccContextCreated;
 };
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 879d1aff0a04..f5fd78c11fb5 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -219,9 +219,9 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 
                     sTxt = ": " + sTxt;
                     if ( !bExecHyperlinks )
-                        sTxt = ViewShell::GetShellRes()->aLinkCtrlClick + sTxt;
+                        sTxt = SwViewShell::GetShellRes()->aLinkCtrlClick + sTxt;
                     else
-                        sTxt = ViewShell::GetShellRes()->aLinkClick + sTxt;
+                        sTxt = SwViewShell::GetShellRes()->aLinkClick + sTxt;
                 }
                 break;
             }
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index b6874c3be867..35b00fb385a3 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -38,7 +38,7 @@
 
 
 // Core-Notify
-void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect,
+void ScrollMDI( SwViewShell* pVwSh, const SwRect &rRect,
                 sal_uInt16 nRangeX, sal_uInt16 nRangeY)
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -47,7 +47,7 @@ void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect,
 }
 
 // Docmdi - movable
-sal_Bool IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect )
+sal_Bool IsScrollMDI( SwViewShell* pVwSh, const SwRect &rRect )
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
     if (pSfxVwSh && pSfxVwSh->ISA(SwView))
@@ -56,7 +56,7 @@ sal_Bool IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect )
 }
 
 // Notify for size change
-void SizeNotify(ViewShell* pVwSh, const Size &rSize)
+void SizeNotify(SwViewShell* pVwSh, const Size &rSize)
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
     if (pSfxVwSh)
@@ -69,7 +69,7 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize)
 }
 
 // Notify for page number update
-void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
+void PageNumNotify( SwViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
                                                     const OUString& rPgStr)
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -78,7 +78,7 @@ void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
             ((SwView *)pSfxVwSh)->UpdatePageNums(nPhyNum, nVirtNum, rPgStr);
 }
 
-void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
+void FrameNotify( SwViewShell* pVwSh, FlyMode eMode )
 {
     if ( pVwSh->ISA(SwCrsrShell) )
         SwBaseShell::SetFrmMode( eMode, (SwWrtShell*)pVwSh );
@@ -114,14 +114,14 @@ TblChgMode GetTblChgDefaultMode()
     return pOpt ? pOpt->GetTblMode() : TBLVAR_CHGABS;
 }
 
-void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect )
+void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect )
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
     if (pSfxVwSh && pSfxVwSh->ISA( SwPagePreview ))
         ((SwPagePreview *)pSfxVwSh)->RepaintCoreRect( rRect );
 }
 
-bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark )
+bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark )
 {
     SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
     if( pSfxVwSh && pSfxVwSh->ISA( SwView ) )
@@ -151,7 +151,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
         {
             pSh->LockPaint();
             bUnlockPaint = sal_True;
-            ViewShell::DeleteReplacementBitmaps();
+            SwViewShell::DeleteReplacementBitmaps();
             GetView().InvalidateBorder();               //Scrollbar work
         }
         break;
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 6897d9608fc1..cf85fd022bca 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -551,7 +551,7 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
                             if ( i == DI_CUSTOM )
                                 sNew = SW_RES( STR_CUSTOM );
                             else
-                                sNew = ViewShell::GetShellRes()->aDocInfoLst[i];
+                                sNew = SwViewShell::GetShellRes()->aDocInfoLst[i];
                         }
                         else
                             sNew = SW_RES(aSwFlds[nPos].nSubTypeStart + i);
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 9d05aa567f95..bc224b7878c0 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -514,7 +514,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         // collect character styles
         ListBox rCharFmtLB(this);
         rCharFmtLB.Clear();
-        rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
+        rCharFmtLB.InsertEntry( SwViewShell::GetShellRes()->aStrNone );
         SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell();
         ::FillCharStyleListBox(rCharFmtLB,  pDocShell);
 
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 10729e8ea350..7a94547f5cfc 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -32,12 +32,12 @@ class SwTestTabPage;
 #endif
 class SwAddPrinterTabPage;
 class SfxPrinter;
-class ViewShell;
+class SwViewShell;
 class SwViewOption;
 class SwContentOptPage;
 class SwShdwCrsrOptionsTabPage;
 
-SfxPrinter* GetPrt( ViewShell* );
+SfxPrinter* GetPrt( SwViewShell* );
 void        SetPrt( SfxPrinter* );
 
 /*--------OS 12.01.95 -----------------------------------
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 86e5483c9c2a..a48b33c99f1b 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -32,7 +32,7 @@
 class   SwWrtShell;
 class   SwView;
 class   SwRect;
-class   ViewShell;
+class   SwViewShell;
 class   SwAnchorMarker;
 class   SdrObject;
 class   SwShadowCursor;
@@ -58,13 +58,13 @@ class   SdrDropMarkerOverlay;
 class SwEditWin: public Window,
                 public DropTargetHelper, public DragSourceHelper
 {
-friend void     ScrollMDI(ViewShell* pVwSh, const SwRect&,
+friend void     ScrollMDI(SwViewShell* pVwSh, const SwRect&,
                           sal_uInt16 nRangeX, sal_uInt16 nRangeY);
-friend sal_Bool     IsScrollMDI(ViewShell* pVwSh, const SwRect&);
+friend sal_Bool     IsScrollMDI(SwViewShell* pVwSh, const SwRect&);
 
-friend void     SizeNotify(ViewShell* pVwSh, const Size &);
+friend void     SizeNotify(SwViewShell* pVwSh, const Size &);
 
-friend void     PageNumNotify(  ViewShell* pVwSh,
+friend void     PageNumNotify(  SwViewShell* pVwSh,
                                 sal_uInt16 nPhyNum,
                                 sal_uInt16 nVirtNum,
                                 const OUString& rPg );
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 7cf9e832dfca..7bec5e4281cc 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -31,7 +31,7 @@
 class SwViewOption;
 class SwDocShell;
 class SwScrollbar;
-class ViewShell;
+class SwViewShell;
 class SwPagePreview;
 class ImageButton;
 class Button;
@@ -44,7 +44,7 @@ class SwPagePreviewLayout;
 // Delete member <mnVirtPage> and its accessor
 class SwPagePreviewWin : public Window
 {
-    ViewShell*          mpViewShell;
+    SwViewShell*          mpViewShell;
     sal_uInt16              mnSttPage;
     sal_uInt8                mnRow, mnCol;
     Size                maPxWinSize;
@@ -62,16 +62,16 @@ public:
     SwPagePreviewWin( Window* pParent, SwPagePreview& rView );
     ~SwPagePreviewWin();
 
-    // calls ViewShell::Paint
+    // calls SwViewShell::Paint
     virtual void Paint( const Rectangle& rRect );
     virtual void KeyInput( const KeyEvent & );
     virtual void Command( const CommandEvent& rCEvt );
     virtual void MouseButtonDown(const MouseEvent& rMEvt);
     virtual void DataChanged( const DataChangedEvent& );
 
-    void SetViewShell( ViewShell* pShell );
+    void SetViewShell( SwViewShell* pShell );
 
-    ViewShell* GetViewShell() const { return mpViewShell; }
+    SwViewShell* GetViewShell() const { return mpViewShell; }
 
     sal_uInt8    GetRow() const      { return mnRow; }
     void    SetRow( sal_uInt8 n )    { if( n ) mnRow = n; }
@@ -221,7 +221,7 @@ public:
     TYPEINFO();
 
     inline Window*          GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); }
-    inline ViewShell*       GetViewShell() const { return aViewWin.GetViewShell(); }
+    inline SwViewShell*       GetViewShell() const { return aViewWin.GetViewShell(); }
     inline const Rectangle& GetVisArea() const { return aVisArea; }
     inline void             GrabFocusViewWin() { aViewWin.GrabFocus(); }
     inline void             RepaintCoreRect( const SwRect& rRect )
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index 7e4e68c3b77e..4b754e183b7f 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -35,7 +35,7 @@ class SwDocFac;
 class SwTextBlocks;
 class SwWrtShell;
 class SvxClipboardFmtItem;
-class ViewShell;
+class SwViewShell;
 class SwView_Impl;
 
 typedef sal_uInt16 TransferBufferType;
@@ -64,7 +64,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
     SwWrtShell      *pWrtShell;
     /* #96392# Added pCreatorView to distinguish SwFrameShell from
        SwWrtShell. */
-    const ViewShell       *pCreatorView;
+    const SwViewShell       *pCreatorView;
     SwDocFac        *pClpDocFac;
     Graphic         *pClpGraphic, *pClpBitmap, *pOrigGrf;
     INetBookmark    *pBkmk;     // URL and description!
@@ -198,9 +198,9 @@ public:
     // Interfaces for Selection
     /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */
     static void CreateSelection( SwWrtShell & rSh,
-                                 const ViewShell * pCreator = NULL );
+                                 const SwViewShell * pCreator = NULL );
     static void ClearSelection( SwWrtShell& rSh,
-                                const ViewShell * pCreator = NULL );
+                                const SwViewShell * pCreator = NULL );
 
     // the related SwView is being closed and the SwTransferable is invalid now
     void    Invalidate() {pWrtShell = 0;}
diff --git a/sw/source/ui/inc/swruler.hxx b/sw/source/ui/inc/swruler.hxx
index 9e59ae16c02a..2eaada89d364 100644
--- a/sw/source/ui/inc/swruler.hxx
+++ b/sw/source/ui/inc/swruler.hxx
@@ -12,7 +12,7 @@
 
 #include <svx/ruler.hxx>
 
-class ViewShell;
+class SwViewShell;
 class View;
 class Window;
 class SwEditWin;
@@ -27,7 +27,7 @@ class SwCommentRuler
 {
 public:
     SwCommentRuler (
-        ViewShell* pViewSh,
+        SwViewShell* pViewSh,
         Window* pParent,
         SwEditWin* pWin,
         sal_uInt16 nRulerFlags,
@@ -42,7 +42,7 @@ public:
     virtual void Paint( const Rectangle& rRect );
 
 protected:
-    ViewShell * mpViewShell;     //< Shell to check if there is any comments on doc and their visibility
+    SwViewShell * mpViewShell;     //< Shell to check if there is any comments on doc and their visibility
     SwEditWin * mpSwWin;         //< Used to get SwView to change the SideBar visibility
     bool        mbIsHighlighted; //< If comment control is highlighted (mouse is over it)
     VirtualDevice maVirDev;      //< VirtualDevice of this window. Just for convenience.
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 5741b629b3bf..d69f6e72fc06 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -794,7 +794,7 @@ void SwIndexMarkPane::UpdateDialog()
     if(!pMark)
         return;
 
-    ViewShell::SetCareWin(&m_rDialog);
+    SwViewShell::SetCareWin(&m_rDialog);
 
     aOrgStr = pMark->GetText();
     m_pEntryED->SetText(aOrgStr);
@@ -971,7 +971,7 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
 SwIndexMarkPane::~SwIndexMarkPane()
 {
     delete pTOXMgr;
-    ViewShell::SetCareWin( 0 );
+    SwViewShell::SetCareWin( 0 );
 }
 
 void    SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark)
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index db8ac851c63c..50e958a5aa94 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -963,7 +963,7 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
         // collect char styles
         ListBox rCharFmtLB(this);
         rCharFmtLB.Clear();
-        rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
+        rCharFmtLB.InsertEntry( SwViewShell::GetShellRes()->aStrNone );
         SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell();
         ::FillCharStyleListBox(rCharFmtLB,  pDocShell);
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index dab46835c456..ea915d15ab6e 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -493,7 +493,7 @@ void    SwOutlineSettingsTabPage::Update()
             if(pFirstFmt)
                 m_pCharFmtLB->SelectEntry(pFirstFmt->GetName());
             else
-                m_pCharFmtLB->SelectEntry( ViewShell::GetShellRes()->aStrNone );
+                m_pCharFmtLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone );
         }
         else
             m_pCharFmtLB->SetNoSelection();
@@ -527,7 +527,7 @@ void    SwOutlineSettingsTabPage::Update()
         if(pFmt)
             m_pCharFmtLB->SelectEntry(pFmt->GetName());
         else
-            m_pCharFmtLB->SelectEntry( ViewShell::GetShellRes()->aStrNone );
+            m_pCharFmtLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone );
 
         if(nTmpLevel)
         {
@@ -695,7 +695,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl)
 {
     OUString sEntry = m_pCharFmtLB->GetSelectEntry();
     sal_uInt16 nMask = 1;
-    bool bFormatNone = sEntry == ViewShell::GetShellRes()->aStrNone;
+    bool bFormatNone = sEntry == SwViewShell::GetShellRes()->aStrNone;
     SwCharFmt* pFmt = 0;
     if(!bFormatNone)
     {
@@ -791,7 +791,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
 
     // collect char styles
     m_pCharFmtLB->Clear();
-    m_pCharFmtLB->InsertEntry( ViewShell::GetShellRes()->aStrNone );
+    m_pCharFmtLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
 
     // char styles
     ::FillCharStyleListBox(*m_pCharFmtLB,
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
index 7806bfebc0d2..b076dc8933e1 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/ui/misc/swruler.cxx
@@ -35,7 +35,7 @@
 #define CONTROL_TRIANGLE_PAD    3
 
 // Constructor
-SwCommentRuler::SwCommentRuler( ViewShell* pViewSh, Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags,  SfxBindings& rBindings, WinBits nWinStyle)
+SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags,  SfxBindings& rBindings, WinBits nWinStyle)
 : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle | WB_HSCROLL)
 , mpViewShell(pViewSh)
 , mpSwWin(pWin)
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 5480849c1de2..c1493584cf22 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -583,7 +583,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             {
                 rSh.UpdateDocStat();
                 rSh.EndAllTblBoxEdit();
-                rSh.ViewShell::UpdateFlds(sal_True);
+                rSh.SwViewShell::UpdateFlds(sal_True);
 
                 if( rSh.IsCrsrInTbl() )
                 {
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index db079a832afc..299d3fc43983 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -945,7 +945,7 @@ SwFrameShell::SwFrameShell(SwView &_rView) :
     SetHelpId(SW_FRAMESHELL);
 
     // #96392# Use this to announce it is the frame shell who creates the selection.
-    SwTransferable::CreateSelection( _rView.GetWrtShell(), (ViewShell *) this );
+    SwTransferable::CreateSelection( _rView.GetWrtShell(), (SwViewShell *) this );
 
     SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Frame));
 }
@@ -953,7 +953,7 @@ SwFrameShell::SwFrameShell(SwView &_rView) :
 SwFrameShell::~SwFrameShell()
 {
     // #96392# Only clear the selection if it was this frame shell who created it.
-    SwTransferable::ClearSelection( GetShell(), (ViewShell *) this );
+    SwTransferable::ClearSelection( GetShell(), (SwViewShell *) this );
 }
 
 void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 96912e3280cf..5b68feb1e3fa 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -200,7 +200,7 @@ void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt )
     if( !bSetAutoFmt )
     {
         // Then the list to be expanded by the entry "- none -".
-        m_pLbFormat->InsertEntry( ViewShell::GetShellRes()->aStrNone );
+        m_pLbFormat->InsertEntry( SwViewShell::GetShellRes()->aStrNone );
         nDfltStylePos = 1;
         nIndex = 255;
     }
@@ -461,7 +461,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
     {
         nIndex = 255;
 
-        SwTableAutoFmt aTmp( ViewShell::GetShellRes()->aStrNone );
+        SwTableAutoFmt aTmp( SwViewShell::GetShellRes()->aStrNone );
         aTmp.SetFont( sal_False );
         aTmp.SetJustify( sal_False );
         aTmp.SetFrame( sal_False );
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 3f39d51284f7..abf1ca9b4e80 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1173,7 +1173,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
             pOldSh = pF->GetViewShell();
     }
 
-    ViewShell *pVS, *pNew;
+    SwViewShell *pVS, *pNew;
 
     if( pOldSh && pOldSh->IsA( TYPE( SwPagePreview ) ) )
         pVS = ((SwPagePreview*)pOldSh)->GetViewShell();
@@ -1207,9 +1207,9 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
     }
 
     if( pVS )
-        pNew = new ViewShell( *pVS, &aViewWin, 0, VSHELLFLAG_ISPREVIEW );
+        pNew = new SwViewShell( *pVS, &aViewWin, 0, VSHELLFLAG_ISPREVIEW );
     else
-        pNew = new ViewShell(
+        pNew = new SwViewShell(
                 *((SwDocShell*)pViewFrame->GetObjectShell())->GetDoc(),
                 &aViewWin, 0, 0, VSHELLFLAG_ISPREVIEW );
 
@@ -1669,7 +1669,7 @@ SfxPrinter*  SwPagePreview::GetPrinter( sal_Bool bCreate )
 
 sal_uInt16  SwPagePreview::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags, bool )
 {
-    ViewShell &rSh = *GetViewShell();
+    SwViewShell &rSh = *GetViewShell();
     SfxPrinter* pOld = rSh.getIDocumentDeviceAccess()->getPrinter( false );
     if ( pOld && pOld->IsPrinting() )
         return SFX_PRINTERROR_BUSY;
@@ -1732,7 +1732,7 @@ SfxTabPage*  SwPagePreview::CreatePrintOptionsPage( Window *pParent,
     return ::CreatePrintOptionsPage( pParent, rOptions, !bNormalPrint );
 }
 
-void SwPagePreviewWin::SetViewShell( ViewShell* pShell )
+void SwPagePreviewWin::SetViewShell( SwViewShell* pShell )
 {
     mpViewShell = pShell;
     if ( mpViewShell && mpViewShell->IsPreview() )
@@ -1884,7 +1884,7 @@ void SwPagePreview::EnableVScrollbar(bool bEnable)
 
 void SwPagePreview::SetZoom(SvxZoomType eType, sal_uInt16 nFactor)
 {
-    ViewShell& rSh = *GetViewShell();
+    SwViewShell& rSh = *GetViewShell();
     SwViewOption aOpt(*rSh.GetViewOptions());
     // perform action only on changes of zoom or zoom type.
     if ( aOpt.GetZoom() != nFactor ||
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 9bf32b3c5420..7e783ba91647 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -830,10 +830,10 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
         }
         m_pWrtShell = new SwWrtShell( rDoc, m_pEditWin, *this, &aUsrPref );
         // creating an SwView from a SwPagePreview needs to
-        // add the ViewShell to the ring of the other ViewShell(s)
+        // add the SwViewShell to the ring of the other SwViewShell(s)
         if(m_bOldShellWasPagePreview)
         {
-            ViewShell& rPreviewViewShell = *((SwPagePreview*)pExistingSh)->GetViewShell();
+            SwViewShell& rPreviewViewShell = *((SwPagePreview*)pExistingSh)->GetViewShell();
             m_pWrtShell->MoveTo(&rPreviewViewShell);
             // to update the field command et.al. if necessary
             const SwViewOption* pPreviewOpt = rPreviewViewShell.GetViewOptions();
diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx
index c4acb7207eba..c82b31c947da 100644
--- a/sw/source/ui/uiview/viewfunc.hxx
+++ b/sw/source/ui/uiview/viewfunc.hxx
@@ -28,13 +28,13 @@ class SfxTabPage;
 class Size;
 class SvxRuler;
 class SwScrollbar;
-class ViewShell;
+class SwViewShell;
 class Window;
 
 // The following functions are available in viewprt.cxx
 void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, sal_Bool bWeb );
 SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& );
-void SetAppPrintOptions( ViewShell* pSh, sal_Bool bWeb );
+void SetAppPrintOptions( SwViewShell* pSh, sal_Bool bWeb );
 
 // The following functions are available in viewport.cxx
 void ViewResizePixel( const Window &rRef,
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 4d2a58a3c23f..09aabece5384 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -404,7 +404,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan
     Rectangle aOldVisArea( m_aVisArea );
     long nDiffY = 0;
 
-    Window* pCareWn = ViewShell::GetCareWin(GetWrtShell());
+    Window* pCareWn = SwViewShell::GetCareWin(GetWrtShell());
     if ( pCareWn )
     {
         Rectangle aDlgRect( GetEditWin().PixelToLogic(
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 09d8d04fde2c..2c9d5eb41c03 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -270,7 +270,7 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent,
     return pPage;
 }
 
-void SetAppPrintOptions( ViewShell* pSh, sal_Bool bWeb )
+void SetAppPrintOptions( SwViewShell* pSh, sal_Bool bWeb )
 {
     const IDocumentDeviceAccess* pIDDA = pSh->getIDocumentDeviceAccess();
     SwPrintData aPrtData = pIDDA->getPrintData();
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 1242e3e8abdc..c658b8598a79 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -405,7 +405,7 @@ SwXTextDocument::~SwXTextDocument()
     delete m_pPrintUIOptions;
     if (m_pRenderData && m_pRenderData->IsViewOptionAdjust())
     {   // rhbz#827695: this can happen if the last page is not printed
-        // the ViewShell has been deleted already by SwView::~SwView
+        // the SwViewShell has been deleted already by SwView::~SwView
         // FIXME: replace this awful implementation of XRenderable with
         // something less insane that has its own view
         m_pRenderData->ViewOptionAdjustCrashPreventionKludge();
@@ -2230,7 +2230,7 @@ void SwXTextDocument::refresh(void) throw( RuntimeException )
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw RuntimeException();
-    ViewShell *pViewShell = pDocShell->GetWrtShell();
+    SwViewShell *pViewShell = pDocShell->GetWrtShell();
     NotifyRefreshListeners();
     if(pViewShell)
         pViewShell->CalcLayout();
@@ -2433,7 +2433,7 @@ SwDoc * SwXTextDocument::GetRenderDoc(
 
                 rpView = GuessViewShell( bIsSwSrcView );
             }
-            OSL_ENSURE( rpView, "ViewShell missing" );
+            OSL_ENSURE( rpView, "SwViewShell missing" );
             // the view shell should be SwView for documents PDF export.
             // for the page preview no selection should be possible
             // (the export dialog does not allow for this option)
@@ -2460,7 +2460,7 @@ SwDoc * SwXTextDocument::GetRenderDoc(
             }
             else
             {
-                OSL_FAIL("unexpected ViewShell" );
+                OSL_FAIL("unexpected SwViewShell" );
             }
         }
     }
@@ -2537,8 +2537,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
     {
         SwDocShell *pRenderDocShell = pDoc->GetDocShell();
 
-        // TODO/mba: we really need a generic way to get the ViewShell!
-        ViewShell* pViewShell = 0;
+        // TODO/mba: we really need a generic way to get the SwViewShell!
+        SwViewShell* pViewShell = 0;
         SwView* pSwView = PTR_CAST(SwView, pView);
         if ( pSwView )
         {
@@ -2614,7 +2614,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             }
 
             // #122919# Force field update before PDF export
-            pViewShell->ViewShell::UpdateFlds(sal_True);
+            pViewShell->SwViewShell::UpdateFlds(sal_True);
             if( bStateChanged )
                 pRenderDocShell->EnableSetModified( sal_True );
 
@@ -2710,8 +2710,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
     if (0 > nRenderer)
         throw IllegalArgumentException();
 
-    // TODO/mba: we really need a generic way to get the ViewShell!
-    ViewShell* pVwSh = 0;
+    // TODO/mba: we really need a generic way to get the SwViewShell!
+    SwViewShell* pVwSh = 0;
     SwView* pSwView = PTR_CAST(SwView, pView);
     if ( pSwView )
         pVwSh = pSwView->GetWrtShellPtr();
@@ -2996,10 +2996,10 @@ void SAL_CALL SwXTextDocument::render(
                 //!! (check for SwView first as in GuessViewShell) !!
                 OSL_ENSURE( pView, "!! view missing !!" );
                 const TypeId aSwViewTypeId = TYPE(SwView);
-                ViewShell* pVwSh = 0;
+                SwViewShell* pVwSh = 0;
                 if (pView)
                 {
-                    // TODO/mba: we really need a generic way to get the ViewShell!
+                    // TODO/mba: we really need a generic way to get the SwViewShell!
                     SwView* pSwView = PTR_CAST(SwView, pView);
                     if ( pSwView )
                         pVwSh = pSwView->GetWrtShellPtr();
@@ -3940,7 +3940,7 @@ void SwXDocumentPropertyHelper::onChange()
 }
 
 SwViewOptionAdjust_Impl::SwViewOptionAdjust_Impl(
-            ViewShell& rSh, const SwViewOption &rViewOptions)
+            SwViewShell& rSh, const SwViewOption &rViewOptions)
     : m_pShell(&rSh)
     , m_aOldViewOptions( rViewOptions )
 {
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 78312ff0a9b5..785ffc4d6a22 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -147,8 +147,8 @@ std::vector<OUString>* pAuthFieldTypeList = 0;
 void _FinitUI()
 {
     SwNewDBMgr::RemoveDbtoolsClient();
-    delete ViewShell::GetShellRes();
-    ViewShell::SetShellRes( 0 );
+    delete SwViewShell::GetShellRes();
+    SwViewShell::SetShellRes( 0 );
 
     SwEditWin::_FinitStaticData();
 
@@ -168,7 +168,7 @@ void _FinitUI()
 void _InitUI()
 {
     // ShellResource gives the CORE the possibility to work with resources.
-    ViewShell::SetShellRes( new ShellResource );
+    SwViewShell::SetShellRes( new ShellResource );
     SwEditWin::_InitStaticData();
 }
 
diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx
index fb5bb376ea02..60098a6378df 100644
--- a/sw/source/ui/vba/vbainformationhelper.cxx
+++ b/sw/source/ui/vba/vbainformationhelper.cxx
@@ -52,7 +52,7 @@ double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css
 
     sal_Int32 nCurrentPage = handleWdActiveEndPageNumber( xTVCursor );
     SwDoc* pDoc = word::getDocShell( xModel )->GetDoc();
-    ViewShell* pViewSh = pDoc->GetCurrentViewShell();
+    SwViewShell* pViewSh = pDoc->GetCurrentViewShell();
     sal_Int32 nPageHeight = pViewSh ? pViewSh->GetPageSize( nCurrentPage, sal_False ).Height() : 0;
     // FIXME: handle multipul page style
     // it is very strange that the curros position is incorrect when open Word file.
diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx
index 910ac525adce..be3443da93f6 100644
--- a/sw/source/ui/vba/wordvbahelper.cxx
+++ b/sw/source/ui/vba/wordvbahelper.cxx
@@ -85,7 +85,7 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame
 sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException)
 {
     SwDocShell* pDocShell = getDocShell( xModel );
-    ViewShell* pViewSh = pDocShell ? pDocShell->GetDoc()->GetCurrentViewShell() : 0;
+    SwViewShell* pViewSh = pDocShell ? pDocShell->GetDoc()->GetCurrentViewShell() : 0;
     return pViewSh ? pViewSh->GetPageCount() : 0;
 }
 
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx
index 72f26a2b3c9c..7f5cab28888b 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/ui/wrtsh/move.cxx
@@ -556,12 +556,12 @@ sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect)
         // This has not work that way, because the cursor was not set
         // because this does not happen within a
         // Start-/EndActionParentheses.
-        // Because only ViewShell::EndAction() is called at the end,
+        // Because only SwViewShell::EndAction() is called at the end,
         // no updating of the display of the cursor position takes place.
         // The CrsrShell-Actionparentheses cannot be used, because it
         // always leads to displaying the cursor, thus also,
         // if after the scroll scrolled in a region without a valid postition.
-        // ViewShell::StartAction();
+        // SwViewShell::StartAction();
     PageMove eDir = lOffset > 0? MV_PAGE_DOWN: MV_PAGE_UP;
         // Change of direction and stack present
     if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( sal_True, bSelect ))
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 03b8ad2b663b..11e06415c2d8 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1698,7 +1698,7 @@ void SwWrtShell::ApplyViewOptions( const SwViewOption &rOpt )
 void SwWrtShell::SetReadonlyOption(sal_Bool bSet)
 {
     GetView().GetEditWin().GetFrameControlsManager().SetReadonlyControls( bSet );
-    ViewShell::SetReadonlyOption( bSet );
+    SwViewShell::SetReadonlyOption( bSet );
 }
 
 // Switch on/off header or footer of a page style - if an empty name is
@@ -1776,7 +1776,7 @@ void SwWrtShell::ChangeHeaderOrFooter(
 
 void SwWrtShell::SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow )
 {
-    ViewShell::SetShowHeaderFooterSeparator( eControl, bShow );
+    SwViewShell::SetShowHeaderFooterSeparator( eControl, bShow );
     if ( !bShow )
         GetView().GetEditWin().GetFrameControlsManager().HideControls( eControl );
 }
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 69cc78be3460..0e034e8174df 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -357,7 +357,7 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
 }
 
 
-void LoadURL( ViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter,
+void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter,
               const OUString& rTargetFrameName )
 {
     OSL_ENSURE( !rURL.isEmpty(), "what should be loaded here?" );