diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 15:09:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 15:09:39 +0000 |
| commit | c7fe03af57fe311272e244b1cb504cd2db562153 (patch) | |
| tree | d25b61e09597c4defdf22c16494c5d6fe3d8e8ca /sfx2 | |
| parent | be91d19c08a07bd706ad723a11d3c909671413c9 (diff) | |
INTEGRATION: CWS mav21 (1.2.24); FILE MERGED
2007/05/25 16:27:59 mav 1.2.24.3: RESYNC: (1.4-1.5); FILE MERGED
2007/05/09 16:32:18 mav 1.2.24.2: RESYNC: (1.2-1.4); FILE MERGED
2007/04/26 08:27:14 mav 1.2.24.1: #i55790# allow more control over modified state
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/sfxbasemodel.hxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 7af5a1fe140f..2faae5dbbf71 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sfxbasemodel.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2007-05-10 13:23:19 $ + * last change: $Author: hr $ $Date: 2007-06-26 16:09:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,8 +116,8 @@ #include <com/sun/star/frame/DoubleInitializationException.hpp> #endif -#ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_ -#include <com/sun/star/util/XModifiable.hpp> +#ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE2_HPP_ +#include <com/sun/star/util/XModifiable2.hpp> #endif #ifndef _COM_SUN_STAR_UTIL_XMODIFYLISTENER_HPP_ @@ -243,7 +243,7 @@ #define XMODEL ::com::sun::star::frame::XModel #define XMODEL2 ::com::sun::star::frame::XModel2 #define XMODIFIABLE ::com::sun::star::util::XModifiable -#define XMODIFIABLE ::com::sun::star::util::XModifiable +#define XMODIFIABLE2 ::com::sun::star::util::XModifiable2 #define XMODIFYBROADCASTER ::com::sun::star::util::XModifyBroadcaster #define XMODIFYLISTENER ::com::sun::star::util::XModifyListener #define XCLOSEABLE ::com::sun::star::util::XCloseable @@ -341,7 +341,7 @@ struct IMPL_SfxBaseModel_MutexContainer XDocumentInfoSupplier XEventListener XModel - XModifiable + XModifiable2 XPrintable XStorable2 ::document::XEventBroadcaster @@ -360,7 +360,7 @@ class SFX2_DLLPUBLIC SfxBaseModel : public XTYPEPROVIDER , public XEVENTLISTENER , public XEVENTSSUPPLIER , public XMODEL2 - , public XMODIFIABLE + , public XMODIFIABLE2 , public XPRINTABLE , public XPRINTJOBBROADCASTER , public XSTORABLE2 @@ -859,9 +859,13 @@ public: css::uno::Exception ); //____________________________________________________________________________________________________ - // XModifiable + // XModifiable2 //____________________________________________________________________________________________________ + virtual ::sal_Bool SAL_CALL disableSetModified( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL enableSetModified( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isSetModifiedEnabled( ) throw (::com::sun::star::uno::RuntimeException); + /**___________________________________________________________________________________________________ @short - @descr - |