summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-03-30 15:16:09 +0000
committerRüdiger Timm <rt@openoffice.org>2004-03-30 15:16:09 +0000
commitee4437d866423e0a8cb80fa45d7226a59831a6e1 (patch)
tree91b44d4583439503eec4fb93c6fd81d9495219d0 /xmloff
parentc25ae1a8622909aeb43c64496a60b542da5cfce0 (diff)
INTEGRATION: CWS interop12 (1.6.156); FILE MERGED
2004/03/05 14:21:50 cl 1.6.156.1: #i26079# save header&footer also for handout and notes
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/ximpnote.cxx13
1 files changed, 11 insertions, 2 deletions
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 37fcd319aaa5..54919a576b10 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ximpnote.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: cl $ $Date: 2002-09-04 13:58:45 $
+ * last change: $Author: rt $ $Date: 2004-03-30 16:16:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,8 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
uno::Reference< drawing::XShapes >& rShapes)
: SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
{
+ OUString sStyleName;
+
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for(sal_Int16 i=0; i < nAttrCount; i++)
{
@@ -96,9 +98,16 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
msPageMasterName = sValue;
break;
}
+ case XML_TOK_MASTERPAGE_STYLE_NAME:
+ {
+ sStyleName = sValue;
+ break;
+ }
}
}
+ SetStyle( sStyleName );
+
// now delete all up-to-now contained shapes from this notes page
uno::Reference< drawing::XShape > xShape;
while(rShapes->getCount())