diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:58:50 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:58:50 +0000 |
commit | e85ea1b48df340213816834cc041fa583f35b6c8 (patch) | |
tree | 130d16b3498c105f25051a1c1687b315e2bbf88b | |
parent | 4f1830b70f4ff9006f584cdbbee388df842a122f (diff) |
INTEGRATION: CWS custommeta (1.8.66); FILE MERGED
2007/12/10 10:32:17 mst 1.8.66.2: RESYNC: (1.8-1.9); FILE MERGED
2007/12/07 16:39:13 mst 1.8.66.1: various refactorings to use DocumentProperties service:
- sfx2/inc/sfx2/docinf.hxx, sfx2/source/doc/docinf.cxx:
+ SetReloadDelay: fix setting of reload delay in the properties dialog
(signed vs. unsigned mismatch)
+ change initialization of SfxDocumentObject (needs DocumentProperties)
- sfx2/inc/sfx2/objuno.hxx, sfx2/source/doc/objuno.cxx:
+ refactor so that SfxDocumentInfoObject is just a wrapper around
an instance of XDocumentProperties
+ implement additional interfaces: XInitialization, XCloneable
+ fix exception specifications on numerous methods
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ implement additional interface: XDocumentPropertiesSupplier
-rw-r--r-- | sfx2/inc/sfx2/sfxbasemodel.hxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 7a91e4f3879c..f9aa1955ade6 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sfxbasemodel.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2007-10-09 15:30:57 $ + * last change: $Author: obo $ $Date: 2008-02-26 14:58:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,6 +80,10 @@ #include <com/sun/star/document/XDocumentInfoSupplier.hpp> #endif +#ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTPROPERTIESSUPPLIER_HPP_ +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#endif + #ifndef _COM_SUN_STAR_DOCUMENT_XEVENTBROADCASTER_HPP_ #include <com/sun/star/document/XEventBroadcaster.hpp> #endif @@ -344,6 +348,7 @@ struct IMPL_SfxBaseModel_MutexContainer @implements XChild XComponent XDocumentInfoSupplier + XDocumentPropertiesSupplier XEventListener XModel XModifiable2 @@ -362,6 +367,7 @@ struct IMPL_SfxBaseModel_MutexContainer class SFX2_DLLPUBLIC SfxBaseModel : public XTYPEPROVIDER , public XCHILD , public XDOCUMENTINFOSUPPLIER + , public ::com::sun::star::document::XDocumentPropertiesSupplier , public XEVENTBROADCASTER , public XEVENTLISTENER , public XEVENTSSUPPLIER @@ -651,6 +657,11 @@ public: virtual REFERENCE< XDOCUMENTINFO > SAL_CALL getDocumentInfo() throw (::com::sun::star::uno::RuntimeException); + // XDocumentPropertiesSupplier + virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > + SAL_CALL getDocumentProperties() + throw (::com::sun::star::uno::RuntimeException); + //____________________________________________________________________________________________________ // XEventListener //____________________________________________________________________________________________________ |