summaryrefslogtreecommitdiff
path: root/xmloff/source/text/txtparae.cxx
diff options
context:
space:
mode:
authorMichael Brauer <mib@openoffice.org>2001-11-07 12:25:05 +0000
committerMichael Brauer <mib@openoffice.org>2001-11-07 12:25:05 +0000
commit0c8ff0d53287cac421d40ef20bde3a81bfe5f9ae (patch)
tree47282abf92e31241ac5d8d65edf4747f36ce9018 /xmloff/source/text/txtparae.cxx
parent02b6953f226737c6ca2947c9d2a620fb4ec15d86 (diff)
#94424#: Export text styles around fields
Diffstat (limited to 'xmloff/source/text/txtparae.cxx')
-rw-r--r--xmloff/source/text/txtparae.cxx17
1 files changed, 13 insertions, 4 deletions
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index daf814857453..2c08cf4db348 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtparae.cxx,v $
*
- * $Revision: 1.96 $
+ * $Revision: 1.97 $
*
- * last change: $Author: mib $ $Date: 2001-11-01 13:34:16 $
+ * last change: $Author: mib $ $Date: 2001-11-07 13:25:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -621,7 +621,7 @@ OUString XMLTextParagraphExport::Find(
}
}
OSL_ENSURE( XML_STYLE_FAMILY_TEXT_TEXT != nFamily,
- "Calling find for text styles is ineffeicent, use FindTextStyle" );
+ "Calling find for text styles is inefficent and might go wrong, use FindTextStyle" );
if( XML_STYLE_FAMILY_TEXT_TEXT == nFamily )
{
// Get parent and remove hyperlinks (they aren't of interest)
@@ -658,7 +658,8 @@ OUString XMLTextParagraphExport::Find(
OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
const Reference < XPropertySet > & rPropSet,
- sal_Bool& rHyperlink ) const
+ sal_Bool& rHyperlink,
+ const XMLPropertyState** ppAddStates ) const
{
UniReference < SvXMLExportPropertyMapper > xPropMapper
= GetTextPropMapper();
@@ -690,6 +691,14 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
break;
}
}
+ if( ppAddStates )
+ {
+ while( *ppAddStates )
+ {
+ xPropStates.push_back( **ppAddStates );
+ ppAddStates++;
+ }
+ }
if( (xPropStates.size() - nIgnoreProps) > 0L )
sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sName, xPropStates );