diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-03-23 20:14:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-27 09:43:58 +0000 |
| commit | d615af618cc6a7152c76a49b3cd09db38eaa9e07 (patch) | |
| tree | bc0d69070444dc687708de9a4a146c5c2d3b6852 /include/sfx2/viewfrm.hxx | |
| parent | 6f968f00b1534406a2943be374fab924c3396482 (diff) | |
create SfxInterfaceId o3tl::strong_int
Change-Id: Ie52f63382a9fb36f9a472801be012b140bfb51f6
Reviewed-on: https://gerrit.libreoffice.org/35722
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2/viewfrm.hxx')
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 2b6093ef3679..83928d364170 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -97,9 +97,9 @@ public: static void SetViewFrame( SfxViewFrame* ); - static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); - static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); - static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId ); + static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, SfxInterfaceId i_nViewId ); + static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, SfxInterfaceId i_nViewId ); + static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, SfxInterfaceId i_nViewId ); static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const css::uno::Reference< css::frame::XFrame >& i_rFrameItem ); static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest ); @@ -143,7 +143,7 @@ public: SAL_DLLPRIVATE void InvalidateBorderImpl( const SfxViewShell *pSh ); virtual SfxObjectShell* GetObjectShell() override; - sal_uInt16 GetCurViewId() const; + SfxInterfaceId GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; @@ -206,12 +206,12 @@ public: SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &); SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); - SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID ); + SAL_DLLPRIVATE void SetCurViewId_Impl( const SfxInterfaceId i_nID ); private: SAL_DLLPRIVATE bool SwitchToViewShell_Impl( sal_uInt16 nNo, bool bIsIndex = false ); SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ); - SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ); + SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const SfxInterfaceId i_nNewViewId ); /** loads the given existing document into the given frame @@ -234,7 +234,7 @@ private: const SfxObjectShell& i_rDoc, const css::uno::Reference< css::frame::XFrame >& i_rFrame, const css::uno::Sequence< css::beans::PropertyValue >& i_rLoadArgs, - const sal_uInt16 i_nViewId, + const SfxInterfaceId i_nViewId, const bool i_bHidden ); @@ -256,7 +256,7 @@ private: SAL_DLLPRIVATE static SfxViewFrame* LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const css::uno::Reference< css::frame::XFrame >& i_rFrame, - const sal_uInt16 i_nViewId, + const SfxInterfaceId i_nViewId, const bool i_bHidden ); }; |