diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:55:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-26 13:55:32 +0000 |
| commit | cc648ab9b45b4b15025fdc7b4a7e7fc68aef874e (patch) | |
| tree | 428d16cf8a0adf28bd1c1b062a347e525fb8cbbf /sc/source/ui/docshell | |
| parent | b74a40b865342d850fe646b93fba0cacb319fd29 (diff) | |
INTEGRATION: CWS custommeta (1.30.140); FILE MERGED
2008/02/01 10:37:20 mst 1.30.140.2: RESYNC: (1.30-1.32); FILE MERGED
2008/01/21 11:47:04 mst 1.30.140.1: - sc/source/ui/docshell/docsh3.cxx:
+ use XDocumentProperties instead of SfxDocumentInfo
- sc/source/core/data/drwlayer.cxx, sc/source/filter/xml/xmlwrap.cxx:
+ remove unneeded includes
- sc/source/ui/docshell/makefile.mk:
+ enable exceptions for docsh3.cxx
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 7b0099e94d27..7568ac6f8143 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docsh3.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: rt $ $Date: 2008-01-29 15:41:28 $ + * last change: $Author: obo $ $Date: 2008-02-26 14:55:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,9 @@ // INCLUDE --------------------------------------------------------------- +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/document/XDocumentProperties.hpp> + #include "scitems.hxx" #include "rangelst.hxx" #include <svx/flstitem.hxx> @@ -52,7 +55,6 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/docinf.hxx> #include <svtools/misccfg.hxx> #include <sfx2/printer.hxx> #include <svtools/ctrltool.hxx> @@ -728,7 +730,14 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) // who last saved the document // (only if comparing different documents) - String aDocUser = GetDocInfo().GetModificationAuthor(); + using namespace ::com::sun::star; + uno::Reference<document::XDocumentPropertiesSupplier> xDPS( + GetModel(), uno::UNO_QUERY_THROW); + uno::Reference<document::XDocumentProperties> xDocProps( + xDPS->getDocumentProperties()); + DBG_ASSERT(xDocProps.is(), "no DocumentProperties"); + String aDocUser = xDocProps->getModifiedBy(); + if ( aDocUser.Len() ) pTrack->SetUser( aDocUser ); } |