diff options
author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:16:51 +0100 |
---|---|---|
committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:16:51 +0100 |
commit | 6f0487c1ff007f44942b78c2bcd07d605ce44035 (patch) | |
tree | 355604fff0c82a167c7b0f2f7423cad8ae69a7b3 /sc | |
parent | a15b7f802db8a2286ce59f325d50b2db29743171 (diff) | |
parent | cc6395630b2203dbf1c8448916fdda610cc8b706 (diff) |
dba33b: merge m69
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/viewuno.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/viewuno.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index bb322424a9a6..510f04936821 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -124,7 +124,7 @@ public: getReferredCells() throw(::com::sun::star::uno::RuntimeException); // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index c1af5ac9bb99..0883c24a14f0 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -337,11 +337,11 @@ namespace } // XFormLayerAccess -uno::Reference< form::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& _Form ) throw (uno::RuntimeException) +uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& _Form ) throw (uno::RuntimeException) { ScUnoGuard aGuard; - uno::Reference< form::XFormController > xController; + uno::Reference< form::runtime::XFormController > xController; Window* pWindow( NULL ); SdrView* pSdrView( NULL ); |