diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-26 19:50:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-26 20:03:50 +0200 |
| commit | ee3189489c0205ec221fbc907a01c711b58fc42e (patch) | |
| tree | 1cd2fd05e3518d9484b11f0fc29b6e458a629338 /sw | |
| parent | 2e99447fc07df98ebbc343ef79852b7eaf7b7757 (diff) | |
sw: ViewShell -> SwViewShell rename
It's a public class, so it should have the 'Sw' prefix.
Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4
Diffstat (limited to 'sw')
185 files changed, 905 insertions, 905 deletions
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx index fc9bb5c689ba..feccc26082ab 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 e5ad23f6af13..5174c89d9ee9 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 3d3e8d912917..bf09a55defda 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 9ab0b91b36cf..b1d57ef7f6d3 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 5e1138e99ede..465443a977c3 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 35cff353b8e2..8807eb24cb34 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 b9d9f22e31c2..82625d521b17 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 78fe1685d7a7..fdeb4fb464ee 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 f6616db05860..a8d38c2d13c2 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 7690cf8149d0..d0b01c51584b 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 cf314227d4b5..98b15667a18e 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 05aa4c1187c0..e111955e1e0b 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 91c359073a4c..7fa39a8ca307 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 6aab290a09c7..9e755ad3dc52 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 2f5a1e1cc8e4..bf6678fabbc6 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 89f2ef86c259..d916bbf8dfa6 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 312e56370f9f..734a066a1949 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 aef159dc2f3e..c43ecdf2e239 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 79b2616da960..a09408cd726a 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 9639d70748bd..1b02418c8519 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 ff6c84984b88..8f2d76225bfc 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 14ae6472d5bd..4726a0b899f2 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 b435b936d0ae..579d087be7f4 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 97e15d279d73..4e2f8742097a 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 60e201f22a24..b26960e671af 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 198b24e76467..daa821436525 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 7e6be84936d0..6070f3040a3a 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 7ea2522e2dda..8312ab216aab 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 399d9c103e87..b550bfbfb0b3 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 18ff56baab26..ec932e33cfa8 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 cfc6b7cdbf40..6f322796e224 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 7d15de1c4db5..f9a1b2ecf1d6 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 c9eb6c79d238..04808143fdb0 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 68e6a5b7f3d7..c925e4c9a5a2 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 b82639813518..f580a1c46224 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@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 0d1d8c3d44fd..552b10c7ff48 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 90031608f23b..27387b04aca8 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 9376d60a0e14..9dd757cc408e 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 ed370d675ceb..413a00d5efb7 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 e05fbd7fa1bb..da57321ed813 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 ba265a36b823..b28a51c76a4d 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 6c9ab2bcabd0..53855093d33b 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 28bdde5e5663..2620ce82f7e6 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 ba545abee36c..9924534a3000 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 46164fda6f0e..2febb36d1061 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 b982ac4ca4ad..9609bf84b408 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 da704fa87632..0ca02239591e 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 bb17e7c63d06..15a3e52b1be0 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 e9425d49db04..afdaa8c02216 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 87af50cca97a..6db9c6de6388 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 cf5c1e9866b5..5c724dbaa539 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 6b83fea70c53..f25c61e5d31c 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 5e73e87e7650..cb2daae2dfad 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 e4a70ae3f804..f904db56630c 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 63eb5bcce609..14710ae0d9b2 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 6380db01fe45..5a553614bb19 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 c42ed840193c..977a43cb58ec 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 1f69c786694c..8adcd5824596 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 317193da34b1..8345a68e198c 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 5416bd243131..1523740c266b 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 abc373f38fe5..68ce4fc0712e 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 0194d4f52608..27641672152c 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 646c6b326c47..3f4d19ce2815 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 59a514357d7a..73c78151fb51 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 c9e73761540f..25946bbd2940 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 ff776fa9850a..86c18b863015 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 ae1e5d0e8e59..1c6328c09108 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 12d8fa3d5cdc..d92a5e4196f4 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 eeb84d878b53..40e4f7f62c40 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 5519eb041f31..c3c609fd097b 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 773dac441818..d633e5a8c35c 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 74aad53eb22a..7d1fab25cb0a 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 d374dedcf0fc..7de8ef58a194 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 e4d44e33f1a4..7f29fd8bc69f 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 1176ca011ac4..34edd1dabb50 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 ) + inline void ChgFnt( SwViewShell *pSh, OutputDevice& rOut ) { bPaintBlank = aSub[nActual].ChgFnt( pSh, rOut ); } ~SwFont(); @@ -179,14 +179,14 @@ public: inline const SvxFont& GetActualFont() const { return aSub[nActual]; } // holt sich eine MagicNumber ueber SwFntAccess - void GoMagic( ViewShell *pSh, sal_uInt8 nWhich ); + void GoMagic( SwViewShell *pSh, sal_uInt8 nWhich ); // set background color void SetBackColor( Color* pNewColor ); inline const Color* GetBackColor() const{ return pBackColor; } void SetHighlightColor( const Color& aNewColor ); const Color& GetHighlightColor() const { return m_aHighlightColor; } - inline void ChkMagic( ViewShell *pSh, sal_uInt8 nWhich ) + inline void ChkMagic( SwViewShell *pSh, sal_uInt8 nWhich ) { if( !aSub[ nWhich ].pMagic ) GoMagic( pSh, nWhich ); } // uebernimmt die MagicNumber eines (hoffentlich ident.) Kollegen inline void CopyMagic( const SwFont* pFnt, sal_uInt8 nWhich ) @@ -273,7 +273,7 @@ public: inline const SvxFont &GetFnt( const sal_uInt8 nWhich ) const { return aSub[nWhich]; }; - sal_Bool IsSymbol( ViewShell *pSh ) + sal_Bool IsSymbol( SwViewShell *pSh ) { return aSub[nActual].IsSymbol( pSh ); } FontUnderline GetUnderline() const { return aSub[nActual].GetUnderline(); } const Color& GetUnderColor() const { return aUnderColor; } @@ -326,12 +326,12 @@ public: { return aSub[nWhich].GetEmphasisMark(); } // Macht den logischen Font im OutputDevice wirksam. - void ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut ); + void ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut ); Size GetCapitalSize( SwDrawTextInfo& rInf ) { return aSub[nActual].GetCapitalSize( rInf ); } - xub_StrLen GetCapitalBreak( ViewShell* pSh, const OutputDevice* pOut, + xub_StrLen GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut, const SwScriptInfo* pScript, const OUString& rTxt, long nTextWidth, const xub_StrLen nIdx, const xub_StrLen nLen ); @@ -365,9 +365,9 @@ public: inline short CheckKerning() { return aSub[nActual].CheckKerning(); } - inline sal_uInt16 GetAscent( ViewShell *pSh, const OutputDevice& rOut ) + inline sal_uInt16 GetAscent( SwViewShell *pSh, const OutputDevice& rOut ) { return aSub[nActual].GetAscent( pSh, rOut ); } - inline sal_uInt16 GetHeight( ViewShell *pSh, const OutputDevice& rOut ) + inline sal_uInt16 GetHeight( SwViewShell *pSh, const OutputDevice& rOut ) { return aSub[nActual].GetHeight( pSh, rOut ); } inline void Invalidate() diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 88fea8872f16..86e0ac4b9789 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -27,7 +27,7 @@ #include <swtypes.hxx> #include <vector> -class ViewShell; +class SwViewShell; class SwFlyFrm; class SwViewOption; class SwRegionRects; @@ -53,7 +53,7 @@ namespace sdr { namespace contact { class SwViewImp { - friend class ViewShell; + friend class SwViewShell; friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus. friend class SwLayIdle; @@ -61,8 +61,8 @@ class SwViewImp // for paint of page preview friend class SwPagePreviewLayout; - ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch - //mal eine ViewShell braucht hier die + SwViewShell *pSh; //Falls jemand einen Imp durchreicht und doch + //mal eine SwViewShell braucht hier die //Rueckwaertsverkettung. SwDrawView *pDrawView; //Unsere DrawView @@ -111,8 +111,8 @@ class SwViewImp void SetFirstVisPage(); //Neue Ermittlung der ersten sichtbaren Seite void StartAction(); //Henkel Anzeigen und verstecken. - void EndAction(); //gerufen von ViewShell::ImplXXXAction - void LockPaint(); //dito, gerufen von ViewShell::ImplLockPaint + void EndAction(); //gerufen von SwViewShell::ImplXXXAction + void LockPaint(); //dito, gerufen von SwViewShell::ImplLockPaint void UnlockPaint(); private: @@ -123,7 +123,7 @@ private: #i27138# implementation for wrapper method - <ViewShell::InvalidateAccessibleParaFlowRelation(..)> + <SwViewShell::InvalidateAccessibleParaFlowRelation(..)> @param _pFromTxtFrm input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM @@ -142,7 +142,7 @@ private: #i27301# implementation for wrapper method - <ViewShell::InvalidateAccessibleParaTextSelection(..)> + <SwViewShell::InvalidateAccessibleParaTextSelection(..)> */ void _InvalidateAccessibleParaTextSelection(); @@ -150,17 +150,17 @@ private: #i88069# implementation for wrapper method - <ViewShell::InvalidateAccessibleParaAttrs(..)> + <SwViewShell::InvalidateAccessibleParaAttrs(..)> */ void _InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ); public: - SwViewImp( ViewShell * ); + SwViewImp( SwViewShell * ); ~SwViewImp(); - void Init( const SwViewOption * ); //nur fuer ViewShell::Init() + void Init( const SwViewOption * ); //nur fuer SwViewShell::Init() - const ViewShell *GetShell() const { return pSh; } - ViewShell *GetShell() { return pSh; } + const SwViewShell *GetShell() const { return pSh; } + SwViewShell *GetShell() { return pSh; } Color GetRetoucheColor() const; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index df3770f74fa5..70f86a744645 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -155,7 +155,7 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool //determine space left in new upper frame nSpace = (aRect.*fnRectX->fnGetHeight)(); - const ViewShell *pSh = pNewUpper->getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = pNewUpper->getRootFrm()->GetCurrShell(); if ( IsInFtn() || (pSh && pSh->GetViewOptions()->getBrowseMode()) || pNewUpper->IsCellFrm() || @@ -700,7 +700,7 @@ void SwPageFrm::MakeAll() pAttrs = pAccess->Get(); } // In BrowseView, we use fixed settings - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( pSh && pSh->GetViewOptions()->getBrowseMode() ) { const Size aBorder = pSh->GetOut()->PixelToLogic( pSh->GetBrowseBorder() ); @@ -972,7 +972,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) const long nRight = ((SwBorderAttrs&)rAttrs).CalcRight( this ); (this->*fnRect->fnSetXMargins)( nLeft, nRight ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); SwTwips nWidthArea; if( pSh && 0!=(nWidthArea=(pSh->VisArea().*fnRect->fnGetWidth)()) && GetUpper()->IsPageBodyFrm() && // but not for BodyFrms in Columns diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 68f94648a9ea..d812502d226e 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -594,7 +594,7 @@ void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling ) OSL_ENSURE( m_rThis.GetUpper(), "Where are we coming from?" ); // Be economical with notifications if an action is running. - ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); + SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); const SwViewImp *pImp = pSh ? pSh->Imp() : 0; const bool bComplete = pImp && pImp->IsAction() && pImp->GetLayAction().IsComplete(); @@ -997,7 +997,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage ) return pLayLeaf; SwPageFrm *pNew = pLayLeaf->FindPageFrm(); - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); // #111704# The pagedesc check does not make sense for frames in fly frames if ( pNew != FindPageFrm() && !bNewPg && !IsInFly() && // #i46683# @@ -1123,7 +1123,7 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const // to insert a break if required. //!!!!!!!!!!!Hack!!!!!!!!!!! - const ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) return sal_False; @@ -1200,7 +1200,7 @@ sal_Bool SwFlowFrm::IsPageBreak( sal_Bool bAct ) const if ( !IsFollow() && m_rThis.IsInDocBody() && ( !m_rThis.IsInTab() || ( m_rThis.IsTabFrm() && !m_rThis.GetUpper()->IsInTab() ) ) ) // i66968 { - const ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) return sal_False; const SwAttrSet *pSet = m_rThis.GetAttrSet(); @@ -2082,7 +2082,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b m_rThis.Prepare( PREP_BOSS_CHGD, 0, sal_False ); if( !bSamePage ) { - ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); + SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); if ( pSh && !pSh->Imp()->IsUpdateExpFlds() ) pSh->GetDoc()->SetNewFldLst(true); // Will be done by CalcLayout() later on! @@ -2094,7 +2094,7 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b } } // OD 30.10.2002 #97265# - no <CheckPageDesc(..)> in online layout - const ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); if ( !( pSh && pSh->GetViewOptions()->getBrowseMode() ) ) { @@ -2620,7 +2620,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) if( pNewPage != pOldPage ) { m_rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, sal_False ); - ViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); + SwViewShell *pSh = m_rThis.getRootFrm()->GetCurrShell(); if ( pSh && !pSh->Imp()->IsUpdateExpFlds() ) pSh->GetDoc()->SetNewFldLst(true); // Will be done by CalcLayout() later on diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index bb9ebf9bf5a6..334e96945994 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -109,7 +109,7 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) : } else { - const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; + const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if( pSh && pSh->GetViewOptions()->getBrowseMode() ) { //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin @@ -255,7 +255,7 @@ SwFlyFrm::~SwFlyFrm() SwRootFrm *pRootFrm = getRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() ) { - ViewShell *pVSh = pRootFrm->GetCurrShell(); + SwViewShell *pVSh = pRootFrm->GetCurrShell(); if( pVSh && pVSh->Imp() ) { // Lowers aren't disposed already, so we have to do a recursive @@ -453,16 +453,16 @@ void SwFlyFrm::FinitDrawObj() //Bei den SdrPageViews abmelden falls das Objekt dort noch selektiert ist. if ( !GetFmt()->GetDoc()->IsInDtor() ) { - ViewShell *p1St = getRootFrm()->GetCurrShell(); + SwViewShell *p1St = getRootFrm()->GetCurrShell(); if ( p1St ) { - ViewShell *pSh = p1St; + SwViewShell *pSh = p1St; do { //z.Zt. kann das Drawing nur ein Unmark auf alles, weil das //Objekt bereits Removed wurde. if( pSh->HasDrawView() ) pSh->Imp()->GetDrawView()->UnmarkAll(); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != p1St ); } @@ -546,7 +546,7 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) } // invalidate accessible relation set (accessibility wrapper) - ViewShell* pSh = pMaster->getRootFrm()->GetCurrShell(); + SwViewShell* pSh = pMaster->getRootFrm()->GetCurrShell(); if( pSh ) { SwRootFrm* pLayout = pMaster->getRootFrm(); @@ -592,7 +592,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) pFollow->GetFmt()->GetDoc(), ++nIndex ); // invalidate accessible relation set (accessibility wrapper) - ViewShell* pSh = pMaster->getRootFrm()->GetCurrShell(); + SwViewShell* pSh = pMaster->getRootFrm()->GetCurrShell(); if( pSh ) { SwRootFrm* pLayout = pMaster->getRootFrm(); @@ -806,7 +806,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, { bool bClear = true; const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); switch( nWhich ) { case RES_VERT_ORIENT: @@ -2163,7 +2163,7 @@ void SwFrm::RemoveFly( SwFlyFrm *pToRemove ) SwRootFrm *pRootFrm = getRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() ) { - ViewShell *pVSh = pRootFrm->GetCurrShell(); + SwViewShell *pVSh = pRootFrm->GetCurrShell(); if( pVSh && pVSh->Imp() ) { pVSh->Imp()->DisposeAccessibleFrm( pToRemove ); @@ -2248,7 +2248,7 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj ) } // Notify accessible layout. - ViewShell* pSh = getRootFrm()->GetCurrShell(); + SwViewShell* pSh = getRootFrm()->GetCurrShell(); if( pSh ) { SwRootFrm* pLayout = getRootFrm(); @@ -2260,7 +2260,7 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj ) void SwFrm::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj ) { // Notify accessible layout. - ViewShell* pSh = getRootFrm()->GetCurrShell(); + SwViewShell* pSh = getRootFrm()->GetCurrShell(); if( pSh ) { SwRootFrm* pLayout = getRootFrm(); @@ -2466,7 +2466,7 @@ Size SwFlyFrm::CalcRel( const SwFmtFrmSize &rSz ) const if( pRel ) // LAYER_IMPL { long nRelWidth = LONG_MAX, nRelHeight = LONG_MAX; - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( ( pRel->IsBodyFrm() || pRel->IsPageFrm() ) && pSh && pSh->GetViewOptions()->getBrowseMode() && pSh->VisArea().HasArea() ) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 06dc22cd320f..ac95bf87fa0e 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -540,7 +540,7 @@ SwLayNotify::~SwLayNotify() ((SwTabFrm*)pLay)->SetComplete(); else { - const ViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); if( !( pSh && pSh->GetViewOptions()->getBrowseMode() ) || !(pLay->GetType() & (FRM_BODY | FRM_PAGE)) ) //Thereby the subordinates are retouched clean. @@ -643,7 +643,7 @@ SwFlyNotify::~SwFlyNotify() SwFlyFrm *pFly = GetFly(); if ( pFly->IsNotifyBack() ) { - ViewShell *pSh = pFly->getRootFrm()->GetCurrShell(); + SwViewShell *pSh = pFly->getRootFrm()->GetCurrShell(); SwViewImp *pImp = pSh ? pSh->Imp() : 0; if ( !pImp || !pImp->IsAction() || !pImp->GetLayAction().IsAgain() ) { @@ -841,7 +841,7 @@ SwCntntNotify::~SwCntntNotify() { //Active PlugIn's or OLE-Objects should know something of the change //thereby they move their window appropriate. - ViewShell *pSh = pCnt->getRootFrm()->GetCurrShell(); + SwViewShell *pSh = pCnt->getRootFrm()->GetCurrShell(); if ( pSh ) { SwOLENode *pNd; @@ -857,7 +857,7 @@ SwCntntNotify::~SwCntntNotify() SwFlyFrm *pFly = pCnt->FindFlyFrm(); svt::EmbeddedObjectRef& xObj = pNd->GetOLEObj().GetObject(); SwFEShell *pFESh = 0; - ViewShell *pTmp = pSh; + SwViewShell *pTmp = pSh; do { if ( pTmp->ISA( SwCrsrShell ) ) { @@ -883,7 +883,7 @@ SwCntntNotify::~SwCntntNotify() &pFly->Prt(), &pFly->Frm(), bNoTxtFrmPrtAreaChanged ); } - pTmp = (ViewShell*)pTmp->GetNext(); + pTmp = (SwViewShell*)pTmp->GetNext(); } while ( pTmp != pSh ); if ( pFESh && pNd->IsOLESizeInvalid() ) @@ -1289,8 +1289,8 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // and relation CONTENT_FLOWS_TO for previous paragraph will change. if ( pFrm->IsTxtFrm() ) { - ViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); - // no notification, if <ViewShell> is in construction + SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); + // no notification, if <SwViewShell> is in construction if ( pViewShell && !pViewShell->IsInConstructor() && pViewShell->GetLayout() && pViewShell->GetLayout()->IsAnyShellAccessible() ) @@ -1339,8 +1339,8 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // Relation CONTENT_FLOWS_FROM for next paragraph will change // and relation CONTENT_FLOWS_TO for previous paragraph will change. { - ViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); - // no notification, if <ViewShell> is in construction + SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); + // no notification, if <SwViewShell> is in construction if ( pViewShell && !pViewShell->IsInConstructor() && pViewShell->GetLayout() && pViewShell->GetLayout()->IsAnyShellAccessible() ) @@ -1414,8 +1414,8 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, // Relation CONTENT_FLOWS_FROM for next paragraph will change // and relation CONTENT_FLOWS_TO for previous paragraph will change. { - ViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); - // no notification, if <ViewShell> is in construction + SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); + // no notification, if <SwViewShell> is in construction if ( pViewShell && !pViewShell->IsInConstructor() && pViewShell->GetLayout() && pViewShell->GetLayout()->IsAnyShellAccessible() ) @@ -2856,7 +2856,7 @@ void Notify( SwFlyFrm *pFly, SwPageFrm *pOld, const SwRect &rOld, //Der Einfachheit halber wird hier bewusst jeweils ein Twip //unnoetig invalidiert. - ViewShell *pSh = pFly->getRootFrm()->GetCurrShell(); + SwViewShell *pSh = pFly->getRootFrm()->GetCurrShell(); if( pSh && rOld.HasArea() ) pSh->InvalidateWindows( rOld ); @@ -3141,7 +3141,7 @@ void Notify_Background( const SdrObject* pObj, pAnchor->GetUpper()->InvalidateSize(); // #i82258# - make code robust - ViewShell* pSh = 0; + SwViewShell* pSh = 0; if ( bInva && pPage && 0 != (pSh = pPage->getRootFrm()->GetCurrShell()) ) { diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 51b583ae9415..c407f6628cde 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -233,7 +233,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) bool bGrow = pPage->IsFtnPage(); if( bGrow ) { - const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; + const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if( pSh && pSh->GetViewOptions()->getBrowseMode() ) bGrow = false; } @@ -330,7 +330,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool ) return 0; } } - const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; + const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); SwPageFrm *pPage = pBoss->FindPageFrm(); if ( bBrowseMode || !pPage->IsFtnPage() ) @@ -444,7 +444,7 @@ SwTwips SwFtnContFrm::ShrinkFrm( SwTwips nDiff, sal_Bool bTst, sal_Bool bInfo ) bShrink = true; else { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) bShrink = true; } @@ -2697,7 +2697,7 @@ void SwFtnBossFrm::SetFtnDeadLine( const SwTwips nDeadLine ) else nMaxFtnHeight = -(pBody->Frm().*fnRect->fnBottomDist)( nDeadLine ); - const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; + const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if( pSh && pSh->GetViewOptions()->getBrowseMode() ) nMaxFtnHeight += pBody->Grow( LONG_MAX, sal_True ); if ( IsInSct() ) @@ -2779,7 +2779,7 @@ SwTwips SwFtnBossFrm::GetVarSpace() const nRet = 0; if ( IsPageFrm() ) { - const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; + const SwViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if( pSh && pSh->GetViewOptions()->getBrowseMode() ) nRet += BROWSE_HEIGHT - Frm().Height(); } diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 2b2b3682714b..25fb9b7e2485 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -694,7 +694,7 @@ void SwPageFrm::PrepareHeader() const SwFmtHeader &rH = ((SwFrmFmt*)GetRegisteredIn())->GetHeader(); - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const sal_Bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode()); if ( bOn && rH.IsActive() ) @@ -743,7 +743,7 @@ void SwPageFrm::PrepareFooter() while ( pLay->GetNext() ) pLay = (SwLayoutFrm*)pLay->GetNext(); - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const sal_Bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode()); if ( bOn && rF.IsActive() ) @@ -766,7 +766,7 @@ void SwPageFrm::PrepareFooter() else if ( pLay && pLay->IsFooterFrm() ) { // Remove footer if already present ::DelFlys( pLay, this ); - ViewShell *pShell; + SwViewShell *pShell; if ( pLay->GetPrev() && 0 != (pShell = getRootFrm()->GetCurrShell()) && pShell->VisArea().HasArea() ) pShell->InvalidateWindows( pShell->VisArea() ); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 2baace7723c0..4026277bdf3d 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -386,7 +386,7 @@ sal_Bool SwLayAction::RemoveEmptyBrowserPages() // switching from the normal to the browser mode, empty pages may be // retained for an annoyingly long time, so delete them here sal_Bool bRet = sal_False; - const ViewShell *pSh = pRoot->GetCurrShell(); + const SwViewShell *pSh = pRoot->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) { SwPageFrm *pPage = (SwPageFrm*)pRoot->Lower(); @@ -1086,7 +1086,7 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage, sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) { sal_Bool bRet = sal_False; - const ViewShell *pSh = pRoot->GetCurrShell(); + const SwViewShell *pSh = pRoot->GetCurrShell(); const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); // If the page is not valid, we quickly format it, otherwise @@ -1339,7 +1339,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect ) pLay->Frm().Pos() == aOldRect.Pos() && pLay->Lower() ) { - const ViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); // Limitations because of headers / footers if( pSh && pSh->GetViewOptions()->getBrowseMode() && !( pLay->IsCompletePaint() && pLay->FindPageFrm()->FindFtnCont() ) ) @@ -1360,7 +1360,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect ) bool bPageInBrowseMode = pLay->IsPageFrm(); if( bPageInBrowseMode ) { - const ViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); if( !pSh || !pSh->GetViewOptions()->getBrowseMode() ) bPageInBrowseMode = false; } @@ -1407,7 +1407,7 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect ) const bool bPrev = bLeftToRightViewLayout ? pLay->GetPrev() : pLay->GetNext(); const bool bNext = bLeftToRightViewLayout ? pLay->GetNext() : pLay->GetPrev(); SwPageFrm* pPageFrm = static_cast<SwPageFrm*>(pLay); - const ViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); SwRect aPageRect( pLay->Frm() ); if(pSh) @@ -1730,7 +1730,7 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect ) sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) { const SwCntntFrm *pCntnt = pPage->ContainsCntnt(); - const ViewShell *pSh = pRoot->GetCurrShell(); + const SwViewShell *pSh = pRoot->GetCurrShell(); const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); while ( pCntnt && pPage->IsAnLower( pCntnt ) ) @@ -2043,7 +2043,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) if( bProcess ) { - ViewShell *pSh = pImp->GetShell(); + SwViewShell *pSh = pImp->GetShell(); if( STRING_LEN == nTxtPos ) { --nTxtPos; @@ -2139,7 +2139,7 @@ sal_Bool SwLayIdle::DoIdleJob( IdleJobType eJob, sal_Bool bVisAreaOnly ) { // Spellcheck all contents of the pages. Either only the // visible ones or all of them. - const ViewShell* pViewShell = pImp->GetShell(); + const SwViewShell* pViewShell = pImp->GetShell(); const SwViewOption* pViewOptions = pViewShell->GetViewOptions(); const SwDoc* pDoc = pViewShell->GetDoc(); @@ -2282,13 +2282,13 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : !DoIdleJob( ONLINE_SPELLING, sal_True ) && !DoIdleJob( AUTOCOMPLETE_WORDS, sal_True ) ) // SMARTTAGS { - // Format, then register repaint rectangles with the ViewShell if necessary. + // Format, then register repaint rectangles with the SwViewShell if necessary. // This requires running artificial actions, so we don't get undesired // effects when for instance the page count gets changed. // We remember the shells where the cursor is visible, so we can make // it visible again if needed after a document change. std::vector<bool> aBools; - ViewShell *pSh = pImp->GetShell(); + SwViewShell *pSh = pImp->GetShell(); do { ++pSh->mnStartAction; sal_Bool bVis = sal_False; @@ -2297,7 +2297,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : bVis = ((SwCrsrShell*)pSh)->GetCharRect().IsOver(pSh->VisArea()); } aBools.push_back( bVis ); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != pImp->GetShell() ); SwLayAction aAction( pRoot, pImp ); @@ -2336,7 +2336,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : } } - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); ++nBoolIdx; } while ( pSh != pImp->GetShell() ); @@ -2392,7 +2392,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : pSh->UnlockPaint( sal_True ); } - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); ++nBoolIdx; } while ( pSh != pImp->GetShell() ); @@ -2408,7 +2408,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : bool bInValid = false; const SwViewOption& rVOpt = *pImp->GetShell()->GetViewOptions(); - const ViewShell* pViewShell = pImp->GetShell(); + const SwViewShell* pViewShell = pImp->GetShell(); // See conditions in DoIdleJob() const sal_Bool bSpell = rVOpt.IsOnlineSpell(); const sal_Bool bACmplWrd = rVOpt.IsAutoCompleteWords(); diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index ce9db62f7fbc..9b9f6940c019 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -578,7 +578,7 @@ sal_uLong SwLayHelper::CalcPageCount() } if ( nNdCount < 1000 ) nPgCount = 0;// no progress bar for small documents - ViewShell *pSh = 0; + SwViewShell *pSh = 0; if( rpLay && rpLay->getRootFrm() ) pSh = rpLay->getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index e9c65f8d00aa..20a8d246f6ae 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -388,7 +388,7 @@ void _FrmFinit() class SwCurrShells : public std::set<CurrShell*> {}; -CurrShell::CurrShell( ViewShell *pNew ) +CurrShell::CurrShell( SwViewShell *pNew ) { OSL_ENSURE( pNew, "insert 0-Shell?" ); pRoot = pNew->GetLayout(); @@ -417,7 +417,7 @@ CurrShell::~CurrShell() } } -void SetShell( ViewShell *pSh ) +void SetShell( SwViewShell *pSh ) { SwRootFrm *pRoot = pSh->GetLayout(); if ( pRoot->pCurrShells->empty() ) @@ -426,11 +426,11 @@ void SetShell( ViewShell *pSh ) pRoot->pWaitingCurrShell = pSh; } -void SwRootFrm::DeRegisterShell( ViewShell *pSh ) +void SwRootFrm::DeRegisterShell( SwViewShell *pSh ) { // Activate some shell if possible if ( pCurrShell == pSh ) - pCurrShell = pSh->GetNext() != pSh ? (ViewShell*)pSh->GetNext() : 0; + pCurrShell = pSh->GetNext() != pSh ? (SwViewShell*)pSh->GetNext() : 0; // Doesn't matter anymore if ( pWaitingCurrShell == pSh ) @@ -463,7 +463,7 @@ void InitCurrShells( SwRootFrm *pRoot ) |*************************************************************************/ -SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : +SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, SwViewShell * pSh ) : SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt( OUString("Root"), pFmt ), 0 ), maPagesArea(), @@ -582,7 +582,7 @@ void SwRootFrm::Init( SwFrmFmt* pFmt ) pTimerAccess->StartIdling(); bCallbackActionEnabled = sal_True; - ViewShell *pViewSh = GetCurrShell(); + SwViewShell *pViewSh = GetCurrShell(); if (pViewSh) mbNeedGrammarCheck = pViewSh->GetViewOptions()->IsOnlineSpell(); } diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 20dc1a02dfd8..9e1a49d52588 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -205,7 +205,7 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) : bInvalidLayout = bInvalidCntnt = bInvalidSpelling = bInvalidSmartTags = bInvalidAutoCmplWrds = bInvalidWordCount = sal_True; bInvalidFlyLayout = bInvalidFlyCntnt = bInvalidFlyInCnt = bFtnPage = bEndNotePage = sal_False; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); if ( bBrowseMode ) { @@ -254,7 +254,7 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) : SwPageFrm::~SwPageFrm() { // Cleanup the header-footer controls in the SwEditWin - ViewShell* pSh = getRootFrm()->GetCurrShell(); + SwViewShell* pSh = getRootFrm()->GetCurrShell(); SwWrtShell* pWrtSh = dynamic_cast< SwWrtShell* >( pSh ); if ( pWrtSh ) { @@ -340,7 +340,7 @@ void SwPageFrm::CheckDirection( sal_Bool bVert ) } else { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) { //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin @@ -532,7 +532,7 @@ void SwPageFrm::PreparePage( sal_Bool bFtn ) |*************************************************************************/ void SwPageFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( pSh ) pSh->SetFirstVisPageInvalid(); sal_uInt8 nInvFlags = 0; @@ -622,7 +622,7 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, case RES_FRM_SIZE: { const SwRect aOldPageFrmRect( Frm() ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) { mbValidSize = sal_False; @@ -783,7 +783,7 @@ SwPageDesc *SwPageFrm::FindPageDesc() SwPageDesc *pRet = 0; //5. - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) { SwCntntFrm *pFrm = GetUpper()->ContainsCntnt(); @@ -837,7 +837,7 @@ void AdjustSizeChgNotify( SwRootFrm *pRoot ) { const sal_Bool bOld = pRoot->IsSuperfluous(); pRoot->bCheckSuperfluous = sal_False; - ViewShell *pSh = pRoot->GetCurrShell(); + SwViewShell *pSh = pRoot->GetCurrShell(); if ( pSh ) { do @@ -848,7 +848,7 @@ void AdjustSizeChgNotify( SwRootFrm *pRoot ) if ( pSh->Imp() ) pSh->Imp()->NotifySizeChg( pRoot->Frm().SSize() ); } - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != pRoot->GetCurrShell() ); } pRoot->bCheckSuperfluous = bOld; @@ -869,7 +869,7 @@ void SwPageFrm::Cut() { //AdjustRootSize( CHG_CUTPAGE, 0 ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( !IsEmptyPage() ) { if ( GetNext() ) @@ -970,7 +970,7 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) InvalidatePos(); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( pSh ) pSh->SetFirstVisPageInvalid(); @@ -1049,7 +1049,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields ) { OSL_ENSURE( pStart, "Keine Startpage." ); - ViewShell *pSh = pStart->getRootFrm()->GetCurrShell(); + SwViewShell *pSh = pStart->getRootFrm()->GetCurrShell(); SwViewImp *pImp = pSh ? pSh->Imp() : 0; if ( pImp && pImp->IsAction() && !pImp->GetLayAction().IsCheckPages() ) @@ -1344,7 +1344,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn ) if ( bCheckPages ) { CheckPageDescs( pSibling, sal_False ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); SwViewImp *pImp = pSh ? pSh->Imp() : 0; if ( pImp && pImp->IsAction() && !pImp->GetLayAction().IsCheckPages() ) { @@ -1361,7 +1361,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn ) //Fuer das Aktualisieren der Seitennummern-Felder gibt nDocPos //die Seitenposition an, _ab_ der invalidiert werden soll. - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( !pSh || !pSh->Imp()->IsUpdateExpFlds() ) { SwDocPosUpdate aMsgHnt( pPrevPage->Frm().Top() ); @@ -1372,7 +1372,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn ) sw::sidebarwindows::SidebarPosition SwPageFrm::SidebarPosition() const { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( !pSh || pSh->GetViewOptions()->getBrowseMode() ) { return sw::sidebarwindows::SIDEBAR_RIGHT; @@ -1510,7 +1510,7 @@ void SwRootFrm::RemoveSuperfluous() } } while ( pPage ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( nDocPos != LONG_MAX && (!pSh || !pSh->Imp()->IsUpdateExpFlds()) ) { @@ -1732,7 +1732,7 @@ void SwRootFrm::ImplCalcBrowseWidth() return; bBrowseWidthValid = sal_True; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); nBrowseWidth = pSh ? MINLAY + 2 * pSh->GetOut()-> PixelToLogic( pSh->GetBrowseBorder() ).Width() @@ -1846,21 +1846,21 @@ void SwRootFrm::ImplCalcBrowseWidth() void SwRootFrm::StartAllAction() { - ViewShell *pSh = GetCurrShell(); + SwViewShell *pSh = GetCurrShell(); if ( pSh ) do { if ( pSh->ISA( SwCrsrShell ) ) ((SwCrsrShell*)pSh)->StartAction(); else pSh->StartAction(); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != GetCurrShell() ); } void SwRootFrm::EndAllAction( sal_Bool bVirDev ) { - ViewShell *pSh = GetCurrShell(); + SwViewShell *pSh = GetCurrShell(); if ( pSh ) do { @@ -1876,19 +1876,19 @@ void SwRootFrm::EndAllAction( sal_Bool bVirDev ) else pSh->EndAction(); pSh->SetEndActionByVirDev( bOldEndActionByVirDev ); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != GetCurrShell() ); } void SwRootFrm::UnoRemoveAllActions() { - ViewShell *pSh = GetCurrShell(); + SwViewShell *pSh = GetCurrShell(); if ( pSh ) do { // #i84729# - // No end action, if <ViewShell> instance is currently in its end action. + // No end action, if <SwViewShell> instance is currently in its end action. // Recursives calls to <::EndAction()> are not allowed. if ( !pSh->IsInEndAction() ) { @@ -1912,14 +1912,14 @@ void SwRootFrm::UnoRemoveAllActions() pSh->SetRestoreActions(nRestore); } pSh->LockView(sal_True); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != GetCurrShell() ); } void SwRootFrm::UnoRestoreAllActions() { - ViewShell *pSh = GetCurrShell(); + SwViewShell *pSh = GetCurrShell(); if ( pSh ) do { @@ -1933,7 +1933,7 @@ void SwRootFrm::UnoRestoreAllActions() } pSh->SetRestoreActions(0); pSh->LockView(sal_False); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != GetCurrShell() ); } @@ -1978,7 +1978,7 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) { SwCntntFrm* pCntntFrm = static_cast<SwCntntFrm*>(pFlyFrm->Lower()); SwRootFrm* pRoot = pFlyFrm->Lower()->getRootFrm(); - ViewShell *pSh = pRoot ? pRoot->GetCurrShell() : 0; + SwViewShell *pSh = pRoot ? pRoot->GetCurrShell() : 0; if ( pSh ) { SwOLENode* pNode = pCntntFrm->GetNode()->GetOLENode(); @@ -1987,13 +1987,13 @@ static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset ) svt::EmbeddedObjectRef& xObj = pNode->GetOLEObj().GetObject(); if ( xObj.is() ) { - ViewShell* pTmp = pSh; + SwViewShell* pTmp = pSh; do { SwFEShell* pFEShell = dynamic_cast< SwFEShell* >( pTmp ); if ( pFEShell ) pFEShell->MoveObjectIfActive( xObj, rOffset ); - pTmp = static_cast<ViewShell*>( pTmp->GetNext() ); + pTmp = static_cast<SwViewShell*>( pTmp->GetNext() ); } while( pTmp != pSh ); } } @@ -2368,7 +2368,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi ::AdjustSizeChgNotify( this ); Calc(); - ViewShell* pSh = GetCurrShell(); + SwViewShell* pSh = GetCurrShell(); if ( pSh && pSh->GetDoc()->GetDocShell() ) { diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 94ba341d7491..0cfe8700ebb0 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -219,7 +219,7 @@ void SwPageDesc::RegisterChange() { return; } - ViewShell* pSh = 0L; + SwViewShell* pSh = 0L; pDoc->GetEditShell( &pSh ); if ( !pSh ) { diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 010347063bcf..9c0d1296a350 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -212,7 +212,7 @@ public: //----------------- End of classes for border lines ---------------------- -static ViewShell *pGlobalShell = 0; +static SwViewShell *pGlobalShell = 0; //Only repaint the Fly content as well as the background of the Fly content if //a metafile is taken of the Fly. @@ -320,7 +320,7 @@ void SwCalcPixStatics( OutputDevice *pOut ) class SwSavePaintStatics { sal_Bool bSFlyMetafile; - ViewShell *pSGlobalShell; + SwViewShell *pSGlobalShell; OutputDevice *pSFlyMetafileOut; SwFlyFrm *pSRetoucheFly, *pSRetoucheFly2, @@ -1192,7 +1192,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, // Correction: adjust rectangle on pixel level in order // to assure, that the border 'leaves its original pixel', if it has to. // No prior adjustments for odd relation between pixel and twip. -void SwAlignRect( SwRect &rRect, const ViewShell *pSh ) +void SwAlignRect( SwRect &rRect, const SwViewShell *pSh ) { if( !rRect.HasArea() ) return; @@ -1769,7 +1769,7 @@ static inline void lcl_DrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, /// with a background color in method <lcl_DrawGraphicBackgrd> /// Also, change type of <bGrfNum> and <bClip> from <sal_Bool> to <bool>. static void lcl_DrawGraphic( const SvxBrushItem& rBrush, OutputDevice *pOut, - ViewShell &rSh, const SwRect &rGrf, const SwRect &rOut, + SwViewShell &rSh, const SwRect &rGrf, const SwRect &rOut, bool bClip, bool bGrfNum, bool bBackgrdAlreadyDrawn = false ) /// add parameter <bBackgrdAlreadyDrawn> to indicate @@ -1815,7 +1815,7 @@ void DrawGraphic( const SvxBrushItem *pBrush, /// Add 6th parameter to indicate that method should /// consider background transparency, saved in the color of the brush item { - ViewShell &rSh = *pGlobalShell; + SwViewShell &rSh = *pGlobalShell; bool bReplaceGrfNum = GRFNUM_REPLACE == nGrfNum; bool bGrfNum = GRFNUM_NO != nGrfNum; Size aGrfSize; @@ -2153,7 +2153,7 @@ void DrawGraphic( const SvxBrushItem *pBrush, if( bReplaceGrfNum ) { - const BitmapEx& rBmp = ViewShell::GetReplacementBitmap( false ); + const BitmapEx& rBmp = SwViewShell::GetReplacementBitmap( false ); Font aTmp( pOutDev->GetFont() ); Graphic::DrawEx( pOutDev, aEmptyOUStr, aTmp, rBmp, rOrg.Pos(), rOrg.SSize() ); } @@ -2913,10 +2913,10 @@ namespace class SwViewObjectContactRedirector : public ::sdr::contact::ViewObjectContactRedirector { private: - const ViewShell& mrViewShell; + const SwViewShell& mrViewShell; public: - SwViewObjectContactRedirector( const ViewShell& rSh ) + SwViewObjectContactRedirector( const SwViewShell& rSh ) : mrViewShell( rSh ) {}; @@ -2968,7 +2968,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const PROTOCOL( this, PROT_FILE_INIT, 0, 0) bool bResetRootPaint = false; - ViewShell *pSh = pCurrShell; + SwViewShell *pSh = pCurrShell; if ( pSh->GetWin() ) { @@ -3000,11 +3000,11 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const //Using this trick we can ensure that all values are valid in all paints - //no problems, no special case(s). // #i92745# - // Extend check on certain states of the 'current' <ViewShell> instance to - // all existing <ViewShell> instances. + // Extend check on certain states of the 'current' <SwViewShell> instance to + // all existing <SwViewShell> instances. bool bPerformLayoutAction( true ); { - ViewShell* pTmpViewShell = pSh; + SwViewShell* pTmpViewShell = pSh; do { if ( pTmpViewShell->IsInEndAction() || pTmpViewShell->IsPaintInProgress() || @@ -3014,7 +3014,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const bPerformLayoutAction = false; } - pTmpViewShell = static_cast<ViewShell*>(pTmpViewShell->GetNext()); + pTmpViewShell = static_cast<SwViewShell*>(pTmpViewShell->GetNext()); } while ( bPerformLayoutAction && pTmpViewShell != pSh ); } if ( bPerformLayoutAction ) @@ -3120,8 +3120,8 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const // moved paint pre-process for DrawingLayer overlay here since the above // code dependent from bExtraData may expand the PaintRect { - // #i75172# if called from ViewShell::ImplEndAction it sould no longer - // really be used but handled by ViewShell::ImplEndAction already + // #i75172# if called from SwViewShell::ImplEndAction it sould no longer + // really be used but handled by SwViewShell::ImplEndAction already const Region aDLRegion(aPaintRect.SVRect()); pSh->DLPrePaint2(aDLRegion); } @@ -3251,8 +3251,8 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const if ( aRect.IsOver( aEmptyPageRect ) ) { - // #i75172# if called from ViewShell::ImplEndAction it sould no longer - // really be used but handled by ViewShell::ImplEndAction already + // #i75172# if called from SwViewShell::ImplEndAction it sould no longer + // really be used but handled by SwViewShell::ImplEndAction already { const Region aDLRegion(aPaintRect.SVRect()); pSh->DLPrePaint2(aDLRegion); @@ -3381,7 +3381,7 @@ SwShortCut::SwShortCut( const SwFrm& rFrm, const SwRect& rRect ) void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); // #i16816# tagged pdf support Frm_Info aFrmInfo( *this ); @@ -3819,7 +3819,7 @@ sal_Bool SwFlyFrm::IsShadowTransparent() const |* |*************************************************************************/ -sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh ) +sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) { SdrObjUserCall *pUserCall; @@ -3946,7 +3946,7 @@ private: void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { //optimize thumbnail generation and store procedure to improve odt saving performance, #i120030# - ViewShell *pShell = getRootFrm()->GetCurrShell(); + SwViewShell *pShell = getRootFrm()->GetCurrShell(); if (pShell && pShell->GetDoc() && pShell->GetDoc()->GetDocShell()) { sal_Bool bInGenerateThumbnail = pShell->GetDoc()->GetDocShell()->IsInGenerateAndStoreThumbnail(); @@ -4085,7 +4085,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const // used in <SwNoTxtFrm::Paint(..)> to set the clip region // for painting the graphic/OLE. Thus, the clip region is // also applied for the PDF export. - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( !pOut->GetConnectMetaFile() || !pSh || !pSh->GetWin() ) { pOut->SetClipRegion(Region(aPoly)); @@ -5816,7 +5816,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const has to be generated. */ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect, - ViewShell* _pViewShell ) const + SwViewShell* _pViewShell ) const { if ( _pViewShell->GetWin() && !_pViewShell->GetViewOptions()->getBrowseMode() ) @@ -5858,7 +5858,7 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 9; sal_Bool SwPageFrm::IsRightShadowNeeded() const { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bIsLTR = getRootFrm()->IsLeftToRightViewLayout(); // We paint the right shadow if we're not in book mode @@ -5871,7 +5871,7 @@ sal_Bool SwPageFrm::IsRightShadowNeeded() const sal_Bool SwPageFrm::IsLeftShadowNeeded() const { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bIsLTR = getRootFrm()->IsLeftToRightViewLayout(); // We paint the left shadow if we're not in book mode @@ -5888,7 +5888,7 @@ sal_Bool SwPageFrm::IsLeftShadowNeeded() const @author OD */ /*static*/ void SwPageFrm::GetHorizontalShadowRect( const SwRect& _rPageRect, - const ViewShell* _pViewShell, + const SwViewShell* _pViewShell, SwRect& _orHorizontalShadowRect, bool bPaintLeftShadow, bool bPaintRightShadow, @@ -5951,7 +5951,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx& @author OD */ /*static*/ void SwPageFrm::PaintBorderAndShadow( const SwRect& _rPageRect, - const ViewShell* _pViewShell, + const SwViewShell* _pViewShell, bool bPaintLeftShadow, bool bPaintRightShadow, bool bRightSidebar ) @@ -6084,7 +6084,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx& //mod #i6193# paint sidebar for notes //IMPORTANT: if you change the rects here, also change SwPostItMgr::ScrollbarHit -/*static*/void SwPageFrm::PaintNotesSidebar(const SwRect& _rPageRect, ViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight) +/*static*/void SwPageFrm::PaintNotesSidebar(const SwRect& _rPageRect, SwViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight) { //TODO: cut out scrollbar area and arrows out of sidepane rect, otherwise it could flicker when pressing arrow buttons if (!_pViewShell ) @@ -6180,7 +6180,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx& } } -/*static*/ void SwPageFrm::PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, ViewShell* _pViewShell, const Color aColorUp, const Color aColorDown) +/*static*/ void SwPageFrm::PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, SwViewShell* _pViewShell, const Color aColorUp, const Color aColorDown) { Polygon aTriangleUp(3); Polygon aTriangleDown(3); @@ -6206,7 +6206,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx& author OD */ /*static*/ void SwPageFrm::GetBorderAndShadowBoundRect( const SwRect& _rPageRect, - const ViewShell* _pViewShell, + const SwViewShell* _pViewShell, SwRect& _orBorderAndShadowBoundRect, bool bLeftShadow, bool bRightShadow, @@ -6234,7 +6234,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx& SwRect SwPageFrm::GetBoundRect() const { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); SwRect aPageRect( Frm() ); SwRect aResult; @@ -6247,7 +6247,7 @@ SwRect SwPageFrm::GetBoundRect() const return aResult; } -/*static*/ SwTwips SwPageFrm::GetSidebarBorderWidth( const ViewShell* _pViewShell ) +/*static*/ SwTwips SwPageFrm::GetSidebarBorderWidth( const SwViewShell* _pViewShell ) { const SwPostItMgr* pPostItMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0; const SwTwips nRet = pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() ? pPostItMgr->GetSidebarWidth() + pPostItMgr->GetSidebarBorderWidth() : 0; @@ -6330,7 +6330,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, if( IsCellFrm() && IsCoveredCell() ) return; - ViewShell *pSh = pGlobalShell; + SwViewShell *pSh = pGlobalShell; // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); @@ -7211,7 +7211,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const //cut out. SwRegionRects aRegion( aRetouche ); aRegion -= rRect; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pSh->GetOut() ); @@ -7251,7 +7251,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const pPage->RefreshSubsidiary( aRetouchePart ); } } - if ( ViewShell::IsLstEndAction() ) + if ( SwViewShell::IsLstEndAction() ) ResetRetouche(); } @@ -7305,7 +7305,7 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, sal_Bool bLowerMode ) const { const SwFrm *pFrm = this; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); const SwViewOption *pOpt = pSh->GetViewOptions(); rpBrush = 0; rpFillStyle = 0; @@ -7408,7 +7408,7 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush, |* |*************************************************************************/ -void SetOutDevAndWin( ViewShell *pSh, OutputDevice *pO, +void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pO, Window *pW, sal_uInt16 nZoom ) { pSh->mpOut = pO; @@ -7427,10 +7427,10 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) //search any Fly! SwIterator<SwFrm,SwFmt> aIter( *this ); SwFrm *pFirst = aIter.First(); - ViewShell *pSh; + SwViewShell *pSh; if ( pFirst && 0 != ( pSh = pFirst->getRootFrm()->GetCurrShell()) ) { - ViewShell *pOldGlobal = pGlobalShell; + SwViewShell *pOldGlobal = pGlobalShell; pGlobalShell = pSh; bool bNoteURL = pMap && diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index d5f0f289934e..58eddf14bd2b 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -188,7 +188,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove ) // Relation CONTENT_FLOWS_FROM for current next paragraph will change // and relation CONTENT_FLOWS_TO for current previous paragraph will change. { - ViewShell* pViewShell( getRootFrm()->GetCurrShell() ); + SwViewShell* pViewShell( getRootFrm()->GetCurrShell() ); if ( pViewShell && pViewShell->GetLayout() && pViewShell->GetLayout()->IsAnyShellAccessible() ) { @@ -772,7 +772,7 @@ void SwSectionFrm::MakeAll() // OD 2004-03-15 #116561# - In online layout join the follows, if section // can grow. - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() && ( Grow( LONG_MAX, true ) > 0 ) ) { @@ -1365,7 +1365,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) // OD 15.10.2002 #103517# - allow grow in online layout // Thus, set <..IsBrowseMode()> as parameter <bGrow> on calling // method <_CheckClipping(..)>. - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); _CheckClipping( pSh && pSh->GetViewOptions()->getBrowseMode(), bMaximize ); bMaximize = ToMaximize( sal_False ); mbValidSize = sal_True; @@ -1988,7 +1988,7 @@ SwTwips SwSectionFrm::_Grow( SwTwips nDist, sal_Bool bTst ) GetSection()->GetFmt()->GetBalancedColumns().GetValue(); if( !bGrow ) { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); bGrow = pSh && pSh->GetViewOptions()->getBrowseMode(); } if( bGrow ) @@ -2509,7 +2509,7 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew case RES_PROTECT: { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetLayout()->IsAnyShellAccessible() ) pSh->Imp()->InvalidateAccessibleEditableState( sal_True, this ); } diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index b0a125435389..ffd6da9bda51 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -362,7 +362,7 @@ void SwFrm::Destroy() SwRootFrm *pRootFrm = getRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() ) { - ViewShell *pVSh = pRootFrm->GetCurrShell(); + SwViewShell *pVSh = pRootFrm->GetCurrShell(); if( pVSh && pVSh->Imp() ) { OSL_ENSURE( !GetLower(), "Lowers should be dispose already!" ); @@ -509,7 +509,7 @@ void SwCntntFrm::DelFrms( const SwCntntNode& rNode ) // and relation CONTENT_FLOWS_TO for current previous paragraph will change. if ( pFrm->IsTxtFrm() ) { - ViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); + SwViewShell* pViewShell( pFrm->getRootFrm()->GetCurrShell() ); if ( pViewShell && pViewShell->GetLayout() && pViewShell->GetLayout()->IsAnyShellAccessible() ) { diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 2e25de503eaf..f2387e6daf0b 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2130,7 +2130,7 @@ void SwTabFrm::MakeAll() /// OD 23.10.2002 #103517# - In online layout try to grow upper of table /// frame, if table frame doesn't fit in its upper. - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); if ( nDistanceToUpperPrtBottom < 0 && bBrowseMode ) { @@ -3014,7 +3014,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) else (this->*fnRect->fnSetXMargins)( nLeftSpacing, nRightSpacing ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( bCheckBrowseWidth && pSh && pSh->GetViewOptions()->getBrowseMode() && GetUpper()->IsPageBodyFrm() && // only PageBodyFrms and not ColBodyFrms @@ -3467,7 +3467,7 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r if ( (pNewUpper->Prt().*fnRectX->fnGetHeight)() > 0 || nTmpSpace <= 0 ) nSpace = nTmpSpace; - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) nSpace += pNewUpper->Grow( LONG_MAX, sal_True ); } @@ -4418,7 +4418,7 @@ void SwRowFrm::Cut() SwRootFrm *pRootFrm = getRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() ) { - ViewShell* pVSh = pRootFrm->GetCurrShell(); + SwViewShell* pVSh = pRootFrm->GetCurrShell(); if ( pVSh && pVSh->Imp() ) { SwFrm* pCellFrm( GetLower() ); @@ -5221,7 +5221,7 @@ void SwCellFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, sal_False ) ) || RES_PROTECT == pNew->Which() ) { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetLayout()->IsAnyShellAccessible() ) pSh->Imp()->InvalidateAccessibleEditableState( sal_True, this ); } @@ -5284,7 +5284,7 @@ void SwCellFrm::Cut() SwRootFrm *pRootFrm = getRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() ) { - ViewShell* pVSh = pRootFrm->GetCurrShell(); + SwViewShell* pVSh = pRootFrm->GetCurrShell(); if ( pVSh && pVSh->Imp() ) { pVSh->Imp()->DisposeAccessibleFrm( this ); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 1be599eb7aa3..485b2049fbbc 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1997,7 +1997,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode ) SwPosition *pStartPos = rCrsr.Start(), *pEndPos = rCrsr.GetPoint() == pStartPos ? rCrsr.GetMark() : rCrsr.GetPoint(); - ViewShell *pSh = GetCurrShell(); + SwViewShell *pSh = GetCurrShell(); // #i12836# enhanced pdf SwRegionRects aRegion( pSh && !pSh->GetViewOptions()->IsPDFExport() ? diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx index 88db08c14f89..c0aa493683f6 100644 --- a/sw/source/core/layout/virtoutp.cxx +++ b/sw/source/core/layout/virtoutp.cxx @@ -167,7 +167,7 @@ sal_Bool SwLayVout::DoesFit( const Size &rNew ) /// output is used. /// <aRect> contains the rectangle that represents the area the virtual /// output device is used for and that is flushed at the end. -void SwLayVout::Enter( ViewShell *pShell, SwRect &rRect, sal_Bool bOn ) +void SwLayVout::Enter( SwViewShell *pShell, SwRect &rRect, sal_Bool bOn ) { Flush(); diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx index 18479d537971..33a1df2a046f 100644 --- a/sw/source/core/layout/virtoutp.hxx +++ b/sw/source/core/layout/virtoutp.hxx @@ -24,7 +24,7 @@ #include "swtypes.hxx" #include "swrect.hxx" -class ViewShell; +class SwViewShell; #define VIRTUALHEIGHT 64 /************************************************************************* @@ -35,7 +35,7 @@ class SwLayVout { friend void _FrmFinit(); //deletes Vout private: - ViewShell* pSh; + SwViewShell* pSh; OutputDevice* pOut; VirtualDevice* pVirDev; SwRect aRect; @@ -50,7 +50,7 @@ public: ~SwLayVout() { delete pVirDev; } /// OD 27.09.2002 #103636# - change 2nd parameter <rRect> - no longer <const> - void Enter( ViewShell *pShell, SwRect &rRect, sal_Bool bOn ); + void Enter( SwViewShell *pShell, SwRect &rRect, sal_Bool bOn ); void Leave() { --nCount; Flush(); } void SetOrgRect( SwRect &rRect ) { aOrgRect = rRect; } diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 13fc678ccc6d..05d90e500be0 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -177,7 +177,7 @@ void SwSectionFrm::CheckDirection( sal_Bool bVert ) const SwFrmFmt* pFmt = GetFmt(); if( pFmt ) { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); CheckDir(((SvxFrameDirectionItem&)pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(), bVert, sal_True, bBrowseMode ); @@ -191,7 +191,7 @@ void SwFlyFrm::CheckDirection( sal_Bool bVert ) const SwFrmFmt* pFmt = GetFmt(); if( pFmt ) { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); CheckDir(((SvxFrameDirectionItem&)pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(), bVert, sal_False, bBrowseMode ); @@ -205,7 +205,7 @@ void SwTabFrm::CheckDirection( sal_Bool bVert ) const SwFrmFmt* pFmt = GetFmt(); if( pFmt ) { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); CheckDir(((SvxFrameDirectionItem&)pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(), bVert, sal_True, bBrowseMode ); @@ -224,7 +224,7 @@ void SwCellFrm::CheckDirection( sal_Bool bVert ) if( pFmt && SFX_ITEM_SET == pFmt->GetItemState( RES_FRAMEDIR, sal_True, &pItem ) ) { const SvxFrameDirectionItem* pFrmDirItem = static_cast<const SvxFrameDirectionItem*>(pItem); - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); CheckDir( pFrmDirItem->GetValue(), bVert, sal_False, bBrowseMode ); } @@ -234,7 +234,7 @@ void SwCellFrm::CheckDirection( sal_Bool bVert ) void SwTxtFrm::CheckDirection( sal_Bool bVert ) { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); CheckDir( GetTxtNode()->GetSwAttrSet().GetFrmDir().GetValue(), bVert, sal_True, bBrowseMode ); @@ -1329,7 +1329,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst ) if ( !nDiff || !GetUpper()->IsFtnBossFrm() ) // only inside pages/columns return 0L; - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); //The (Page-)Body only changes in BrowseMode, but only if it does not @@ -1343,7 +1343,7 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst ) long nBrowseAdd = 0; if ( bBrowse && GetUpper()->IsPageFrm() ) // only (Page-)BodyFrms { - ViewShell *pViewShell = getRootFrm()->GetCurrShell(); + SwViewShell *pViewShell = getRootFrm()->GetCurrShell(); SwLayoutFrm *pUp = GetUpper(); long nChg; const long nUpPrtBottom = pUp->Frm().Height() - @@ -1797,7 +1797,7 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) nDist > (LONG_MAX - nFrmHeight ) ) nDist = LONG_MAX - nFrmHeight; - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse with Body if( !(GetUpper()->GetType() & nTmpType) && GetUpper()->HasFixSize() ) @@ -2306,7 +2306,7 @@ SwTwips SwLayoutFrm::InnerHeight() const |*************************************************************************/ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse with Body if( !(GetType() & nTmpType) && HasFixSize() ) @@ -2472,7 +2472,7 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) |*************************************************************************/ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body if( !(GetType() & nTmpType) && HasFixSize() ) @@ -3207,7 +3207,7 @@ long SwLayoutFrm::CalcRel( const SwFmtFrmSize &rSz, sal_Bool ) const { const SwFrm *pRel = GetUpper(); long nRel = LONG_MAX; - const ViewShell *pSh = getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = getRootFrm()->GetCurrShell(); const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode(); if( pRel->IsPageBodyFrm() && pSh && bBrowseMode && pSh->VisArea().Width() ) { @@ -3305,7 +3305,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, bool bEnd = false; bool bBackLock = false; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); SwViewImp *pImp = pSh ? pSh->Imp() : 0; { // Underlying algorithm @@ -3808,7 +3808,7 @@ void SwRootFrm::InvalidateAllCntnt( sal_uInt8 nInv ) if( nInv & INV_PRTAREA ) { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh ) pSh->InvalidateWindows( Frm() ); } diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index 969677e565de..e3296e347a20 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -152,7 +152,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() bool bBrowse = GetAnchorFrm().IsInDocBody() && !GetAnchorFrm().IsInTab(); if( bBrowse ) { - const ViewShell *pSh = GetAnchorFrm().getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = GetAnchorFrm().getRootFrm()->GetCurrShell(); if( !pSh || !pSh->GetViewOptions()->getBrowseMode() ) bBrowse = false; } diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index ea4796292ea6..ed7bac77d3de 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -126,7 +126,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() // if in online-layout the bottom of to-page anchored object is beyond // the page bottom, the page frame has to grow by growing its body frame. - const ViewShell *pSh = GetAnchorFrm().getRootFrm()->GetCurrShell(); + const SwViewShell *pSh = GetAnchorFrm().getRootFrm()->GetCurrShell(); if ( !bFlyAtFly && GetAnchorFrm().IsPageFrm() && pSh && pSh->GetViewOptions()->getBrowseMode() ) { diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 11b26adbbe7a..5e41bcbb9af8 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2391,7 +2391,7 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) OUString sNewTxt; if( DBL_MAX == fVal ) { - sNewTxt = ViewShell::GetShellRes()->aCalc_Error; + sNewTxt = SwViewShell::GetShellRes()->aCalc_Error; } else { diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx index 1cddbe9e73f6..6fa4b2cf39b4 100644 --- a/sw/source/core/text/atrhndl.hxx +++ b/sw/source/core/text/atrhndl.hxx @@ -28,7 +28,7 @@ class SwAttrSet; class IDocumentSettingAccess; -class ViewShell; +class SwViewShell; class SfxPoolItem; extern const sal_uInt8 StackPos[]; @@ -89,7 +89,7 @@ private: SwAttrStack aAttrStack[ NUM_ATTRIBUTE_STACKS ]; // stack collection const SfxPoolItem* pDefaultArray[ NUM_DEFAULT_VALUES ]; const IDocumentSettingAccess* mpIDocumentSettingAccess; - const ViewShell* mpShell; + const SwViewShell* mpShell; // This is the base font for the paragraph. It is stored in order to have // a template, if we have to restart the attribute evaluation @@ -116,10 +116,10 @@ public: // set default attributes to values in rAttrSet or from cache void Init( const SwAttrSet& rAttrSet, const IDocumentSettingAccess& rIDocumentSettingAccess, - const ViewShell* pShell ); + const SwViewShell* pShell ); void Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAttrSet, const IDocumentSettingAccess& rIDocumentSettingAccess, - const ViewShell* pShell, SwFont& rFnt, + const SwViewShell* pShell, SwFont& rFnt, sal_Bool bVertLayout ); // remove everything from internal stacks, keep default data @@ -141,7 +141,7 @@ public: inline void ResetFont( SwFont& rFnt ) const; inline const SwFont* GetFont() const; - void GetDefaultAscentAndHeight(ViewShell* pShell, + void GetDefaultAscentAndHeight(SwViewShell* pShell, OutputDevice& rOut, sal_uInt16& nAscent, sal_uInt16& nHeight) const; diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 18e49095e265..b7574d8b7189 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -214,7 +214,7 @@ bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr ) static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, const SfxPoolItem& rItem, - const ViewShell* pShell, + const SwViewShell* pShell, Color* pColor ) { if ( !pShell || @@ -401,7 +401,7 @@ SwAttrHandler::~SwAttrHandler() void SwAttrHandler::Init( const SwAttrSet& rAttrSet, const IDocumentSettingAccess& rIDocumentSettingAcces, - const ViewShell* pSh ) + const SwViewShell* pSh ) { mpIDocumentSettingAccess = &rIDocumentSettingAcces; mpShell = pSh; @@ -412,7 +412,7 @@ void SwAttrHandler::Init( const SwAttrSet& rAttrSet, void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS, const IDocumentSettingAccess& rIDocumentSettingAcces, - const ViewShell* pSh, + const SwViewShell* pSh, SwFont& rFnt, sal_Bool bVL ) { // initialize default array @@ -952,7 +952,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu } // Takes the default font and calculated the ascent and height -void SwAttrHandler::GetDefaultAscentAndHeight( ViewShell* pShell, OutputDevice& rOut, +void SwAttrHandler::GetDefaultAscentAndHeight( SwViewShell* pShell, OutputDevice& rOut, sal_uInt16& nAscent, sal_uInt16& nHeight ) const { OSL_ENSURE( pFnt, "No font available for GetDefaultAscentAndHeight" ); diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 305790bb905b..152d06693030 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -116,7 +116,7 @@ bool sw_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew ) !pFly->GetNextLink() && !pFly->GetPrevLink() ) || ( !pFly && pFrm->IsInTab() ) ) { - ViewShell* pVsh = pFrm->getRootFrm()->GetCurrShell(); + SwViewShell* pVsh = pFrm->getRootFrm()->GetCurrShell(); if( pVsh ) { if( pVsh->GetNext() != pVsh || @@ -902,7 +902,7 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset, xub_StrLen nOffs = GetOfst(); if( pTmpPrev ) { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); sal_Bool bProtectedAllowed = pSh && pSh->GetViewOptions()->IsCursorInProtectedArea(); const SwTxtFrm *pPrevPrev = pTmpPrev; // We skip protected frames and frames without content here @@ -1256,7 +1256,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset, if( 0 != ( pTmpFollow = GetFollow() ) ) { // Skip protected follows const SwCntntFrm* pTmp = pTmpFollow; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( !pSh || !pSh->GetViewOptions()->IsCursorInProtectedArea() ) { while( pTmpFollow && pTmpFollow->IsProtected() ) @@ -1417,7 +1417,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const pColl = &pColl->GetNextTxtFmtColl(); SwAttrSet aSet( ((SwDoc*)GetTxtNode()->GetDoc())->GetAttrPool(), aTxtFmtCollSetRange ); const SwAttrSet* pSet = &pColl->GetAttrSet(); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( GetTxtNode()->HasSwAttrSet() ) { aSet.Put( *GetTxtNode()->GetpSwAttrSet() ); diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 355e5d2b5e1e..4291e9230b80 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -625,7 +625,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm() // and relation CONTENT_FLOWS_TO for current previous paragraph, which // is <this>, will change. { - ViewShell* pViewShell( pFoll->getRootFrm()->GetCurrShell() ); + SwViewShell* pViewShell( pFoll->getRootFrm()->GetCurrShell() ); if ( pViewShell && pViewShell->GetLayout() && pViewShell->GetLayout()->IsAnyShellAccessible() ) { @@ -659,7 +659,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos ) // and relation CONTENT_FLOWS_TO for current previous paragraph, which // is <this>, will change. { - ViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() ); + SwViewShell* pViewShell( pNew->getRootFrm()->GetCurrShell() ); if ( pViewShell && pViewShell->GetLayout() && pViewShell->GetLayout()->IsAnyShellAccessible() ) { @@ -1184,7 +1184,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev ) } SwTwips nRght = std::max( nOldWidth, pNew->Width() + pNew->GetHangingMargin() ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); const SwViewOption *pOpt = pSh ? pSh->GetViewOptions() : 0; if( pOpt && (pOpt->IsParagraph() || pOpt->IsLineBreak()) ) nRght += ( std::max( nOldAscent, pNew->GetAscent() ) ); diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 881f932ff74a..253adfb32b6e 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -67,7 +67,7 @@ class SwExtraPainter SwSaveClip aClip; SwRect aRect; const SwTxtFrm* pTxtFrm; - ViewShell *pSh; + SwViewShell *pSh; SwFont* pFnt; const SwLineNumberInfo &rLineInf; SwTwips nX; @@ -78,7 +78,7 @@ class SwExtraPainter bool bLineNum; inline bool IsClipChg() { return aClip.IsChg(); } public: - SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh, + SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh, const SwLineNumberInfo &rLnInf, const SwRect &rRct, sal_Int16 eHor, bool bLnNm ); ~SwExtraPainter() { delete pFnt; } @@ -93,7 +93,7 @@ public: }; -SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh, +SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, SwViewShell *pVwSh, const SwLineNumberInfo &rLnInf, const SwRect &rRct, sal_Int16 eHor, bool bLnNm ) : aClip( pVwSh->GetWin() || pFrm->IsUndersized() ? pVwSh->GetOut() : 0 ), @@ -294,7 +294,7 @@ void SwTxtFrm::PaintExtraData( const SwRect &rRect ) const { if( IsLocked() || IsHiddenNow() || !Prt().Height() ) return; - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); SWAP_IF_NOT_SWAPPED( this ) SwRect rOldRect( rRect ); @@ -444,7 +444,7 @@ SwRect SwTxtFrm::Paint() sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && ( pSh->GetViewOptions()->IsParagraph() || bInitFont ) ) { bInitFont = false; @@ -567,7 +567,7 @@ void SwTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const ResetRepaint(); // #i16816# tagged pdf support - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); Num_Info aNumInfo( *this ); SwTaggedPDFHelper aTaggedPDFHelperNumbering( &aNumInfo, 0, 0, *pSh->GetOut() ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 46b1c867aa12..828aab658369 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -552,7 +552,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor if( GetFont()->IsBlink() && OnWin() && rPor.Width() ) { // check if accessibility options allow blinking portions: - const ViewShell* pSh = GetTxtFrm()->getRootFrm()->GetCurrShell(); + const SwViewShell* pSh = GetTxtFrm()->getRootFrm()->GetCurrShell(); if ( pSh && ! pSh->GetAccessibilityOptions()->IsStopAnimatedText() && ! pSh->IsPreview() ) { @@ -777,7 +777,7 @@ void SwTxtPaintInfo::CalcRect( const SwLinePortion& rPor, if( aRect.HasArea() && pIntersect ) { - ::SwAlignRect( aRect, (ViewShell*)GetVsh() ); + ::SwAlignRect( aRect, (SwViewShell*)GetVsh() ); if ( GetOut()->IsClipRegion() ) { diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 4fadf2ad72ce..010cbdc840d5 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -50,7 +50,7 @@ class SwTabPortion; class SwTxtFrm; class SwTxtSizeInfo; class SwViewOption; -class ViewShell; +class SwViewShell; class SwAttrIter; struct SwMultiCreator; class SwMultiPortion; @@ -162,7 +162,7 @@ protected: // this array is passed over to the info structure std::deque<sal_uInt16>* m_pKanaComp; - ViewShell *m_pVsh; + SwViewShell *m_pVsh; // m_pOut is the output device, m_pRef is the device used for formatting OutputDevice* m_pOut; @@ -248,8 +248,8 @@ public: inline void SetDirection( const sal_uInt8 nNew ) { m_nDirection = nNew; } inline sal_Bool IsRotated() const { return 0 != ( 1 & m_nDirection ); } - inline ViewShell *GetVsh() { return m_pVsh; } - inline const ViewShell *GetVsh() const { return m_pVsh; } + inline SwViewShell *GetVsh() { return m_pVsh; } + inline const SwViewShell *GetVsh() const { return m_pVsh; } inline OutputDevice *GetOut() { return m_pOut; } inline const OutputDevice *GetOut() const { return m_pOut; } diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 37819b144c34..a61b1eb0c884 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -359,7 +359,7 @@ class SwMinMaxArgs { public: OutputDevice* pOut; - ViewShell* pSh; + SwViewShell* pSh; sal_uLong &rMin; sal_uLong &rMax; sal_uLong &rAbsMin; @@ -367,7 +367,7 @@ public: long nWordWidth; long nWordAdd; xub_StrLen nNoLineBreak; - SwMinMaxArgs( OutputDevice* pOutI, ViewShell* pShI, sal_uLong& rMinI, sal_uLong &rMaxI, sal_uLong &rAbsI ) + SwMinMaxArgs( OutputDevice* pOutI, SwViewShell* pShI, sal_uLong& rMinI, sal_uLong &rMaxI, sal_uLong &rAbsI ) : pOut( pOutI ), pSh( pShI ), rMin( rMinI ), rMax( rMaxI ), rAbsMin( rAbsI ) { nRowWidth = nWordWidth = nWordAdd = 0; nNoLineBreak = STRING_LEN; } void Minimum( long nNew ) const { if( (long)rMin < nNew ) rMin = nNew; } @@ -434,7 +434,7 @@ sal_Bool SwTxtNode::IsSymbol( const xub_StrLen nBegin ) const SwAttrIter aIter( *(SwTxtNode*)this, aScriptInfo ); aIter.Seek( nBegin ); return aIter.GetFnt()->IsSymbol( - const_cast<ViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()) ); + const_cast<SwViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()) ); } class SwMinMaxNodeArgs @@ -585,7 +585,7 @@ static void lcl_MinMaxNode( SwFrmFmt* pNd, SwMinMaxNodeArgs* pIn ) void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong& rAbsMin, OutputDevice* pOut ) const { - ViewShell* pSh = 0; + SwViewShell* pSh = 0; GetDoc()->GetEditShell( &pSh ); if( !pOut ) { @@ -696,7 +696,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa case CHAR_HARDHYPHEN: { OUString sTmp( cChar ); - SwDrawTextInfo aDrawInf( const_cast<ViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()), + SwDrawTextInfo aDrawInf( const_cast<SwViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()), *pOut, 0, sTmp, 0, 1, 0, sal_False ); nAktWidth = aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width(); aArg.nWordWidth += nAktWidth; @@ -822,7 +822,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa sal_uInt16 SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const { - ViewShell* pSh = NULL; + SwViewShell* pSh = NULL; OutputDevice* pOut = NULL; GetDoc()->GetEditShell( &pSh ); diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx index 6b48dc111af5..acd35fcc8706 100644 --- a/sw/source/core/text/itratr.hxx +++ b/sw/source/core/text/itratr.hxx @@ -32,7 +32,7 @@ class SwTxtAttr; class SwAttrSet; class SwTxtNode; class SwRedlineItr; -class ViewShell; +class SwViewShell; class SwTxtFrm; /************************************************************************* @@ -45,7 +45,7 @@ class SwAttrIter protected: SwAttrHandler aAttrHandler; - ViewShell *pShell; + SwViewShell *pShell; SwFont *pFnt; SwpHints *pHints; const SwAttrSet* pAttrSet; // The char attribute set diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 3e48b7b4cab4..4d977d92964a 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -975,7 +975,7 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const if( aTmp.IsOver( rInf.GetPaintRect() ) && !bDraw ) { rInf.NoteAnimation(); - const ViewShell* pViewShell = rInf.GetVsh(); + const SwViewShell* pViewShell = rInf.GetVsh(); // virtual device, not pdf export if( OUTDEV_VIRDEV == rInf.GetOut()->GetOutDevType() && @@ -1218,7 +1218,7 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf ) } sal_uInt16 nTop = ( nCount + 1 ) / 2; // the first character of the second line - ViewShell *pSh = rInf.GetTxtFrm()->getRootFrm()->GetCurrShell(); + SwViewShell *pSh = rInf.GetTxtFrm()->getRootFrm()->GetCurrShell(); SwFont aTmpFont( *rInf.GetFont() ); SwFontSave aFontSave( rInf, &aTmpFont ); nProportion = 55; diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 5e80d374d443..fd3b40d1560f 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -219,7 +219,7 @@ SwLinePortion *SwArrowPortion::Compress() { return this; } SwTwips SwTxtFrm::EmptyHeight() const { if (IsCollapse()) { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( pSh->IsA( TYPE(SwCrsrShell) ) ) { SwCrsrShell *pCrSh=(SwCrsrShell*)pSh; SwCntntFrm *pCurrFrm=pCrSh->GetCurrFrm(); @@ -237,7 +237,7 @@ SwTwips SwTxtFrm::EmptyHeight() const SwFont *pFnt; const SwTxtNode& rTxtNode = *GetTxtNode(); const IDocumentSettingAccess* pIDSA = rTxtNode.getIDocumentSettingAccess(); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( rTxtNode.HasSwAttrSet() ) { const SwAttrSet *pAttrSet = &( rTxtNode.GetSwAttrSet() ); @@ -398,7 +398,7 @@ sal_Bool SwTxtFrm::FillRegister( SwTwips& rRegStart, KSHORT& rRegDiff ) } else { - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); SwFontAccess aFontAccess( pFmt, pSh ); SwFont aFnt( *aFontAccess.Get()->GetFont() ); diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 266c96cda1f4..5c0dc843c2a7 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -91,7 +91,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf, const_cast<SwFmtFld*> (&pHint->GetFld())->Broadcast( SwFmtFldHint( &pHint->GetFld(), SWFMTFLD_LANGUAGE ) ); } - ViewShell *pSh = rInf.GetVsh(); + SwViewShell *pSh = rInf.GetVsh(); SwDoc *const pDoc( (pSh) ? pSh->GetDoc() : 0 ); bool const bInClipboard( (pDoc) ? pDoc->IsClipBoard() : true ); sal_Bool bPlaceHolder = false; diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index e1511a46cf0a..8698b43999e2 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -259,7 +259,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt, delete pPolyPolygon; // UPPER_LOWER_TEST #ifdef DBG_UTIL - const ViewShell* pTmpViewShell = pFmt->GetDoc()->GetCurrentViewShell(); + const SwViewShell* pTmpViewShell = pFmt->GetDoc()->GetCurrentViewShell(); if( pTmpViewShell ) { sal_Bool bT2 = pTmpViewShell->GetViewOptions()->IsTest2(); diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index acb60ef8dc07..ff0da2365dda 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -419,7 +419,7 @@ sal_Bool SwTxtFrm::IsHiddenNow() const const bool bHiddenCharsHidePara = GetTxtNode()->HasHiddenCharAttribute( true ); const bool bHiddenParaField = GetTxtNode()->HasHiddenParaField(); - const ViewShell* pVsh = getRootFrm()->GetCurrShell(); + const SwViewShell* pVsh = getRootFrm()->GetCurrShell(); if ( pVsh && ( bHiddenCharsHidePara || bHiddenParaField ) ) { @@ -584,7 +584,7 @@ void SwTxtFrm::HideAndShowObjects() // paragraph is visible, but can contain hidden text portion. // first we check if objects are allowed to be hidden: const SwTxtNode& rNode = *GetTxtNode(); - const ViewShell* pVsh = getRootFrm()->GetCurrShell(); + const SwViewShell* pVsh = getRootFrm()->GetCurrShell(); const bool bShouldBeHidden = !pVsh || !pVsh->GetWin() || !pVsh->GetViewOptions()->IsShowHiddenChar(); @@ -1044,7 +1044,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) } // #i104008# - ViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; + SwViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if ( pViewSh ) { pViewSh->InvalidateAccessibleParaAttrs( *this ); @@ -1301,7 +1301,7 @@ void SwTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if (isA11yRelevantAttribute(nWhich)) { // #i88069# - ViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; + SwViewShell* pViewSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if ( pViewSh ) { pViewSh->InvalidateAccessibleParaAttrs( *this ); @@ -2262,10 +2262,10 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont ) // invalidate printing area, if height of last line changes const SwTwips mnOldHeightOfLastLine( mnHeightOfLastLine ); // determine output device - ViewShell* pVsh = getRootFrm()->GetCurrShell(); - OSL_ENSURE( pVsh, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no ViewShell" ); + SwViewShell* pVsh = getRootFrm()->GetCurrShell(); + OSL_ENSURE( pVsh, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no SwViewShell" ); // #i78921# - make code robust, according to provided patch - // There could be no <ViewShell> instance in the case of loading a binary + // There could be no <SwViewShell> instance in the case of loading a binary // StarOffice file format containing an embedded Writer document. if ( !pVsh ) { @@ -2741,7 +2741,7 @@ void SwTxtFrm::repaintTextFrames( const SwTxtNode& rNode ) { SwRect aRec( pFrm->PaintArea() ); const SwRootFrm *pRootFrm = pFrm->getRootFrm(); - ViewShell *pCurShell = pRootFrm ? pRootFrm->GetCurrShell() : NULL; + SwViewShell *pCurShell = pRootFrm ? pRootFrm->GetCurrShell() : NULL; if( pCurShell ) pCurShell->InvalidateWindows( aRec ); } diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 8cbf49526434..8f66acf877cb 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -745,7 +745,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) pBoss->RearrangeFtns( nDeadLine, sal_False, pFtn ); ValidateBodyFrm(); ValidateFrm(); - ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( pSh && nHeight == (pCont->Frm().*fnRect->fnGetHeight)() ) //Damit uns nix durch die Lappen geht. pSh->InvalidateWindows( pCont->Frm() ); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 59660bc1cd90..aa7349b50318 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -103,7 +103,7 @@ void SwFntCache::Flush( ) |* |*************************************************************************/ -SwFntObj::SwFntObj( const SwSubFont &rFont, const void *pOwn, ViewShell *pSh ) : +SwFntObj::SwFntObj( const SwSubFont &rFont, const void *pOwn, SwViewShell *pSh ) : SwCacheObj( (void*)pOwn ), aFont( rFont ), pScrFont( NULL ), @@ -279,7 +279,7 @@ static void lcl_calcLinePos( const CalcLinePosData &rData, * it may be necessary to create the screen font first. *************************************************************************/ -sal_uInt16 SwFntObj::GetFontAscent( const ViewShell *pSh, const OutputDevice& rOut ) +sal_uInt16 SwFntObj::GetFontAscent( const SwViewShell *pSh, const OutputDevice& rOut ) { sal_uInt16 nRet = 0; const OutputDevice& rRefDev = pSh ? pSh->GetRefDev() : rOut; @@ -322,7 +322,7 @@ sal_uInt16 SwFntObj::GetFontAscent( const ViewShell *pSh, const OutputDevice& rO * it may be necessary to create the screen font first. *************************************************************************/ -sal_uInt16 SwFntObj::GetFontHeight( const ViewShell* pSh, const OutputDevice& rOut ) +sal_uInt16 SwFntObj::GetFontHeight( const SwViewShell* pSh, const OutputDevice& rOut ) { sal_uInt16 nRet = 0; const OutputDevice& rRefDev = pSh ? pSh->GetRefDev() : rOut; @@ -362,7 +362,7 @@ sal_uInt16 SwFntObj::GetFontHeight( const ViewShell* pSh, const OutputDevice& rO return nRet; } -sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& rOut ) +sal_uInt16 SwFntObj::GetFontLeading( const SwViewShell *pSh, const OutputDevice& rOut ) { sal_uInt16 nRet = 0; @@ -416,13 +416,13 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& r /************************************************************************* * - * SwFntObj::CreateScrFont( const ViewShell& rSh, const OutputDevice& rOut ) + * SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) * * pOut is the output device, not the reference device * *************************************************************************/ -void SwFntObj::CreateScrFont( const ViewShell& rSh, const OutputDevice& rOut ) +void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) { if ( pScrFont ) return; @@ -516,7 +516,7 @@ void SwFntObj::CreateScrFont( const ViewShell& rSh, const OutputDevice& rOut ) } -void SwFntObj::GuessLeading( const ViewShell& +void SwFntObj::GuessLeading( const SwViewShell& #if defined(WNT) rSh #endif @@ -601,7 +601,7 @@ void SwFntObj::GuessLeading( const ViewShell& * *************************************************************************/ -void SwFntObj::SetDevFont( const ViewShell *pSh, OutputDevice& rOut ) +void SwFntObj::SetDevFont( const SwViewShell *pSh, OutputDevice& rOut ) { const OutputDevice& rRefDev = pSh ? pSh->GetRefDev() : rOut; @@ -2228,7 +2228,7 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) |*************************************************************************/ SwFntAccess::SwFntAccess( const void* &rMagic, - sal_uInt16 &rIndex, const void *pOwn, ViewShell *pSh, + sal_uInt16 &rIndex, const void *pOwn, SwViewShell *pSh, sal_Bool bCheck ) : SwCacheAccess( *pFntCache, rMagic, rIndex ), pShell( pSh ) diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 892273778f01..a73cf97d8049 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -243,7 +243,7 @@ void SwDoGetCapitalBreak::Do() * SwFont::GetCapitalBreak() *************************************************************************/ -xub_StrLen SwFont::GetCapitalBreak( ViewShell* pSh, const OutputDevice* pOut, +xub_StrLen SwFont::GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut, const SwScriptInfo* pScript, const OUString& rTxt, long const nTextWidth, const xub_StrLen nIdx, const xub_StrLen nLen ) { diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx index fbf867b5378b..803891177e03 100644 --- a/sw/source/core/txtnode/swfntcch.cxx +++ b/sw/source/core/txtnode/swfntcch.cxx @@ -35,7 +35,7 @@ SwFontCache *pSwFontCache = NULL; |* |*************************************************************************/ -SwFontObj::SwFontObj( const void *pOwn, ViewShell *pSh ) : +SwFontObj::SwFontObj( const void *pOwn, SwViewShell *pSh ) : SwCacheObj( (void*)pOwn ), aSwFont( &((SwTxtFmtColl *)pOwn)->GetAttrSet(), pSh ? pSh->getIDocumentSettingAccess() : 0 ) { @@ -55,7 +55,7 @@ SwFontObj::~SwFontObj() |* |*************************************************************************/ -SwFontAccess::SwFontAccess( const void *pOwn, ViewShell *pSh ) : +SwFontAccess::SwFontAccess( const void *pOwn, SwViewShell *pSh ) : SwCacheAccess( *pSwFontCache, pOwn, ((SwTxtFmtColl*)pOwn)->IsInSwFntCache() ), pShell( pSh ) diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 0a361cac51a7..11b559a52a55 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -960,19 +960,19 @@ SwFont& SwFont::operator=( const SwFont &rFont ) return *this; } -void SwFont::GoMagic( ViewShell *pSh, sal_uInt8 nWhich ) +void SwFont::GoMagic( SwViewShell *pSh, sal_uInt8 nWhich ) { SwFntAccess aFntAccess( aSub[nWhich].pMagic, aSub[nWhich].nFntIndex, &aSub[nWhich], pSh, sal_True ); } -sal_Bool SwSubFont::IsSymbol( ViewShell *pSh ) +sal_Bool SwSubFont::IsSymbol( SwViewShell *pSh ) { SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, sal_False ); return aFntAccess.Get()->IsSymbol(); } -sal_Bool SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut ) +sal_Bool SwSubFont::ChgFnt( SwViewShell *pSh, OutputDevice& rOut ) { if ( pLastFont ) pLastFont->Unlock(); @@ -989,7 +989,7 @@ sal_Bool SwSubFont::ChgFnt( ViewShell *pSh, OutputDevice& rOut ) STRIKEOUT_NONE != GetStrikeout(); } -void SwFont::ChgPhysFnt( ViewShell *pSh, OutputDevice& rOut ) +void SwFont::ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut ) { if( bOrgChg && aSub[nActual].IsEsc() ) { @@ -1046,7 +1046,7 @@ short SwSubFont::_CheckKerning( ) return nKernx; } -sal_uInt16 SwSubFont::GetAscent( ViewShell *pSh, const OutputDevice& rOut ) +sal_uInt16 SwSubFont::GetAscent( SwViewShell *pSh, const OutputDevice& rOut ) { sal_uInt16 nAscent; SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh ); @@ -1056,7 +1056,7 @@ sal_uInt16 SwSubFont::GetAscent( ViewShell *pSh, const OutputDevice& rOut ) return nAscent; } -sal_uInt16 SwSubFont::GetHeight( ViewShell *pSh, const OutputDevice& rOut ) +sal_uInt16 SwSubFont::GetHeight( SwViewShell *pSh, const OutputDevice& rOut ) { SV_STAT( nGetTextSize ); SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh ); diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 52aa1b3ced33..948837742a5e 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -69,7 +69,7 @@ IMPL_LINK( SwDoc, AddDrawUndo, SdrUndoAction *, pUndo ) GetIDocumentUndoRedo().DoesDrawUndo()) { const SdrMarkList* pMarkList = 0; - ViewShell* pSh = GetCurrentViewShell(); + SwViewShell* pSh = GetCurrentViewShell(); if( pSh && pSh->HasDrawView() ) pMarkList = &pSh->GetDrawView()->GetMarkedObjectList(); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index fb74a806cb01..48a2904534bc 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2232,7 +2232,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, // correctly evaluated the document needs a layout // (has to be already formatted) SwDoc *pDoc = m_pImpl->m_pDoc; - ViewShell *pViewShell = 0; + SwViewShell *pViewShell = 0; SwEditShell *pEditShell = pDoc ? pDoc->GetEditShell( &pViewShell ) : 0; if (pEditShell) pEditShell->CalcLayout(); diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 1f17df33dedf..c378f0372b1d 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -348,7 +348,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara() SwTxtNode* pRet = 0; if ( mbAutomatic ) { - ViewShell* pViewShell = 0; + SwViewShell* pViewShell = 0; mpDoc->GetEditShell( &pViewShell ); SwPageFrm* pCurrentPage = pViewShell ? pViewShell->Imp()->GetFirstVisPage() : 0; diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index ef8fdcea6f87..99fe888aa494 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -143,7 +143,7 @@ static const char cUserSuffix[] = " (user)"; static void lcl_ConvertTOUNameToProgrammaticName(OUString& rTmp) { - ShellResource* pShellRes = ViewShell::GetShellRes(); + ShellResource* pShellRes = SwViewShell::GetShellRes(); if(rTmp.equals(pShellRes->aTOXUserName)) { @@ -160,7 +160,7 @@ static void lcl_ConvertTOUNameToProgrammaticName(OUString& rTmp) static void lcl_ConvertTOUNameToUserName(OUString& rTmp) { - ShellResource* pShellRes = ViewShell::GetShellRes(); + ShellResource* pShellRes = SwViewShell::GetShellRes(); if (rTmp.equalsAscii(cUserDefined)) { rTmp = pShellRes->aTOXUserName; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 75bb8b0447af..e54169b09b76 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1001,7 +1001,7 @@ sal_Int32 SwXCell::getError(void) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; OUString sContent = getString(); - return sContent.equals(ViewShell::GetShellRes()->aCalc_Error); + return sContent.equals(SwViewShell::GetShellRes()->aCalc_Error); } uno::Reference< text::XTextCursor > SwXCell::createTextCursor(void) throw( uno::RuntimeException ) diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index ec3fb79349be..e3328c81e1b9 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -45,7 +45,7 @@ extern void SwCalcPixStatics( OutputDevice *pOut ); // methods to initialize page preview layout -SwPagePreviewLayout::SwPagePreviewLayout( ViewShell& _rParentViewShell, +SwPagePreviewLayout::SwPagePreviewLayout( SwViewShell& _rParentViewShell, const SwRootFrm& _rLayoutRootFrm ) : mnXFree ( 4*142 ), mnYFree ( 4*142 ), diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 7600816d00a6..631f75c3f547 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -60,7 +60,7 @@ void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, SwViewOption aViewOpt( *pViewOpt ); aViewOpt.SetOnlineSpell( sal_False ); - m_pPostItShell.reset(new ViewShell(*new SwDoc, 0, &aViewOpt, pOutDev)); + m_pPostItShell.reset(new SwViewShell(*new SwDoc, 0, &aViewOpt, pOutDev)); } void SwRenderData::DeletePostItData() @@ -84,13 +84,13 @@ void SwRenderData::SetTempDocShell(SfxObjectShellLock const& xShell) m_xTempDocShell = xShell; } -bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell& rCompare ) const +bool SwRenderData::NeedNewViewOptionAdjust( const SwViewShell& rCompare ) const { return m_pViewOptionAdjust ? ! m_pViewOptionAdjust->checkShell( rCompare ) : true; } void SwRenderData::ViewOptionAdjustStart( - ViewShell &rSh, const SwViewOption &rViewOptions) + SwViewShell &rSh, const SwViewOption &rViewOptions) { if (m_pViewOptionAdjust) { diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 4c77bd8e1422..0eca42131c5d 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -88,7 +88,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt ) } /// CTor for the core internals -SwViewImp::SwViewImp( ViewShell *pParent ) : +SwViewImp::SwViewImp( SwViewShell *pParent ) : pSh( pParent ), pDrawView( 0 ), pSdrPageView( 0 ), @@ -251,7 +251,7 @@ void SwViewImp::MakeDrawView() Color SwViewImp::GetRetoucheColor() const { Color aRet( COL_TRANSPARENT ); - const ViewShell &rSh = *GetShell(); + const SwViewShell &rSh = *GetShell(); if ( rSh.GetWin() ) { if ( rSh.GetViewOptions()->getBrowseMode() && @@ -291,13 +291,13 @@ void SwViewImp::DisposeAccessible( const SwFrm *pFrm, sal_Bool bRecursive ) { OSL_ENSURE( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" ); - ViewShell *pVSh = GetShell(); - ViewShell *pTmp = pVSh; + SwViewShell *pVSh = GetShell(); + SwViewShell *pTmp = pVSh; do { if( pTmp->Imp()->IsAccessible() ) pTmp->Imp()->GetAccessibleMap().Dispose( pFrm, pObj, 0, bRecursive ); - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } @@ -305,27 +305,27 @@ void SwViewImp::MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj, const SwRect& rOldFrm ) { OSL_ENSURE( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" ); - ViewShell *pVSh = GetShell(); - ViewShell *pTmp = pVSh; + SwViewShell *pVSh = GetShell(); + SwViewShell *pTmp = pVSh; do { if( pTmp->Imp()->IsAccessible() ) pTmp->Imp()->GetAccessibleMap().InvalidatePosOrSize( pFrm, pObj, 0, rOldFrm ); - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm ) { OSL_ENSURE( pFrm->IsAccessibleFrm(), "frame is not accessible" ); - ViewShell *pVSh = GetShell(); - ViewShell *pTmp = pVSh; + SwViewShell *pVSh = GetShell(); + SwViewShell *pTmp = pVSh; do { if( pTmp->Imp()->IsAccessible() ) pTmp->Imp()->GetAccessibleMap().InvalidateContent( pFrm ); - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } @@ -340,13 +340,13 @@ void SwViewImp::InvalidateAccessibleEditableState( sal_Bool bAllShells, { if( bAllShells ) { - ViewShell *pVSh = GetShell(); - ViewShell *pTmp = pVSh; + SwViewShell *pVSh = GetShell(); + SwViewShell *pTmp = pVSh; do { if( pTmp->Imp()->IsAccessible() ) pTmp->Imp()->GetAccessibleMap().InvalidateStates( ACC_STATE_EDITABLE, pFrm ); - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } else if( IsAccessible() ) @@ -358,14 +358,14 @@ void SwViewImp::InvalidateAccessibleEditableState( sal_Bool bAllShells, void SwViewImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster, const SwFlyFrm *pFollow ) { - ViewShell *pVSh = GetShell(); - ViewShell *pTmp = pVSh; + SwViewShell *pVSh = GetShell(); + SwViewShell *pTmp = pVSh; do { if( pTmp->Imp()->IsAccessible() ) pTmp->Imp()->GetAccessibleMap().InvalidateRelationSet( pMaster, pFollow ); - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } @@ -379,8 +379,8 @@ void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxt return; } - ViewShell* pVSh = GetShell(); - ViewShell* pTmp = pVSh; + SwViewShell* pVSh = GetShell(); + SwViewShell* pTmp = pVSh; do { if ( pTmp->Imp()->IsAccessible() ) @@ -396,15 +396,15 @@ void SwViewImp::_InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxt InvalidateParaFlowRelation( *_pToTxtFrm, false ); } } - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } /// invalidate text selection for paragraphs void SwViewImp::_InvalidateAccessibleParaTextSelection() { - ViewShell* pVSh = GetShell(); - ViewShell* pTmp = pVSh; + SwViewShell* pVSh = GetShell(); + SwViewShell* pTmp = pVSh; do { if ( pTmp->Imp()->IsAccessible() ) @@ -412,15 +412,15 @@ void SwViewImp::_InvalidateAccessibleParaTextSelection() pTmp->Imp()->GetAccessibleMap().InvalidateTextSelectionOfAllParas(); } - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } /// invalidate attributes for paragraphs void SwViewImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ) { - ViewShell* pVSh = GetShell(); - ViewShell* pTmp = pVSh; + SwViewShell* pVSh = GetShell(); + SwViewShell* pTmp = pVSh; do { if ( pTmp->Imp()->IsAccessible() ) @@ -428,7 +428,7 @@ void SwViewImp::_InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ) pTmp->Imp()->GetAccessibleMap().InvalidateAttr( rTxtFrm ); } - pTmp = (ViewShell *)pTmp->GetNext(); + pTmp = (SwViewShell *)pTmp->GetNext(); } while ( pTmp != pVSh ); } diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index c4d194777114..ba58d63f9e24 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -49,12 +49,12 @@ SwPageFrm const* sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage); // vprint.cxx // OD 12.12.2002 #103492# -SwPagePreviewLayout* ViewShell::PagePreviewLayout() +SwPagePreviewLayout* SwViewShell::PagePreviewLayout() { return Imp()->PagePreviewLayout(); } -void ViewShell::ShowPreviewSelection( sal_uInt16 nSelPage ) +void SwViewShell::ShowPreviewSelection( sal_uInt16 nSelPage ) { Imp()->InvalidateAccessiblePreviewSelection( nSelPage ); } @@ -63,7 +63,7 @@ void ViewShell::ShowPreviewSelection( sal_uInt16 nSelPage ) OD 09.01.2003 #i6467# */ -void ViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions) +void SwViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions) { if ( !IsPreview() ) { @@ -79,7 +79,7 @@ void ViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions) /// print brochure // OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling // for a page to be printed. -void ViewShell::PrintProspect( +void SwViewShell::PrintProspect( OutputDevice *pOutDev, const SwPrintData &rPrintData, sal_Int32 nRenderer // the index in the vector of prospect pages to be printed @@ -101,7 +101,7 @@ void ViewShell::PrintProspect( OSL_ENSURE( rPagesToPrint.second == -1 || rPrintData.GetRenderData().GetValidPagesSet().count( rPagesToPrint.second ) == 1, "second Page not valid" ); // create a new shell for the printer - ViewShell aShell( *this, 0, pPrinter ); + SwViewShell aShell( *this, 0, pPrinter ); SET_CURR_SHELL( &aShell ); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 7929dbdff409..6a63a2da0424 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -65,21 +65,21 @@ #include <vcl/svapp.hxx> #include <svx/sdrpaintwindow.hxx> -sal_Bool ViewShell::mbLstAct = sal_False; -ShellResource *ViewShell::mpShellRes = 0; -Window *ViewShell::mpCareWindow = 0; -BitmapEx* ViewShell::mpErrorBmp = NULL; -BitmapEx* ViewShell::mpReplaceBmp = NULL; +sal_Bool SwViewShell::mbLstAct = sal_False; +ShellResource *SwViewShell::mpShellRes = 0; +Window *SwViewShell::mpCareWindow = 0; +BitmapEx* SwViewShell::mpErrorBmp = NULL; +BitmapEx* SwViewShell::mpReplaceBmp = NULL; bool bInSizeNotify = false; DBG_NAME(LayoutIdle) -TYPEINIT0(ViewShell); +TYPEINIT0(SwViewShell); using namespace ::com::sun::star; -void ViewShell::ToggleHeaderFooterEdit() +void SwViewShell::ToggleHeaderFooterEdit() { mbHeaderFooterEdit = !mbHeaderFooterEdit; if ( !mbHeaderFooterEdit ) @@ -100,7 +100,7 @@ void ViewShell::ToggleHeaderFooterEdit() } static void -lcl_PaintTransparentFormControls(ViewShell & rShell, SwRect const& rRect) +lcl_PaintTransparentFormControls(SwViewShell & rShell, SwRect const& rRect) { // Direct paint has been performed: the background of transparent child // windows has been painted, so need to paint the child windows now. @@ -120,7 +120,7 @@ lcl_PaintTransparentFormControls(ViewShell & rShell, SwRect const& rRect) // buffered into VDevs to avoid flicker. Tis is in general problematic and should be // solved once using the BufferedOutput functionality of the DrawView. -void ViewShell::PrePaint() +void SwViewShell::PrePaint() { // forward PrePaint event from VCL Window to DrawingLayer if(HasDrawView()) @@ -129,7 +129,7 @@ void ViewShell::PrePaint() } } -void ViewShell::DLPrePaint2(const Region& rRegion) +void SwViewShell::DLPrePaint2(const Region& rRegion) { if(mPrePostPaintRegions.empty()) { @@ -164,9 +164,9 @@ void ViewShell::DLPrePaint2(const Region& rRegion) } } -void ViewShell::DLPostPaint2(bool bPaintFormLayer) +void SwViewShell::DLPostPaint2(bool bPaintFormLayer) { - OSL_ENSURE(!mPrePostPaintRegions.empty(), "ViewShell::DLPostPaint2: Pre/PostPaint encapsulation broken (!)"); + OSL_ENSURE(!mPrePostPaintRegions.empty(), "SwViewShell::DLPostPaint2: Pre/PostPaint encapsulation broken (!)"); if( mPrePostPaintRegions.size() > 1 ) { @@ -192,7 +192,7 @@ void ViewShell::DLPostPaint2(bool bPaintFormLayer) } // end of Pre/PostPaints -void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) +void SwViewShell::ImplEndAction( const sal_Bool bIdleEnd ) { // Nothing to do for the printer? if ( !GetWin() || IsPreview() ) @@ -205,17 +205,17 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) mbInEndAction = sal_True; //will this put the EndAction of the last shell in the sequence? - ViewShell::mbLstAct = sal_True; - ViewShell *pSh = (ViewShell*)this->GetNext(); + SwViewShell::mbLstAct = sal_True; + SwViewShell *pSh = (SwViewShell*)this->GetNext(); while ( pSh != this ) { if ( pSh->ActionPend() ) { - ViewShell::mbLstAct = sal_False; + SwViewShell::mbLstAct = sal_False; pSh = this; } else - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } const bool bIsShellForCheckViewLayout = ( this == GetLayout()->GetCurrShell() ); @@ -389,7 +389,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) mbPaintWorks = sal_True; mbInEndAction = sal_False; - ViewShell::mbLstAct = sal_False; + SwViewShell::mbLstAct = sal_False; Imp()->EndAction(); //We artificially end the action here to enable the automatic scrollbars @@ -404,20 +404,20 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) Imp()->FireAccessibleEvents(); } -void ViewShell::ImplStartAction() +void SwViewShell::ImplStartAction() { mbPaintWorks = sal_False; Imp()->StartAction(); } -void ViewShell::ImplLockPaint() +void SwViewShell::ImplLockPaint() { if ( GetWin() && GetWin()->IsVisible() ) GetWin()->EnablePaint( sal_False ); //Also cut off the controls. Imp()->LockPaint(); } -void ViewShell::ImplUnlockPaint( sal_Bool bVirDev ) +void SwViewShell::ImplUnlockPaint( sal_Bool bVirDev ) { SET_CURR_SHELL( this ); if ( GetWin() && GetWin()->IsVisible() ) @@ -474,10 +474,10 @@ void ViewShell::ImplUnlockPaint( sal_Bool bVirDev ) Imp()->UnlockPaint(); } -sal_Bool ViewShell::AddPaintRect( const SwRect & rRect ) +sal_Bool SwViewShell::AddPaintRect( const SwRect & rRect ) { sal_Bool bRet = sal_False; - ViewShell *pSh = this; + SwViewShell *pSh = this; do { if( pSh->Imp() ) @@ -487,16 +487,16 @@ sal_Bool ViewShell::AddPaintRect( const SwRect & rRect ) else bRet |= pSh->Imp()->AddPaintRect( rRect ); } - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != this ); return bRet; } -void ViewShell::InvalidateWindows( const SwRect &rRect ) +void SwViewShell::InvalidateWindows( const SwRect &rRect ) { if ( !Imp()->IsCalcLayoutProgress() ) { - ViewShell *pSh = this; + SwViewShell *pSh = this; do { if ( pSh->GetWin() ) @@ -506,13 +506,13 @@ void ViewShell::InvalidateWindows( const SwRect &rRect ) else if ( pSh->VisArea().IsOver( rRect ) ) pSh->GetWin()->Invalidate( rRect.SVRect() ); } - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != this ); } } -void ViewShell::MakeVisible( const SwRect &rRect ) +void SwViewShell::MakeVisible( const SwRect &rRect ) { if ( !VisArea().IsInside( rRect ) || IsScrollMDI( this, rRect ) || GetCareWin(*this) ) { @@ -542,7 +542,7 @@ void ViewShell::MakeVisible( const SwRect &rRect ) } } -Window* ViewShell::CareChildWin(ViewShell& rVSh) +Window* SwViewShell::CareChildWin(SwViewShell& rVSh) { if(rVSh.mpSfxViewShell) { @@ -556,19 +556,19 @@ Window* ViewShell::CareChildWin(ViewShell& rVSh) return NULL; } -Point ViewShell::GetPagePos( sal_uInt16 nPageNum ) const +Point SwViewShell::GetPagePos( sal_uInt16 nPageNum ) const { return GetLayout()->GetPagePos( nPageNum ); } -sal_uInt16 ViewShell::GetNumPages() +sal_uInt16 SwViewShell::GetNumPages() { //It is possible that no layout exists when the method from //root-Ctor is called. return GetLayout() ? GetLayout()->GetPageNum() : 0; } -sal_Bool ViewShell::IsDummyPage( sal_uInt16 nPageNum ) const +sal_Bool SwViewShell::IsDummyPage( sal_uInt16 nPageNum ) const { return GetLayout() ? GetLayout()->IsDummyPage( nPageNum ) : 0; } @@ -579,7 +579,7 @@ sal_Bool ViewShell::IsDummyPage( sal_uInt16 nPageNum ) const * type is sent (???). * @param[in] bCloseDB Passed in to GetDoc()->UpdateFlds. [TODO] Purpose??? */ -void ViewShell::UpdateFlds(sal_Bool bCloseDB) +void SwViewShell::UpdateFlds(sal_Bool bCloseDB) { SET_CURR_SHELL( this ); @@ -598,14 +598,14 @@ void ViewShell::UpdateFlds(sal_Bool bCloseDB) } /** update all charts for which any table exists */ -void ViewShell::UpdateAllCharts() +void SwViewShell::UpdateAllCharts() { SET_CURR_SHELL( this ); // Start-/EndAction handled in the SwDoc-Method! GetDoc()->UpdateAllCharts(); } -sal_Bool ViewShell::HasCharts() const +sal_Bool SwViewShell::HasCharts() const { sal_Bool bRet = sal_False; const SwStartNode *pStNd; @@ -624,18 +624,18 @@ sal_Bool ViewShell::HasCharts() const return bRet; } -void ViewShell::LayoutIdle() +void SwViewShell::LayoutIdle() { if( !mpOpt->IsIdle() || !GetWin() || ( Imp()->HasDrawView() && Imp()->GetDrawView()->IsDragObj() ) ) return; //No idle when printing is going on. - ViewShell *pSh = this; + SwViewShell *pSh = this; do { if ( !pSh->GetWin() ) return; - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != this ); @@ -654,9 +654,9 @@ void ViewShell::LayoutIdle() SwSaveSetLRUOfst aSave( *SwTxtFrm::GetTxtCache(), SwTxtFrm::GetTxtCache()->GetCurMax() - 50 ); // #125243# there are lots of stacktraces indicating that Imp() returns NULL - // this ViewShell seems to be invalid - but it's not clear why + // this SwViewShell seems to be invalid - but it's not clear why // this return is only a workaround! - OSL_ENSURE(Imp(), "ViewShell already deleted?"); + OSL_ENSURE(Imp(), "SwViewShell already deleted?"); if(!Imp()) return; SwLayIdle aIdle( GetLayout(), Imp() ); @@ -664,7 +664,7 @@ void ViewShell::LayoutIdle() } } -static void lcl_InvalidateAllCntnt( ViewShell& rSh, sal_uInt8 nInv ) +static void lcl_InvalidateAllCntnt( SwViewShell& rSh, sal_uInt8 nInv ) { sal_Bool bCrsr = rSh.ISA(SwCrsrShell); if ( bCrsr ) @@ -684,7 +684,7 @@ static void lcl_InvalidateAllCntnt( ViewShell& rSh, sal_uInt8 nInv ) * objects (Writer fly frame and drawing objects), which are anchored * to paragraph or to character. #i11860# */ -static void lcl_InvalidateAllObjPos( ViewShell &_rSh ) +static void lcl_InvalidateAllObjPos( SwViewShell &_rSh ) { const bool bIsCrsrShell = _rSh.ISA(SwCrsrShell); if ( bIsCrsrShell ) @@ -702,7 +702,7 @@ static void lcl_InvalidateAllObjPos( ViewShell &_rSh ) _rSh.GetDoc()->SetModified(); } -void ViewShell::SetParaSpaceMax( bool bNew ) +void SwViewShell::SetParaSpaceMax( bool bNew ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX) != bNew ) @@ -714,7 +714,7 @@ void ViewShell::SetParaSpaceMax( bool bNew ) } } -void ViewShell::SetParaSpaceMaxAtPages( bool bNew ) +void SwViewShell::SetParaSpaceMaxAtPages( bool bNew ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES) != bNew ) @@ -726,7 +726,7 @@ void ViewShell::SetParaSpaceMaxAtPages( bool bNew ) } } -void ViewShell::SetTabCompat( bool bNew ) +void SwViewShell::SetTabCompat( bool bNew ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if( pIDSA->get(IDocumentSettingAccess::TAB_COMPAT) != bNew ) @@ -738,7 +738,7 @@ void ViewShell::SetTabCompat( bool bNew ) } } -void ViewShell::SetAddExtLeading( bool bNew ) +void SwViewShell::SetAddExtLeading( bool bNew ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::ADD_EXT_LEADING) != bNew ) @@ -753,7 +753,7 @@ void ViewShell::SetAddExtLeading( bool bNew ) } } -void ViewShell::SetUseVirDev( bool bNewVirtual ) +void SwViewShell::SetUseVirDev( bool bNewVirtual ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) != bNewVirtual ) @@ -769,7 +769,7 @@ void ViewShell::SetUseVirDev( bool bNewVirtual ) * #106629# * @param[in] (bool) setting of the new value */ -void ViewShell::SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCells ) +void SwViewShell::SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCells ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS) != _bAddParaSpacingToTableCells ) @@ -786,7 +786,7 @@ void ViewShell::SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCells * #i11859# * @param[in] (bool) setting of the new value */ -void ViewShell::SetUseFormerLineSpacing( bool _bUseFormerLineSpacing ) +void SwViewShell::SetUseFormerLineSpacing( bool _bUseFormerLineSpacing ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::OLD_LINE_SPACING) != _bUseFormerLineSpacing ) @@ -803,7 +803,7 @@ void ViewShell::SetUseFormerLineSpacing( bool _bUseFormerLineSpacing ) * #i11860# * @param[in] (bool) setting the new value */ -void ViewShell::SetUseFormerObjectPositioning( bool _bUseFormerObjPos ) +void SwViewShell::SetUseFormerObjectPositioning( bool _bUseFormerObjPos ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) != _bUseFormerObjPos ) @@ -815,7 +815,7 @@ void ViewShell::SetUseFormerObjectPositioning( bool _bUseFormerObjPos ) } // #i28701# -void ViewShell::SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos ) +void SwViewShell::SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) != _bConsiderWrapOnObjPos ) @@ -826,7 +826,7 @@ void ViewShell::SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos ) } } -void ViewShell::SetUseFormerTextWrapping( bool _bUseFormerTextWrapping ) +void SwViewShell::SetUseFormerTextWrapping( bool _bUseFormerTextWrapping ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) != _bUseFormerTextWrapping ) @@ -839,7 +839,7 @@ void ViewShell::SetUseFormerTextWrapping( bool _bUseFormerTextWrapping ) } // #i45491# -void ViewShell::SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWithManualBreak ) +void SwViewShell::SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWithManualBreak ) { IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess(); if ( pIDSA->get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) != _bDoNotJustifyLinesWithManualBreak ) @@ -851,7 +851,7 @@ void ViewShell::SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWit } } -void ViewShell::Reformat() +void SwViewShell::Reformat() { SwWait aWait( *GetDoc()->GetDocShell(), sal_True ); @@ -873,7 +873,7 @@ void ViewShell::Reformat() } } -void ViewShell::ChgNumberDigits() +void SwViewShell::ChgNumberDigits() { SdrModel* pTmpDrawModel = getIDocumentDrawModelAccess()->GetDrawModel(); if ( pTmpDrawModel ) @@ -881,7 +881,7 @@ void ViewShell::ChgNumberDigits() Reformat(); } -void ViewShell::CalcLayout() +void SwViewShell::CalcLayout() { SET_CURR_SHELL( this ); SwWait aWait( *GetDoc()->GetDocShell(), sal_True ); @@ -930,19 +930,19 @@ void ViewShell::CalcLayout() ::EndProgress( GetDoc()->GetDocShell() ); } -void ViewShell::SetFirstVisPageInvalid() +void SwViewShell::SetFirstVisPageInvalid() { - ViewShell *pSh = this; + SwViewShell *pSh = this; do { if ( pSh->Imp() ) pSh->Imp()->SetFirstVisPageInvalid(); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != this ); } -void ViewShell::SizeChgNotify() +void SwViewShell::SizeChgNotify() { if ( !mpWin ) mbDocSizeChgd = sal_True; @@ -970,7 +970,7 @@ void ViewShell::SizeChgNotify() } } -void ViewShell::VisPortChgd( const SwRect &rRect) +void SwViewShell::VisPortChgd( const SwRect &rRect) { OSL_ENSURE( GetWin(), "VisPortChgd ohne Window." ); @@ -1140,7 +1140,7 @@ void ViewShell::VisPortChgd( const SwRect &rRect) Imp()->UpdateAccessible(); } -sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect ) +sal_Bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect ) { #if !defined(MACOSX) && !defined(ANDROID) && !defined(IOS) // #i98766# - disable smooth scrolling for Mac @@ -1233,9 +1233,9 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe // SW paint stuff PaintDesktop( aRect ); - ViewShell::mbLstAct = sal_True; + SwViewShell::mbLstAct = sal_True; GetLayout()->Paint( aRect ); - ViewShell::mbLstAct = sal_False; + SwViewShell::mbLstAct = sal_False; // end paint and destroy ObjectContact again DLPostPaint2(true); @@ -1373,7 +1373,7 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe return sal_False; } -void ViewShell::PaintDesktop( const SwRect &rRect ) +void SwViewShell::PaintDesktop( const SwRect &rRect ) { if ( !GetWin() && !GetOut()->GetConnectMetaFile() ) return; //for the printer we don't do anything here. @@ -1455,7 +1455,7 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) } // PaintDesktop is split in two, this part is also used by PreviewPage -void ViewShell::_PaintDesktop( const SwRegionRects &rRegion ) +void SwViewShell::_PaintDesktop( const SwRegionRects &rRegion ) { // OD 2004-04-23 #116347# GetOut()->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR ); @@ -1506,7 +1506,7 @@ void ViewShell::_PaintDesktop( const SwRegionRects &rRegion ) GetOut()->Pop(); } -sal_Bool ViewShell::CheckInvalidForPaint( const SwRect &rRect ) +sal_Bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect ) { if ( !GetWin() ) return sal_False; @@ -1607,7 +1607,7 @@ sal_Bool ViewShell::CheckInvalidForPaint( const SwRect &rRect ) return bRet; } -void ViewShell::Paint(const Rectangle &rRect) +void SwViewShell::Paint(const Rectangle &rRect) { if ( mnLockPaint ) { @@ -1663,9 +1663,9 @@ void ViewShell::Paint(const Rectangle &rRect) //When useful, process or destroy the old InvalidRect. if ( aRect.IsInside( maInvalidRect ) ) ResetInvalidRect(); - ViewShell::mbLstAct = sal_True; + SwViewShell::mbLstAct = sal_True; GetLayout()->Paint( aRect ); - ViewShell::mbLstAct = sal_False; + SwViewShell::mbLstAct = sal_False; } else { @@ -1684,9 +1684,9 @@ void ViewShell::Paint(const Rectangle &rRect) //When useful, process or destroy the old InvalidRect. if ( aRect.IsInside( maInvalidRect ) ) ResetInvalidRect(); - ViewShell::mbLstAct = sal_True; + SwViewShell::mbLstAct = sal_True; GetLayout()->Paint( aRect ); - ViewShell::mbLstAct = sal_False; + SwViewShell::mbLstAct = sal_False; // --> OD 2009-08-12 #i101192# // end Pre/PostPaint encapsulation DLPostPaint2(true); @@ -1740,7 +1740,7 @@ void ViewShell::Paint(const Rectangle &rRect) } } -void ViewShell::SetBrowseBorder( const Size& rNew ) +void SwViewShell::SetBrowseBorder( const Size& rNew ) { if( rNew != maBrowseBorder ) { @@ -1750,12 +1750,12 @@ void ViewShell::SetBrowseBorder( const Size& rNew ) } } -const Size& ViewShell::GetBrowseBorder() const +const Size& SwViewShell::GetBrowseBorder() const { return maBrowseBorder; } -sal_Int32 ViewShell::GetBrowseWidth() const +sal_Int32 SwViewShell::GetBrowseWidth() const { const SwPostItMgr* pPostItMgr = GetPostItMgr(); if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() ) @@ -1769,7 +1769,7 @@ sal_Int32 ViewShell::GetBrowseWidth() const return maVisArea.Width() - 2 * GetOut()->PixelToLogic(maBrowseBorder).Width(); } -void ViewShell::CheckBrowseView( sal_Bool bBrowseChgd ) +void SwViewShell::CheckBrowseView( sal_Bool bBrowseChgd ) { if ( !bBrowseChgd && !GetViewOptions()->getBrowseMode() ) return; @@ -1825,12 +1825,12 @@ void ViewShell::CheckBrowseView( sal_Bool bBrowseChgd ) UnlockPaint(); } -SwRootFrm *ViewShell::GetLayout() const +SwRootFrm *SwViewShell::GetLayout() const { return mpLayout.get(); } -OutputDevice& ViewShell::GetRefDev() const +OutputDevice& SwViewShell::GetRefDev() const { OutputDevice* pTmpOut = 0; if ( GetWin() && @@ -1845,16 +1845,16 @@ OutputDevice& ViewShell::GetRefDev() const return *pTmpOut; } -const SwNodes& ViewShell::GetNodes() const +const SwNodes& SwViewShell::GetNodes() const { return mpDoc->GetNodes(); } -void ViewShell::DrawSelChanged() +void SwViewShell::DrawSelChanged() { } -Size ViewShell::GetDocSize() const +Size SwViewShell::GetDocSize() const { Size aSz; const SwRootFrm* pRoot = GetLayout(); @@ -1864,18 +1864,18 @@ Size ViewShell::GetDocSize() const return aSz; } -SfxItemPool& ViewShell::GetAttrPool() +SfxItemPool& SwViewShell::GetAttrPool() { return GetDoc()->GetAttrPool(); } -void ViewShell::ApplyViewOptions( const SwViewOption &rOpt ) +void SwViewShell::ApplyViewOptions( const SwViewOption &rOpt ) { - ViewShell *pSh = this; + SwViewShell *pSh = this; do { pSh->StartAction(); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != this ); ImplApplyViewOptions( rOpt ); @@ -1883,7 +1883,7 @@ void ViewShell::ApplyViewOptions( const SwViewOption &rOpt ) // With one layout per view it is not longer necessary // to sync these "layout related" view options // But as long as we have to disable "multiple layout" - pSh = (ViewShell*)this->GetNext(); + pSh = (SwViewShell*)this->GetNext(); while ( pSh != this ) { SwViewOption aOpt( *pSh->GetViewOptions() ); @@ -1896,19 +1896,19 @@ void ViewShell::ApplyViewOptions( const SwViewOption &rOpt ) aOpt.SetPostIts(rOpt.IsPostIts()); if ( !(aOpt == *pSh->GetViewOptions()) ) pSh->ImplApplyViewOptions( aOpt ); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } // End of disabled multiple window pSh = this; do { pSh->EndAction(); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } while ( pSh != this ); } -void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) +void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) { if (*mpOpt == rOpt) return; @@ -1916,7 +1916,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) Window *pMyWin = GetWin(); if( !pMyWin ) { - OSL_ENSURE( pMyWin, "ViewShell::ApplyViewOptions: no window" ); + OSL_ENSURE( pMyWin, "SwViewShell::ApplyViewOptions: no window" ); return; } @@ -2032,20 +2032,20 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) if( bOnlineSpellChgd ) { - ViewShell *pSh = (ViewShell*)this->GetNext(); + SwViewShell *pSh = (SwViewShell*)this->GetNext(); sal_Bool bOnlineSpl = rOpt.IsOnlineSpell(); while( pSh != this ) { pSh->mpOpt->SetOnlineSpell( bOnlineSpl ); Window *pTmpWin = pSh->GetWin(); if( pTmpWin ) pTmpWin->Invalidate(); - pSh = (ViewShell*)pSh->GetNext(); + pSh = (SwViewShell*)pSh->GetNext(); } } } -void ViewShell::SetUIOptions( const SwViewOption &rOpt ) +void SwViewShell::SetUIOptions( const SwViewOption &rOpt ) { mpOpt->SetUIOptions(rOpt); //the API-Flag of the view options is set but never reset @@ -2056,7 +2056,7 @@ void ViewShell::SetUIOptions( const SwViewOption &rOpt ) mpOpt->SetSymbolFont(rOpt.GetSymbolFont()); } -void ViewShell::SetReadonlyOption(sal_Bool bSet) +void SwViewShell::SetReadonlyOption(sal_Bool bSet) { //JP 01.02.99: at readonly flag query properly // and if need be format; Bug 61335 @@ -2086,7 +2086,7 @@ void ViewShell::SetReadonlyOption(sal_Bool bSet) } } -void ViewShell::SetPDFExportOption(sal_Bool bSet) +void SwViewShell::SetPDFExportOption(sal_Bool bSet) { if( bSet != mpOpt->IsPDFExport() ) { @@ -2096,7 +2096,7 @@ void ViewShell::SetPDFExportOption(sal_Bool bSet) } } -void ViewShell::SetReadonlySelectionOption(sal_Bool bSet) +void SwViewShell::SetReadonlySelectionOption(sal_Bool bSet) { if( bSet != mpOpt->IsSelectionInReadonly() ) { @@ -2104,12 +2104,12 @@ void ViewShell::SetReadonlySelectionOption(sal_Bool bSet) } } -void ViewShell::SetPrtFormatOption( sal_Bool bSet ) +void SwViewShell::SetPrtFormatOption( sal_Bool bSet ) { mpOpt->SetPrtFormat( bSet ); } -void ViewShell::UISizeNotify() +void SwViewShell::UISizeNotify() { if ( mbDocSizeChgd ) { @@ -2121,22 +2121,22 @@ void ViewShell::UISizeNotify() } } -void ViewShell::SetRestoreActions(sal_uInt16 nSet) +void SwViewShell::SetRestoreActions(sal_uInt16 nSet) { OSL_ENSURE(!GetRestoreActions()||!nSet, "multiple restore of the Actions ?"); Imp()->SetRestoreActions(nSet); } -sal_uInt16 ViewShell::GetRestoreActions() const +sal_uInt16 SwViewShell::GetRestoreActions() const { return Imp()->GetRestoreActions(); } -sal_Bool ViewShell::IsNewLayout() const +sal_Bool SwViewShell::IsNewLayout() const { return GetLayout()->IsNewLayout(); } -uno::Reference< ::com::sun::star::accessibility::XAccessible > ViewShell::CreateAccessible() +uno::Reference< ::com::sun::star::accessibility::XAccessible > SwViewShell::CreateAccessible() { uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc; @@ -2151,10 +2151,10 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > ViewShell::Create } uno::Reference< ::com::sun::star::accessibility::XAccessible > -ViewShell::CreateAccessiblePreview() +SwViewShell::CreateAccessiblePreview() { OSL_ENSURE( IsPreview(), - "Can't create accessible preview for non-preview ViewShell" ); + "Can't create accessible preview for non-preview SwViewShell" ); // We require a layout and an XModel to be accessible. OSL_ENSURE( mpLayout, "no layout, no access" ); @@ -2171,7 +2171,7 @@ ViewShell::CreateAccessiblePreview() return NULL; } -void ViewShell::InvalidateAccessibleFocus() +void SwViewShell::InvalidateAccessibleFocus() { if( Imp()->IsAccessible() ) Imp()->GetAccessibleMap().InvalidateFocus(); @@ -2180,7 +2180,7 @@ void ViewShell::InvalidateAccessibleFocus() /** * invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs #i27138# */ -void ViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm, +void SwViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm, const SwTxtFrm* _pToTxtFrm ) { if ( GetLayout() && GetLayout()->IsAnyShellAccessible() ) @@ -2192,7 +2192,7 @@ void ViewShell::InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtF /** * invalidate text selection for paragraphs #i27301# */ -void ViewShell::InvalidateAccessibleParaTextSelection() +void SwViewShell::InvalidateAccessibleParaTextSelection() { if ( GetLayout() && GetLayout()->IsAnyShellAccessible() ) { @@ -2203,7 +2203,7 @@ void ViewShell::InvalidateAccessibleParaTextSelection() /** * invalidate attributes for paragraphs #i88069# */ -void ViewShell::InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ) +void SwViewShell::InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ) { if ( GetLayout() && GetLayout()->IsAnyShellAccessible() ) { @@ -2211,7 +2211,7 @@ void ViewShell::InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm ) } } -SwAccessibleMap* ViewShell::GetAccessibleMap() +SwAccessibleMap* SwViewShell::GetAccessibleMap() { if ( Imp()->IsAccessible() ) { @@ -2221,7 +2221,7 @@ SwAccessibleMap* ViewShell::GetAccessibleMap() return 0; } -void ViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) +void SwViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) { if(mpOpt->IsPagePreview() && !rAccessibilityOptions.GetIsForPagePreviews()) { @@ -2241,22 +2241,22 @@ void ViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibility } } -ShellResource* ViewShell::GetShellRes() +ShellResource* SwViewShell::GetShellRes() { return mpShellRes; } -void ViewShell::SetCareWin( Window* pNew ) +void SwViewShell::SetCareWin( Window* pNew ) { mpCareWindow = pNew; } -sal_uInt16 ViewShell::GetPageCount() const +sal_uInt16 SwViewShell::GetPageCount() const { return GetLayout() ? GetLayout()->GetPageNum() : 1; } -const Size ViewShell::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const +const Size SwViewShell::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const { Size aSize; const SwRootFrm* pTmpRoot = GetLayout(); @@ -2277,7 +2277,7 @@ const Size ViewShell::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) c } // #i12836# enhanced pdf export -sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const +sal_Int32 SwViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const { OSL_ENSURE( GetLayout(), "GetPageNumAndSetOffsetForPDF assumes presence of layout" ); @@ -2307,7 +2307,7 @@ sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwR } // --> PB 2007-05-30 #146850# -const BitmapEx& ViewShell::GetReplacementBitmap( bool bIsErrorState ) +const BitmapEx& SwViewShell::GetReplacementBitmap( bool bIsErrorState ) { BitmapEx** ppRet; sal_uInt16 nResId = 0; @@ -2329,13 +2329,13 @@ const BitmapEx& ViewShell::GetReplacementBitmap( bool bIsErrorState ) return **ppRet; } -void ViewShell::DeleteReplacementBitmaps() +void SwViewShell::DeleteReplacementBitmaps() { DELETEZ( mpErrorBmp ); DELETEZ( mpReplaceBmp ); } -SwPostItMgr* ViewShell::GetPostItMgr() +SwPostItMgr* SwViewShell::GetPostItMgr() { SwView* pView = GetDoc()->GetDocShell() ? GetDoc()->GetDocShell()->GetView() : 0; if ( pView ) @@ -2347,34 +2347,34 @@ SwPostItMgr* ViewShell::GetPostItMgr() /* * Document Interface Access */ -const IDocumentSettingAccess* ViewShell::getIDocumentSettingAccess() const { return mpDoc; } -IDocumentSettingAccess* ViewShell::getIDocumentSettingAccess() { return mpDoc; } -const IDocumentDeviceAccess* ViewShell::getIDocumentDeviceAccess() const { return mpDoc; } -IDocumentDeviceAccess* ViewShell::getIDocumentDeviceAccess() { return mpDoc; } -const IDocumentMarkAccess* ViewShell::getIDocumentMarkAccess() const { return mpDoc->getIDocumentMarkAccess(); } -IDocumentMarkAccess* ViewShell::getIDocumentMarkAccess() { return mpDoc->getIDocumentMarkAccess(); } -const IDocumentDrawModelAccess* ViewShell::getIDocumentDrawModelAccess() const { return mpDoc; } -IDocumentDrawModelAccess* ViewShell::getIDocumentDrawModelAccess() { return mpDoc; } -const IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() const { return mpDoc; } -IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() { return mpDoc; } -const IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() const { return mpDoc; } -IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() { return mpDoc; } -IDocumentContentOperations* ViewShell::getIDocumentContentOperations() { return mpDoc; } -IDocumentStylePoolAccess* ViewShell::getIDocumentStylePoolAccess() { return mpDoc; } -const IDocumentStatistics* ViewShell::getIDocumentStatistics() const { return mpDoc; } - -IDocumentUndoRedo & ViewShell::GetIDocumentUndoRedo() +const IDocumentSettingAccess* SwViewShell::getIDocumentSettingAccess() const { return mpDoc; } +IDocumentSettingAccess* SwViewShell::getIDocumentSettingAccess() { return mpDoc; } +const IDocumentDeviceAccess* SwViewShell::getIDocumentDeviceAccess() const { return mpDoc; } +IDocumentDeviceAccess* SwViewShell::getIDocumentDeviceAccess() { return mpDoc; } +const IDocumentMarkAccess* SwViewShell::getIDocumentMarkAccess() const { return mpDoc->getIDocumentMarkAccess(); } +IDocumentMarkAccess* SwViewShell::getIDocumentMarkAccess() { return mpDoc->getIDocumentMarkAccess(); } +const IDocumentDrawModelAccess* SwViewShell::getIDocumentDrawModelAccess() const { return mpDoc; } +IDocumentDrawModelAccess* SwViewShell::getIDocumentDrawModelAccess() { return mpDoc; } +const IDocumentRedlineAccess* SwViewShell::getIDocumentRedlineAccess() const { return mpDoc; } +IDocumentRedlineAccess* SwViewShell::getIDocumentRedlineAccess() { return mpDoc; } +const IDocumentLayoutAccess* SwViewShell::getIDocumentLayoutAccess() const { return mpDoc; } +IDocumentLayoutAccess* SwViewShell::getIDocumentLayoutAccess() { return mpDoc; } +IDocumentContentOperations* SwViewShell::getIDocumentContentOperations() { return mpDoc; } +IDocumentStylePoolAccess* SwViewShell::getIDocumentStylePoolAccess() { return mpDoc; } +const IDocumentStatistics* SwViewShell::getIDocumentStatistics() const { return mpDoc; } + +IDocumentUndoRedo & SwViewShell::GetIDocumentUndoRedo() { return mpDoc->GetIDocumentUndoRedo(); } -IDocumentUndoRedo const& ViewShell::GetIDocumentUndoRedo() const +IDocumentUndoRedo const& SwViewShell::GetIDocumentUndoRedo() const { return mpDoc->GetIDocumentUndoRedo(); } // --> OD 2007-11-14 #i83479# -const IDocumentListItems* ViewShell::getIDocumentListItemsAccess() const +const IDocumentListItems* SwViewShell::getIDocumentListItemsAccess() const { return mpDoc; } -const IDocumentOutlineNodes* ViewShell::getIDocumentOutlineNodesAccess() const +const IDocumentOutlineNodes* SwViewShell::getIDocumentOutlineNodesAccess() const { return mpDoc; } diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 3275ace32a99..01e909ddfaba 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -36,7 +36,7 @@ #include <accessibilityoptions.hxx> #include <switerator.hxx> -void ViewShell::Init( const SwViewOption *pNewOpt ) +void SwViewShell::Init( const SwViewOption *pNewOpt ) { mbDocSizeChgd = sal_False; @@ -114,7 +114,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt ) // Here's the code which disables the usage of "multiple" layouts at the moment // If the problems with controls and groups objects are solved, // this code can be removed... - ViewShell *pCurrShell = GetDoc()->GetCurrentViewShell(); + SwViewShell *pCurrShell = GetDoc()->GetCurrentViewShell(); if( pCurrShell ) mpLayout = pCurrShell->mpLayout; // end of "disable multiple layouts" @@ -140,7 +140,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt ) } /// CTor for the first Shell. -ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, +SwViewShell::SwViewShell( SwDoc& rDocument, Window *pWindow, const SwViewOption *pNewOpt, OutputDevice *pOutput, long nFlags ) : @@ -167,7 +167,7 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, maPrePostMapMode() { // OD 2004-06-01 #i26791# - in order to suppress event handling in - // <SwDrawContact::Changed> during contruction of <ViewShell> instance + // <SwDrawContact::Changed> during contruction of <SwViewShell> instance mbInConstructor = true; mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView = @@ -184,7 +184,7 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, mpOut = pOutput; // OD 28.03.2003 #108470# - initialize print preview layout after layout - // is created in <ViewShell::Init(..)> - called above. + // is created in <SwViewShell::Init(..)> - called above. if ( mbPreview ) { // OD 12.12.2002 #103492# - init page preview layout @@ -216,7 +216,7 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, } /// CTor for further Shells on a document. -ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, +SwViewShell::SwViewShell( SwViewShell& rShell, Window *pWindow, OutputDevice *pOutput, long nFlags ) : Ring( &rShell ), maBrowseBorder( rShell.maBrowseBorder ), @@ -242,7 +242,7 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, maPrePostMapMode() { // OD 2004-06-01 #i26791# - in order to suppress event handling in - // <SwDrawContact::Changed> during contruction of <ViewShell> instance + // <SwDrawContact::Changed> during contruction of <SwViewShell> instance mbInConstructor = true; mbPaintWorks = mbEnableSmooth = sal_True; @@ -286,7 +286,7 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, } -ViewShell::~ViewShell() +SwViewShell::~SwViewShell() { { SET_CURR_SHELL( this ); @@ -351,29 +351,29 @@ ViewShell::~ViewShell() GetLayout()->DeRegisterShell( this ); if(mpDoc->GetCurrentViewShell()==this) mpDoc->SetCurrentViewShell( this->GetNext()!=this ? - (ViewShell*)this->GetNext() : NULL ); + (SwViewShell*)this->GetNext() : NULL ); } delete mpTmpRef; delete mpAccOptions; } -sal_Bool ViewShell::HasDrawView() const +sal_Bool SwViewShell::HasDrawView() const { return Imp() ? Imp()->HasDrawView() : 0; } -void ViewShell::MakeDrawView() +void SwViewShell::MakeDrawView() { Imp()->MakeDrawView( ); } -SdrView* ViewShell::GetDrawView() +SdrView* SwViewShell::GetDrawView() { return Imp()->GetDrawView(); } -SdrView* ViewShell::GetDrawViewWithValidMarkList() +SdrView* SwViewShell::GetDrawViewWithValidMarkList() { SwDrawView* pDView = Imp()->GetDrawView(); pDView->ValidateMarkList(); diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index aa4090445bcd..92cb36e913bf 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -77,10 +77,10 @@ class SwQueuedPaint { public: SwQueuedPaint *pNext; - ViewShell *pSh; + SwViewShell *pSh; SwRect aRect; - SwQueuedPaint( ViewShell *pNew, const SwRect &rRect ) : + SwQueuedPaint( SwViewShell *pNew, const SwRect &rRect ) : pNext( 0 ), pSh( pNew ), aRect( rRect ) @@ -100,7 +100,7 @@ public: ~SwDrawViewSave(); }; -void SwPaintQueue::Add( ViewShell *pNew, const SwRect &rNew ) +void SwPaintQueue::Add( SwViewShell *pNew, const SwRect &rNew ) { SwQueuedPaint *pPt; if ( 0 != (pPt = pQueue) ) @@ -126,7 +126,7 @@ void SwPaintQueue::Repaint() { SwQueuedPaint *pPt = pQueue; do - { ViewShell *pSh = pPt->pSh; + { SwViewShell *pSh = pPt->pSh; SET_CURR_SHELL( pSh ); if ( pSh->IsPreview() ) { @@ -150,7 +150,7 @@ void SwPaintQueue::Repaint() } } -void SwPaintQueue::Remove( ViewShell *pSh ) +void SwPaintQueue::Remove( SwViewShell *pSh ) { SwQueuedPaint *pPt; if ( 0 != (pPt = pQueue) ) @@ -172,7 +172,7 @@ void SwPaintQueue::Remove( ViewShell *pSh ) } } -void SetSwVisArea( ViewShell *pSh, const SwRect &rRect ) +void SetSwVisArea( SwViewShell *pSh, const SwRect &rRect ) { OSL_ENSURE( !pSh->GetWin(), "Drucken mit Window?" ); pSh->maVisArea = rRect; @@ -192,7 +192,7 @@ void SetSwVisArea( ViewShell *pSh, const SwRect &rRect ) pOut->SetMapMode( aMapMode ); } -void ViewShell::InitPrt( OutputDevice *pOutDev ) +void SwViewShell::InitPrt( OutputDevice *pOutDev ) { // For printing we use a negative offset (exactly the offset of OutputSize). // This is necessary because the origin is in the upper left corner of the @@ -215,7 +215,7 @@ void ViewShell::InitPrt( OutputDevice *pOutDev ) mpOut = pOutDev; } -void ViewShell::ChgAllPageOrientation( sal_uInt16 eOri ) +void SwViewShell::ChgAllPageOrientation( sal_uInt16 eOri ) { OSL_ENSURE( mnStartAction, "missing an Action" ); SET_CURR_SHELL( this ); @@ -254,7 +254,7 @@ void ViewShell::ChgAllPageOrientation( sal_uInt16 eOri ) } } -void ViewShell::ChgAllPageSize( Size &rSz ) +void SwViewShell::ChgAllPageSize( Size &rSz ) { OSL_ENSURE( mnStartAction, "missing an Action" ); SET_CURR_SHELL( this ); @@ -288,7 +288,7 @@ void ViewShell::ChgAllPageSize( Size &rSz ) } } -void ViewShell::CalcPagesForPrint( sal_uInt16 nMax ) +void SwViewShell::CalcPagesForPrint( sal_uInt16 nMax ) { SET_CURR_SHELL( this ); @@ -318,9 +318,9 @@ void ViewShell::CalcPagesForPrint( sal_uInt16 nMax ) pMyLayout->EndAllAction(); } -SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) +SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) { - OSL_ENSURE( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only"); + OSL_ENSURE( this->IsA( TYPE(SwFEShell) ),"SwViewShell::Prt for FEShell only"); SwFEShell* pFESh = (SwFEShell*)this; pPrtDoc->LockExpFlds(); @@ -438,7 +438,7 @@ sw_getPage(SwRootFrm const& rLayout, sal_Int32 const nPage) return 0; } -sal_Bool ViewShell::PrintOrPDFExport( +sal_Bool SwViewShell::PrintOrPDFExport( OutputDevice *pOutDev, SwPrintData const& rPrintData, sal_Int32 nRenderer /* the index in the vector of pages to be printed */ ) @@ -460,7 +460,7 @@ sal_Bool ViewShell::PrintOrPDFExport( // It is implemented this way because PDF export calls this Prt function // once per page and we do not like to always have the temporary document // to be created that often here. - ViewShell *pShell = new ViewShell( *this, 0, pOutDev ); + SwViewShell *pShell = new SwViewShell( *this, 0, pOutDev ); SdrView *pDrawView = pShell->GetDrawView(); if (pDrawView) @@ -485,8 +485,8 @@ sal_Bool ViewShell::PrintOrPDFExport( const sal_Int32 nPage = rPrintData.GetRenderData().GetPagesToPrint()[ nRenderer ]; OSL_ENSURE( nPage < 0 || rPrintData.GetRenderData().GetValidPagesSet().count( nPage ) == 1, - "ViewShell::PrintOrPDFExport: nPage not valid" ); - ViewShell *const pViewSh2 = (nPage < 0) + "SwViewShell::PrintOrPDFExport: nPage not valid" ); + SwViewShell *const pViewSh2 = (nPage < 0) ? rPrintData.GetRenderData().m_pPostItShell.get()// post-it page : pShell; // a 'regular' page, not one from the post-it doc @@ -520,16 +520,16 @@ sal_Bool ViewShell::PrintOrPDFExport( return sal_True; } -void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, +void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, OutputDevice* pOleOut, const Rectangle& rRect ) { // For printing a shell is needed. Either the Doc already has one, than we // create a new view, or it has none, than we create the first view. - ViewShell *pSh; + SwViewShell *pSh; if( pDoc->GetCurrentViewShell() ) - pSh = new ViewShell( *pDoc->GetCurrentViewShell(), 0, pOleOut,VSHELLFLAG_SHARELAYOUT ); + pSh = new SwViewShell( *pDoc->GetCurrentViewShell(), 0, pOleOut,VSHELLFLAG_SHARELAYOUT ); else - pSh = new ViewShell( *pDoc, 0, pOpt, pOleOut); + pSh = new SwViewShell( *pDoc, 0, pOpt, pOleOut); { SET_CURR_SHELL( pSh ); @@ -563,7 +563,7 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintDat } /// Check if the DocNodesArray contains fields. -sal_Bool ViewShell::IsAnyFieldInDoc() const +sal_Bool SwViewShell::IsAnyFieldInDoc() const { const SfxPoolItem* pItem; sal_uInt32 nMaxItems = mpDoc->GetAttrPool().GetItemCount2( RES_TXTATR_FIELD ); @@ -600,7 +600,7 @@ SwDrawViewSave::~SwDrawViewSave() } // OD 09.01.2003 #i6467# - method also called for page preview -void ViewShell::PrepareForPrint( const SwPrintData &rOptions ) +void SwViewShell::PrepareForPrint( const SwPrintData &rOptions ) { mpOpt->SetGraphic ( sal_True == rOptions.bPrintGraphic ); mpOpt->SetTable ( sal_True == rOptions.bPrintTable ); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 701f3820da9e..2e0f9756b3ed 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2347,7 +2347,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt ) if( pDoc->get(IDocumentSettingAccess::HTML_MODE) || pDoc->get(IDocumentSettingAccess::BROWSE_MODE)) { - ViewShell *pVSh = 0; + SwViewShell *pVSh = 0; pDoc->GetEditShell( &pVSh ); if ( pVSh && COL_TRANSPARENT != pVSh->GetViewOptions()->GetRetoucheColor().GetColor()) diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index e404c1c8ab7b..db24efe7f3f1 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1721,7 +1721,7 @@ sal_Bool SwHTMLParser::FileDownload( const OUString& rURL, OUString& rStr ) { // View wegschmeissen (wegen Reschedule) - ViewShell *pOldVSh = CallEndAction(); + SwViewShell *pOldVSh = CallEndAction(); // Ein Medium anlegen SfxMedium aDLMedium( rURL, STREAM_READ | STREAM_SHARE_DENYWRITE ); @@ -1754,8 +1754,8 @@ sal_Bool SwHTMLParser::FileDownload( const OUString& rURL, } // recreate View - ViewShell *const pVSh = CallStartAction( pOldVSh ); - OSL_ENSURE( pOldVSh == pVSh, "FileDownload: ViewShell changed on us" ); + SwViewShell *const pVSh = CallStartAction( pOldVSh ); + OSL_ENSURE( pOldVSh == pVSh, "FileDownload: SwViewShell changed on us" ); (void) pVSh; return pStream!=0; diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index cdee63a85206..ac91fcc36762 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -685,7 +685,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha // das auch vom SwXShape implementiert wird. uno::Reference< beans::XPropertySet > xPropSet( rShape, UNO_QUERY ); - ViewShell *pVSh; + SwViewShell *pVSh; pDoc->GetEditShell( &pVSh ); if( !pVSh && !nEventId ) { diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 61cf6a2a5585..df928d1b1e02 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -690,7 +690,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt ) static void GetControlSize( const SdrObject& rSdrObj, Size& rSz, SwDoc *pDoc ) { - ViewShell *pVSh = 0; + SwViewShell *pVSh = 0; pDoc->GetEditShell( &pVSh ); if( !pVSh ) return; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 31564246f7b5..04cf2e53acff 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -5472,7 +5472,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, } // Wenn Import abgebrochen wurde kein erneutes Show - // aufrufen, weil die ViewShell schon geloescht wurde! + // aufrufen, weil die SwViewShell schon geloescht wurde! // Genuegt nicht. Auch im ACCEPTING_STATE darf // kein Show aufgerufen werden, weil sonst waehrend des // Reschedules der Parser zerstoert wird, wenn noch ein diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index b3b80ad2d009..9a464ae41c83 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -1119,7 +1119,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, #ifdef DBG_UTIL { - ViewShell *pSh; + SwViewShell *pSh; rWrt.pDoc->GetEditShell( &pSh ); if ( pSh && pSh->GetViewOptions()->IsTest1() ) pLayout = 0; diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx index 4d0289f22640..882d2c9baee1 100644 --- a/sw/source/filter/html/htmlvsh.hxx +++ b/sw/source/filter/html/htmlvsh.hxx @@ -21,7 +21,7 @@ #define _HTMLVSH_HXX #include <calbck.hxx> -class ViewShell; +class SwViewShell; class SwHTMLViewShellClient : public SwClient @@ -31,14 +31,14 @@ protected: public: - SwHTMLViewShellClient( ViewShell *pVSh ); + SwHTMLViewShellClient( SwViewShell *pVSh ); virtual ~SwHTMLViewShellClient(); - void Register( ViewShell *pVsh ); + void Register( SwViewShell *pVsh ); void DeRegister(); - ViewShell *GetViewShell(); + SwViewShell *GetViewShell(); }; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 787bb0ebc199..858ebb6f8490 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -574,8 +574,8 @@ void SwHTMLParser::Continue( int nToken ) if( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() ) eState = SVPAR_ERROR; - // Die ViewShell vom Dokument holen, merken und als aktuelle setzen. - ViewShell *pInitVSh = CallStartAction(); + // Die SwViewShell vom Dokument holen, merken und als aktuelle setzen. + SwViewShell *pInitVSh = CallStartAction(); if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated ) { @@ -759,7 +759,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) if( pCNd && pCNd->StartOfSectionIndex()+2 < pCNd->EndOfSectionIndex() && !bHasFlysOrMarks ) { - ViewShell *pVSh = CheckActionViewShell(); + SwViewShell *pVSh = CheckActionViewShell(); SwCrsrShell *pCrsrSh = pVSh && pVSh->ISA(SwCrsrShell) ? static_cast < SwCrsrShell * >( pVSh ) : 0; @@ -872,7 +872,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) // kann trotzdem mitlerweile eine angelegt worden sein. // In dieses Fall stimmt das bWasUndo-Flag nicht und // wir muessen das Undo noch anschalten. - ViewShell *pTmpVSh = CheckActionViewShell(); + SwViewShell *pTmpVSh = CheckActionViewShell(); if( pTmpVSh ) { pDoc->GetIDocumentUndoRedo().DoUndo(true); @@ -890,7 +890,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) } - // Wenn die Dokuemnt-ViewShell noch existiert und eine Action + // Wenn die Dokuemnt-SwViewShell noch existiert und eine Action // offen ist (muss bei Abbruch nicht sein), die Action beenden, // uns von der Shell abmelden und schliesslich die alte Shell // wieder rekonstruieren. @@ -929,7 +929,7 @@ void SwHTMLParser::DocumentDetected() pDoc->GetIDocumentUndoRedo().DoUndo(false); // Durch das DocumentDetected wurde im allgemeinen eine - // ViewShell angelegt. Es kann aber auch sein, dass sie + // SwViewShell angelegt. Es kann aber auch sein, dass sie // erst spaeter angelegt wird, naemlich dann, wenn die UI // gecaptured ist. CallStartAction(); @@ -2472,7 +2472,7 @@ void SwHTMLParser::Show() // - und Start-Action gerufen OSL_ENSURE( SVPAR_WORKING==eState, "Show nicht im Working-State - Das kann ins Auge gehen" ); - ViewShell *pOldVSh = CallEndAction(); + SwViewShell *pOldVSh = CallEndAction(); GetpApp()->Reschedule(); @@ -2483,9 +2483,9 @@ void SwHTMLParser::Show() eState = SVPAR_ERROR; } - // Die ViewShell nochmal holen, denn sie koennte im Reschedule + // Die SwViewShell nochmal holen, denn sie koennte im Reschedule // zerstoert wirden sein. - ViewShell *pVSh = CallStartAction( pOldVSh ); + SwViewShell *pVSh = CallStartAction( pOldVSh ); // ist der aktuelle Node nicht mehr sichtbar, dann benutzen wir // eine groessere Schrittweite @@ -2520,7 +2520,7 @@ void SwHTMLParser::ShowStatline() // wurde der Import vom SFX abgebrochen? eState = SVPAR_ERROR; - ViewShell *pVSh = CheckActionViewShell(); + SwViewShell *pVSh = CheckActionViewShell(); if( pVSh && pVSh->HasInvalidRect() ) { CallEndAction( sal_False, sal_False ); @@ -2529,18 +2529,18 @@ void SwHTMLParser::ShowStatline() } } -ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, sal_Bool bChkPtr ) +SwViewShell *SwHTMLParser::CallStartAction( SwViewShell *pVSh, sal_Bool bChkPtr ) { - OSL_ENSURE( !pActionViewShell, "CallStartAction: ViewShell schon gesetzt" ); + OSL_ENSURE( !pActionViewShell, "CallStartAction: SwViewShell schon gesetzt" ); if( !pVSh || bChkPtr ) { #if OSL_DEBUG_LEVEL > 0 - ViewShell *pOldVSh = pVSh; + SwViewShell *pOldVSh = pVSh; #endif pDoc->GetEditShell( &pVSh ); #if OSL_DEBUG_LEVEL > 0 - OSL_ENSURE( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" ); + OSL_ENSURE( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die SwViewShell ausgetauscht?" ); if( pOldVSh && !pVSh ) pVSh = 0; #endif @@ -2558,14 +2558,14 @@ ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, sal_Bool bChkPtr ) return pActionViewShell; } -ViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr ) +SwViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr ) { if( bChkPtr ) { - ViewShell *pVSh = 0; + SwViewShell *pVSh = 0; pDoc->GetEditShell( &pVSh ); OSL_ENSURE( !pVSh || pActionViewShell == pVSh, - "CallEndAction: Wer hat die ViewShell ausgetauscht?" ); + "CallEndAction: Wer hat die SwViewShell ausgetauscht?" ); #if OSL_DEBUG_LEVEL > 0 if( pActionViewShell && !pVSh ) pVSh = 0; @@ -2580,11 +2580,11 @@ ViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr ) if( bSetCrsr ) { // an allen CrsrEditShells die Cursor auf den Doc-Anfang setzen - ViewShell *pSh = pActionViewShell; + SwViewShell *pSh = pActionViewShell; do { if( pSh->IsA( TYPE( SwCrsrShell ) ) ) ((SwCrsrShell*)pSh)->SttEndDoc(sal_True); - pSh = (ViewShell *)pSh->GetNext(); + pSh = (SwViewShell *)pSh->GetNext(); } while( pSh != pActionViewShell ); bSetCrsr = sal_False; @@ -2620,18 +2620,18 @@ ViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr ) eState = SVPAR_ERROR; } - ViewShell *pVSh = pActionViewShell; + SwViewShell *pVSh = pActionViewShell; pActionViewShell = 0; return pVSh; } -ViewShell *SwHTMLParser::CheckActionViewShell() +SwViewShell *SwHTMLParser::CheckActionViewShell() { - ViewShell *pVSh = 0; + SwViewShell *pVSh = 0; pDoc->GetEditShell( &pVSh ); OSL_ENSURE( !pVSh || pActionViewShell == pVSh, - "CheckActionViewShell: Wer hat die ViewShell ausgetauscht?" ); + "CheckActionViewShell: Wer hat die SwViewShell ausgetauscht?" ); #if OSL_DEBUG_LEVEL > 0 if( pActionViewShell && !pVSh ) pVSh = 0; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index e574f30cc203..03c5407528f7 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -37,7 +37,7 @@ class SdrObject; class SvxMacroTableDtor; class SwDoc; class SwPaM; -class ViewShell; +class SwViewShell; class SwStartNode; class SwFmtColl; class SwField; @@ -391,7 +391,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient SwDoc *pDoc; SwPaM *pPam; // SwPosition duerfte doch reichen, oder ?? - ViewShell *pActionViewShell; // ViewShell, an der das StartAction + SwViewShell *pActionViewShell; // SwViewShell, an der das StartAction // gerufen wurde. SwNodeIndex *pSttNdIdx; @@ -482,9 +482,9 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void DocumentDetected(); void Show(); void ShowStatline(); - ViewShell *CallStartAction( ViewShell *pVSh = 0, sal_Bool bChkPtr = sal_True ); - ViewShell *CallEndAction( sal_Bool bChkAction = sal_False, sal_Bool bChkPtr = sal_True ); - ViewShell *CheckActionViewShell(); + SwViewShell *CallStartAction( SwViewShell *pVSh = 0, sal_Bool bChkPtr = sal_True ); + SwViewShell *CallEndAction( sal_Bool bChkAction = sal_False, sal_Bool bChkPtr = sal_True ); + SwViewShell *CheckActionViewShell(); DECL_LINK( AsyncCallback, void* ); diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 9735f8e0aa54..dfd1490cd51b 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -2124,7 +2124,7 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc) // Erkennung doppelter Namen fehlt noch (Wahrscheinlichkeit // fuer dopp. Namen ist gering) - nPos = GetDoc().MakePageDesc( ViewShell::GetShellRes()->GetPageDescName( + nPos = GetDoc().MakePageDesc( SwViewShell::GetShellRes()->GetPageDescName( GetDoc().GetPageDescCnt(), bFollow ? ShellResource::FOLLOW_PAGE : ShellResource::NORMAL_PAGE), pFirstPageDesc, false ); diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 14f8174b4f28..6af07889d66b 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -685,7 +685,7 @@ void DocxExport::WriteProperties( ) void DocxExport::WriteSettings() { - ViewShell *pViewShell(pDoc->GetCurrentViewShell()); + SwViewShell *pViewShell(pDoc->GetCurrentViewShell()); if( !pViewShell && !settings.hasData() && !m_pAttrOutput->HasFootnotes() && !m_pAttrOutput->HasEndnotes()) return; diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index 2226ed3d953f..8373fc0070f2 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -51,7 +51,7 @@ bool DocxExportFilter::exportDocument() return false; // update layout (if present), for SwWriteTable - ViewShell* pViewShell = NULL; + SwViewShell* pViewShell = NULL; pDoc->GetEditShell(&pViewShell); if (pViewShell != NULL) pViewShell->CalcLayout(); diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 92f0d0214b46..36f650936090 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -516,7 +516,7 @@ void RtfExport::ExportDocument_Impl() // Default TabSize Strm() << m_pAttrOutput->m_aTabStop.makeStringAndClear().getStr() << SAL_NEWLINE_STRING; // Zoom - ViewShell *pViewShell(pDoc->GetCurrentViewShell()); + SwViewShell *pViewShell(pDoc->GetCurrentViewShell()); if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() == SVX_ZOOM_PERCENT) { Strm() << OOO_STRING_SVTOOLS_RTF_VIEWSCALE; diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 39637dc1ab78..05d30d604711 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -63,7 +63,7 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& a } // fdo#37161 - update layout (if present), for SwWriteTable - ViewShell* pViewShell = NULL; + SwViewShell* pViewShell = NULL; pDoc->GetEditShell(&pViewShell); if (pViewShell != NULL) pViewShell->CalcLayout(); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e5000919fae6..0f03fef060fc 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -343,7 +343,7 @@ static void WriteDop( WW8Export& rWrt ) rDop.dxaTab = (sal_uInt16)rTabStop[0].GetTabPos(); // Zoom factor - ViewShell *pViewShell(rWrt.pDoc->GetCurrentViewShell()); + SwViewShell *pViewShell(rWrt.pDoc->GetCurrentViewShell()); if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() == SVX_ZOOM_PERCENT) rDop.wScaleSaved = pViewShell->GetViewOptions()->GetZoom(); @@ -3354,7 +3354,7 @@ void WW8Export::PrepareStorage() sal_uLong SwWW8Writer::WriteStorage() { // #i34818# - update layout (if present), for SwWriteTable - ViewShell* pViewShell = NULL; + SwViewShell* pViewShell = NULL; pDoc->GetEditShell( &pViewShell ); if( pViewShell != NULL ) pViewShell->CalcLayout(); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 2bce444fb10d..577c6d56fba1 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3996,7 +3996,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter, else { sal_uInt16 nPos = mrReader.rDoc.MakePageDesc( - ViewShell::GetShellRes()->GetPageDescName(mnDesc, ShellResource::NORMAL_PAGE), + SwViewShell::GetShellRes()->GetPageDescName(mnDesc, ShellResource::NORMAL_PAGE), 0, false); rIter->mpPage = &mrReader.rDoc.GetPageDesc(nPos); } diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index fcc73bd3ff1e..3ede120139c8 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2850,7 +2850,7 @@ void SwXMLTableContext::MakeTable() pTableNode->SetNewTable(pDDETable, sal_False); } - // ??? this is always false: root frame is only created in ViewShell::Init + // ??? this is always false: root frame is only created in SwViewShell::Init if( pTableNode->GetDoc()->GetCurrentViewShell() ) { pTableNode->DelFrms(); diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index d73fcfb8edaf..8582adb97e48 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -793,7 +793,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal if( pObjSh->IsA(TYPE(SwDocShell)) ) { const SwDoc* pDoc = ((SwDocShell*)pObjSh)->GetDoc(); - ViewShell* pVSh = 0; + SwViewShell* pVSh = 0; pDoc->GetEditShell( &pVSh ); if ( pVSh ) pVSh->ChgNumberDigits(); diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 0a601cad2d80..7da8e090503b 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -790,7 +790,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, pDev->SetBackground(); sal_Bool bWeb = 0 != PTR_CAST(SwWebDocShell, this); SwPrintData aOpts; - ViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect ); + SwViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect ); pDev->Pop(); if( pOrig ) diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index d520ea76fca3..1afff5892a25 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -434,7 +434,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( nSlotId ) { // PagePreview in the WebDocShell - // is found under Id ViewShell2. + // is found under Id VIEWSHELL2. if( ISA(SwWebDocShell) && SID_VIEWSHELL1 == nSlotId ) nSlotId = SID_VIEWSHELL2; diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 6fd4075676b0..dfaf2892d369 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -70,7 +70,7 @@ using namespace ::com::sun::star::view; using namespace ::com::sun::star::lang; -static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell* pSh ) +static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell* pSh ) { // in FrameSets the actual visibility can differ from the ViewOption's setting bool bVScrollChanged = rPref.IsViewVScrollBar() != pSh->GetViewOptions()->IsViewVScrollBar(); @@ -143,7 +143,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView, sal_uInt16 nDest ) { SwView* pCurrView = pActView; - ViewShell* pSh = pCurrView ? &pCurrView->GetWrtShell() : 0; + SwViewShell* pSh = pCurrView ? &pCurrView->GetWrtShell() : 0; SwMasterUsrPref* pPref = (SwMasterUsrPref*)GetUsrPref( static_cast< sal_Bool >( VIEWOPT_DEST_WEB == nDest ? sal_True : @@ -192,7 +192,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView, xViewOpt->SetReadonly( bReadonly ); if( !(*pSh->GetViewOptions() == *xViewOpt) ) { - //is maybe only a ViewShell + //is maybe only a SwViewShell pSh->StartAction(); pSh->ApplyViewOptions( *xViewOpt ); ((SwWrtShell*)pSh)->SetReadOnlyAvailable(xViewOpt->IsCursorInProtectedArea()); @@ -622,7 +622,7 @@ void SwModule::CheckSpellChanges( bool bOnlineSpelling, if ( pTmp->GetCurrentViewShell() ) { pTmp->SpellItAgainSam( bInvalid, bOnlyWrong, bSmartTags ); - ViewShell* pViewShell = 0; + SwViewShell* pViewShell = 0; pTmp->GetEditShell( &pViewShell ); if ( bSmartTags && pViewShell && pViewShell->GetWin() ) pViewShell->GetWin()->Invalidate(); diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 5d8a8df461d4..cacedeb9b8fd 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -452,7 +452,7 @@ sal_Bool SwNewDBMgr::Merge(SwWrtShell* pSh) { pSh->StartAllAction(); - pSh->ViewShell::UpdateFlds(sal_True); + pSh->SwViewShell::UpdateFlds(sal_True); pSh->SetModified(); pSh->EndAllAction(); @@ -2808,7 +2808,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig, rWorkShell.CalcLayout(); rWorkShell.UnlockExpFlds(); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), rWorkShell.GetView().GetViewFrame()->GetObjectShell())); - rWorkShell.ViewShell::UpdateFlds(); + rWorkShell.SwViewShell::UpdateFlds(); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), rWorkShell.GetView().GetViewFrame()->GetObjectShell())); // strip invisible content and convert fields to text diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index a109c8af1258..be2f1133c39e 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -114,7 +114,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat) void SwDocStatPage::Update() { SfxViewShell *pVSh = SfxViewShell::Current(); - ViewShell *pSh = 0; + SwViewShell *pSh = 0; if ( pVSh->ISA(SwView) ) pSh = ((SwView*)pVSh)->GetWrtShellPtr(); else if ( pVSh->ISA(SwPagePreview) ) diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 50035a895a37..4bbd6225e323 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -43,7 +43,7 @@ IMPL_LINK_NOARG(SwWordCountFloatDlg, CloseHdl) SwWordCountFloatDlg::~SwWordCountFloatDlg() { - ViewShell::SetCareWin( 0 ); + SwViewShell::SetCareWin( 0 ); } namespace diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index dbf5f29fedf1..c34e8fe8d4f0 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -3470,7 +3470,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, // Interfaces for Selection void SwTransferable::CreateSelection( SwWrtShell& rSh, - const ViewShell * _pCreatorView ) + const SwViewShell * _pCreatorView ) { SwModule *pMod = SW_MOD(); SwTransferable* pNew = new SwTransferable( rSh ); @@ -3483,7 +3483,7 @@ void SwTransferable::CreateSelection( SwWrtShell& rSh, } void SwTransferable::ClearSelection( SwWrtShell& rSh, - const ViewShell * _pCreatorView) + const SwViewShell * _pCreatorView) { SwModule *pMod = SW_MOD(); if( pMod->pXSelection && diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index 27bc2462eed5..b1d3767c2474 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -241,9 +241,9 @@ void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt ) OUString sURL( pURL->GetURL() ); SvtSecurityOptions aSecOpts; if ( aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK) ) - sURL = ViewShell::GetShellRes()->aLinkCtrlClick + ": " + sURL; + sURL = SwViewShell::GetShellRes()->aLinkCtrlClick + ": " + sURL; else - sURL = ViewShell::GetShellRes()->aLinkClick + ": " + sURL; + sURL = SwViewShell::GetShellRes()->aLinkClick + ": " + sURL; Help::ShowQuickHelp( this,PixelToLogic(Rectangle(GetPosPixel(),Size(50,10))),sURL); } } diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/ui/docvw/SidebarWinAcc.cxx index 283de1c22185..d977dadcfb93 100644 --- a/sw/source/ui/docvw/SidebarWinAcc.cxx +++ b/sw/source/ui/docvw/SidebarWinAcc.cxx @@ -33,7 +33,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent { public: explicit SidebarWinAccessibleContext( SwSidebarWin& rSidebarWin, - ViewShell& rViewShell, + SwViewShell& rViewShell, const SwFrm* pAnchorFrm ) : VCLXAccessibleComponent( rSidebarWin.GetWindowPeer() ) , mrViewShell( rViewShell ) @@ -86,7 +86,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent } private: - ViewShell& mrViewShell; + SwViewShell& mrViewShell; const SwFrm* mpAnchorFrm; ::osl::Mutex maMutex; @@ -94,7 +94,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent // implementaion of accessible for <SwSidebarWin> instance SidebarWinAccessible::SidebarWinAccessible( SwSidebarWin& rSidebarWin, - ViewShell& rViewShell, + SwViewShell& rViewShell, const SwSidebarItem& rSidebarItem ) : VCLXWindow() , mrSidebarWin( rSidebarWin ) diff --git a/sw/source/ui/docvw/SidebarWinAcc.hxx b/sw/source/ui/docvw/SidebarWinAcc.hxx index 0b485906ad00..cd09fb3542ad 100644 --- a/sw/source/ui/docvw/SidebarWinAcc.hxx +++ b/sw/source/ui/docvw/SidebarWinAcc.hxx @@ -22,7 +22,7 @@ #include <toolkit/awt/vclxwindow.hxx> -class ViewShell; +class SwViewShell; class SwSidebarItem; class SwFrm; @@ -34,7 +34,7 @@ class SidebarWinAccessible : public VCLXWindow { public: explicit SidebarWinAccessible( SwSidebarWin& rSidebarWin, - ViewShell& rViewShell, + SwViewShell& rViewShell, const SwSidebarItem& rSidebarItem ); virtual ~SidebarWinAccessible(); @@ -45,7 +45,7 @@ class SidebarWinAccessible : public VCLXWindow private: SwSidebarWin& mrSidebarWin; - ViewShell& mrViewShell; + SwViewShell& mrViewShell; const SwFrm* mpAnchorFrm; bool bAccContextCreated; }; diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index 879d1aff0a04..f5fd78c11fb5 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -219,9 +219,9 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) sTxt = ": " + sTxt; if ( !bExecHyperlinks ) - sTxt = ViewShell::GetShellRes()->aLinkCtrlClick + sTxt; + sTxt = SwViewShell::GetShellRes()->aLinkCtrlClick + sTxt; else - sTxt = ViewShell::GetShellRes()->aLinkClick + sTxt; + sTxt = SwViewShell::GetShellRes()->aLinkClick + sTxt; } break; } diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index b6874c3be867..35b00fb385a3 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -38,7 +38,7 @@ // Core-Notify -void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect, +void ScrollMDI( SwViewShell* pVwSh, const SwRect &rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); @@ -47,7 +47,7 @@ void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect, } // Docmdi - movable -sal_Bool IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect ) +sal_Bool IsScrollMDI( SwViewShell* pVwSh, const SwRect &rRect ) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if (pSfxVwSh && pSfxVwSh->ISA(SwView)) @@ -56,7 +56,7 @@ sal_Bool IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect ) } // Notify for size change -void SizeNotify(ViewShell* pVwSh, const Size &rSize) +void SizeNotify(SwViewShell* pVwSh, const Size &rSize) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if (pSfxVwSh) @@ -69,7 +69,7 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize) } // Notify for page number update -void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, +void PageNumNotify( SwViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUString& rPgStr) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); @@ -78,7 +78,7 @@ void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, ((SwView *)pSfxVwSh)->UpdatePageNums(nPhyNum, nVirtNum, rPgStr); } -void FrameNotify( ViewShell* pVwSh, FlyMode eMode ) +void FrameNotify( SwViewShell* pVwSh, FlyMode eMode ) { if ( pVwSh->ISA(SwCrsrShell) ) SwBaseShell::SetFrmMode( eMode, (SwWrtShell*)pVwSh ); @@ -114,14 +114,14 @@ TblChgMode GetTblChgDefaultMode() return pOpt ? pOpt->GetTblMode() : TBLVAR_CHGABS; } -void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect ) +void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect ) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if (pSfxVwSh && pSfxVwSh->ISA( SwPagePreview )) ((SwPagePreview *)pSfxVwSh)->RepaintCoreRect( rRect ); } -bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark ) +bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark ) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if( pSfxVwSh && pSfxVwSh->ISA( SwView ) ) @@ -151,7 +151,7 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt ) { pSh->LockPaint(); bUnlockPaint = sal_True; - ViewShell::DeleteReplacementBitmaps(); + SwViewShell::DeleteReplacementBitmaps(); GetView().InvalidateBorder(); //Scrollbar work } break; diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 6897d9608fc1..cf85fd022bca 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -551,7 +551,7 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) if ( i == DI_CUSTOM ) sNew = SW_RES( STR_CUSTOM ); else - sNew = ViewShell::GetShellRes()->aDocInfoLst[i]; + sNew = SwViewShell::GetShellRes()->aDocInfoLst[i]; } else sNew = SW_RES(aSwFlds[nPos].nSubTypeStart + i); diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 9d05aa567f95..bc224b7878c0 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -514,7 +514,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) // collect character styles ListBox rCharFmtLB(this); rCharFmtLB.Clear(); - rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); + rCharFmtLB.InsertEntry( SwViewShell::GetShellRes()->aStrNone ); SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); ::FillCharStyleListBox(rCharFmtLB, pDocShell); diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 10729e8ea350..7a94547f5cfc 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -32,12 +32,12 @@ class SwTestTabPage; #endif class SwAddPrinterTabPage; class SfxPrinter; -class ViewShell; +class SwViewShell; class SwViewOption; class SwContentOptPage; class SwShdwCrsrOptionsTabPage; -SfxPrinter* GetPrt( ViewShell* ); +SfxPrinter* GetPrt( SwViewShell* ); void SetPrt( SfxPrinter* ); /*--------OS 12.01.95 ----------------------------------- diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 86e5483c9c2a..a48b33c99f1b 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -32,7 +32,7 @@ class SwWrtShell; class SwView; class SwRect; -class ViewShell; +class SwViewShell; class SwAnchorMarker; class SdrObject; class SwShadowCursor; @@ -58,13 +58,13 @@ class SdrDropMarkerOverlay; class SwEditWin: public Window, public DropTargetHelper, public DragSourceHelper { -friend void ScrollMDI(ViewShell* pVwSh, const SwRect&, +friend void ScrollMDI(SwViewShell* pVwSh, const SwRect&, sal_uInt16 nRangeX, sal_uInt16 nRangeY); -friend sal_Bool IsScrollMDI(ViewShell* pVwSh, const SwRect&); +friend sal_Bool IsScrollMDI(SwViewShell* pVwSh, const SwRect&); -friend void SizeNotify(ViewShell* pVwSh, const Size &); +friend void SizeNotify(SwViewShell* pVwSh, const Size &); -friend void PageNumNotify( ViewShell* pVwSh, +friend void PageNumNotify( SwViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUString& rPg ); diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index 7cf9e832dfca..7bec5e4281cc 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -31,7 +31,7 @@ class SwViewOption; class SwDocShell; class SwScrollbar; -class ViewShell; +class SwViewShell; class SwPagePreview; class ImageButton; class Button; @@ -44,7 +44,7 @@ class SwPagePreviewLayout; // Delete member <mnVirtPage> and its accessor class SwPagePreviewWin : public Window { - ViewShell* mpViewShell; + SwViewShell* mpViewShell; sal_uInt16 mnSttPage; sal_uInt8 mnRow, mnCol; Size maPxWinSize; @@ -62,16 +62,16 @@ public: SwPagePreviewWin( Window* pParent, SwPagePreview& rView ); ~SwPagePreviewWin(); - // calls ViewShell::Paint + // calls SwViewShell::Paint virtual void Paint( const Rectangle& rRect ); virtual void KeyInput( const KeyEvent & ); virtual void Command( const CommandEvent& rCEvt ); virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void DataChanged( const DataChangedEvent& ); - void SetViewShell( ViewShell* pShell ); + void SetViewShell( SwViewShell* pShell ); - ViewShell* GetViewShell() const { return mpViewShell; } + SwViewShell* GetViewShell() const { return mpViewShell; } sal_uInt8 GetRow() const { return mnRow; } void SetRow( sal_uInt8 n ) { if( n ) mnRow = n; } @@ -221,7 +221,7 @@ public: TYPEINFO(); inline Window* GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); } - inline ViewShell* GetViewShell() const { return aViewWin.GetViewShell(); } + inline SwViewShell* GetViewShell() const { return aViewWin.GetViewShell(); } inline const Rectangle& GetVisArea() const { return aVisArea; } inline void GrabFocusViewWin() { aViewWin.GrabFocus(); } inline void RepaintCoreRect( const SwRect& rRect ) diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index 7e4e68c3b77e..4b754e183b7f 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -35,7 +35,7 @@ class SwDocFac; class SwTextBlocks; class SwWrtShell; class SvxClipboardFmtItem; -class ViewShell; +class SwViewShell; class SwView_Impl; typedef sal_uInt16 TransferBufferType; @@ -64,7 +64,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper SwWrtShell *pWrtShell; /* #96392# Added pCreatorView to distinguish SwFrameShell from SwWrtShell. */ - const ViewShell *pCreatorView; + const SwViewShell *pCreatorView; SwDocFac *pClpDocFac; Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; INetBookmark *pBkmk; // URL and description! @@ -198,9 +198,9 @@ public: // Interfaces for Selection /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */ static void CreateSelection( SwWrtShell & rSh, - const ViewShell * pCreator = NULL ); + const SwViewShell * pCreator = NULL ); static void ClearSelection( SwWrtShell& rSh, - const ViewShell * pCreator = NULL ); + const SwViewShell * pCreator = NULL ); // the related SwView is being closed and the SwTransferable is invalid now void Invalidate() {pWrtShell = 0;} diff --git a/sw/source/ui/inc/swruler.hxx b/sw/source/ui/inc/swruler.hxx index 9e59ae16c02a..2eaada89d364 100644 --- a/sw/source/ui/inc/swruler.hxx +++ b/sw/source/ui/inc/swruler.hxx @@ -12,7 +12,7 @@ #include <svx/ruler.hxx> -class ViewShell; +class SwViewShell; class View; class Window; class SwEditWin; @@ -27,7 +27,7 @@ class SwCommentRuler { public: SwCommentRuler ( - ViewShell* pViewSh, + SwViewShell* pViewSh, Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, @@ -42,7 +42,7 @@ public: virtual void Paint( const Rectangle& rRect ); protected: - ViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility + SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility SwEditWin * mpSwWin; //< Used to get SwView to change the SideBar visibility bool mbIsHighlighted; //< If comment control is highlighted (mouse is over it) VirtualDevice maVirDev; //< VirtualDevice of this window. Just for convenience. diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 5741b629b3bf..d69f6e72fc06 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -794,7 +794,7 @@ void SwIndexMarkPane::UpdateDialog() if(!pMark) return; - ViewShell::SetCareWin(&m_rDialog); + SwViewShell::SetCareWin(&m_rDialog); aOrgStr = pMark->GetText(); m_pEntryED->SetText(aOrgStr); @@ -971,7 +971,7 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox ) SwIndexMarkPane::~SwIndexMarkPane() { delete pTOXMgr; - ViewShell::SetCareWin( 0 ); + SwViewShell::SetCareWin( 0 ); } void SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark) diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index db8ac851c63c..50e958a5aa94 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -963,7 +963,7 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) // collect char styles ListBox rCharFmtLB(this); rCharFmtLB.Clear(); - rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone ); + rCharFmtLB.InsertEntry( SwViewShell::GetShellRes()->aStrNone ); SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell(); ::FillCharStyleListBox(rCharFmtLB, pDocShell); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index dab46835c456..ea915d15ab6e 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -493,7 +493,7 @@ void SwOutlineSettingsTabPage::Update() if(pFirstFmt) m_pCharFmtLB->SelectEntry(pFirstFmt->GetName()); else - m_pCharFmtLB->SelectEntry( ViewShell::GetShellRes()->aStrNone ); + m_pCharFmtLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone ); } else m_pCharFmtLB->SetNoSelection(); @@ -527,7 +527,7 @@ void SwOutlineSettingsTabPage::Update() if(pFmt) m_pCharFmtLB->SelectEntry(pFmt->GetName()); else - m_pCharFmtLB->SelectEntry( ViewShell::GetShellRes()->aStrNone ); + m_pCharFmtLB->SelectEntry( SwViewShell::GetShellRes()->aStrNone ); if(nTmpLevel) { @@ -695,7 +695,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFmtHdl) { OUString sEntry = m_pCharFmtLB->GetSelectEntry(); sal_uInt16 nMask = 1; - bool bFormatNone = sEntry == ViewShell::GetShellRes()->aStrNone; + bool bFormatNone = sEntry == SwViewShell::GetShellRes()->aStrNone; SwCharFmt* pFmt = 0; if(!bFormatNone) { @@ -791,7 +791,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell) // collect char styles m_pCharFmtLB->Clear(); - m_pCharFmtLB->InsertEntry( ViewShell::GetShellRes()->aStrNone ); + m_pCharFmtLB->InsertEntry( SwViewShell::GetShellRes()->aStrNone ); // char styles ::FillCharStyleListBox(*m_pCharFmtLB, diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx index 7806bfebc0d2..b076dc8933e1 100644 --- a/sw/source/ui/misc/swruler.cxx +++ b/sw/source/ui/misc/swruler.cxx @@ -35,7 +35,7 @@ #define CONTROL_TRIANGLE_PAD 3 // Constructor -SwCommentRuler::SwCommentRuler( ViewShell* pViewSh, Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle | WB_HSCROLL) , mpViewShell(pViewSh) , mpSwWin(pWin) diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 5480849c1de2..c1493584cf22 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -583,7 +583,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) { rSh.UpdateDocStat(); rSh.EndAllTblBoxEdit(); - rSh.ViewShell::UpdateFlds(sal_True); + rSh.SwViewShell::UpdateFlds(sal_True); if( rSh.IsCrsrInTbl() ) { diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index db079a832afc..299d3fc43983 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -945,7 +945,7 @@ SwFrameShell::SwFrameShell(SwView &_rView) : SetHelpId(SW_FRAMESHELL); // #96392# Use this to announce it is the frame shell who creates the selection. - SwTransferable::CreateSelection( _rView.GetWrtShell(), (ViewShell *) this ); + SwTransferable::CreateSelection( _rView.GetWrtShell(), (SwViewShell *) this ); SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Frame)); } @@ -953,7 +953,7 @@ SwFrameShell::SwFrameShell(SwView &_rView) : SwFrameShell::~SwFrameShell() { // #96392# Only clear the selection if it was this frame shell who created it. - SwTransferable::ClearSelection( GetShell(), (ViewShell *) this ); + SwTransferable::ClearSelection( GetShell(), (SwViewShell *) this ); } void SwFrameShell::ExecFrameStyle(SfxRequest& rReq) diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 96912e3280cf..5b68feb1e3fa 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -200,7 +200,7 @@ void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt ) if( !bSetAutoFmt ) { // Then the list to be expanded by the entry "- none -". - m_pLbFormat->InsertEntry( ViewShell::GetShellRes()->aStrNone ); + m_pLbFormat->InsertEntry( SwViewShell::GetShellRes()->aStrNone ); nDfltStylePos = 1; nIndex = 255; } @@ -461,7 +461,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl) { nIndex = 255; - SwTableAutoFmt aTmp( ViewShell::GetShellRes()->aStrNone ); + SwTableAutoFmt aTmp( SwViewShell::GetShellRes()->aStrNone ); aTmp.SetFont( sal_False ); aTmp.SetJustify( sal_False ); aTmp.SetFrame( sal_False ); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 3f39d51284f7..abf1ca9b4e80 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1173,7 +1173,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): pOldSh = pF->GetViewShell(); } - ViewShell *pVS, *pNew; + SwViewShell *pVS, *pNew; if( pOldSh && pOldSh->IsA( TYPE( SwPagePreview ) ) ) pVS = ((SwPagePreview*)pOldSh)->GetViewShell(); @@ -1207,9 +1207,9 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): } if( pVS ) - pNew = new ViewShell( *pVS, &aViewWin, 0, VSHELLFLAG_ISPREVIEW ); + pNew = new SwViewShell( *pVS, &aViewWin, 0, VSHELLFLAG_ISPREVIEW ); else - pNew = new ViewShell( + pNew = new SwViewShell( *((SwDocShell*)pViewFrame->GetObjectShell())->GetDoc(), &aViewWin, 0, 0, VSHELLFLAG_ISPREVIEW ); @@ -1669,7 +1669,7 @@ SfxPrinter* SwPagePreview::GetPrinter( sal_Bool bCreate ) sal_uInt16 SwPagePreview::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags, bool ) { - ViewShell &rSh = *GetViewShell(); + SwViewShell &rSh = *GetViewShell(); SfxPrinter* pOld = rSh.getIDocumentDeviceAccess()->getPrinter( false ); if ( pOld && pOld->IsPrinting() ) return SFX_PRINTERROR_BUSY; @@ -1732,7 +1732,7 @@ SfxTabPage* SwPagePreview::CreatePrintOptionsPage( Window *pParent, return ::CreatePrintOptionsPage( pParent, rOptions, !bNormalPrint ); } -void SwPagePreviewWin::SetViewShell( ViewShell* pShell ) +void SwPagePreviewWin::SetViewShell( SwViewShell* pShell ) { mpViewShell = pShell; if ( mpViewShell && mpViewShell->IsPreview() ) @@ -1884,7 +1884,7 @@ void SwPagePreview::EnableVScrollbar(bool bEnable) void SwPagePreview::SetZoom(SvxZoomType eType, sal_uInt16 nFactor) { - ViewShell& rSh = *GetViewShell(); + SwViewShell& rSh = *GetViewShell(); SwViewOption aOpt(*rSh.GetViewOptions()); // perform action only on changes of zoom or zoom type. if ( aOpt.GetZoom() != nFactor || diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 9bf32b3c5420..7e783ba91647 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -830,10 +830,10 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) } m_pWrtShell = new SwWrtShell( rDoc, m_pEditWin, *this, &aUsrPref ); // creating an SwView from a SwPagePreview needs to - // add the ViewShell to the ring of the other ViewShell(s) + // add the SwViewShell to the ring of the other SwViewShell(s) if(m_bOldShellWasPagePreview) { - ViewShell& rPreviewViewShell = *((SwPagePreview*)pExistingSh)->GetViewShell(); + SwViewShell& rPreviewViewShell = *((SwPagePreview*)pExistingSh)->GetViewShell(); m_pWrtShell->MoveTo(&rPreviewViewShell); // to update the field command et.al. if necessary const SwViewOption* pPreviewOpt = rPreviewViewShell.GetViewOptions(); diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx index c4acb7207eba..c82b31c947da 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -28,13 +28,13 @@ class SfxTabPage; class Size; class SvxRuler; class SwScrollbar; -class ViewShell; +class SwViewShell; class Window; // The following functions are available in viewprt.cxx void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, sal_Bool bWeb ); SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& ); -void SetAppPrintOptions( ViewShell* pSh, sal_Bool bWeb ); +void SetAppPrintOptions( SwViewShell* pSh, sal_Bool bWeb ); // The following functions are available in viewport.cxx void ViewResizePixel( const Window &rRef, diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 4d2a58a3c23f..09aabece5384 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -404,7 +404,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan Rectangle aOldVisArea( m_aVisArea ); long nDiffY = 0; - Window* pCareWn = ViewShell::GetCareWin(GetWrtShell()); + Window* pCareWn = SwViewShell::GetCareWin(GetWrtShell()); if ( pCareWn ) { Rectangle aDlgRect( GetEditWin().PixelToLogic( diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 09d8d04fde2c..2c9d5eb41c03 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -270,7 +270,7 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent, return pPage; } -void SetAppPrintOptions( ViewShell* pSh, sal_Bool bWeb ) +void SetAppPrintOptions( SwViewShell* pSh, sal_Bool bWeb ) { const IDocumentDeviceAccess* pIDDA = pSh->getIDocumentDeviceAccess(); SwPrintData aPrtData = pIDDA->getPrintData(); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 1242e3e8abdc..c658b8598a79 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -405,7 +405,7 @@ SwXTextDocument::~SwXTextDocument() delete m_pPrintUIOptions; if (m_pRenderData && m_pRenderData->IsViewOptionAdjust()) { // rhbz#827695: this can happen if the last page is not printed - // the ViewShell has been deleted already by SwView::~SwView + // the SwViewShell has been deleted already by SwView::~SwView // FIXME: replace this awful implementation of XRenderable with // something less insane that has its own view m_pRenderData->ViewOptionAdjustCrashPreventionKludge(); @@ -2230,7 +2230,7 @@ void SwXTextDocument::refresh(void) throw( RuntimeException ) SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); - ViewShell *pViewShell = pDocShell->GetWrtShell(); + SwViewShell *pViewShell = pDocShell->GetWrtShell(); NotifyRefreshListeners(); if(pViewShell) pViewShell->CalcLayout(); @@ -2433,7 +2433,7 @@ SwDoc * SwXTextDocument::GetRenderDoc( rpView = GuessViewShell( bIsSwSrcView ); } - OSL_ENSURE( rpView, "ViewShell missing" ); + OSL_ENSURE( rpView, "SwViewShell missing" ); // the view shell should be SwView for documents PDF export. // for the page preview no selection should be possible // (the export dialog does not allow for this option) @@ -2460,7 +2460,7 @@ SwDoc * SwXTextDocument::GetRenderDoc( } else { - OSL_FAIL("unexpected ViewShell" ); + OSL_FAIL("unexpected SwViewShell" ); } } } @@ -2537,8 +2537,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( { SwDocShell *pRenderDocShell = pDoc->GetDocShell(); - // TODO/mba: we really need a generic way to get the ViewShell! - ViewShell* pViewShell = 0; + // TODO/mba: we really need a generic way to get the SwViewShell! + SwViewShell* pViewShell = 0; SwView* pSwView = PTR_CAST(SwView, pView); if ( pSwView ) { @@ -2614,7 +2614,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( } // #122919# Force field update before PDF export - pViewShell->ViewShell::UpdateFlds(sal_True); + pViewShell->SwViewShell::UpdateFlds(sal_True); if( bStateChanged ) pRenderDocShell->EnableSetModified( sal_True ); @@ -2710,8 +2710,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( if (0 > nRenderer) throw IllegalArgumentException(); - // TODO/mba: we really need a generic way to get the ViewShell! - ViewShell* pVwSh = 0; + // TODO/mba: we really need a generic way to get the SwViewShell! + SwViewShell* pVwSh = 0; SwView* pSwView = PTR_CAST(SwView, pView); if ( pSwView ) pVwSh = pSwView->GetWrtShellPtr(); @@ -2996,10 +2996,10 @@ void SAL_CALL SwXTextDocument::render( //!! (check for SwView first as in GuessViewShell) !! OSL_ENSURE( pView, "!! view missing !!" ); const TypeId aSwViewTypeId = TYPE(SwView); - ViewShell* pVwSh = 0; + SwViewShell* pVwSh = 0; if (pView) { - // TODO/mba: we really need a generic way to get the ViewShell! + // TODO/mba: we really need a generic way to get the SwViewShell! SwView* pSwView = PTR_CAST(SwView, pView); if ( pSwView ) pVwSh = pSwView->GetWrtShellPtr(); @@ -3940,7 +3940,7 @@ void SwXDocumentPropertyHelper::onChange() } SwViewOptionAdjust_Impl::SwViewOptionAdjust_Impl( - ViewShell& rSh, const SwViewOption &rViewOptions) + SwViewShell& rSh, const SwViewOption &rViewOptions) : m_pShell(&rSh) , m_aOldViewOptions( rViewOptions ) { diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 78312ff0a9b5..785ffc4d6a22 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -147,8 +147,8 @@ std::vector<OUString>* pAuthFieldTypeList = 0; void _FinitUI() { SwNewDBMgr::RemoveDbtoolsClient(); - delete ViewShell::GetShellRes(); - ViewShell::SetShellRes( 0 ); + delete SwViewShell::GetShellRes(); + SwViewShell::SetShellRes( 0 ); SwEditWin::_FinitStaticData(); @@ -168,7 +168,7 @@ void _FinitUI() void _InitUI() { // ShellResource gives the CORE the possibility to work with resources. - ViewShell::SetShellRes( new ShellResource ); + SwViewShell::SetShellRes( new ShellResource ); SwEditWin::_InitStaticData(); } diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx index fb5bb376ea02..60098a6378df 100644 --- a/sw/source/ui/vba/vbainformationhelper.cxx +++ b/sw/source/ui/vba/vbainformationhelper.cxx @@ -52,7 +52,7 @@ double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css sal_Int32 nCurrentPage = handleWdActiveEndPageNumber( xTVCursor ); SwDoc* pDoc = word::getDocShell( xModel )->GetDoc(); - ViewShell* pViewSh = pDoc->GetCurrentViewShell(); + SwViewShell* pViewSh = pDoc->GetCurrentViewShell(); sal_Int32 nPageHeight = pViewSh ? pViewSh->GetPageSize( nCurrentPage, sal_False ).Height() : 0; // FIXME: handle multipul page style // it is very strange that the curros position is incorrect when open Word file. diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx index 910ac525adce..be3443da93f6 100644 --- a/sw/source/ui/vba/wordvbahelper.cxx +++ b/sw/source/ui/vba/wordvbahelper.cxx @@ -85,7 +85,7 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException) { SwDocShell* pDocShell = getDocShell( xModel ); - ViewShell* pViewSh = pDocShell ? pDocShell->GetDoc()->GetCurrentViewShell() : 0; + SwViewShell* pViewSh = pDocShell ? pDocShell->GetDoc()->GetCurrentViewShell() : 0; return pViewSh ? pViewSh->GetPageCount() : 0; } diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index 72f26a2b3c9c..7f5cab28888b 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -556,12 +556,12 @@ sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect) // This has not work that way, because the cursor was not set // because this does not happen within a // Start-/EndActionParentheses. - // Because only ViewShell::EndAction() is called at the end, + // Because only SwViewShell::EndAction() is called at the end, // no updating of the display of the cursor position takes place. // The CrsrShell-Actionparentheses cannot be used, because it // always leads to displaying the cursor, thus also, // if after the scroll scrolled in a region without a valid postition. - // ViewShell::StartAction(); + // SwViewShell::StartAction(); PageMove eDir = lOffset > 0? MV_PAGE_DOWN: MV_PAGE_UP; // Change of direction and stack present if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( sal_True, bSelect )) diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 03b8ad2b663b..11e06415c2d8 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -1698,7 +1698,7 @@ void SwWrtShell::ApplyViewOptions( const SwViewOption &rOpt ) void SwWrtShell::SetReadonlyOption(sal_Bool bSet) { GetView().GetEditWin().GetFrameControlsManager().SetReadonlyControls( bSet ); - ViewShell::SetReadonlyOption( bSet ); + SwViewShell::SetReadonlyOption( bSet ); } // Switch on/off header or footer of a page style - if an empty name is @@ -1776,7 +1776,7 @@ void SwWrtShell::ChangeHeaderOrFooter( void SwWrtShell::SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) { - ViewShell::SetShowHeaderFooterSeparator( eControl, bShow ); + SwViewShell::SetShowHeaderFooterSeparator( eControl, bShow ); if ( !bShow ) GetView().GetEditWin().GetFrameControlsManager().HideControls( eControl ); } diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 69cc78be3460..0e034e8174df 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -357,7 +357,7 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter ) } -void LoadURL( ViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, +void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter, const OUString& rTargetFrameName ) { OSL_ENSURE( !rURL.isEmpty(), "what should be loaded here?" ); |