diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:35:04 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:35:04 +0000 |
commit | f9035343b1b276eb46601168832e01a11e179293 (patch) | |
tree | 5ee9d697a60731c6e4b6e912db2ef56b6f6a7143 /comphelper | |
parent | 486612db6697dd3ba5b584b0e44f3d9905ce9527 (diff) |
INTEGRATION: CWS dba30c (1.14.14); FILE MERGED
2008/05/13 06:50:40 fs 1.14.14.1: joining changes from CWS odbmacros3 to CWS dba30c
2008/05/07 08:15:29 fs 1.13.8.1: during #i49133#: +PROP_VIEWCONTROLLERNAME
2008/05/09 09:28:53 fs 1.13.8.2: RESYNC: (1.13-1.14); FILE MERGED
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/inc/comphelper/mediadescriptor.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx index 3e10fae98c24..05d5d59bc102 100644 --- a/comphelper/inc/comphelper/mediadescriptor.hxx +++ b/comphelper/inc/comphelper/mediadescriptor.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mediadescriptor.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.15 $ * * This file is part of OpenOffice.org. * @@ -121,6 +121,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap static const ::rtl::OUString& PROP_MODEL(); static const ::rtl::OUString& PROP_VIEWONLY(); static const ::rtl::OUString& PROP_DOCUMENTBASEURL(); + static const ::rtl::OUString& PROP_VIEWCONTROLLERNAME(); //------------------------------------------- // interface |