diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-11 13:49:14 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-12-11 13:49:14 +0100 |
| commit | 8c7ba14bf2acf14d12afb115e9024c73235faca5 (patch) | |
| tree | 2ffae46f1f6852c2f6351872d6d2f58ef3d78dd4 /sfx2/inc | |
| parent | d8bba185c2b34969e8c4c7d2d052f87c50ca50e5 (diff) | |
autorecovery: moved SfxViewFrame::LoadDocument_Impl to SfxFrameLoader_Impl::impl_createDocumentView
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/frmload.hxx | 12 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/viewfrm.hxx | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx index 5fd13c1bf088..48d03ec6dd07 100644 --- a/sfx2/inc/frmload.hxx +++ b/sfx2/inc/frmload.hxx @@ -37,6 +37,8 @@ /** === begin UNO includes === **/ #include <com/sun/star/frame/XLoadEventListener.hpp> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> +#include <com/sun/star/frame/XController2.hpp> +#include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -119,7 +121,7 @@ private: ) const; SfxObjectShellLock impl_findObjectShell( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_rxDocument + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel2 >& i_rxDocument ) const; void impl_lockHiddenDocument( @@ -149,6 +151,14 @@ private: impl_extractViewCreationArgs( ::comphelper::NamedValueCollection& io_rDescriptor ); + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > + impl_createDocumentView( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel2 >& i_rModel, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, + const ::comphelper::NamedValueCollection& i_rViewFactoryArgs, + const ::rtl::OUString& i_rViewName + ); }; #endif diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index ab218d89034a..9c454526cd0a 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -307,13 +307,6 @@ public: SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID ); - SAL_DLLPRIVATE static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > - LoadDocument_Impl( - const SfxObjectShell& i_rDoc, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rViewFactoryArgs, - const ::rtl::OUString& i_rViewName - ); //#endif private: |