INTEGRATION: CWS xmlfilter05 (1.10.2); FILE MERGED

2008/05/02 10:30:58 hbrinkm 1.10.2.3: RESYNC: (1.10-1.12); FILE MERGED
2008/04/24 08:45:54 hbrinkm 1.10.2.2: parse settings from docx
2008/04/02 10:58:38 hbrinkm 1.10.2.1: merged changes from xmlfilter04 to xmlfilter05
This commit is contained in:
Vladimir Glazounov 2008-07-01 10:06:42 +00:00
parent 1b27b7b515
commit 93968bf850

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: OOXMLStreamImpl.cxx,v $
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* This file is part of OpenOffice.org.
*
@ -130,6 +130,7 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
static rtl::OUString sEndnotesType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"));
static rtl::OUString sCommentsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"));
static rtl::OUString sThemeType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"));
static rtl::OUString sSettingsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"));
static rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("Target"));
static rtl::OUString sTargetMode(RTL_CONSTASCII_USTRINGPARAM("TargetMode"));
static rtl::OUString sExternal(RTL_CONSTASCII_USTRINGPARAM("External"));
@ -138,32 +139,35 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
switch (nStreamType)
{
case DOCUMENT:
sStreamType = sDocumentType;
break;
case STYLES:
sStreamType = sStylesType;
break;
case NUMBERING:
sStreamType = sNumberingType;
break;
case FONTTABLE:
sStreamType = sFonttableType;
break;
case FOOTNOTES:
sStreamType = sFootnotesType;
break;
case ENDNOTES:
sStreamType = sEndnotesType;
break;
case COMMENTS:
sStreamType = sCommentsType;
break;
case THEME:
sStreamType = sThemeType;
break;
default:
break;
case DOCUMENT:
sStreamType = sDocumentType;
break;
case STYLES:
sStreamType = sStylesType;
break;
case NUMBERING:
sStreamType = sNumberingType;
break;
case FONTTABLE:
sStreamType = sFonttableType;
break;
case FOOTNOTES:
sStreamType = sFootnotesType;
break;
case ENDNOTES:
sStreamType = sEndnotesType;
break;
case COMMENTS:
sStreamType = sCommentsType;
break;
case THEME:
sStreamType = sThemeType;
break;
case SETTINGS:
sStreamType = sSettingsType;
break;
default:
break;
}
if (xRelationshipAccess.is())