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/source/ui/inc | |
parent | fix warnings in gtksalframe (diff) | |
download | core-ee3189489c0205ec221fbc907a01c711b58fc42e.tar.gz core-ee3189489c0205ec221fbc907a01c711b58fc42e.zip |
sw: ViewShell -> SwViewShell rename
It's a public class, so it should have the 'Sw' prefix.
Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/cfgitems.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/edtwin.hxx | 10 | ||||
-rw-r--r-- | sw/source/ui/inc/pview.hxx | 12 | ||||
-rw-r--r-- | sw/source/ui/inc/swdtflvr.hxx | 8 | ||||
-rw-r--r-- | sw/source/ui/inc/swruler.hxx | 6 |
5 files changed, 20 insertions, 20 deletions
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. |