diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:18:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:18:27 +0000 |
| commit | 1ec379d9a55ef3c874944affca26f80bfa175a82 (patch) | |
| tree | 70ddf5bdb82545ffd42eec1abda35e4c5a253db5 /sfx2 | |
| parent | e8685279ad48c9080b9321f2c7ad5a670e5f0c84 (diff) | |
INTEGRATION: CWS dba30b (1.43.6); FILE MERGED
2008/04/15 22:18:31 fs 1.43.6.2: RESYNC: (1.43-1.44); FILE MERGED
2008/03/17 09:13:49 fs 1.43.6.1: during #152837#: IMacroDocumentAccess::(s|g)etImposedMacroExecMode renamed to (s|g)etCurrentMacroExecMode, to better fit its changed semantics
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/inc/objshimp.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 0c1f6e2be137..88afb10dfcc9 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: objshimp.hxx,v $ - * $Revision: 1.45 $ + * $Revision: 1.46 $ * * This file is part of OpenOffice.org. * @@ -172,8 +172,8 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess virtual ~SfxObjectShell_Impl(); // IMacroDocumentAccess overridables - virtual sal_Int16 getImposedMacroExecMode() const; - virtual sal_Bool setImposedMacroExecMode( sal_uInt16 nMacroMode ); + virtual sal_Int16 getCurrentMacroExecMode() const; + virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ); virtual ::rtl::OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getLastCommitDocumentStorage(); virtual sal_Bool documentStorageHasMacros() const; |