diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-09-29 23:22:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-09-29 23:59:29 +0200 |
| commit | 0f21f932081471b2a5eda820fa1a194fbf3ab85c (patch) | |
| tree | 6c84c713a42a25eb3d7b24cbebf756f3347ca32a /xmloff | |
| parent | 87331efa9b190793c1719b31a62a2eef6a66f92d (diff) | |
fdo#79269: fix ODF import of style:footer-first
The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.
Change-Id: I520a4929d9d7313da65bcdcf4094f8244382377d
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextHeaderFooterContext.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index 6ee1e7346ae9..b396e911c006 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -68,7 +68,9 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa if (bLeft) { aAny = xPropSet->getPropertyValue( sShareContent ); - sal_Bool bShared = *(sal_Bool *)aAny.getValue(); + bool bShared; + if (!(aAny >>= bShared)) + assert(false); // should return a value! if( bShared ) { // Don't share headers any longer @@ -80,7 +82,9 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa if (bFirst) { aAny = xPropSet->getPropertyValue( sShareContentFirst ); - sal_Bool bSharedFirst = aAny.has<sal_Bool>() && *(sal_Bool *)aAny.getValue(); + bool bSharedFirst; + if (!(aAny >>= bSharedFirst)) + assert(false); // should return a value! if( bSharedFirst ) { // Don't share first/right headers any longer |