diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-19 16:00:39 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-19 16:03:28 -0400 |
commit | 2fc4f5cd750cc3899ffc6b2f831edcb01e7773b4 (patch) | |
tree | 050d146a6cf1639453a98581d2801e132d2d4ada /include | |
parent | 0d361388060741fe8e2f1ba059fba95707bdc233 (diff) |
Register OpenGL windows to ScGridWindow upon file load.
Change-Id: I6fdce232ef41079f20a983dc72da032196078858
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/sfxbasecontroller.hxx | 9 | ||||
-rw-r--r-- | include/sfx2/viewsh.hxx | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index cff341714b74..5389d8f9978f 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -35,7 +35,8 @@ #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <cppuhelper/implbase9.hxx> +#include <com/sun/star/lang/XInitialization.hpp> +#include <cppuhelper/implbase10.hxx> #include <cppuhelper/basemutex.hxx> #include <osl/mutex.hxx> #include <com/sun/star/task/XStatusIndicatorSupplier.hpp> @@ -60,7 +61,7 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID ); // class declarations -typedef ::cppu::WeakImplHelper9 < css::frame::XController2 +typedef ::cppu::WeakImplHelper10 < css::frame::XController2 , css::frame::XControllerBorder , css::frame::XDispatchProvider , css::task::XStatusIndicatorSupplier @@ -69,6 +70,7 @@ typedef ::cppu::WeakImplHelper9 < css::frame::XController2 , css::frame::XDispatchInformationProvider , css::frame::XTitle , css::frame::XTitleChangeBroadcaster + , css::lang::XInitialization > SfxBaseController_Base; class SFX2_DLLPUBLIC SfxBaseController :public SfxBaseController_Base @@ -166,6 +168,9 @@ public: virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::lang::XInitialization + virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments ) SAL_OVERRIDE; + // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now; // either the _Impl name should vanish or there should be an "official" API SfxViewShell* GetViewShell_Impl() const; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 13eb515e9016..7c43c93c0c95 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -190,6 +190,13 @@ public: void VisAreaChanged(const Rectangle& rRect); // Misc + + /** + * Initialize is called after the frame has been loaded and the controller + * has been set. By the time this is called the document has been fully + * imported. + */ + virtual void Initialize(); virtual bool PrepareClose( bool bUI = true ); virtual OUString GetSelectionText( bool bCompleteWords = false ); virtual bool HasSelection( bool bText = true ) const; |