diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:10:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:10:27 +0000 |
| commit | f71404c88e647bced51363497d5ad994124eacdc (patch) | |
| tree | baca50971ce232166ed0b7303fbceb52c3e16a5f /xmloff/source/draw/ximpbody.cxx | |
| parent | 5a3fba44ff4053d5e7aa7b427ee2e21ac2ee1543 (diff) | |
INTEGRATION: CWS oasis (1.18.266); FILE MERGED
2004/06/12 19:40:13 mib 1.18.266.2: RESYNC: (1.18-1.19); FILE MERGED
2004/05/07 11:59:54 mib 1.18.266.1: - #i20153#: encode/decode style names (ooo2oasis missing)
Diffstat (limited to 'xmloff/source/draw/ximpbody.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpbody.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 313cb278e16d..ee32aeafd745 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpbody.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:15:41 $ + * last change: $Author: rt $ $Date: 2004-07-13 08:10:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,7 +153,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, } case XML_TOK_DRAWPAGE_STYLE_NAME: { - maStyleName = sValue; + maStyleName = sValue; break; } case XML_TOK_DRAWPAGE_MASTER_PAGE_NAME: @@ -163,7 +163,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, } case XML_TOK_DRAWPAGE_PAGE_LAYOUT_NAME: { - maPageLayoutName = sValue; + maPageLayoutName = sValue; break; } case XML_TOK_DRAWPAGE_ID: @@ -217,6 +217,8 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, if(xDrawPage.is() && xMasterPages.is()) { sal_Bool bDone(FALSE); + OUString sDisplayName( rImport.GetStyleDisplayName( + XML_STYLE_FAMILY_MASTER_PAGE, maMasterPageName ) ); for(sal_Int32 a = 0; !bDone && a < xMasterPages->getCount(); a++) { @@ -230,7 +232,8 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, { OUString sMasterPageName = xMasterNamed->getName(); - if(sMasterPageName.getLength() && sMasterPageName.equals(maMasterPageName)) + if(sMasterPageName.getLength() && + sMasterPageName.equals(sDisplayName)) { xDrawPage->setMasterPage(xMasterPage); bDone = TRUE; |