summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-01-29 15:28:11 +0000
committerRüdiger Timm <rt@openoffice.org>2008-01-29 15:28:11 +0000
commitd7885b17cac375ddd0661a762cdde248937d3d90 (patch)
tree1c6817e8487ecb544a567aa5a662b4ca3c3cb547 /sfx2
parent7ef0d37fbeeec4ea0630a4d36543a7f75f114f84 (diff)
INTEGRATION: CWS fwk82_SRC680 (1.36.26.2.2); FILE MERGED
2008/01/15 17:13:16 mba 1.36.26.2.2.1: #152862#: read ODFVersion on Import
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objuno.cxx14
1 files changed, 12 insertions, 2 deletions
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 063e1c1d1c72..50f995dc7be0 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: objuno.cxx,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: obo $ $Date: 2008-01-04 16:34:38 $
+ * last change: $Author: rt $ $Date: 2008-01-29 16:28:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -129,6 +129,7 @@ SfxItemPropertyMap aDocInfoPropertyMap_Impl[] =
{ "MIMEType" , 8 , WID_CONTENT_TYPE, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND | ::com::sun::star::beans::PropertyAttribute::READONLY, 0 },
{ "ModifiedBy" , 10, MID_DOCINFO_MODIFICATIONAUTHOR, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
{ "ModifyDate" , 10, WID_DATE_MODIFIED, &::getCppuType((const ::com::sun::star::util::DateTime*)0),PROPERTY_MAYBEVOID, 0 },
+ { "ODFVersion" , 10, SID_VERSION, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
{ "PrintDate" , 9 , MID_DOCINFO_PRINTDATE, &::getCppuType((const ::com::sun::star::util::DateTime*)0),PROPERTY_MAYBEVOID, 0 },
{ "PrintedBy" , 9 , MID_DOCINFO_PRINTEDBY, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
{ "Subject" , 7 , MID_DOCINFO_SUBJECT, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
@@ -396,6 +397,7 @@ struct SfxDocumentInfoObject_Impl
::rtl::OUString aReloadURL; // MID_DOCINFO_AUTOLOADURL
::rtl::OUString aDefaultTarget; // MID_DOCINFO_DEFAULTTARGET
::rtl::OUString aGenerator; // SID_APPLICATION
+ ::rtl::OUString aODFVersion;
sal_Int32 nEditTime; // MID_DOCINFO_EDITTIME
sal_Int32 nReloadSecs; // MID_DOCINFO_AUTOLOADSECS
sal_Int16 nRevision; // MID_DOCINFO_REVISION
@@ -426,6 +428,8 @@ struct SfxDocumentInfoObject_Impl
sTitle.SearchAndReplace( sVar, String::CreateFromInt32(i+1) );
aUserKeys[i].First = sTitle;
}
+
+ aODFVersion = ::rtl::OUString::createFromAscii("1.1");
}
void Reset();
@@ -938,6 +942,9 @@ void SAL_CALL SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co
bModified = sal_True;
_pImp->aMediaType = sTemp;
break;
+ case SID_VERSION:
+ _pImp->aODFVersion = sTemp;
+ break;
default:
bModified = sal_False;
break;
@@ -1206,6 +1213,9 @@ void SAL_CALL SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co
case MID_DOCINFO_AUTOLOADURL:
aValue <<= _pImp->aReloadURL;
break;
+ case SID_VERSION:
+ aValue <<= _pImp->aODFVersion;
+ break;
case MID_DOCINFO_AUTOLOADSECS:
aValue <<= _pImp->nReloadSecs;
break;