diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:34:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:34:03 +0000 |
| commit | 7089f3a38034fe018118d46d26a119c98abf9496 (patch) | |
| tree | f2edf8a743c85d52f55f488fada859d19c710bc4 /sfx2/source/doc/sfxbasemodel.cxx | |
| parent | 8864a17808442eb640f68894b76a2eda93c87578 (diff) | |
INTEGRATION: CWS dba30c (1.142.8); FILE MERGED
2008/05/13 10:22:27 fs 1.142.8.1: joining changes from CWS odbmacros3 to CWS dba30c:
2008/05/07 09:47:56 fs 1.139.2.1: during #i49133#: create(Default)ViewController signature changed
2008/05/09 09:28:17 fs 1.139.2.2: RESYNC: (1.139-1.142); FILE MERGED
Diffstat (limited to 'sfx2/source/doc/sfxbasemodel.cxx')
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 28dc8f4709e3..625149f71e8c 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sfxbasemodel.cxx,v $ - * $Revision: 1.143 $ + * $Revision: 1.144 $ * * This file is part of OpenOffice.org. * @@ -3721,24 +3721,22 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getAvailableViewCon //============================================================================= // css::frame::XModel2 -css::uno::Reference< css::frame::XController > SAL_CALL SfxBaseModel::createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& /*Frame */, - css::uno::Reference< css::awt::XWindow >& /*ComponentWindow*/) +css::uno::Reference< css::frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& /*Frame*/) throw (css::uno::RuntimeException , css::lang::IllegalArgumentException, css::uno::Exception ) { - return css::uno::Reference< css::frame::XController >(); + return css::uno::Reference< css::frame::XController2 >(); } //============================================================================= // css::frame::XModel2 -css::uno::Reference< css::frame::XController > SAL_CALL SfxBaseModel::createViewController(const ::rtl::OUString& /*ViewName */, - const css::uno::Sequence< css::beans::PropertyValue >& /*Arguments */, - const css::uno::Reference< css::frame::XFrame >& /*Frame */, - css::uno::Reference< css::awt::XWindow >& /*ComponentWindow*/) +css::uno::Reference< css::frame::XController2 > SAL_CALL SfxBaseModel::createViewController(const ::rtl::OUString& /*ViewName*/, + const css::uno::Sequence< css::beans::PropertyValue >& /*Arguments*/, + const css::uno::Reference< css::frame::XFrame >& /*Frame */) throw (css::uno::RuntimeException , css::lang::IllegalArgumentException, css::uno::Exception ) { - return css::uno::Reference< css::frame::XController >(); + return css::uno::Reference< css::frame::XController2 >(); } |