summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-09-17 18:32:12 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-09-17 18:32:12 +0000
commit59a10f3b233f32763f6e43044597b222e875bc07 (patch)
tree2bdc3d6c24a0142afe3e9928392776c497c673af /xmloff
parent0035ed72bc17a440a1c867094ef64210918af952 (diff)
INTEGRATION: CWS cheffsache01 (1.8.290); FILE MERGED
2004/09/14 16:44:23 cl 1.8.290.1: #i33768# correctly handle display name for master pages
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/ximpstyl.hxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index f01573ebd3..77e12bc380 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ximpstyl.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hr $ $Date: 2003-03-27 18:20:18 $
+ * last change: $Author: rt $ $Date: 2004-09-17 19:32:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -156,6 +156,7 @@ class SdXMLMasterPageContext: public SdXMLGenericPageContext
{
rtl::OUString msPageMasterName;
rtl::OUString msName;
+ rtl::OUString msDisplayName;
rtl::OUString msStyleName;
public:
@@ -176,7 +177,9 @@ public:
virtual void EndElement();
const rtl::OUString& GetPageMasterName() const { return msPageMasterName; }
- const rtl::OUString& GetName() const { return msName; }
+ const rtl::OUString& GetEncodedName() const { return msName; }
+ const rtl::OUString& GetDisplayName() const { return msDisplayName; }
+
};
DECLARE_LIST(ImpMasterPageList, SdXMLMasterPageContext*);