diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-09 09:45:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-09 11:25:41 +0200 |
| commit | 84493425a1c5645221760756bec1c751ed24f522 (patch) | |
| tree | 56a3f424d621d307fc62c7e8057db57a7c5e0bba /xmloff/source/text/XMLTextHeaderFooterContext.cxx | |
| parent | a96d2f339c913e6a53f6003fda024ddc7a6adbbf (diff) | |
merge HeaderIsSharedFirst and FooterIsSharedFirst to FirstIsShared
sw document model, xmloff and offapi supported these separately, but sw
layout did not. It turns out it's not needed for Word interop, either,
so better to just merge these, instead of implementing them
independently without a good use-case.
Change-Id: I5c3b334baa09cabec123745c7af3d65d830754fc
Diffstat (limited to 'xmloff/source/text/XMLTextHeaderFooterContext.cxx')
| -rw-r--r-- | xmloff/source/text/XMLTextHeaderFooterContext.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index c69ff1eb6e7b..70ede5860926 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -58,7 +58,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" )) ), sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsShared" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsShared" )) ), - sShareContentFirst( bFooter ? OUString("FooterIsSharedFirst" ) : OUString( "HeaderIsSharedFirst" ) ), + sShareContentFirst( "FirstIsShared" ), sText( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterText" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderText" )) ), sTextFirst(bFooter ? OUString("FooterTextFirst") : OUString("HeaderTextFirst")), sTextLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterTextLeft" )) @@ -161,14 +161,6 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext( aAny.setValue( &bShared, ::getBooleanCppuType() ); xPropSet->setPropertyValue( sShareContent, aAny ); } - aAny = xPropSet->getPropertyValue( sShareContentFirst ); - sal_Bool bSharedFirst = *(sal_Bool *)aAny.getValue(); - if( !bSharedFirst ) - { - bSharedFirst = sal_True; - aAny.setValue( &bSharedFirst, ::getBooleanCppuType() ); - xPropSet->setPropertyValue( sShareContentFirst, aAny ); - } aAny = xPropSet->getPropertyValue( sText ); } |