summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmlimp.cxx1
-rw-r--r--xmloff/source/style/xmlnumi.cxx2
-rw-r--r--xmloff/source/text/txtimp.cxx38
-rw-r--r--xmloff/source/text/txtimppr.cxx16
4 files changed, 13 insertions, 44 deletions
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2e4eb46a33c4..121b4d458ef1 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1490,7 +1490,6 @@ XMLEventImportHelper& SvXMLImport::GetEventImport()
void SvXMLImport::SetFontDecls( XMLFontStylesContext *pFontDecls )
{
mxFontDecls = pFontDecls;
- GetTextImport()->SetFontDecls( pFontDecls );
}
void SvXMLImport::SetStyles( SvXMLStylesContext *pStyles )
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 28553ba5ca06..b4ac805eda1e 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -784,7 +784,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
if( !sFontName.isEmpty() )
{
const XMLFontStylesContext *pFontDecls =
- GetImport().GetTextImport()->GetFontDecls();
+ GetImport().GetFontDecls();
if( pFontDecls )
{
::std::vector < XMLPropertyState > aProps;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index f35a46defd9a..eb74f00fd47f 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1029,39 +1029,32 @@ SvXMLImportPropertyMapper *XMLTextImportHelper::CreateShapeExtPropMapper(SvXMLIm
{
XMLPropertySetMapper *pPropMapper =
new XMLTextPropertySetMapper( TEXT_PROP_MAP_FRAME );
- return new XMLTextImportPropertyMapper( pPropMapper, rImport,
- const_cast<XMLFontStylesContext*>(rImport.GetFontDecls()) );
+ return new XMLTextImportPropertyMapper( pPropMapper, rImport );
}
-SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaExtPropMapper(SvXMLImport& rImport, XMLFontStylesContext *pFontDecls)
+SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaExtPropMapper(SvXMLImport& rImport)
{
XMLPropertySetMapper *pPropMapper =
new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA );
- if (!pFontDecls)
- pFontDecls = const_cast<XMLFontStylesContext*>(rImport.GetFontDecls());
- return new XMLTextImportPropertyMapper( pPropMapper, rImport, pFontDecls );
+ return new XMLTextImportPropertyMapper( pPropMapper, rImport );
}
-SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaDefaultExtPropMapper(SvXMLImport& rImport, XMLFontStylesContext* pFontDecls)
+SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaDefaultExtPropMapper(SvXMLImport& rImport)
{
- if (!pFontDecls)
- pFontDecls = const_cast<XMLFontStylesContext*>(rImport.GetFontDecls());
-
XMLPropertySetMapper* pPropMapper =
new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE_PARA );
- SvXMLImportPropertyMapper* pImportMapper = new XMLTextImportPropertyMapper( pPropMapper, rImport, pFontDecls );
+ SvXMLImportPropertyMapper* pImportMapper = new XMLTextImportPropertyMapper( pPropMapper, rImport );
pPropMapper =
new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT_ADDITIONAL_DEFAULTS );
- pImportMapper->ChainImportMapper( new XMLTextImportPropertyMapper( pPropMapper, rImport, pFontDecls ) );
+ pImportMapper->ChainImportMapper( new XMLTextImportPropertyMapper( pPropMapper, rImport ) );
return pImportMapper;
}
SvXMLImportPropertyMapper*
XMLTextImportHelper::CreateTableDefaultExtPropMapper(
- SvXMLImport& rImport,
- XMLFontStylesContext* )
+ SvXMLImport& rImport )
{
XMLPropertySetMapper *pPropMapper =
new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_DEFAULTS );
@@ -1070,8 +1063,7 @@ SvXMLImportPropertyMapper*
SvXMLImportPropertyMapper*
XMLTextImportHelper::CreateTableRowDefaultExtPropMapper(
- SvXMLImport& rImport,
- XMLFontStylesContext* )
+ SvXMLImport& rImport )
{
XMLPropertySetMapper *pPropMapper =
new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_ROW_DEFAULTS );
@@ -2155,20 +2147,6 @@ void XMLTextImportHelper::SetAutoStyles( SvXMLStylesContext *pStyles )
m_pImpl->m_xAutoStyles = pStyles;
}
-void XMLTextImportHelper::SetFontDecls( XMLFontStylesContext *pFontDecls )
-{
- m_pImpl->m_xFontDecls = pFontDecls;
- ((XMLTextImportPropertyMapper *)m_pImpl->m_xParaImpPrMap.get())
- ->SetFontDecls( pFontDecls );
- ((XMLTextImportPropertyMapper *)m_pImpl->m_xTextImpPrMap.get())
- ->SetFontDecls( pFontDecls );
-}
-
-const XMLFontStylesContext *XMLTextImportHelper::GetFontDecls() const
-{
- return (XMLFontStylesContext *)&m_pImpl->m_xFontDecls;
-}
-
SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 306ebb19f8db..40f5dc21bc3e 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -54,7 +54,7 @@ bool XMLTextImportPropertyMapper::handleSpecialItem(
case CTF_FONTNAME:
case CTF_FONTNAME_CJK:
case CTF_FONTNAME_CTL:
- if( xFontDecls.Is() )
+ if( GetImport().GetFontDecls() != NULL )
{
DBG_ASSERT(
( CTF_FONTFAMILYNAME ==
@@ -89,7 +89,7 @@ bool XMLTextImportPropertyMapper::handleSpecialItem(
getPropertySetMapper()->GetEntryContextId(nIndex+5) ),
"illegal property map" );
- ((XMLFontStylesContext *)&xFontDecls)->FillProperties(
+ GetImport().GetFontDecls()->FillProperties(
rValue, rProperties,
rProperty.mnIndex+1, rProperty.mnIndex+2,
rProperty.mnIndex+3, rProperty.mnIndex+4,
@@ -132,12 +132,10 @@ bool XMLTextImportPropertyMapper::handleSpecialItem(
XMLTextImportPropertyMapper::XMLTextImportPropertyMapper(
const UniReference< XMLPropertySetMapper >& rMapper,
- SvXMLImport& rImp,
- XMLFontStylesContext *pFontDecls ) :
+ SvXMLImport& rImp ) :
SvXMLImportPropertyMapper( rMapper, rImp ),
nSizeTypeIndex( -2 ),
- nWidthTypeIndex( -2 ),
- xFontDecls( pFontDecls )
+ nWidthTypeIndex( -2 )
{
}
@@ -145,12 +143,6 @@ XMLTextImportPropertyMapper::~XMLTextImportPropertyMapper()
{
}
-void XMLTextImportPropertyMapper::SetFontDecls(
- XMLFontStylesContext *pFontDecls )
-{
- xFontDecls = pFontDecls;
-}
-
void XMLTextImportPropertyMapper::FontFinished(
XMLPropertyState *pFontFamilyNameState,
XMLPropertyState *pFontStyleNameState,
generated by cgit (git 2.34.1) at 2024-08-12 21:57:56 +0000