[Libreoffice-commits] core.git: sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat Oct 26 11:08:12 PDT 2013
sw/inc/IDocumentLayoutAccess.hxx | 8
sw/inc/accmap.hxx | 8
sw/inc/crsrsh.hxx | 2
sw/inc/dbmgr.hxx | 2
sw/inc/doc.hxx | 16
sw/inc/editsh.hxx | 2
sw/inc/htmltbl.hxx | 2
sw/inc/init.hxx | 4
sw/inc/mdiexp.hxx | 16
sw/inc/node.hxx | 4
sw/inc/pagepreviewlayout.hxx | 8
sw/inc/printdata.hxx | 8
sw/inc/swcrsr.hxx | 4
sw/inc/swurl.hxx | 4
sw/inc/unotxdoc.hxx | 10
sw/inc/viewopt.hxx | 6
sw/inc/viewsh.hxx | 46 -
sw/inc/viscrs.hxx | 2
sw/source/core/access/acccell.cxx | 4
sw/source/core/access/acccontext.cxx | 12
sw/source/core/access/acccontext.hxx | 4
sw/source/core/access/accframe.cxx | 4
sw/source/core/access/accframe.hxx | 6
sw/source/core/access/accframebase.cxx | 4
sw/source/core/access/acchyperlink.cxx | 2
sw/source/core/access/accmap.cxx | 8
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/accselectionhelper.cxx | 2
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 24
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/crsr/swcrsr.cxx | 4
sw/source/core/crsr/trvltbl.cxx | 6
sw/source/core/crsr/viscrs.cxx | 10
sw/source/core/doc/doc.cxx | 14
sw/source/core/doc/docbm.cxx | 4
sw/source/core/doc/docchart.cxx | 8
sw/source/core/doc/doccorr.cxx | 10
sw/source/core/doc/docdesc.cxx | 8
sw/source/core/doc/docdraw.cxx | 8
sw/source/core/doc/doclay.cxx | 22
sw/source/core/doc/docnew.cxx | 6
sw/source/core/doc/docredln.cxx | 4
sw/source/core/doc/htmltbl.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 24
sw/source/core/docnode/ndsect.cxx | 4
sw/source/core/docnode/ndtbl.cxx | 4
sw/source/core/docnode/node.cxx | 4
sw/source/core/docnode/section.cxx | 4
sw/source/core/docnode/swbaslnk.cxx | 4
sw/source/core/draw/dcontact.cxx | 8
sw/source/core/draw/dflyobj.cxx | 6
sw/source/core/draw/dpage.cxx | 8
sw/source/core/edit/autofmt.cxx | 4
sw/source/core/edit/editsh.cxx | 4
sw/source/core/edit/edredln.cxx | 6
sw/source/core/edit/edws.cxx | 14
sw/source/core/fields/ddefld.cxx | 4
sw/source/core/fields/docufld.cxx | 6
sw/source/core/fields/fldbas.cxx | 4
sw/source/core/fields/reffld.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/frmedt/feshview.cxx | 14
sw/source/core/frmedt/fews.cxx | 8
sw/source/core/graphic/ndgrf.cxx | 4
sw/source/core/inc/drawfont.hxx | 8
sw/source/core/inc/flyfrm.hxx | 2
sw/source/core/inc/fntcache.hxx | 20
sw/source/core/inc/frame.hxx | 2
sw/source/core/inc/frmtool.hxx | 4
sw/source/core/inc/pagefrm.hxx | 16
sw/source/core/inc/ptqueue.hxx | 6
sw/source/core/inc/rootfrm.hxx | 22
sw/source/core/inc/swfntcch.hxx | 8
sw/source/core/inc/swfont.hxx | 26
sw/source/core/inc/viewimp.hxx | 26
sw/source/core/layout/calcmove.cxx | 6
sw/source/core/layout/flowfrm.cxx | 14
sw/source/core/layout/fly.cxx | 24
sw/source/core/layout/frmtool.cxx | 26
sw/source/core/layout/ftnfrm.cxx | 10
sw/source/core/layout/hffrm.cxx | 6
sw/source/core/layout/layact.cxx | 28 -
sw/source/core/layout/laycache.cxx | 2
sw/source/core/layout/newfrm.cxx | 12
sw/source/core/layout/pagechg.cxx | 58 +-
sw/source/core/layout/pagedesc.cxx | 2
sw/source/core/layout/paintfrm.cxx | 76 +-
sw/source/core/layout/sectfrm.cxx | 10
sw/source/core/layout/ssfrm.cxx | 4
sw/source/core/layout/tabfrm.cxx | 12
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/layout/virtoutp.cxx | 2
sw/source/core/layout/virtoutp.hxx | 6
sw/source/core/layout/wsfrm.cxx | 26
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 2
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/atrhndl.hxx | 10
sw/source/core/text/atrstck.cxx | 8
sw/source/core/text/frmcrsr.cxx | 8
sw/source/core/text/frmform.cxx | 6
sw/source/core/text/frmpaint.cxx | 12
sw/source/core/text/inftxt.cxx | 4
sw/source/core/text/inftxt.hxx | 8
sw/source/core/text/itratr.cxx | 12
sw/source/core/text/itratr.hxx | 4
sw/source/core/text/porfld.cxx | 4
sw/source/core/text/porrst.cxx | 6
sw/source/core/text/txtfld.cxx | 2
sw/source/core/text/txtfly.cxx | 2
sw/source/core/text/txtfrm.cxx | 16
sw/source/core/text/txtftn.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 18
sw/source/core/txtnode/fntcap.cxx | 2
sw/source/core/txtnode/swfntcch.cxx | 4
sw/source/core/txtnode/swfont.cxx | 12
sw/source/core/undo/undraw.cxx | 2
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoflatpara.cxx | 2
sw/source/core/unocore/unoidx.cxx | 4
sw/source/core/unocore/unotbl.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 2
sw/source/core/view/printdata.cxx | 6
sw/source/core/view/viewimp.cxx | 52 -
sw/source/core/view/viewpg.cxx | 10
sw/source/core/view/viewsh.cxx | 276 +++++-----
sw/source/core/view/vnew.cxx | 26
sw/source/core/view/vprint.cxx | 44 -
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 6
sw/source/filter/html/htmlform.cxx | 2
sw/source/filter/html/htmlforw.cxx | 2
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/htmltabw.cxx | 2
sw/source/filter/html/htmlvsh.hxx | 8
sw/source/filter/html/swhtml.cxx | 46 -
sw/source/filter/html/swhtml.hxx | 10
sw/source/filter/ww1/fltshell.cxx | 2
sw/source/filter/ww8/docxexport.cxx | 2
sw/source/filter/ww8/docxexportfilter.cxx | 2
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/rtfexportfilter.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/xml/xmltbli.cxx | 2
sw/source/ui/app/apphdl.cxx | 2
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docsh2.cxx | 2
sw/source/ui/app/swmodul1.cxx | 8
sw/source/ui/dbui/dbmgr.cxx | 4
sw/source/ui/dialog/docstdlg.cxx | 2
sw/source/ui/dialog/wordcountdialog.cxx | 2
sw/source/ui/dochdl/swdtflvr.cxx | 4
sw/source/ui/docvw/SidebarTxtControl.cxx | 4
sw/source/ui/docvw/SidebarWinAcc.cxx | 6
sw/source/ui/docvw/SidebarWinAcc.hxx | 6
sw/source/ui/docvw/edtwin2.cxx | 4
sw/source/ui/docvw/edtwin3.cxx | 16
sw/source/ui/fldui/fldmgr.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/inc/cfgitems.hxx | 4
sw/source/ui/inc/edtwin.hxx | 10
sw/source/ui/inc/pview.hxx | 12
sw/source/ui/inc/swdtflvr.hxx | 8
sw/source/ui/inc/swruler.hxx | 6
sw/source/ui/index/swuiidxmrk.cxx | 4
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/outline.cxx | 8
sw/source/ui/misc/swruler.cxx | 2
sw/source/ui/shells/basesh.cxx | 2
sw/source/ui/shells/frmsh.cxx | 4
sw/source/ui/table/tautofmt.cxx | 4
sw/source/ui/uiview/pview.cxx | 12
sw/source/ui/uiview/view.cxx | 4
sw/source/ui/uiview/viewfunc.hxx | 4
sw/source/ui/uiview/viewport.cxx | 2
sw/source/ui/uiview/viewprt.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 24
sw/source/ui/utlui/initui.cxx | 6
sw/source/ui/vba/vbainformationhelper.cxx | 2
sw/source/ui/vba/wordvbahelper.cxx | 2
sw/source/ui/wrtsh/move.cxx | 4
sw/source/ui/wrtsh/wrtsh1.cxx | 4
sw/source/ui/wrtsh/wrtsh2.cxx | 2
185 files changed, 905 insertions(+), 905 deletions(-)
New commits:
commit ee3189489c0205ec221fbc907a01c711b58fc42e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Oct 26 19:50:13 2013 +0200
sw: ViewShell -> SwViewShell rename
It's a public class, so it should have the 'Sw' prefix.
Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index fc9bb5c..feccc26 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -22,7 +22,7 @@
#include <swtypes.hxx>
-class ViewShell;
+class SwViewShell;
class SwRootFrm;
class SwFrmFmt;
class SfxItemSet;
@@ -37,15 +37,15 @@ public:
/** Returns the layout set at the document.
*/
- virtual const ViewShell* GetCurrentViewShell() const = 0;
- virtual ViewShell* GetCurrentViewShell() = 0;
+ virtual const SwViewShell* GetCurrentViewShell() const = 0;
+ virtual SwViewShell* GetCurrentViewShell() = 0;
virtual const SwRootFrm* GetCurrentLayout() const = 0;
virtual SwRootFrm* GetCurrentLayout() = 0;
virtual bool HasLayout() const = 0;
/** !!!The old layout must be deleted!!!
*/
- virtual void SetCurrentViewShell( ViewShell* pNew ) = 0;
+ virtual void SetCurrentViewShell( SwViewShell* pNew ) = 0;
/**
*/
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index e5ad23f..5174c89 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -29,7 +29,7 @@
#include <vector>
-class ViewShell;
+class SwViewShell;
class Rectangle;
class SwFrm;
class SwTxtFrm;
@@ -82,7 +82,7 @@ class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
// #i27301 data structure to keep information about
// accessible paragraph, which have a selection.
SwAccessibleSelectedParas_Impl* mpSelectedParas;
- ViewShell *mpVSh;
+ SwViewShell *mpVSh;
/// for page preview: store preview data, VisArea, and mapping of
/// preview-to-display coordinates
SwAccPreviewData* mpPreview;
@@ -124,7 +124,7 @@ class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
public:
- SwAccessibleMap( ViewShell *pSh );
+ SwAccessibleMap( SwViewShell *pSh );
~SwAccessibleMap();
::com::sun::star::uno::Reference<
@@ -155,7 +155,7 @@ public:
SwAccessibleContext *pParentImpl,
sal_Bool bCreate = sal_True );
- inline ViewShell* GetShell() const
+ inline SwViewShell* GetShell() const
{
return mpVSh;
}
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 3d3e8d9..bf09a55 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -140,7 +140,7 @@ const int CRSR_POSOLD = 0x01, // cursor stays at old position
OUString *ReplaceBackReferences( const com::sun::star::util::SearchOptions& rSearchOpt, SwPaM* pPam );
class SW_DLLPUBLIC SwCrsrShell
- : public ViewShell
+ : public SwViewShell
, public SwModify
, public ::sw::IShellCursorSupplier
{
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 9ab0b91..b1d57ef 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -198,7 +198,7 @@ friend class SwConnectionDisposedListener_Impl;
sal_Bool bInMerge : 1; ///< merge process active
sal_Bool bMergeSilent : 1; ///< suppress display of dialogs/boxes (used when called over API)
sal_Bool bMergeLock : 1; /**< prevent update of database fields while document is
- actually printed at the ViewShell */
+ actually printed at the SwViewShell */
SwDSParamArr aDataSourceParams;
SwNewDBMgr_Impl* pImpl;
const SwXMailMerge* pMergeEvtSrc; ///< != 0 if mail merge events are to be send
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 5e1138e..465443a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -172,7 +172,7 @@ class SwTxtFmtColls;
class SwURLStateChanged;
class SwUnoCrsr;
class SwUnoCrsrTbl;
-class ViewShell;
+class SwViewShell;
class _SetGetExpFld;
class SwDrawContact;
class SwLayouter;
@@ -314,7 +314,7 @@ class SW_DLLPUBLIC SwDoc :
SwTOXTypes *mpTOXTypes; ///< Tables/indices
SwDefTOXBase_Impl * mpDefTOXBases; ///< defaults of SwTOXBase's
- ViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView
+ SwViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView
SdrModel *mpDrawModel; ///< StarView Drawing
SwDocUpdtFld *mpUpdtFlds; ///< Struct for updating fields
@@ -673,7 +673,7 @@ private:
const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 );
/// Update charts of given table.
- void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const;
+ void _UpdateCharts( const SwTable& rTbl, SwViewShell& rVSh ) const;
sal_Bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
sal_uInt16 nMode );
@@ -946,15 +946,15 @@ public:
/** IDocumentLayoutAccess
*/
- virtual void SetCurrentViewShell( ViewShell* pNew );
+ virtual void SetCurrentViewShell( SwViewShell* pNew );
virtual SwLayouter* GetLayouter();
virtual const SwLayouter* GetLayouter() const;
virtual void SetLayouter( SwLayouter* pNew );
virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet );
virtual void DelLayoutFmt( SwFrmFmt *pFmt );
virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms );
- virtual const ViewShell *GetCurrentViewShell() const;
- virtual ViewShell *GetCurrentViewShell(); ///< It must be able to communicate to a ViewShell.This is going to be removerd later.
+ virtual const SwViewShell *GetCurrentViewShell() const;
+ virtual SwViewShell *GetCurrentViewShell(); ///< It must be able to communicate to a SwViewShell.This is going to be removerd later.
virtual const SwRootFrm *GetCurrentLayout() const;
virtual SwRootFrm *GetCurrentLayout();
virtual bool HasLayout() const;
@@ -1733,8 +1733,8 @@ public:
const SwAttrPool& GetAttrPool() const { return *mpAttrPool; }
SwAttrPool& GetAttrPool() { return *mpAttrPool; }
- /// Search an EditShell or, if appropriate, a ViewShell via layout.
- SwEditShell* GetEditShell( ViewShell** ppSh = 0 ) const;
+ /// Search an EditShell or, if appropriate, a SwViewShell via layout.
+ SwEditShell* GetEditShell( SwViewShell** ppSh = 0 ) const;
::sw::IShellCursorSupplier * GetIShellCursorSupplier();
/// OLE 2.0-notification.
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 35cff35..8807eb2 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -159,7 +159,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
SW_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
- using ViewShell::UpdateFlds;
+ using SwViewShell::UpdateFlds;
using SwModify::GetInfo;
public:
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index b9d9f22..82625d5 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -325,7 +325,7 @@ public:
void BordersChanged( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False );
/** Calculate available width. This works only if a layout or a
- ViewShell exists. Otherwise returns 0.
+ SwViewShell exists. Otherwise returns 0.
This is needed by HTML-filter because it doesn't have access to the layout.) */
static sal_uInt16 GetBrowseWidth( const SwDoc& rDoc );
diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx
index 78fe1685..fdeb4fb 100644
--- a/sw/inc/init.hxx
+++ b/sw/inc/init.hxx
@@ -25,7 +25,7 @@
#include "osl/module.h"
#include "osl/module.hxx"
-class ViewShell;
+class SwViewShell;
void _InitCore(); // bastyp/init.cxx
void _FinitCore();
@@ -51,7 +51,7 @@ private:
// layout/newfrm.cxx
void _FrmInit();
void _FrmFinit();
-void SetShell( ViewShell *pSh );
+void SetShell( SwViewShell *pSh );
// text/txtfrm.cxx
void _TextInit();
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index f6616db..a8d38c2 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -27,22 +27,22 @@
class SwRect;
class Size;
class Dialog;
-class ViewShell;
+class SwViewShell;
class SwDoc;
class SwDocShell;
-extern void ScrollMDI(ViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY);
-extern sal_Bool IsScrollMDI(ViewShell* pVwSh, const SwRect &);
-extern void SizeNotify(ViewShell* pVwSh, const Size &);
+extern void ScrollMDI(SwViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY);
+extern sal_Bool IsScrollMDI(SwViewShell* pVwSh, const SwRect &);
+extern void SizeNotify(SwViewShell* pVwSh, const Size &);
// Update of status bar during an action.
-extern void PageNumNotify( ViewShell* pVwSh,
+extern void PageNumNotify( SwViewShell* pVwSh,
sal_uInt16 nPhyNum,
sal_uInt16 nVirtNum,
const OUString& rPg );
enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
-extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
+extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
SW_DLLPUBLIC void StartProgress ( sal_uInt16 nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 );
SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh = 0 );
@@ -54,7 +54,7 @@ void EnableCmdInterface(sal_Bool bEnable = sal_True);
Dialog* GetSearchDialog();
-void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect );
+void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
// ndgrf.cxx
// Delete all QuickDraw-bitmaps of the specific Document.
@@ -63,7 +63,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc );
// Read ChgMode for tables from configuration.
TblChgMode GetTblChgDefaultMode();
-bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark );
+bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark );
#endif
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 7690cf8..d0b01c5 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -61,7 +61,7 @@ class SwTableNode;
class SwTableBox;
class SwTxtNode;
class SwPageDesc;
-class ViewShell;
+class SwViewShell;
struct SwPosition;
class IStyleAccess;
class IDocumentSettingAccess;
@@ -258,7 +258,7 @@ public:
IDocumentListItems& getIDocumentListItems();
/// Is node in the visible area of the Shell?
- sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const;
+ sal_Bool IsInVisibleArea( SwViewShell* pSh = 0 ) const;
/// Is node in an protected area?
bool IsInProtectSect() const;
/** Is node in something that is protected (range, frame,
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index cf31422..98b1566 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -29,7 +29,7 @@
// datatype <SwTwips>
#include <swtypes.hxx>
-class ViewShell;
+class SwViewShell;
class SwRootFrm;
class SwPageFrm;
class Fraction;
@@ -43,14 +43,14 @@ struct PreviewPage;
class SwPagePreviewLayout
{
private:
- friend class ViewShell;
+ friend class SwViewShell;
/// number of horizontal and vertical twips for spacing between the pages.
const SwTwips mnXFree;
const SwTwips mnYFree;
/// view shell the print preview is generated for.
- ViewShell& mrParentViewShell;
+ SwViewShell& mrParentViewShell;
/// top layout frame of the layout for accessing the pages
const SwRootFrm& mrLayoutRootFrm;
@@ -237,7 +237,7 @@ public:
Reference will be hold as member <mrLayoutRootFrm> in order to get
access to the page frames.
*/
- SwPagePreviewLayout( ViewShell& _rParentViewShell,
+ SwPagePreviewLayout( SwViewShell& _rParentViewShell,
const SwRootFrm& _rLayoutRootFrm );
/** destructor of <SwPagePreviewLayout>
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 05aa4c1..e111955 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -37,7 +37,7 @@ class _SetGetExpFlds;
class SwViewOption;
class OutputDevice;
class SwViewOptionAdjust_Impl;
-class ViewShell;
+class SwViewShell;
class SfxViewShell;
// forward declarations
@@ -248,7 +248,7 @@ public:
/// an array of "_SetGetExpFld *" sorted by page and line numbers
::boost::scoped_ptr<_SetGetExpFlds> m_pPostItFields;
/// this contains a SwDoc with the post-it content
- ::boost::scoped_ptr<ViewShell> m_pPostItShell;
+ ::boost::scoped_ptr<SwViewShell> m_pPostItShell;
public:
SwRenderData();
@@ -263,8 +263,8 @@ public:
void SetTempDocShell(SfxObjectShellLock const&);
bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; }
- bool NeedNewViewOptionAdjust( const ViewShell& ) const;
- void ViewOptionAdjustStart( ViewShell &rSh, const SwViewOption &rViewOptions);
+ bool NeedNewViewOptionAdjust( const SwViewShell& ) const;
+ void ViewOptionAdjustStart( SwViewShell &rSh, const SwViewOption &rViewOptions);
void ViewOptionAdjust( SwPrintData const* const pPrtOptions );
void ViewOptionAdjustStop();
void ViewOptionAdjustCrashPreventionKludge();
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 91c3590..7fa39a8 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -130,7 +130,7 @@ public:
sal_Bool GoEndWord();
sal_Bool GoNextWord();
sal_Bool GoPrevWord();
- sal_Bool SelectWord( ViewShell* pViewShell, const Point* pPt = 0 );
+ sal_Bool SelectWord( SwViewShell* pViewShell, const Point* pPt = 0 );
// API versions of above functions (will be used with a different
// WordType for the break iterator)
@@ -141,7 +141,7 @@ public:
sal_Bool GoEndWordWT( sal_Int16 nWordType );
sal_Bool GoNextWordWT( sal_Int16 nWordType );
sal_Bool GoPrevWordWT( sal_Int16 nWordType );
- sal_Bool SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 );
+ sal_Bool SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 );
enum SentenceMoveType
{
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 6aab290a..9e755ad 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -21,12 +21,12 @@
#include <rtl/ustring.hxx>
-class ViewShell;
+class SwViewShell;
#define URLLOAD_NOFILTER 0x0000
#define URLLOAD_NEWVIEW 0x8000
-void LoadURL( ViewShell& rSh, const OUString& rName,
+void LoadURL( SwViewShell& rSh, const OUString& rName,
sal_uInt16 nFilter, const OUString& rTargetFrameName );
#endif
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 2f5a1e1..bf6678f 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -118,7 +118,7 @@ class SfxViewFrame;
class SwPrintUIOptions;
class SwPrintData;
class SwRenderData;
-class ViewShell;
+class SwViewShell;
typedef std::deque<UnoActionContext*> ActionContextArr;
@@ -568,21 +568,21 @@ public:
/* The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
- the current ViewShell so that fields are not printed as commands and
+ the current SwViewShell so that fields are not printed as commands and
hidden characters are always invisible. Hidden text and place holders
should be printed according to the current print options.
After printing the view options are restored
-----------------------------------------------------------------------*/
class SwViewOptionAdjust_Impl
{
- ViewShell * m_pShell;
+ SwViewShell * m_pShell;
SwViewOption m_aOldViewOptions;
public:
- SwViewOptionAdjust_Impl( ViewShell& rSh, const SwViewOption &rViewOptions );
+ SwViewOptionAdjust_Impl( SwViewShell& rSh, const SwViewOption &rViewOptions );
~SwViewOptionAdjust_Impl();
void AdjustViewOptions( SwPrintData const* const pPrtOptions );
- bool checkShell( const ViewShell& rCompare ) const
+ bool checkShell( const SwViewShell& rCompare ) const
{ return &rCompare == m_pShell; }
void DontTouchThatViewShellItSmellsFunny() { m_pShell = 0; }
};
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 89f2ef8..d916bbf 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -33,7 +33,7 @@
class SwRect;
class Window;
class OutputDevice;
-class ViewShell;
+class SwViewShell;
class SwDocShell;
namespace svtools{ class ColorConfig;}
@@ -136,8 +136,8 @@ protected:
static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips
OUString sSymbolFont; // Symbolfont.
- sal_uInt32 nCoreOptions; // Bits for ViewShell.
- sal_uInt32 nCore2Options; // Bits for ViewShell.
+ sal_uInt32 nCoreOptions; // Bits for SwViewShell.
+ sal_uInt32 nCore2Options; // Bits for SwViewShell.
sal_uInt32 nUIOptions; // UI-Bits
Color aRetoucheColor; // DefaultBackground for BrowseView
Size aSnapSize; // Describes horizontal and vertical snap.
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 312e563..734a066 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -95,10 +95,10 @@ enum FrameControlType
#define VSHELLFLAG_SHARELAYOUT ((long)0x2)
typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr;
-class SW_DLLPUBLIC ViewShell : public Ring
+class SW_DLLPUBLIC SwViewShell : public Ring
{
- friend void SetOutDev( ViewShell *pSh, OutputDevice *pOut );
- friend void SetOutDevAndWin( ViewShell *pSh, OutputDevice *pOut,
+ friend void SetOutDev( SwViewShell *pSh, OutputDevice *pOut );
+ friend void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pOut,
Window *pWin, sal_uInt16 nZoom );
friend class SwViewImp;
@@ -109,7 +109,7 @@ class SW_DLLPUBLIC ViewShell : public Ring
// Set SwVisArea in order to enable clean formatting before printing.
- friend void SetSwVisArea( ViewShell *pSh, const SwRect & );
+ friend void SetSwVisArea( SwViewShell *pSh, const SwRect & );
static BitmapEx* mpReplaceBmp; ///< replaced display of still loaded images
static BitmapEx* mpErrorBmp; ///< error display of missed images
@@ -124,7 +124,7 @@ class SW_DLLPUBLIC ViewShell : public Ring
SwRect maInvalidRect;
SfxViewShell *mpSfxViewShell;
- SwViewImp *mpImp; // Core-internals of ViewShell.
+ SwViewImp *mpImp; // Core-internals of SwViewShell.
// The pointer is never 0.
Window *mpWin; ///< = 0 during printing or pdf export
@@ -147,7 +147,7 @@ class SW_DLLPUBLIC ViewShell : public Ring
sal_Bool mbViewLocked :1; // Lock visible range;
// in this case MakeVisible is ineffectual.
sal_Bool mbInEndAction :1; // Avoid problems, cf. viewsh.cxx.
- sal_Bool mbPreview :1; // If sal_True it is a Preview-ViewShell.
+ sal_Bool mbPreview :1; // If sal_True it is a Preview-SwViewShell.
sal_Bool mbFrameView :1; // If sal_True it is a (HTML-)Frame.
sal_Bool mbEnableSmooth :1; // Disable SmoothScroll, e.g. for drag
// of scrollbars.
@@ -343,7 +343,7 @@ public:
inline Window* GetWin() const { return mpWin; }
inline OutputDevice* GetOut() const { return mpOut; }
- static inline sal_Bool IsLstEndAction() { return ViewShell::mbLstAct; }
+ static inline sal_Bool IsLstEndAction() { return SwViewShell::mbLstAct; }
// Change of all page descriptors.
void ChgAllPageOrientation( sal_uInt16 eOri );
@@ -429,9 +429,9 @@ public:
static ShellResource* GetShellRes();
static void SetCareWin( Window* pNew );
- static Window* GetCareWin(ViewShell& rVSh)
+ static Window* GetCareWin(SwViewShell& rVSh)
{ return mpCareWindow ? mpCareWindow : CareChildWin(rVSh); }
- static Window* CareChildWin(ViewShell& rVSh);
+ static Window* CareChildWin(SwViewShell& rVSh);
inline SfxViewShell *GetSfxViewShell() { return mpSfxViewShell; }
inline void SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }
@@ -468,7 +468,7 @@ public:
// DrawView may be used at UI.
SdrView *GetDrawView();
- const SdrView *GetDrawView() const { return ((ViewShell*)this)->GetDrawView(); }
+ const SdrView *GetDrawView() const { return ((SwViewShell*)this)->GetDrawView(); }
// Take care that MarkList is up-to-date in any case (Bug 57153).
SdrView *GetDrawViewWithValidMarkList();
@@ -542,12 +542,12 @@ public:
SwAccessibleMap* GetAccessibleMap();
- ViewShell( ViewShell&, Window *pWin = 0, OutputDevice *pOut = 0,
+ SwViewShell( SwViewShell&, Window *pWin = 0, OutputDevice *pOut = 0,
long nFlags = 0 );
- ViewShell( SwDoc& rDoc, Window *pWin,
+ SwViewShell( SwDoc& rDoc, Window *pWin,
const SwViewOption *pOpt = 0, OutputDevice *pOut = 0,
long nFlags = 0 );
- virtual ~ViewShell();
+ virtual ~SwViewShell();
sal_Int32 GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const;
@@ -556,7 +556,7 @@ public:
static const BitmapEx& GetReplacementBitmap( bool bIsErrorState );
static void DeleteReplacementBitmaps();
- const SwPostItMgr* GetPostItMgr() const { return (const_cast<ViewShell*>(this))->GetPostItMgr(); }
+ const SwPostItMgr* GetPostItMgr() const { return (const_cast<SwViewShell*>(this))->GetPostItMgr(); }
SwPostItMgr* GetPostItMgr();
/// Acts both for headers / footers, depending on the bShow(Header|Footer)Separator flags
@@ -573,43 +573,43 @@ public:
class CurrShell
{
public:
- ViewShell *pPrev;
+ SwViewShell *pPrev;
SwRootFrm *pRoot;
- CurrShell( ViewShell *pNew );
+ CurrShell( SwViewShell *pNew );
~CurrShell();
};
-inline void ViewShell::ResetInvalidRect()
+inline void SwViewShell::ResetInvalidRect()
{
maInvalidRect.Clear();
}
-inline void ViewShell::StartAction()
+inline void SwViewShell::StartAction()
{
if ( !mnStartAction++ )
ImplStartAction();
}
-inline void ViewShell::EndAction( const sal_Bool bIdleEnd )
+inline void SwViewShell::EndAction( const sal_Bool bIdleEnd )
{
if( 0 == (mnStartAction - 1) )
ImplEndAction( bIdleEnd );
--mnStartAction;
}
-inline void ViewShell::LockPaint()
+inline void SwViewShell::LockPaint()
{
if ( !mnLockPaint++ )
ImplLockPaint();
}
-inline void ViewShell::UnlockPaint( sal_Bool bVirDev )
+inline void SwViewShell::UnlockPaint( sal_Bool bVirDev )
{
if ( 0 == --mnLockPaint )
ImplUnlockPaint( bVirDev );
}
-inline const SfxItemPool& ViewShell::GetAttrPool() const
+inline const SfxItemPool& SwViewShell::GetAttrPool() const
{
- return ((ViewShell*)this)->GetAttrPool();
+ return ((SwViewShell*)this)->GetAttrPool();
}
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index aef159d..c43ecdf 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -96,7 +96,7 @@ public:
const SwCrsrShell* GetShell() const { return pCShell; }
// check current MapMode of the shell and set possibly the static members.
// Optional set the parameters pX, pY
- static void Get1PixelInLogic( const ViewShell& rSh,
+ static void Get1PixelInLogic( const SwViewShell& rSh,
long* pX = 0, long* pY = 0 );
};
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 79b2616..a09408c 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -51,7 +51,7 @@ sal_Bool SwAccessibleCell::IsSelected()
sal_Bool bRet = sal_False;
OSL_ENSURE( GetMap(), "no map?" );
- const ViewShell *pVSh = GetMap()->GetShell();
+ const SwViewShell *pVSh = GetMap()->GetShell();
OSL_ENSURE( pVSh, "no shell?" );
if( pVSh->ISA( SwCrsrShell ) )
{
@@ -75,7 +75,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
SwAccessibleContext::GetStates( rStateSet );
// SELECTABLE
- const ViewShell *pVSh = GetMap()->GetShell();
+ const SwViewShell *pVSh = GetMap()->GetShell();
OSL_ENSURE( pVSh, "no shell?" );
if( pVSh->ISA( SwCrsrShell ) )
rStateSet.AddState( AccessibleStateType::SELECTABLE );
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 9639d70..1b02418 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -54,7 +54,7 @@ void SwAccessibleContext::InitStates()
{
bIsShowingState = GetMap() ? IsShowing( *(GetMap()) ) : sal_False;
- ViewShell *pVSh = GetMap()->GetShell();
+ SwViewShell *pVSh = GetMap()->GetShell();
bIsEditableState = pVSh && IsEditable( pVSh );
bIsOpaqueState = pVSh && IsOpaque( pVSh );
bIsDefuncState = sal_False;
@@ -82,7 +82,7 @@ Window *SwAccessibleContext::GetWindow()
if( GetMap() )
{
- const ViewShell *pVSh = GetMap()->GetShell();
+ const SwViewShell *pVSh = GetMap()->GetShell();
OSL_ENSURE( pVSh, "no view shell" );
if( pVSh )
pWin = pVSh->GetWin();
@@ -93,11 +93,11 @@ Window *SwAccessibleContext::GetWindow()
return pWin;
}
-// get ViewShell from accessibility map, and cast to cursor shell
+// get SwViewShell from accessibility map, and cast to cursor shell
SwCrsrShell* SwAccessibleContext::GetCrsrShell()
{
SwCrsrShell* pCrsrShell;
- ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
+ SwViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
OSL_ENSURE( pViewShell, "no view shell" );
if( pViewShell && pViewShell->ISA( SwCrsrShell ) )
pCrsrShell = static_cast<SwCrsrShell*>( pViewShell );
@@ -111,7 +111,7 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
{
// just like non-const GetCrsrShell
const SwCrsrShell* pCrsrShell;
- const ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
+ const SwViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
OSL_ENSURE( pViewShell, "no view shell" );
if( pViewShell && pViewShell->ISA( SwCrsrShell ) )
pCrsrShell = static_cast<const SwCrsrShell*>( pViewShell );
@@ -1260,7 +1260,7 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates )
{
if( GetMap() )
{
- ViewShell *pVSh = GetMap()->GetShell();
+ SwViewShell *pVSh = GetMap()->GetShell();
if( pVSh )
{
if( (_nStates & ACC_STATE_EDITABLE) != 0 )
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index ff6c849..8f2d762 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -107,11 +107,11 @@ protected:
const SwAccessibleMap *GetMap() const { return pMap; }
/** convenience method to get the SwViewShell through accessibility map */
- inline ViewShell* GetShell()
+ inline SwViewShell* GetShell()
{
return GetMap()->GetShell();
}
- inline const ViewShell* GetShell() const
+ inline const SwViewShell* GetShell() const
{
return GetMap()->GetShell();
}
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 14ae647..4726a0b 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -340,7 +340,7 @@ SwRect SwAccessibleFrame::GetBounds( const SwAccessibleMap& rAccMap,
return aBounds;
}
-sal_Bool SwAccessibleFrame::IsEditable( ViewShell *pVSh ) const
+sal_Bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
{
const SwFrm *pFrm = GetFrm();
if( !pFrm )
@@ -357,7 +357,7 @@ sal_Bool SwAccessibleFrame::IsEditable( ViewShell *pVSh ) const
return sal_True;
}
-sal_Bool SwAccessibleFrame::IsOpaque( ViewShell *pVSh ) const
+sal_Bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
{
SwAccessibleChild aFrm( GetFrm() );
if( !aFrm.GetSwFrm() )
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index b435b93..579d087 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -30,7 +30,7 @@
class SwAccessibleMap;
class SwFrm;
-class ViewShell;
+class SwViewShell;
namespace sw { namespace access {
class SwAccessibleChild;
}}
@@ -76,9 +76,9 @@ private:
sal_Bool bInPagePreview );
protected:
- sal_Bool IsEditable( ViewShell *pVSh ) const;
+ sal_Bool IsEditable( SwViewShell *pVSh ) const;
- sal_Bool IsOpaque( ViewShell *pVSh ) const;
+ sal_Bool IsOpaque( SwViewShell *pVSh ) const;
sal_Bool IsShowing( const SwAccessibleMap& rAccMap,
const sw::access::SwAccessibleChild& rFrmOrObj ) const;
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 97e15d2..4e2f874 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -42,7 +42,7 @@ sal_Bool SwAccessibleFrameBase::IsSelected()
sal_Bool bRet = sal_False;
OSL_ENSURE( GetMap(), "no map?" );
- const ViewShell *pVSh = GetMap()->GetShell();
+ const SwViewShell *pVSh = GetMap()->GetShell();
OSL_ENSURE( pVSh, "no shell?" );
if( pVSh->ISA( SwFEShell ) )
{
@@ -60,7 +60,7 @@ void SwAccessibleFrameBase::GetStates(
{
SwAccessibleContext::GetStates( rStateSet );
- const ViewShell *pVSh = GetMap()->GetShell();
+ const SwViewShell *pVSh = GetMap()->GetShell();
OSL_ENSURE( pVSh, "no shell?" );
sal_Bool bSelectable = pVSh->ISA( SwFEShell );
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 60e201f..b26960e 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -76,7 +76,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
if( !rINetFmt.GetValue().isEmpty() )
{
- ViewShell *pVSh = xPara->GetShell();
+ SwViewShell *pVSh = xPara->GetShell();
if( pVSh )
{
LoadURL(*pVSh, rINetFmt.GetValue(), URLLOAD_NOFILTER,
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 198b24e..daa8214 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -985,7 +985,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
SwAccessibleObjShape_Impl *pSelShape = 0;
size_t nShapes = 0;
- const ViewShell *pVSh = GetShell();
+ const SwViewShell *pVSh = GetShell();
const SwFEShell *pFESh = pVSh->ISA( SwFEShell ) ?
static_cast< const SwFEShell * >( pVSh ) : 0;
sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
@@ -1072,7 +1072,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection()
void SwAccessibleMap::DoInvalidateShapeFocus()
{
- const ViewShell *pVSh = GetShell();
+ const SwViewShell *pVSh = GetShell();
const SwFEShell *pFESh = pVSh->ISA( SwFEShell ) ?
static_cast< const SwFEShell * >( pVSh ) : 0;
sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
@@ -1113,7 +1113,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus()
}
}
-SwAccessibleMap::SwAccessibleMap( ViewShell *pSh ) :
+SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) :
mpFrmMap( 0 ),
mpShapeMap( 0 ),
mpShapes( 0 ),
@@ -1889,7 +1889,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
{
SwAccessibleChild aFrmOrObj( pFrm );
bool bShapeSelected = false;
- const ViewShell *pVSh = GetShell();
+ const SwViewShell *pVSh = GetShell();
if( pVSh->ISA( SwCrsrShell ) )
{
const SwCrsrShell *pCSh = static_cast< const SwCrsrShell * >( pVSh );
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 7e6be84..6070f30 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -529,7 +529,7 @@ void SwAccessibleParagraph::ClearPortionData()
void SwAccessibleParagraph::ExecuteAtViewShell( sal_uInt16 nSlot )
{
OSL_ENSURE( GetMap() != NULL, "no map?" );
- ViewShell* pViewShell = GetMap()->GetShell();
+ SwViewShell* pViewShell = GetMap()->GetShell();
OSL_ENSURE( pViewShell != NULL, "View shell expected!" );
SfxViewShell* pSfxShell = pViewShell->GetSfxViewShell();
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 7ea2522..8312ab2 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -50,7 +50,7 @@ SwAccessibleSelectionHelper::~SwAccessibleSelectionHelper()
SwFEShell* SwAccessibleSelectionHelper::GetFEShell()
{
OSL_ENSURE( rContext.GetMap() != NULL, "no map?" );
- ViewShell* pViewShell = rContext.GetMap()->GetShell();
+ SwViewShell* pViewShell = rContext.GetMap()->GetShell();
OSL_ENSURE( pViewShell != NULL,
"No view shell? Then what are you looking at?" );
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 399d9c1..b550bfb 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -54,7 +54,7 @@
using namespace ::com::sun::star;
// shortcut
-#define RESOURCE ViewShell::GetShellRes()
+#define RESOURCE SwViewShell::GetShellRes()
const sal_Char sCalc_Add[] = "add";
const sal_Char sCalc_Sub[] = "sub";
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 18ff56b..ec932e3 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -68,7 +68,7 @@
using namespace com::sun::star;
using namespace util;
-TYPEINIT2(SwCrsrShell,ViewShell,SwModify);
+TYPEINIT2(SwCrsrShell,SwViewShell,SwModify);
/**
* Delete all overlapping Cursors from a Cursor ring.
@@ -226,7 +226,7 @@ void SwCrsrShell::StartAction()
else
m_nLeftFrmPos = 0;
}
- ViewShell::StartAction(); // to the ViewShell
+ SwViewShell::StartAction(); // to the SwViewShell
}
void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
@@ -244,12 +244,12 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
if( 1 == mnStartAction )
GetDoc()->UpdateNumRule();
- // #i76923#: Don't show the cursor in the ViewShell::EndAction() - call.
+ // #i76923#: Don't show the cursor in the SwViewShell::EndAction() - call.
// Only the UpdateCrsr shows the cursor.
sal_Bool bSavSVCrsrVis = m_bSVCrsrVis;
m_bSVCrsrVis = sal_False;
- ViewShell::EndAction( bIdleEnd ); // have ViewShell go first
+ SwViewShell::EndAction( bIdleEnd ); // have SwViewShell go first
m_bSVCrsrVis = bSavSVCrsrVis;
@@ -1177,7 +1177,7 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
}
// re-paint area
- ViewShell::Paint( rRect );
+ SwViewShell::Paint( rRect );
if( m_bHasFocus && !m_bBasicHideCrsr )
{
@@ -1211,9 +1211,9 @@ void SwCrsrShell::VisPortChgd( const SwRect & rRect )
m_aOldRBPos.setY(VisArea().Bottom());
// For not having problems with the SV cursor, Update() is called for the
- // Window in ViewShell::VisPo...
+ // Window in SwViewShell::VisPo...
// During painting no selections should be shown, thus the call is encapsulated. <- TODO: old artefact?
- ViewShell::VisPortChgd( rRect ); // move area
+ SwViewShell::VisPortChgd( rRect ); // move area
if( m_bSVCrsrVis && bVis ) // show SV cursor again
m_pVisCrsr->Show();
@@ -2077,7 +2077,7 @@ void SwCrsrShell::ShGetFcs( sal_Bool bUpdate )
/** Get current frame in which the cursor is positioned. */
SwCntntFrm *SwCrsrShell::GetCurrFrm( const sal_Bool bCalcFrm ) const
{
- SET_CURR_SHELL( (ViewShell*)this );
+ SET_CURR_SHELL( (SwViewShell*)this );
SwCntntFrm *pRet = 0;
SwCntntNode *pNd = m_pCurCrsr->GetCntntNode();
if ( pNd )
@@ -2473,7 +2473,7 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
pNew->GetPoint()->nNode = *pNode->EndOfSectionNode();
// take care of all shells
- ViewShell *pTmp = this;
+ SwViewShell *pTmp = this;
do {
if( pTmp->IsA( TYPE( SwCrsrShell )))
{
@@ -2495,7 +2495,7 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
}
}
}
- } while ( this != (pTmp = (ViewShell*)pTmp->GetNext() ));
+ } while ( this != (pTmp = (SwViewShell*)pTmp->GetNext() ));
delete pNew;
}
@@ -2505,7 +2505,7 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
All views of a document are in the ring of the shell.
*/
SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
- : ViewShell( rShell, pInitWin ),
+ : SwViewShell( rShell, pInitWin ),
SwModify( 0 ), m_pCrsrStk( 0 ), m_pBlockCrsr( 0 ), m_pTblCrsr( 0 ),
m_pBoxIdx( 0 ), m_pBoxPtr( 0 ), m_nCrsrMove( 0 ), m_nBasicActionCnt( 0 ),
m_eMvState( MV_NONE ),
@@ -2534,7 +2534,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
/// default constructor
SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
const SwViewOption *pInitOpt )
- : ViewShell( rDoc, pInitWin, pInitOpt ),
+ : SwViewShell( rDoc, pInitWin, pInitOpt ),
SwModify( 0 ), m_pCrsrStk( 0 ), m_pBlockCrsr( 0 ), m_pTblCrsr( 0 ),
m_pBoxIdx( 0 ), m_pBoxPtr( 0 ), m_nCrsrMove( 0 ), m_nBasicActionCnt( 0 ),
m_eMvState( MV_NONE ), // state for crsr-travelling - GetCrsrOfst
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index cfc6b7c..6f32279 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -293,7 +293,7 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
}
SwDocShell *const pDocShell = pNode->GetDoc()->GetDocShell();
- ViewShell *const pWrtShell = (pDocShell) ? (ViewShell*)(pDocShell->GetWrtShell()) : 0;
+ SwViewShell *const pWrtShell = (pDocShell) ? (SwViewShell*)(pDocShell->GetWrtShell()) : 0;
SwPostItMgr *const pPostItMgr = (pWrtShell) ? pWrtShell->GetPostItMgr() : 0;
xub_StrLen aStart = 0;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 7d15de1..f9a1b2e 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1097,7 +1097,7 @@ sal_Bool SwCursor::GoPrevWord()
return GoPrevWordWT( WordType::ANYWORD_IGNOREWHITESPACES );
}
-sal_Bool SwCursor::SelectWord( ViewShell* pViewShell, const Point* pPt )
+sal_Bool SwCursor::SelectWord( SwViewShell* pViewShell, const Point* pPt )
{
return SelectWordWT( pViewShell, WordType::ANYWORD_IGNOREWHITESPACES, pPt );
}
@@ -1274,7 +1274,7 @@ sal_Bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
return bRet;
}
-sal_Bool SwCursor::SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt )
+sal_Bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt )
{
SwCrsrSaveState aSave( *this );
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index c9eb6c7..0480814 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -811,7 +811,7 @@ sal_Bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
const SwTxtNode* pNd = GetDoc()->GetNodes()[
pSttNd->GetIndex() + 1 ]->GetTxtNode();
if( !pNd ||
- ( pNd->GetTxt() == ViewShell::GetShellRes()->aCalc_Error &&
+ ( pNd->GetTxt() == SwViewShell::GetShellRes()->aCalc_Error &&
SFX_ITEM_SET == pChkBox->GetFrmFmt()->
GetItemState( RES_BOXATR_FORMULA )) )
pChkBox = 0;
@@ -877,13 +877,13 @@ void SwCrsrShell::ClearTblBoxCntnt()
sal_Bool SwCrsrShell::EndAllTblBoxEdit()
{
sal_Bool bRet = sal_False;
- ViewShell *pSh = this;
+ SwViewShell *pSh = this;
do {
if( pSh->IsA( TYPE( SwCrsrShell ) ) )
bRet |= ((SwCrsrShell*)pSh)->CheckTblBoxCntnt(
((SwCrsrShell*)pSh)->m_pCurCrsr->GetPoint() );
- } while( this != (pSh = (ViewShell *)pSh->GetNext()) );
+ } while( this != (pSh = (SwViewShell *)pSh->GetNext()) );
return bRet;
}
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 68e6a5b..c925e4c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -161,7 +161,7 @@ void SwVisCrsr::_SetPosAndShow()
if( aRect.Height() )
{
::SwCalcPixStatics( m_pCrsrShell->GetOut() );
- ::SwAlignRect( aRect, (ViewShell*)m_pCrsrShell );
+ ::SwAlignRect( aRect, (SwViewShell*)m_pCrsrShell );
}
if( !m_pCrsrShell->IsOverwriteCrsr() || m_bIsDragCrsr ||
m_pCrsrShell->IsSelection() )
@@ -367,7 +367,7 @@ void SwSelPaintRects::Paint( const Rectangle& /*rRect*/ )
// check current MapMode of the shell and set possibly the static members.
// Optional set the parameters pX, pY
-void SwSelPaintRects::Get1PixelInLogic( const ViewShell& rSh,
+void SwSelPaintRects::Get1PixelInLogic( const SwViewShell& rSh,
long* pX, long* pY )
{
const OutputDevice* pOut = rSh.GetWin();
@@ -488,13 +488,13 @@ short SwShellCrsr::MaxReplaceArived()
// a SSelection can be created.
std::vector<sal_uInt16> aArr;
sal_uInt16 nActCnt;
- ViewShell *pShell = const_cast< SwCrsrShell* >( GetShell() ),
+ SwViewShell *pShell = const_cast< SwCrsrShell* >( GetShell() ),
*pSh = pShell;
do {
for( nActCnt = 0; pSh->ActionPend(); ++nActCnt )
pSh->EndAction();
aArr.push_back( nActCnt );
- } while( pShell != ( pSh = (ViewShell*)pSh->GetNext() ) );
+ } while( pShell != ( pSh = (SwViewShell*)pSh->GetNext() ) );
{
nRet = QueryBox( pDlg, SW_RES( MSG_COMCORE_ASKSEARCH )).Execute();
@@ -504,7 +504,7 @@ short SwShellCrsr::MaxReplaceArived()
{
for( nActCnt = aArr[n]; nActCnt--; )
pSh->StartAction();
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
}
}
else
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b826398..f580a1c 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -193,7 +193,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case TAB_OVER_MARGIN: return mbTabOverMargin;
case SURROUND_TEXT_WRAP_SMALL: return mbSurroundTextWrapSmall;
- case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the ViewShell has to be asked!
+ case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the SwViewShell has to be asked!
case HTML_MODE: return mbHTMLMode;
case GLOBAL_DOCUMENT: return mbIsGlobalDoc;
case GLOBAL_DOCUMENT_SAVE_LINKS: return mbGlblDocSaveLinks;
@@ -354,7 +354,7 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
// COMPATIBILITY FLAGS END
- case BROWSE_MODE: //can be used temporary (load/save) when no ViewShell is avaiable
+ case BROWSE_MODE: //can be used temporary (load/save) when no SwViewShell is avaiable
mbLastBrowseMode = value;
break;
@@ -563,7 +563,7 @@ void SwDoc::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/
delete mpPrt;
mpPrt = pP;
- // our printer should always use TWIP. Don't rely on this being set in ViewShell::InitPrt, there
+ // our printer should always use TWIP. Don't rely on this being set in SwViewShell::InitPrt, there
// are situations where this isn't called.
// #i108712# / 2010-02-26 / frank.schoenheit at sun.com
if ( mpPrt )
@@ -1227,7 +1227,7 @@ static void lcl_FormatPostIt(
{
static char const sTmp[] = " : ";
- OSL_ENSURE( ViewShell::GetShellRes(), "missing ShellRes" );
+ OSL_ENSURE( SwViewShell::GetShellRes(), "missing ShellRes" );
if (bNewPage)
{
@@ -1241,19 +1241,19 @@ static void lcl_FormatPostIt(
pIDCO->SplitNode( *aPam.GetPoint(), false );
}
- OUString aStr( ViewShell::GetShellRes()->aPostItPage );
+ OUString aStr( SwViewShell::GetShellRes()->aPostItPage );
aStr += sTmp;
aStr += OUString::number( nPageNo );
aStr += " ";
if( nLineNo )
{
- aStr += ViewShell::GetShellRes()->aPostItLine;
+ aStr += SwViewShell::GetShellRes()->aPostItLine;
aStr += sTmp;
aStr += OUString::number( nLineNo );
aStr += " ";
}
- aStr += ViewShell::GetShellRes()->aPostItAuthor;
+ aStr += SwViewShell::GetShellRes()->aPostItAuthor;
aStr += sTmp;
aStr += pField->GetPar1();
aStr += " ";
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 0d1d8c3..552b10c 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -896,14 +896,14 @@ namespace sw { namespace mark
#define PCURSH ((SwCrsrShell*)_pStartShell)
#define FOREACHSHELL_START( pEShell ) \
{\
- ViewShell *_pStartShell = pEShell; \
+ SwViewShell *_pStartShell = pEShell; \
do { \
if( _pStartShell->IsA( TYPE( SwCrsrShell )) ) \
{
#define FOREACHSHELL_END( pEShell ) \
} \
- } while((_pStartShell=(ViewShell*)_pStartShell->GetNext())!= pEShell ); \
+ } while((_pStartShell=(SwViewShell*)_pStartShell->GetNext())!= pEShell ); \
}
namespace
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 9003160..27387b0 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -93,7 +93,7 @@ bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
void SwDoc::DoUpdateAllCharts()
{
- ViewShell* pVSh;
+ SwViewShell* pVSh;
GetEditShell( &pVSh );
if( pVSh )
{
@@ -114,7 +114,7 @@ void SwDoc::DoUpdateAllCharts()
}
}
-void SwDoc::_UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const
+void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell& rVSh ) const
{
OUString aName( rTbl.GetFrmFmt()->GetName() );
SwOLENode *pONd;
@@ -142,7 +142,7 @@ void SwDoc::UpdateCharts( const OUString &rName ) const
SwTable* pTmpTbl = SwTable::FindTable( FindTblFmtByName( rName ) );
if( pTmpTbl )
{
- ViewShell* pVSh;
+ SwViewShell* pVSh;
GetEditShell( &pVSh );
if( pVSh )
@@ -183,7 +183,7 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
{
pNd->SetChartTblName( rNewName );
- ViewShell* pVSh;
+ SwViewShell* pVSh;
GetEditShell( &pVSh );
SwTable* pTable = SwTable::FindTable( &rTblFmt );
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 9376d60..9dd757c 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -38,14 +38,14 @@
#define PCURSH ((SwCrsrShell*)_pStartShell)
#define FOREACHSHELL_START( pEShell ) \
{\
- ViewShell *_pStartShell = pEShell; \
+ SwViewShell *_pStartShell = pEShell; \
do { \
if( _pStartShell->IsA( TYPE( SwCrsrShell )) ) \
{
#define FOREACHSHELL_END( pEShell ) \
} \
- } while((_pStartShell=(ViewShell*)_pStartShell->GetNext())!= pEShell ); \
+ } while((_pStartShell=(SwViewShell*)_pStartShell->GetNext())!= pEShell ); \
}
namespace
@@ -314,12 +314,12 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
::PaMCorrRel(rOldNode, rNewPos, nOffset);
}
-SwEditShell* SwDoc::GetEditShell( ViewShell** ppSh ) const
+SwEditShell* SwDoc::GetEditShell( SwViewShell** ppSh ) const
{
// Layout and OLE shells should be available
if( mpCurrentView )
{
- ViewShell *pSh = mpCurrentView, *pVSh = pSh;
+ SwViewShell *pSh = mpCurrentView, *pVSh = pSh;
if( ppSh )
*ppSh = pSh;
@@ -328,7 +328,7 @@ SwEditShell* SwDoc::GetEditShell( ViewShell** ppSh ) const
if( pSh->IsA( TYPE( SwEditShell ) ) )
return (SwEditShell*)pSh;
- } while( pVSh != ( pSh = (ViewShell*)pSh->GetNext() ));
+ } while( pVSh != ( pSh = (SwViewShell*)pSh->GetNext() ));
}
else if( ppSh )
*ppSh = 0;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index ed370d67..413a00d 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -610,7 +610,7 @@ void SwDoc::PrtDataChanged()
bool bDraw = true;
if ( pTmpRoot )
{
- ViewShell *pSh = GetCurrentViewShell();
+ SwViewShell *pSh = GetCurrentViewShell();
if( pSh &&
(!pSh->GetViewOptions()->getBrowseMode() ||
pSh->GetViewOptions()->IsPrtFormat()) )
@@ -636,7 +636,7 @@ void SwDoc::PrtDataChanged()
do
{
pSh->InitPrt( mpPrt );
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
}
while ( pSh != GetCurrentViewShell() );
}
@@ -670,10 +670,10 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
SwFEShell *pShell = 0;
if ( GetCurrentViewShell() )
{
- ViewShell *pSh = GetCurrentViewShell();
+ SwViewShell *pSh = GetCurrentViewShell();
if ( !pSh->ISA(SwFEShell) )
do
- { pSh = (ViewShell*)pSh->GetNext();
+ { pSh = (SwViewShell*)pSh->GetNext();
} while ( !pSh->ISA(SwFEShell) &&
pSh != GetCurrentViewShell() );
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index e05fbd7..da57321 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -603,7 +603,7 @@ void SwDoc::InitDrawModel()
mpDrawModel->SetNotifyUndoActionHdl( LINK( this, SwDoc, AddDrawUndo ));
if ( mpCurrentView )
{
- ViewShell* pViewSh = mpCurrentView;
+ SwViewShell* pViewSh = mpCurrentView;
do
{
SwRootFrm* pRoot = pViewSh->GetLayout();
@@ -617,7 +617,7 @@ void SwDoc::InitDrawModel()
pRoot->SetDrawPage( pDrawPage );
pDrawPage->SetSize( pRoot->Frm().SSize() );
}
- pViewSh = (ViewShell*)pViewSh->GetNext();
+ pViewSh = (SwViewShell*)pViewSh->GetNext();
}while( pViewSh != mpCurrentView );
}
}
@@ -766,11 +766,11 @@ SdrModel* SwDoc::_MakeDrawModel()
InitDrawModel();
if ( mpCurrentView )
{
- ViewShell* pTmp = mpCurrentView;
+ SwViewShell* pTmp = mpCurrentView;
do
{
pTmp->MakeDrawView();
- pTmp = (ViewShell*) pTmp->GetNext();
+ pTmp = (SwViewShell*) pTmp->GetNext();
} while ( pTmp != mpCurrentView );
// Broadcast, so that the FormShell can be connected to the DrawView
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index ba265a3..b28a51c 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1802,7 +1802,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
if( pTmpRoot &&
!SfxProgress::GetActiveProgress( mpDocShell ) )
{
- ViewShell *pSh, *pStartSh;
+ SwViewShell *pSh, *pStartSh;
pSh = pStartSh = GetCurrentViewShell();
do {
if( pSh->ActionPend() )
@@ -1810,7 +1810,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
pTimer->Start();
return 0;
}
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
} while( pSh != pStartSh );
if( pTmpRoot->IsNeedGrammarCheck() )
@@ -1883,7 +1883,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
IMPL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem*, EMPTYARG )
{
- ViewShell *pSh, *pStartSh;
+ SwViewShell *pSh, *pStartSh;
pSh = pStartSh = pThis->GetCurrentViewShell();
if( pStartSh )
do {
@@ -1893,7 +1893,7 @@ IMPL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem*, EMPTYARG )
pSh->LockPaint();
pSh->UnlockPaint( sal_True );
}
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
} while( pSh != pStartSh );
return 0;
}
@@ -2236,7 +2236,7 @@ bool SwDoc::IsInVerticalText( const SwPosition& rPos, const Point* pPt ) const
return FRMDIR_VERT_TOP_RIGHT == nDir || FRMDIR_VERT_TOP_LEFT == nDir;
}
-void SwDoc::SetCurrentViewShell( ViewShell* pNew )
+void SwDoc::SetCurrentViewShell( SwViewShell* pNew )
{
mpCurrentView = pNew;
}
@@ -2256,18 +2256,18 @@ void SwDoc::SetLayouter( SwLayouter* pNew )
mpLayouter = pNew;
}
-const ViewShell *SwDoc::GetCurrentViewShell() const
+const SwViewShell *SwDoc::GetCurrentViewShell() const
{
return mpCurrentView;
}
-ViewShell *SwDoc::GetCurrentViewShell()
+SwViewShell *SwDoc::GetCurrentViewShell()
{
return mpCurrentView;
}
-// It must be able to communicate to a ViewShell. This is going to be removed later.
+// It must be able to communicate to a SwViewShell. This is going to be removed later.
const SwRootFrm *SwDoc::GetCurrentLayout() const
{
if(GetCurrentViewShell())
@@ -2291,8 +2291,8 @@ bool SwDoc::HasLayout() const
std::set<SwRootFrm*> SwDoc::GetAllLayouts()
{
std::set<SwRootFrm*> aAllLayouts;
- ViewShell *pStart = GetCurrentViewShell();
- ViewShell *pTemp = pStart;
+ SwViewShell *pStart = GetCurrentViewShell();
+ SwViewShell *pTemp = pStart;
if ( pTemp )
{
do
@@ -2300,7 +2300,7 @@ std::set<SwRootFrm*> SwDoc::GetAllLayouts()
if (pTemp->GetLayout())
{
aAllLayouts.insert(pTemp->GetLayout());
- pTemp = (ViewShell*)pTemp->GetNext();
+ pTemp = (SwViewShell*)pTemp->GetNext();
}
} while(pTemp!=pStart);
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 6c9ab2b..5385509 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -970,7 +970,7 @@ void SwDoc::UpdateLinks( bool bUI )
SFX_CREATE_MODE_PREVIEW != eMode &&
!GetDocShell()->IsPreview() )
{
- ViewShell* pVSh = 0;
+ SwViewShell* pVSh = 0;
bool bAskUpdate = nLinkMode == MANUAL;
bool bUpdate = true;
switch(nUpdateDocMode)
@@ -986,7 +986,7 @@ void SwDoc::UpdateLinks( bool bUI )
Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0;
if( GetCurrentViewShell() && !GetEditShell( &pVSh ) && !pVSh )
{
- ViewShell aVSh( *this, 0, 0 );
+ SwViewShell aVSh( *this, 0, 0 );
SET_CURR_SHELL( &aVSh );
GetLinkManager().UpdateAllLinks( bAskUpdate , true, false, pDlgParent );
@@ -1041,7 +1041,7 @@ SwDoc::GetIDocumentUndoRedo() const
void SwDoc::InitTOXTypes()
{
- ShellResource* pShellRes = ViewShell::GetShellRes();
+ ShellResource* pShellRes = SwViewShell::GetShellRes();
SwTOXType * pNew = new SwTOXType(TOX_CONTENT, pShellRes->aTOXContentName );
mpTOXTypes->push_back( pNew );
pNew = new SwTOXType(TOX_INDEX, pShellRes->aTOXIndexName );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 28bdde5..2620ce8 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2739,7 +2739,7 @@ void SwRedlineTbl::Remove( sal_uInt16 nP )
erase( begin() + nP );
- ViewShell* pSh;
+ SwViewShell* pSh;
if( pDoc && !pDoc->IsInDtor() &&
0 != ( pSh = pDoc->GetCurrentViewShell()) )
pSh->InvalidateWindows( SwRect( 0, 0, LONG_MAX, LONG_MAX ) );
@@ -2760,7 +2760,7 @@ void SwRedlineTbl::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
delete *it;
erase( begin() + nP, begin() + nP + nL );
- ViewShell* pSh;
+ SwViewShell* pSh;
if( pDoc && !pDoc->IsInDtor() &&
0 != ( pSh = pDoc->GetCurrentViewShell() ) )
pSh->InvalidateWindows( SwRect( 0, 0, LONG_MAX, LONG_MAX ) );
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index ba545ab..9924534 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -318,7 +318,7 @@ void SwHTMLTableLayout::GetAvail( sal_uInt16 nCol, sal_uInt16 nColSpan,
sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByVisArea( const SwDoc& rDoc )
{
- ViewShell *pVSh = 0;
+ SwViewShell *pVSh = 0;
rDoc.GetEditShell( &pVSh );
if( pVSh )
{
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 46164fd..2febb36 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -87,7 +87,7 @@ inline bool GetRealURL( const SwGrfNode& rNd, OUString& rTxt )
}
static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
- const ViewShell &rSh, const SwNoTxtFrm *pFrm,
+ const SwViewShell &rSh, const SwNoTxtFrm *pFrm,
bool bDefect )
{
static Font *pFont = 0;
@@ -132,7 +132,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText,
pFont->SetUnderline( eUnderline );
pFont->SetColor( aCol );
- const BitmapEx& rBmp = ViewShell::GetReplacementBitmap( bDefect );
+ const BitmapEx& rBmp = SwViewShell::GetReplacementBitmap( bDefect );
Graphic::DrawEx( rSh.GetOut(), rText, *pFont, rBmp, rRect.Pos(), rRect.SSize() );
}
@@ -162,7 +162,7 @@ SwNoTxtFrm::~SwNoTxtFrm()
StopAnimation();
}
-void SetOutDev( ViewShell *pSh, OutputDevice *pOut )
+void SetOutDev( SwViewShell *pSh, OutputDevice *pOut )
{
pSh->mpOut = pOut;
}
@@ -197,7 +197,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
if ( Frm().IsEmpty() )
return;
- const ViewShell* pSh = getRootFrm()->GetCurrShell();
+ const SwViewShell* pSh = getRootFrm()->GetCurrShell();
if( !pSh->GetViewOptions()->IsGraphic() )
{
StopAnimation();
@@ -560,7 +560,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
bComplete = false;
SwGrfNode* pNd = (SwGrfNode*) GetNode();
- ViewShell *pVSh = 0;
+ SwViewShell *pVSh = 0;
pNd->GetDoc()->GetEditShell( &pVSh );
if( pVSh )
{
@@ -568,7 +568,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if( pNd->GetGrfObj().IsCached( pVSh->GetOut(), Point(),
Prt().SSize(), &pNd->GetGraphicAttr( aAttr, this ) ))
{
- ViewShell *pSh = pVSh;
+ SwViewShell *pSh = pVSh;
do {
SET_CURR_SHELL( pSh );
if( pSh->GetWin() )
@@ -578,7 +578,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
else
pSh->GetWin()->Invalidate( Frm().SVRect() );
}
- } while( pVSh != (pSh = (ViewShell*)pSh->GetNext() ));
+ } while( pVSh != (pSh = (SwViewShell*)pSh->GetNext() ));
}
else
pNd->SwapIn();
@@ -619,12 +619,12 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
SwRect aRect( Frm() );
- ViewShell *pVSh = 0;
+ SwViewShell *pVSh = 0;
pNd->GetDoc()->GetEditShell( &pVSh );
if( !pVSh )
break;
- ViewShell *pSh = pVSh;
+ SwViewShell *pSh = pVSh;
do {
SET_CURR_SHELL( pSh );
if( pSh->IsPreview() )
@@ -639,7 +639,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
pSh->GetWin()->Invalidate( aRect.SVRect() );
}
- pSh = (ViewShell *)pSh->GetNext();
+ pSh = (SwViewShell *)pSh->GetNext();
} while( pSh != pVSh );
}
break;
@@ -780,7 +780,7 @@ bool paintUsingPrimitivesHelper(
@todo pixel-align coordinations for drawing graphic. */
void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) const
{
- ViewShell* pShell = getRootFrm()->GetCurrShell();
+ SwViewShell* pShell = getRootFrm()->GetCurrShell();
SwNoTxtNode& rNoTNd = *(SwNoTxtNode*)GetNode();
SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
@@ -1086,7 +1086,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
sal_Bool SwNoTxtFrm::IsTransparent() const
{
- const ViewShell* pSh = getRootFrm()->GetCurrShell();
+ const SwViewShell* pSh = getRootFrm()->GetCurrShell();
if ( !pSh || !pSh->GetViewOptions()->IsGraphic() )
return sal_True;
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index b982ac4..9609bf8 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1113,7 +1113,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
if ( pNew->IsTxtFrm() )
{
- ViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
+ SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
pViewShell->GetLayout()->IsAnyShellAccessible() )
{
@@ -1139,7 +1139,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
if ( pNew->IsTxtFrm() )
{
- ViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
+ SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
pViewShell->GetLayout()->IsAnyShellAccessible() )
{
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index da704fa..0ca0223 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2388,7 +2388,7 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
{
- ViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
+ SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
pViewShell->GetLayout()->IsAnyShellAccessible() )
{
@@ -2423,7 +2423,7 @@ void SwTableNode::DelFrms()
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph will change.
{
- ViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() );
+ SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
pViewShell->GetLayout()->IsAnyShellAccessible() )
{
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index bb17e7c..15a3e52 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -363,7 +363,7 @@ SwTableNode* SwNode::FindTableNode()
}
/// Is the node located in the visible area of the Shell?
-sal_Bool SwNode::IsInVisibleArea( ViewShell* pSh ) const
+sal_Bool SwNode::IsInVisibleArea( SwViewShell* pSh ) const
{
sal_Bool bRet = sal_False;
const SwCntntNode* pNd;
@@ -1207,7 +1207,7 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
if ( pNew->IsTxtFrm() )
{
- ViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
+ SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
pViewShell->GetLayout()->IsAnyShellAccessible() )
{
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index e9425d4..afdaa8c 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1204,7 +1204,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
pDoc->SetVisibleLinks( sal_False );
SwPaM* pPam;
- ViewShell* pVSh = 0;
+ SwViewShell* pVSh = 0;
SwEditShell* pESh = pDoc->GetEditShell( &pVSh );
pDoc->LockExpFlds();
{
@@ -1455,7 +1455,7 @@ void SwIntrnlSectRefLink::Closed()
for( sal_uInt16 n = rFmts.size(); n; )
if( rFmts[ --n ] == &rSectFmt )
{
- ViewShell* pSh;
+ SwViewShell* pSh;
SwEditShell* pESh = pDoc->GetEditShell( &pSh );
if( pESh )
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 87af50c..6db9c6d 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -193,7 +193,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
else if( pCntntNode->IsOLENode() )
bUpdate = true;
- ViewShell *pSh = 0;
+ SwViewShell *pSh = 0;
SwEditShell* pESh = pDoc->GetEditShell( &pSh );
if ( bUpdate && bGraphicPieceArrived && !(bSwapIn || bDontNotify) )
@@ -290,7 +290,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
sal_Bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd )
{
sal_Bool bRet = sal_False;
- ViewShell *pSh;
+ SwViewShell *pSh;
CurrShell *pCurr = 0;
if ( pGrfNd->GetDoc()->GetEditShell( &pSh ) )
pCurr = new CurrShell( pSh );
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index cf5c1e9..5c724db 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1043,7 +1043,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
SdrUserCallType eType,
const Rectangle& rOldBoundRect )
{
- // #i26791# - no event handling, if existing <ViewShell>
+ // #i26791# - no event handling, if existing <SwViewShell>
// is in contruction
SwDoc* pDoc = GetFmt()->GetDoc();
if ( pDoc->GetCurrentViewShell() &&
@@ -1061,7 +1061,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
}
//Put on Action, but not if presently anywhere an action runs.
- ViewShell *pSh = 0, *pOrg;
+ SwViewShell *pSh = 0, *pOrg;
SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();
if ( pTmpRoot && pTmpRoot->IsCallbackActionEnabled() )
{
@@ -1072,7 +1072,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
{ if ( pSh->Imp()->IsAction() || pSh->Imp()->IsIdleAction() )
pSh = 0;
else
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
} while ( pSh && pSh != pOrg );
@@ -1734,7 +1734,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
case FLY_AT_PAGE:
{
sal_uInt16 nPgNum = pAnch->GetPageNum();
- ViewShell *pShell = pDrawFrmFmt->getIDocumentLayoutAccess()->GetCurrentViewShell();
+ SwViewShell *pShell = pDrawFrmFmt->getIDocumentLayoutAccess()->GetCurrentViewShell();
if( !pShell )
break;
SwRootFrm* pRoot = pShell->GetLayout();
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 6b83fea..f25c61e 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -408,7 +408,7 @@ namespace
class RestoreMapMode
{
public:
- explicit RestoreMapMode( ViewShell* pViewShell )
+ explicit RestoreMapMode( SwViewShell* pViewShell )
: mbMapModeRestored( false )
, mpOutDev( pViewShell->GetOut() )
{
@@ -449,7 +449,7 @@ namespace
void SwVirtFlyDrawObj::wrap_DoPaintObject() const
{
- ViewShell* pShell = pFlyFrm->getRootFrm()->GetCurrShell();
+ SwViewShell* pShell = pFlyFrm->getRootFrm()->GetCurrShell();
// Only paint when we have a current shell and a DrawingLayer paint is in progress.
// This avcoids evtl. problems with renderers which do processing stuff,
@@ -780,7 +780,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef,
const SwFrm *pRel = GetFlyFrm()->IsFlyLayFrm() ?
GetFlyFrm()->GetAnchorFrm() :
GetFlyFrm()->GetAnchorFrm()->GetUpper();
- const ViewShell *pSh = GetFlyFrm()->getRootFrm()->GetCurrShell();
+ const SwViewShell *pSh = GetFlyFrm()->getRootFrm()->GetCurrShell();
if ( pSh && pRel->IsBodyFrm() &&
pSh->GetViewOptions()->getBrowseMode() &&
pSh->VisArea().HasArea() )
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 5e73e87..cb2daae 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -83,11 +83,11 @@ void InsertGridFrame( SdrPageGridFrameList *pLst, const SwFrm *pPg )
const SdrPageGridFrameList* SwDPage::GetGridFrameList(
const SdrPageView* pPV, const Rectangle *pRect ) const
{
- ViewShell *pSh = ((SwDrawDocument*)GetModel())->GetDoc().GetCurrentViewShell();
+ SwViewShell *pSh = ((SwDrawDocument*)GetModel())->GetDoc().GetCurrentViewShell();
if ( pSh )
{
while ( pSh->Imp()->GetPageView() != pPV )
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
if ( pSh )
{
if ( pGridLst )
@@ -182,9 +182,9 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
if ( !bExecHyperlinks )
- sTxt = ViewShell::GetShellRes()->aLinkCtrlClick + ": " + sTxt;
+ sTxt = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sTxt;
else
- sTxt = ViewShell::GetShellRes()->aLinkClick + ": " + sTxt;
+ sTxt = SwViewShell::GetShellRes()->aLinkClick + ": " + sTxt;
}
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index e4a70ae..f904db5 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -269,7 +269,7 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
sal_uInt16 nSeqNo = 0;
if( STR_AUTOFMTREDL_END > nActionId )
{
- sTxt = ViewShell::GetShellRes()->GetAutoFmtNameLst()[ nActionId ];
+ sTxt = SwViewShell::GetShellRes()->GetAutoFmtNameLst()[ nActionId ];
switch( nActionId )
{
case STR_AUTOFMTREDL_SET_NUMBULET:
@@ -1762,7 +1762,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
{
if( aFlags.bWithRedlining )
{
- OUString sTxt(ViewShell::GetShellRes()->GetAutoFmtNameLst()[
+ OUString sTxt(SwViewShell::GetShellRes()->GetAutoFmtNameLst()[
STR_AUTOFMTREDL_SET_TMPL_HEADLINE ] );
sTxt = sTxt.replaceAll( "$(ARG1)", OUString::number( nLvl + 1 ) );
pDoc->SetAutoFmtRedlineComment( &sTxt );
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 63eb5bc..14710ae 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -598,7 +598,7 @@ void *SwEditShell::GetIMapInventor() const
Graphic SwEditShell::GetIMapGraphic() const
{
// returns always a graphic if the cursor is in a Fly
- SET_CURR_SHELL( (ViewShell*)this );
+ SET_CURR_SHELL( (SwViewShell*)this );
Graphic aRet;
SwPaM* pCrsr = GetCrsr();
if ( !pCrsr->HasMark() )
@@ -1075,7 +1075,7 @@ void SwEditShell::CountWords( SwDocStat& rStat ) const
void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt )
{
SwCrsrShell::StartAction();
- ViewShell::ApplyViewOptions( rOpt );
+ SwViewShell::ApplyViewOptions( rOpt );
SwEditShell::EndAction();
}
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index 6380db0..5a55361 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -57,14 +57,14 @@ const SwRedline& SwEditShell::GetRedline( sal_uInt16 nPos ) const
return *GetDoc()->GetRedlineTbl()[ nPos ];
}
-static void lcl_InvalidateAll( ViewShell* pSh )
+static void lcl_InvalidateAll( SwViewShell* pSh )
{
- ViewShell *pStop = pSh;
+ SwViewShell *pStop = pSh;
do
{
if ( pSh->GetWin() )
pSh->GetWin()->Invalidate();
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
} while ( pSh != pStop );
}
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index c42ed84..977a43c 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -69,39 +69,39 @@ void SwEditShell::SetUndoNoResetModified()
void SwEditShell::StartAllAction()
{
- ViewShell *pSh = this;
+ SwViewShell *pSh = this;
do {
if( pSh->IsA( TYPE( SwEditShell ) ) )
((SwEditShell*)pSh)->StartAction();
else
pSh->StartAction();
- pSh = (ViewShell *)pSh->GetNext();
+ pSh = (SwViewShell *)pSh->GetNext();
} while(pSh != this);
}
void SwEditShell::EndAllAction()
{
- ViewShell *pSh = this;
+ SwViewShell *pSh = this;
do {
if( pSh->IsA( TYPE( SwEditShell ) ) )
((SwEditShell*)pSh)->EndAction();
else
pSh->EndAction();
- pSh = (ViewShell *)pSh->GetNext();
+ pSh = (SwViewShell *)pSh->GetNext();
} while(pSh != this);
}
void SwEditShell::CalcLayout()
{
StartAllAction();
- ViewShell::CalcLayout();
+ SwViewShell::CalcLayout();
- ViewShell *pSh = this;
+ SwViewShell *pSh = this;
do
{
if ( pSh->GetWin() )
pSh->GetWin()->Invalidate();
- pSh = (ViewShell*)pSh->GetNext();
+ pSh = (SwViewShell*)pSh->GetNext();
} while ( pSh != this );
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 1f69c78..8adcd58 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -95,7 +95,7 @@ public:
// no dependencies left?
if( rFldType.GetDepends() && !rFldType.IsModifyLocked() && !ChkNoDataFlag() )
{
- ViewShell* pSh;
+ SwViewShell* pSh;
SwEditShell* pESh = rFldType.GetDoc()->GetEditShell( &pSh );
// Search for fields. If no valid found, disconnect.
@@ -145,7 +145,7 @@ void SwIntrnlRefLink::Closed()
if( rFldType.GetDoc() && !rFldType.GetDoc()->IsInDtor() )
{
// advise goes, convert all fields into text?
- ViewShell* pSh;
+ SwViewShell* pSh;
SwEditShell* pESh = rFldType.GetDoc()->GetEditShell( &pSh );
if( pESh )
{
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 317193d..8345a68 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1107,7 +1107,7 @@ OUString SwDocInfoField::Expand() const
else if( aAny >>= aDuration )
{
sVal = OUString(aDuration.Negative ? '-' : '+')
- + ViewShell::GetShellRes()->sDurationFormat;
+ + SwViewShell::GetShellRes()->sDurationFormat;
sVal = sVal.replaceFirst("%1", OUString::number( aDuration.Years ) );
sVal = sVal.replaceFirst("%2", OUString::number( aDuration.Months ) );
sVal = sVal.replaceFirst("%3", OUString::number( aDuration.Days ) );
@@ -1145,13 +1145,13 @@ OUString SwDocInfoField::GetFieldName() const
break;
default:
- aStr += ViewShell::GetShellRes()
+ aStr += SwViewShell::GetShellRes()
->aDocInfoLst[ nSub - DI_SUBTYPE_BEGIN ];
break;
}
if (IsFixed())
{
- aStr += " " + OUString(ViewShell::GetShellRes()->aFixedStr);
+ aStr += " " + OUString(SwViewShell::GetShellRes()->aFixedStr);
}
return aStr;
}
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 5416bd2..1523740 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -231,7 +231,7 @@ OUString SwField::GetFieldName() const
OUString sRet = SwFieldType::GetTypeStr( nTypeId );
if (IsFixed())
{
- sRet += " " + OUString(ViewShell::GetShellRes()->aFixedStr);
+ sRet += " " + OUString(SwViewShell::GetShellRes()->aFixedStr);
}
return sRet;
}
@@ -428,7 +428,7 @@ OUString SwValueFieldType::ExpandValue( const double& rVal,
sal_uInt32 nFmt, sal_uInt16 nLng) const
{
if (rVal >= DBL_MAX) // error string for calculator
- return ViewShell::GetShellRes()->aCalc_Error;
+ return SwViewShell::GetShellRes()->aCalc_Error;
OUString sExpand;
SvNumberFormatter* pFormatter = pDoc->GetNumberFormatter();
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index abc373f..68ce4fc 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -281,7 +281,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
// not found?
if ( !pTxtNd )
{
- sTxt = ViewShell::GetShellRes()->aGetRefFld_RefItemNotFound;
+ sTxt = SwViewShell::GetShellRes()->aGetRefFld_RefItemNotFound;
return ;
}
// where is the category name (e.g. "Illustration")?
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 0194d4f..2764167 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1025,7 +1025,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
}
}
- SET_CURR_SHELL( (ViewShell*)this );
+ SET_CURR_SHELL( (SwViewShell*)this );
if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), sal_True ) )
return sal_False;
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 646c6b3..3f4d19c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -88,7 +88,7 @@ using namespace com::sun::star;
// tolerance limit of Drawing-SS
#define MINMOVE ((sal_uInt16)GetOut()->PixelToLogic(Size(Imp()->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width())
-SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh )
+SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, SwViewShell *pSh )
{
if ( !pLst )
pLst = pSh->HasDrawView() ? &pSh->Imp()->GetDrawView()->GetMarkedObjectList():0;
@@ -542,7 +542,7 @@ sal_uInt16 SwFEShell::GetSelFrmType() const
{
// obtain marked item as fly frame; if no fly frame, it must
// be a draw object
- const SwFlyFrm* pFly = ::GetFlyFromMarked(pMarkList, (ViewShell*)this);
+ const SwFlyFrm* pFly = ::GetFlyFromMarked(pMarkList, (SwViewShell*)this);
if ( pFly != NULL )
{
if( pFly->IsFlyLayFrm() )
@@ -660,11 +660,11 @@ long SwFEShell::EndDrag( const Point *, sal_Bool )
SdrView *pView = Imp()->GetDrawView();
if ( pView->IsDragObj() )
{
- // Setup Start-/EndActions only to the ViewShell
- ViewShell *pSh = this;
+ // Setup Start-/EndActions only to the SwViewShell
+ SwViewShell *pSh = this;
do {
pSh->StartAction();
- } while ( this != (pSh = (ViewShell*)pSh->GetNext()) );
+ } while ( this != (pSh = (SwViewShell*)pSh->GetNext()) );
StartUndo( UNDO_START );
@@ -689,7 +689,7 @@ long SwFEShell::EndDrag( const Point *, sal_Bool )
pSh->EndAction();
if( pSh->IsA( TYPE( SwCrsrShell ) ) )
((SwCrsrShell*)pSh)->CallChgLnk();
- } while ( this != (pSh = (ViewShell*)pSh->GetNext()) );
+ } while ( this != (pSh = (SwViewShell*)pSh->GetNext()) );
GetDoc()->SetModified();
::FrameNotify( this, FLY_DRAG );
@@ -989,7 +989,7 @@ sal_Bool SwFEShell::IsFrmSelected() const
return sal_False;
else
return 0 != ::GetFlyFromMarked( &Imp()->GetDrawView()->GetMarkedObjectList(),
- (ViewShell*)this );
+ (SwViewShell*)this );
}
sal_Bool SwFEShell::IsObjSelected( const SdrObject& rObj ) const
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 59a5143..73c7815 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -62,7 +62,7 @@ TYPEINIT1(SwFEShell,SwEditShell)
void SwFEShell::EndAllActionAndCall()
{
- ViewShell *pTmp = this;
+ SwViewShell *pTmp = this;
do {
if( pTmp->IsA( TYPE(SwCrsrShell) ) )
{
@@ -71,7 +71,7 @@ void SwFEShell::EndAllActionAndCall()
}
else
pTmp->EndAction();
- } while( this != ( pTmp = (ViewShell*)pTmp->GetNext() ));
+ } while( this != ( pTmp = (SwViewShell*)pTmp->GetNext() ));
}
@@ -83,7 +83,7 @@ void SwFEShell::EndAllActionAndCall()
Point SwFEShell::GetCntntPos( const Point& rPoint, sal_Bool bNext ) const
{
- SET_CURR_SHELL( (ViewShell*)this );
+ SET_CURR_SHELL( (SwViewShell*)this );
return GetLayout()->GetNextPrevCntntPos( rPoint, bNext );
}
@@ -93,7 +93,7 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
{
const SwFrm *pFrm = Imp()->HasDrawView()
? ::GetFlyFromMarked( &Imp()->GetDrawView()->GetMarkedObjectList(),
- (ViewShell*)this)
+ (SwViewShell*)this)
: 0;
if( !pFrm )
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index c9e7376..25946bb 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -1123,7 +1123,7 @@ sal_Bool SwGrfNode::IsSelected() const
if( pESh )
{
const SwNode* pN = this;
- const ViewShell* pV = pESh;
+ const SwViewShell* pV = pESh;
do {
if( pV->ISA( SwEditShell ) && pN == &((SwCrsrShell*)pV)
->GetCrsr()->GetPoint()->nNode.GetNode() )
@@ -1132,7 +1132,7 @@ sal_Bool SwGrfNode::IsSelected() const
break;
}
}
- while( pESh != ( pV = (ViewShell*)pV->GetNext() ));
+ while( pESh != ( pV = (SwViewShell*)pV->GetNext() ));
}
return bRet;
}
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index ff776fa..86c18b8 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -25,7 +25,7 @@
class SwTxtFrm;
class OutputDevice;
-class ViewShell;
+class SwViewShell;
class SwScriptInfo;
class Point;
class SwWrongList;
@@ -39,7 +39,7 @@ class SwDrawTextInfo
{
const SwTxtFrm* pFrm;
OutputDevice* pOut;
- ViewShell* pSh;
+ SwViewShell* pSh;
const SwScriptInfo* pScriptInfo;
Point m_aPos;
OUString m_aText;
@@ -102,7 +102,7 @@ public:
bool m_bDrawSp: 1;
#endif
- SwDrawTextInfo( ViewShell *pS, OutputDevice &rO, const SwScriptInfo* pSI,
+ SwDrawTextInfo( SwViewShell *pS, OutputDevice &rO, const SwScriptInfo* pSI,
const OUString &rSt, xub_StrLen nI, xub_StrLen nL,
sal_uInt16 nW = 0, sal_Bool bB = sal_False )
{
@@ -164,7 +164,7 @@ public:
pFrm = pNewFrm;
}
- ViewShell *GetShell() const
+ SwViewShell *GetShell() const
{
return pSh;
}
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index ae1e5d0..1c6328c 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -226,7 +226,7 @@ public:
// Paint on this shell (consider Preview, print flag, etc. recursively)?
- static sal_Bool IsPaint( SdrObject *pObj, const ViewShell *pSh );
+ static sal_Bool IsPaint( SdrObject *pObj, const SwViewShell *pSh );
/** SwFlyFrm::IsBackgroundTransparent
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 12d8fa3..d92a5e4 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -29,7 +29,7 @@ class OutputDevice;
class FontMetric;
class SwFntObj;
class SwDrawTextInfo;
-class ViewShell;
+class SwViewShell;
class SwSubFont;
class MapMode;
class Point;
@@ -89,7 +89,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwFntObj)
SwFntObj( const SwSubFont &rFont, const void* pOwner,
- ViewShell *pSh );
+ SwViewShell *pSh );
virtual ~SwFntObj();
@@ -100,13 +100,13 @@ public:
inline sal_uInt16 GetGuessedLeading() const { return nGuessedLeading; }
inline sal_uInt16 GetExtLeading() const { return nExtLeading; }
- sal_uInt16 GetFontAscent( const ViewShell *pSh, const OutputDevice& rOut );
- sal_uInt16 GetFontHeight( const ViewShell *pSh, const OutputDevice& rOut );
- sal_uInt16 GetFontLeading( const ViewShell *pSh, const OutputDevice& rOut );
+ sal_uInt16 GetFontAscent( const SwViewShell *pSh, const OutputDevice& rOut );
+ sal_uInt16 GetFontHeight( const SwViewShell *pSh, const OutputDevice& rOut );
+ sal_uInt16 GetFontLeading( const SwViewShell *pSh, const OutputDevice& rOut );
- void GuessLeading( const ViewShell& rSh, const FontMetric& rMet );
+ void GuessLeading( const SwViewShell& rSh, const FontMetric& rMet );
- void SetDevFont( const ViewShell *pSh, OutputDevice& rOut );
+ void SetDevFont( const SwViewShell *pSh, OutputDevice& rOut );
inline OutputDevice* GetPrt() const { return pPrinter; }
inline sal_uInt16 GetZoom() const { return nZoom; }
inline sal_uInt16 GetPropWidth() const { return nPropWidth; }
@@ -117,19 +117,19 @@ public:
Size GetTextSize( SwDrawTextInfo &rInf );
xub_StrLen GetCrsrOfst( SwDrawTextInfo &rInf );
- void CreateScrFont( const ViewShell& rSh, const OutputDevice& rOut );
+ void CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut );
void CreatePrtFont( const OutputDevice& rOut );
};
class SwFntAccess : public SwCacheAccess
{
- ViewShell *pShell;
+ SwViewShell *pShell;
protected:
virtual SwCacheObj *NewObj( );
public:
SwFntAccess( const void * &rMagic, sal_uInt16 &rIndex, const void *pOwner,
- ViewShell *pShell,
+ SwViewShell *pShell,
sal_Bool bCheck = sal_False );
inline SwFntObj* Get() { return (SwFntObj*) SwCacheAccess::Get(); };
};
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index eeb84d8..40e4f7f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -43,7 +43,7 @@ class SwFlowFrm;
class SwCntntFrm;
class SfxPoolItem;
class SwAttrSet;
-class ViewShell;
+class SwViewShell;
class Color;
class SwBorderAttrs;
class SwCache;
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 5519eb0..c3c609f 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -59,7 +59,7 @@ void DrawGraphic( const SvxBrushItem *, const XFillStyleItem*, const XFillGradie
// method to align rectangle.
// Created declaration here to avoid <extern> declarations
-void SwAlignRect( SwRect &rRect, const ViewShell *pSh );
+void SwAlignRect( SwRect &rRect, const SwViewShell *pSh );
// method to align graphic rectangle
// Created declaration here to avoid <extern> declarations
@@ -80,7 +80,7 @@ void PaintCharacterBorder(
// get Fly, if no List is given use the current shell
// Implementation in feshview.cxx
-SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, ViewShell *pSh );
+SwFlyFrm *GetFlyFromMarked( const SdrMarkList *pLst, SwViewShell *pSh );
sal_uLong SqRt( BigInt nX );
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 773dac4..d633e5a 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -95,7 +95,7 @@ class SwPageFrm: public SwFtnBossFrm
*/
static void GetHorizontalShadowRect( const SwRect& _rPageRect,
- const ViewShell* _pViewShell,
+ const SwViewShell* _pViewShell,
SwRect& _orBottomShadowRect,
bool bPaintLeftShadow,
bool bPaintRightShadow,
@@ -111,7 +111,7 @@ public:
SwPageFrm( SwFrmFmt*, SwFrm*, SwPageDesc* );
~SwPageFrm();
- //public, damit die ViewShell beim Umschalten vom BrowseMode darauf
+ //public, damit die SwViewShell beim Umschalten vom BrowseMode darauf
//zugreifen kann.
void PrepareHeader(); //Kopf-/Fusszeilen anlegen/entfernen.
void PrepareFooter();
@@ -250,7 +250,7 @@ public:
has to be generated.
*/
void PaintMarginArea( const SwRect& _rOutputRect,
- ViewShell* _pViewShell ) const;
+ SwViewShell* _pViewShell ) const;
/** paint page border and shadow
@@ -275,7 +275,7 @@ public:
shadow with & position).
*/
static void PaintBorderAndShadow( const SwRect& _rPageRect,
- const ViewShell* _pViewShell,
+ const SwViewShell* _pViewShell,
bool bPaintLeftShadow,
bool bPaintRightShadow,
bool bRightSidebar );
@@ -296,15 +296,15 @@ public:
rectangle for the given page rectangle
*/
static void GetBorderAndShadowBoundRect( const SwRect& _rPageRect,
- const ViewShell* _pViewShell,
+ const SwViewShell* _pViewShell,
SwRect& _orBorderAndShadowBoundRect,
const bool bLeftShadow,
const bool bRightShadow,
const bool bRightSidebar
);
- static void PaintNotesSidebar(const SwRect& _rPageRect, ViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight);
- static void PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, ViewShell* _pViewShell, const Color aColorUp, const Color aColorDown);
+ static void PaintNotesSidebar(const SwRect& _rPageRect, SwViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight);
+ static void PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, SwViewShell* _pViewShell, const Color aColorUp, const Color aColorDown);
/**
asks the page on which side a margin should be shown, e.g for notes
returns true for left side, false for right side
@@ -329,7 +329,7 @@ public:
// return font used to paint the "empty page" string
static const Font& GetEmptyPageFont();
- static SwTwips GetSidebarBorderWidth( const ViewShell* );
+ static SwTwips GetSidebarBorderWidth( const SwViewShell* );
};
inline SwCntntFrm *SwPageFrm::FindFirstBodyCntnt()
diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx
index 74aad53..7d1fab2 100644
--- a/sw/source/core/inc/ptqueue.hxx
+++ b/sw/source/core/inc/ptqueue.hxx
@@ -38,7 +38,7 @@
//teuer werden kann.
class SwQueuedPaint;
-class ViewShell;
+class SwViewShell;
class SwRect;
class SwPaintQueue
@@ -46,8 +46,8 @@ class SwPaintQueue
public:
static SwQueuedPaint *pQueue;
- static void Add( ViewShell *pSh, const SwRect &rNew );
- static void Remove( ViewShell *pSh );
+ static void Add( SwViewShell *pSh, const SwRect &rNew );
+ static void Remove( SwViewShell *pSh );
static void Repaint();
};
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index d374ded..7de8ef5 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -24,7 +24,7 @@
#include <doc.hxx>
class SwCntntFrm;
-class ViewShell;
+class SwViewShell;
class SdrPage;
class SwFrmFmt;
class SwPaM;
@@ -109,7 +109,7 @@ class SwRootFrm: public SwLayoutFrm
// this is approximated by setting the pointer pCurrShell when a
// shell gets the focus (FEShell). Acditionally the pointer will be
// set temporarily by SwCurrShell typically via SET_CURR_SHELL
- // The macro and class can be found in the ViewShell. These object can
+ // The macro and class can be found in the SwViewShell. These object can
// be created nested (also for different kinds of Shells). They are
// collected into the Array pCurrShells.
// Futhermore it can happen that a shell is activated while a curshell
@@ -120,10 +120,10 @@ class SwRootFrm: public SwLayoutFrm
// If at the time of the destruction of a shell, which is still referneced
// by a curshell object, that will be cleaned up as well.
friend class CurrShell;
- friend void SetShell( ViewShell *pSh );
+ friend void SetShell( SwViewShell *pSh );
friend void InitCurrShells( SwRootFrm *pRoot );
- ViewShell *pCurrShell;
- ViewShell *pWaitingCurrShell;
+ SwViewShell *pCurrShell;
+ SwViewShell *pWaitingCurrShell;
SwCurrShells *pCurrShells;
//Eine Page im DrawModel pro Dokument, hat immer die Groesse der Root.
@@ -159,12 +159,12 @@ public:
//Clipping sparen, wenn im Vout eh genau das Cliprechteck ausgegeben wird
static sal_Bool HasSameRect( const SwRect& rRect );
- SwRootFrm( SwFrmFmt*, ViewShell* );
+ SwRootFrm( SwFrmFmt*, SwViewShell* );
virtual ~SwRootFrm();
void Init(SwFrmFmt*);
- ViewShell *GetCurrShell() const { return pCurrShell; }
- void DeRegisterShell( ViewShell *pSh );
+ SwViewShell *GetCurrShell() const { return pCurrShell; }
+ void DeRegisterShell( SwViewShell *pSh );
//Start-/EndAction fuer alle Shells auf moeglichst hoeher
//(Shell-Ableitungs-)Ebene aufsetzen. Fuer die StarONE Anbindung, die
@@ -175,7 +175,7 @@ public:
void EndAllAction( sal_Bool bVirDev = sal_False );
// fuer bestimmte UNO-Aktionen (Tabellencursor) ist es notwendig, dass alle Actions
- // kurzfristig zurueckgesetzt werden. Dazu muss sich jede ViewShell ihren alten Action-zaehler
+ // kurzfristig zurueckgesetzt werden. Dazu muss sich jede SwViewShell ihren alten Action-zaehler
// merken
void UnoRemoveAllActions();
void UnoRestoreAllActions();
@@ -206,7 +206,7 @@ public:
{
bIdleFormat = sal_True;
- ViewShell* lcl_pCurrShell = GetCurrShell();
+ SwViewShell* lcl_pCurrShell = GetCurrShell();
// May be NULL if called from SfxBaseModel::dispose
// (this happens in the build test 'rtfexport').
if (lcl_pCurrShell != NULL)
@@ -222,7 +222,7 @@ public:
if ( bVal )
{
- ViewShell* lcl_pCurrShell = GetCurrShell();
+ SwViewShell* lcl_pCurrShell = GetCurrShell();
// May be NULL if called from SfxBaseModel::dispose
// (this happens in the build test 'rtfexport').
if (lcl_pCurrShell != NULL)
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index e4d44e3..7f29fd8 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -26,7 +26,7 @@
#include "swcache.hxx"
#include "swfont.hxx"
-class ViewShell;
+class SwViewShell;
class SfxPoolItem;
/*************************************************************************
@@ -63,7 +63,7 @@ private:
public:
DECL_FIXEDMEMPOOL_NEWDEL(SwFontObj)
- SwFontObj( const void* pOwner, ViewShell *pSh );
+ SwFontObj( const void* pOwner, SwViewShell *pSh );
virtual ~SwFontObj();
@@ -79,12 +79,12 @@ public:
class SwFontAccess : public SwCacheAccess
{
- ViewShell *pShell;
+ SwViewShell *pShell;
protected:
virtual SwCacheObj *NewObj( );
public:
- SwFontAccess( const void *pOwner, ViewShell *pSh );
+ SwFontAccess( const void *pOwner, SwViewShell *pSh );
SwFontObj *Get();
};
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 1176ca0..34edd1d 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -34,7 +34,7 @@ class SwAttrSet;
class SwDoCapitals; // DoCapitals
class SwDrawTextInfo; // _DrawText
class SwScriptInfo; // _GetTxtSize
-class ViewShell;
+class SwViewShell;
class IDocumentSettingAccess;
const sal_Unicode CH_BLANK = ' '; // ' ' Leerzeichen
@@ -68,10 +68,10 @@ class SwSubFont : public SvxFont
short _CheckKerning( );
- sal_Bool ChgFnt( ViewShell *pSh, OutputDevice& rOut );
- sal_Bool IsSymbol( ViewShell *pSh );
- sal_uInt16 GetAscent( ViewShell *pSh, const OutputDevice& rOut );
- sal_uInt16 GetHeight( ViewShell *pSh, const OutputDevice& rOut );
+ sal_Bool ChgFnt( SwViewShell *pSh, OutputDevice& rOut );
+ sal_Bool IsSymbol( SwViewShell *pSh );
+ sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut );
+ sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut );
Size _GetTxtSize( SwDrawTextInfo& rInf );
Size GetCapitalSize( SwDrawTextInfo& rInf );
void _DrawText( SwDrawTextInfo &rInf, const sal_Bool bGrey );
@@ -167,7 +167,7 @@ public:
SwFont( const SwAttrSet* pSet, const IDocumentSettingAccess* pIDocumentSettingAccess );
SwFont( const SwFont& rFont );
- inline void ChgFnt( ViewShell *pSh, OutputDevice& rOut )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list