diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/lokhelper.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/viewsh.hxx | 39 |
2 files changed, 18 insertions, 23 deletions
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index 90ddd52d01a4..f7de18112c04 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -188,7 +188,7 @@ public: static VclPtr<vcl::Window> getInPlaceDocWindow(SfxViewShell* pViewShell); private: - static int createView(SfxViewFrame* pViewFrame, ViewShellDocId docId); + static int createView(SfxViewFrame& rViewFrame, ViewShellDocId docId); }; template<typename ViewShellType, typename FunctionType> diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 1e70f8301bda..0465fd036d4b 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -163,7 +163,7 @@ friend class SfxBaseController; friend class SfxPrinterController; std::unique_ptr<struct SfxViewShell_Impl> pImpl; - SfxViewFrame* pFrame; + SfxViewFrame& rFrame; VclPtr<vcl::Window> pWindow; bool bNoNewWindow; bool mbPrinterSettingsModified; @@ -262,7 +262,22 @@ public: const SvBorder& GetBorderPixel() const; void SetBorderPixel( const SvBorder &rBorder ); void InvalidateBorder(); - inline SfxViewFrame* GetViewFrame() const; + + /* [Description] + + This method returns a reference to the <SfxViewFrame> Instance in which + this SfxViewShell is displayed. This is the instance that was passed + on in the constructor. It is guaranteed that the returned reference + is a valid SfxViewFrame instance. + + [Cross-reference] + + <SfxShell::GetFrame()const> + */ + SfxViewFrame& GetViewFrame() const + { + return rFrame; + } // Printing Interface virtual SfxPrinter* GetPrinter( bool bCreate = false ); @@ -442,26 +457,6 @@ public: void SetStoringHelper(std::shared_ptr<SfxStoringHelper> xHelper) { m_xHelper = xHelper; } }; - -inline SfxViewFrame* SfxViewShell::GetViewFrame() const - -/* [Description] - - This method returns a pointer to the <SfxViewFrame> Instance in which - this SfxViewShell is displayed. This is the instance that was passed - on in the constructor. It is guaranteed that the returned pointer - points on the valid SfxViewFrame instance. - - [Cross-reference] - - <SfxShell::GetFrame()const> -*/ - -{ - return pFrame; -} - #endif // INCLUDED_SFX2_VIEWSH_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |