include/xmloff/XMLTextShapeImportHelper.hxx | 2
include/xmloff/XMLTextShapeStyleContext.hxx | 4 -
include/xmloff/numehelp.hxx | 18 ++--
include/xmloff/txtimppr.hxx | 4 -
xmloff/source/style/numehelp.cxx | 88 ++++++++++++------------
xmloff/source/text/XMLTextShapeImportHelper.cxx | 6 -
xmloff/source/text/XMLTextShapeStyleContext.cxx | 16 ++--
xmloff/source/text/txtimppr.cxx | 24 +++---
8 files changed, 81 insertions(+), 81 deletions(-)
New commits:
commit 423d09bd237ac92382d0f7ff451c5025320823e7
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jun 12 08:14:57 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jun 12 11:01:41 2023 +0200
xmloff: prefix members of XMLNumberFormatAttributesExportHelper, ...
... XMLTextImportPropertyMapper, XMLTextShapeImportHelper and
XMLTextShapeStyleContext.
See tdf#94879 for motivation.
Change-Id: I03e663811f3c7b0208c50a07806a4ba41e82ad29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152892
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/xmloff/XMLTextShapeImportHelper.hxx
b/include/xmloff/XMLTextShapeImportHelper.hxx
index f02e566afbec..be5d179bb735 100644
--- a/include/xmloff/XMLTextShapeImportHelper.hxx
+++ b/include/xmloff/XMLTextShapeImportHelper.hxx
@@ -26,7 +26,7 @@
class XMLOFF_DLLPUBLIC XMLTextShapeImportHelper : public XMLShapeImportHelper
{
- SvXMLImport& rImport;
+ SvXMLImport& m_rImport;
public:
diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx
b/include/xmloff/XMLTextShapeStyleContext.hxx
index 43cd9807a8dc..4425cb85f7e0 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -26,9 +26,9 @@
class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext final : public
XMLShapeStyleContext
{
- bool bAutoUpdate : 1;
+ bool m_bAutoUpdate : 1;
- rtl::Reference<XMLEventsImportContext> xEventContext;
+ rtl::Reference<XMLEventsImportContext> m_xEventContext;
virtual void SetAttribute( sal_Int32 nElement,
const OUString& rValue ) override;
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index 41d2ddaf29e4..1e71a6a15ac8 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -61,15 +61,15 @@ typedef std::set<XMLNumberFormat, LessNumberFormat>
XMLNumberFormatSet;
class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper
{
- css::uno::Reference< css::util::XNumberFormats > xNumberFormats;
- SvXMLExport* pExport;
- const OUString sAttrValue;
- const OUString sAttrDateValue;
- const OUString sAttrTimeValue;
- const OUString sAttrBooleanValue;
- const OUString sAttrStringValue;
- const OUString sAttrCurrency;
- XMLNumberFormatSet aNumberFormats;
+ css::uno::Reference< css::util::XNumberFormats > m_xNumberFormats;
+ SvXMLExport* m_pExport;
+ const OUString m_sAttrValue;
+ const OUString m_sAttrDateValue;
+ const OUString m_sAttrTimeValue;
+ const OUString m_sAttrBooleanValue;
+ const OUString m_sAttrStringValue;
+ const OUString m_sAttrCurrency;
+ XMLNumberFormatSet m_aNumberFormats;
public:
XMLNumberFormatAttributesExportHelper(css::uno::Reference<
css::util::XNumberFormatsSupplier > const & xNumberFormatsSupplier);
XMLNumberFormatAttributesExportHelper(css::uno::Reference<
css::util::XNumberFormatsSupplier > const & xNumberFormatsSupplier,
diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index 860c869611ab..89f8b369fdea 100644
--- a/include/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
@@ -25,8 +25,8 @@
class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper final : public
SvXMLImportPropertyMapper
{
- sal_Int32 nSizeTypeIndex;
- sal_Int32 nWidthTypeIndex;
+ sal_Int32 m_nSizeTypeIndex;
+ sal_Int32 m_nWidthTypeIndex;
static void FontFinished(
XMLPropertyState *pFontFamilyNameState,
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index c375fe3e69e3..da33b500741c 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -45,22 +45,22 @@ constexpr OUStringLiteral
gsCurrencyAbbreviation(u"CurrencyAbbreviation");
XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
css::uno::Reference< css::util::XNumberFormatsSupplier > const &
xTempNumberFormatsSupplier)
- : xNumberFormats(xTempNumberFormatsSupplier.is() ?
xTempNumberFormatsSupplier->getNumberFormats() : css::uno::Reference<
css::util::XNumberFormats > ()),
- pExport(nullptr)
+ : m_xNumberFormats(xTempNumberFormatsSupplier.is() ?
xTempNumberFormatsSupplier->getNumberFormats() : css::uno::Reference<
css::util::XNumberFormats > ()),
+ m_pExport(nullptr)
{
}
XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
css::uno::Reference< css::util::XNumberFormatsSupplier > const &
xTempNumberFormatsSupplier,
SvXMLExport& rTempExport )
-: xNumberFormats(xTempNumberFormatsSupplier.is() ?
xTempNumberFormatsSupplier->getNumberFormats() : css::uno::Reference<
css::util::XNumberFormats > ()),
- pExport(&rTempExport),
- sAttrValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_VALUE))),
- sAttrDateValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_DATE_VALUE))),
- sAttrTimeValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_TIME_VALUE))),
- sAttrBooleanValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_BOOLEAN_VALUE))),
- sAttrStringValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_STRING_VALUE))),
- sAttrCurrency(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_CURRENCY)))
+: m_xNumberFormats(xTempNumberFormatsSupplier.is() ?
xTempNumberFormatsSupplier->getNumberFormats() : css::uno::Reference<
css::util::XNumberFormats > ()),
+ m_pExport(&rTempExport),
+ m_sAttrValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_VALUE))),
+ m_sAttrDateValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_DATE_VALUE))),
+ m_sAttrTimeValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_TIME_VALUE))),
+ m_sAttrBooleanValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_BOOLEAN_VALUE))),
+ m_sAttrStringValue(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_STRING_VALUE))),
+ m_sAttrCurrency(rTempExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_OFFICE, GetXMLToken(XML_CURRENCY)))
{
}
@@ -71,8 +71,8 @@
XMLNumberFormatAttributesExportHelper::~XMLNumberFormatAttributesExportHelper()
sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32
nNumberFormat, OUString& sCurrency, bool& bIsStandard)
{
XMLNumberFormat aFormat(nNumberFormat);
- XMLNumberFormatSet::iterator aItr(aNumberFormats.find(aFormat));
- XMLNumberFormatSet::iterator aEndItr(aNumberFormats.end());
+ XMLNumberFormatSet::iterator aItr(m_aNumberFormats.find(aFormat));
+ XMLNumberFormatSet::iterator aEndItr(m_aNumberFormats.end());
if (aItr != aEndItr)
{
bIsStandard = aItr->bIsStandard;
@@ -86,7 +86,7 @@ sal_Int16
XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu
if ((aFormat.nType & ~util::NumberFormat::DEFINED) ==
util::NumberFormat::CURRENCY)
if (GetCurrencySymbol(nNumberFormat, aFormat.sCurrency))
sCurrency = aFormat.sCurrency;
- aNumberFormats.insert(aFormat);
+ m_aNumberFormats.insert(aFormat);
return aFormat.nType;
}
}
@@ -293,14 +293,14 @@ void
XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor
bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32
nNumberFormat, OUString& rCurrencySymbol)
{
- if (!xNumberFormats.is() && pExport &&
pExport->GetNumberFormatsSupplier().is())
-
xNumberFormats.set(pExport->GetNumberFormatsSupplier()->getNumberFormats());
+ if (!m_xNumberFormats.is() && m_pExport &&
m_pExport->GetNumberFormatsSupplier().is())
+
m_xNumberFormats.set(m_pExport->GetNumberFormatsSupplier()->getNumberFormats());
- if (xNumberFormats.is())
+ if (m_xNumberFormats.is())
{
try
{
- uno::Reference <beans::XPropertySet>
xNumberPropertySet(xNumberFormats->getByKey(nNumberFormat));
+ uno::Reference <beans::XPropertySet>
xNumberPropertySet(m_xNumberFormats->getByKey(nNumberFormat));
if ( xNumberPropertySet->getPropertyValue(gsCurrencySymbol) >>=
rCurrencySymbol)
{
OUString sCurrencyAbbreviation;
@@ -327,14 +327,14 @@ bool
XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nN
sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32
nNumberFormat, bool& bIsStandard)
{
- if (!xNumberFormats.is() && pExport &&
pExport->GetNumberFormatsSupplier().is())
-
xNumberFormats.set(pExport->GetNumberFormatsSupplier()->getNumberFormats());
+ if (!m_xNumberFormats.is() && m_pExport &&
m_pExport->GetNumberFormatsSupplier().is())
+
m_xNumberFormats.set(m_pExport->GetNumberFormatsSupplier()->getNumberFormats());
- if (xNumberFormats.is())
+ if (m_xNumberFormats.is())
{
try
{
- uno::Reference <beans::XPropertySet>
xNumberPropertySet(xNumberFormats->getByKey(nNumberFormat));
+ uno::Reference <beans::XPropertySet>
xNumberPropertySet(m_xNumberFormats->getByKey(nNumberFormat));
if (xNumberPropertySet.is())
{
xNumberPropertySet->getPropertyValue(gsStandardFormat) >>=
bIsStandard;
@@ -359,11 +359,11 @@ void
XMLNumberFormatAttributesExportHelper::WriteAttributes(
const OUString& rCurrency,
bool bExportValue, sal_uInt16 nNamespace)
{
- if (!pExport)
+ if (!m_pExport)
return;
bool bWasSetTypeAttribute = false;
- OUString sAttrValType = pExport->GetNamespaceMap().GetQNameByKey(
nNamespace, GetXMLToken(XML_VALUE_TYPE));
+ OUString sAttrValType = m_pExport->GetNamespaceMap().GetQNameByKey(
nNamespace, GetXMLToken(XML_VALUE_TYPE));
switch(nTypeKey & ~util::NumberFormat::DEFINED)
{
case 0:
@@ -371,7 +371,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
case util::NumberFormat::SCIENTIFIC:
case util::NumberFormat::FRACTION:
{
- pExport->AddAttribute(sAttrValType, XML_FLOAT);
+ m_pExport->AddAttribute(sAttrValType, XML_FLOAT);
bWasSetTypeAttribute = true;
[[fallthrough]];
}
@@ -379,7 +379,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
{
if (!bWasSetTypeAttribute)
{
- pExport->AddAttribute(sAttrValType, XML_PERCENTAGE);
+ m_pExport->AddAttribute(sAttrValType, XML_PERCENTAGE);
bWasSetTypeAttribute = true;
}
[[fallthrough]];
@@ -388,9 +388,9 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
{
if (!bWasSetTypeAttribute)
{
- pExport->AddAttribute(sAttrValType, XML_CURRENCY);
+ m_pExport->AddAttribute(sAttrValType, XML_CURRENCY);
if (!rCurrency.isEmpty())
- pExport->AddAttribute(sAttrCurrency, rCurrency);
+ m_pExport->AddAttribute(m_sAttrCurrency, rCurrency);
}
if (bExportValue)
@@ -398,51 +398,51 @@ void
XMLNumberFormatAttributesExportHelper::WriteAttributes(
OUString sValue( ::rtl::math::doubleToUString( rValue,
rtl_math_StringFormat_Automatic,
rtl_math_DecimalPlaces_Max, '.', true));
- pExport->AddAttribute(sAttrValue, sValue);
+ m_pExport->AddAttribute(m_sAttrValue, sValue);
}
}
break;
case util::NumberFormat::DATE:
case util::NumberFormat::DATETIME:
{
- pExport->AddAttribute(sAttrValType, XML_DATE);
+ m_pExport->AddAttribute(sAttrValType, XML_DATE);
if (bExportValue)
{
- if ( pExport->SetNullDateOnUnitConverter() )
+ if ( m_pExport->SetNullDateOnUnitConverter() )
{
OUStringBuffer sBuffer;
- pExport->GetMM100UnitConverter().convertDateTime(sBuffer,
rValue);
- pExport->AddAttribute(sAttrDateValue,
sBuffer.makeStringAndClear());
+
m_pExport->GetMM100UnitConverter().convertDateTime(sBuffer, rValue);
+ m_pExport->AddAttribute(m_sAttrDateValue,
sBuffer.makeStringAndClear());
}
}
}
break;
case util::NumberFormat::TIME:
{
- pExport->AddAttribute(sAttrValType, XML_TIME);
+ m_pExport->AddAttribute(sAttrValType, XML_TIME);
if (bExportValue)
{
OUStringBuffer sBuffer;
::sax::Converter::convertDuration(sBuffer, rValue);
- pExport->AddAttribute(sAttrTimeValue,
sBuffer.makeStringAndClear());
+ m_pExport->AddAttribute(m_sAttrTimeValue,
sBuffer.makeStringAndClear());
}
}
break;
case util::NumberFormat::LOGICAL:
{
- pExport->AddAttribute(sAttrValType, XML_BOOLEAN);
+ m_pExport->AddAttribute(sAttrValType, XML_BOOLEAN);
if (bExportValue)
{
double fTempValue = rValue;
if (::rtl::math::approxEqual( fTempValue, 1.0 ))
{
- pExport->AddAttribute(sAttrBooleanValue, XML_TRUE);
+ m_pExport->AddAttribute(m_sAttrBooleanValue, XML_TRUE);
}
else
{
if (rValue == 0.0)
{
- pExport->AddAttribute(sAttrBooleanValue, XML_FALSE);
+ m_pExport->AddAttribute(m_sAttrBooleanValue,
XML_FALSE);
}
else
{
@@ -451,7 +451,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
rtl_math_StringFormat_Automatic,
rtl_math_DecimalPlaces_Max, '.',
true));
- pExport->AddAttribute(sAttrBooleanValue, sValue);
+ m_pExport->AddAttribute(m_sAttrBooleanValue, sValue);
}
}
}
@@ -459,13 +459,13 @@ void
XMLNumberFormatAttributesExportHelper::WriteAttributes(
break;
case util::NumberFormat::TEXT:
{
- pExport->AddAttribute(sAttrValType, XML_FLOAT);
+ m_pExport->AddAttribute(sAttrValType, XML_FLOAT);
if (bExportValue)
{
OUString sValue( ::rtl::math::doubleToUString( rValue,
rtl_math_StringFormat_Automatic,
rtl_math_DecimalPlaces_Max, '.', true));
- pExport->AddAttribute(sAttrValue, sValue);
+ m_pExport->AddAttribute(m_sAttrValue, sValue);
}
}
break;
@@ -476,7 +476,7 @@ void
XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
const sal_Int32 nNumberFormat, const double& rValue, bool bExportValue,
sal_uInt16 nNamespace, bool bExportCurrencySymbol)
{
- if (pExport)
+ if (m_pExport)
{
bool bIsStandard;
OUString sCurrency;
@@ -496,11 +496,11 @@ void
XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
bool bExportValue,
sal_uInt16 nNamespace)
{
- if (pExport)
+ if (m_pExport)
{
- pExport->AddAttribute(nNamespace, XML_VALUE_TYPE, XML_STRING);
+ m_pExport->AddAttribute(nNamespace, XML_VALUE_TYPE, XML_STRING);
if (bExportValue && !rValue.isEmpty() && (rValue != rCharacters))
- pExport->AddAttribute(sAttrStringValue, rValue);
+ m_pExport->AddAttribute(m_sAttrStringValue, rValue);
}
else {
OSL_FAIL("no SvXMLExport given");
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx
b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index 21c6c3134c16..aba039095a4d 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -51,7 +51,7 @@ XMLTextShapeImportHelper::XMLTextShapeImportHelper(
SvXMLImport& rImp ) :
XMLShapeImportHelper( rImp, rImp.GetModel(),
XMLTextImportHelper::CreateShapeExtPropMapper(rImp)
),
- rImport( rImp )
+ m_rImport( rImp )
{
Reference < XDrawPageSupplier > xDPS( rImp.GetModel(), UNO_QUERY );
if( xDPS.is() )
@@ -84,7 +84,7 @@ void XMLTextShapeImportHelper::addShape(
sal_Int32 nY = 0;
rtl::Reference < XMLTextImportHelper > xTxtImport =
- rImport.GetTextImport();
+ m_rImport.GetTextImport();
for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
{
@@ -109,7 +109,7 @@ void XMLTextShapeImportHelper::addShape(
break;
case XML_ELEMENT(SVG, XML_Y):
case XML_ELEMENT(SVG_COMPAT, XML_Y):
- rImport.GetMM100UnitConverter().convertMeasureToCore( nY,
aIter.toView() );
+ m_rImport.GetMM100UnitConverter().convertMeasureToCore( nY,
aIter.toView() );
break;
}
}
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx
b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 2928ff905638..9d87a4879c32 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -125,7 +125,7 @@ void XMLTextShapeStyleContext::SetAttribute( sal_Int32
nElement,
if( nElement == XML_ELEMENT(STYLE, XML_AUTO_UPDATE) )
{
if( IsXMLToken( rValue, XML_TRUE ) )
- bAutoUpdate = true;
+ m_bAutoUpdate = true;
}
else
{
@@ -139,7 +139,7 @@ constexpr OUStringLiteral gsIsAutoUpdate( u"IsAutoUpdate" );
XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
SvXMLStylesContext& rStyles, XmlStyleFamily nFamily ) :
XMLShapeStyleContext( rImport, rStyles, nFamily ),
- bAutoUpdate( false )
+ m_bAutoUpdate( false )
{
}
@@ -178,8 +178,8 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
XMLTextShapeStyleConte
{
// create and remember events import context
// (for delayed processing of events)
- xEventContext = new XMLEventsImportContext( GetImport() );
- return xEventContext;
+ m_xEventContext = new XMLEventsImportContext( GetImport() );
+ return m_xEventContext;
}
return XMLShapeStyleContext::createFastChildContext( nElement, xAttrList );
@@ -197,17 +197,17 @@ void XMLTextShapeStyleContext::CreateAndInsert( bool
bOverwrite )
xPropSet->getPropertySetInfo();
if( xPropSetInfo->hasPropertyByName( gsIsAutoUpdate ) )
{
- bool bTmp = bAutoUpdate;
+ bool bTmp = m_bAutoUpdate;
xPropSet->setPropertyValue( gsIsAutoUpdate, Any(bTmp) );
}
// tell the style about it's events (if applicable)
- if( xEventContext.is() )
+ if( m_xEventContext.is() )
{
// set event supplier and release reference to context
Reference<XEventsSupplier> xEventsSupplier(xStyle, UNO_QUERY);
- xEventContext->SetEvents(xEventsSupplier);
- xEventContext = nullptr;
+ m_xEventContext->SetEvents(xEventsSupplier);
+ m_xEventContext = nullptr;
}
}
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index dcf9d1d3e57e..e1da4578a1b8 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -139,8 +139,8 @@ XMLTextImportPropertyMapper::XMLTextImportPropertyMapper(
const rtl::Reference< XMLPropertySetMapper >& rMapper,
SvXMLImport& rImp ) :
SvXMLImportPropertyMapper( rMapper, rImp ),
- nSizeTypeIndex( -2 ),
- nWidthTypeIndex( -2 )
+ m_nSizeTypeIndex( -2 ),
+ m_nWidthTypeIndex( -2 )
{
}
@@ -784,10 +784,10 @@ void XMLTextImportPropertyMapper::finished(
if( bHasAnyHeight )
{
- if( nSizeTypeIndex == -2 )
+ if( m_nSizeTypeIndex == -2 )
{
const_cast < XMLTextImportPropertyMapper * > ( this )
- ->nSizeTypeIndex = -1;
+ ->m_nSizeTypeIndex = -1;
sal_Int32 nPropCount = getPropertySetMapper()->GetEntryCount();
for( sal_Int32 j=0; j < nPropCount; j++ )
{
@@ -795,14 +795,14 @@ void XMLTextImportPropertyMapper::finished(
->GetEntryContextId( j ) )
{
const_cast < XMLTextImportPropertyMapper * > ( this )
- ->nSizeTypeIndex = j;
+ ->m_nSizeTypeIndex = j;
break;
}
}
}
- if( nSizeTypeIndex != -1 )
+ if( m_nSizeTypeIndex != -1 )
{
- XMLPropertyState aSizeTypeState( nSizeTypeIndex );
+ XMLPropertyState aSizeTypeState( m_nSizeTypeIndex );
aSizeTypeState.maValue <<= static_cast<sal_Int16>( bHasAnyMinHeight
? SizeType::MIN
: SizeType::FIX);
@@ -813,10 +813,10 @@ void XMLTextImportPropertyMapper::finished(
if( !bHasAnyWidth )
return;
- if( nWidthTypeIndex == -2 )
+ if( m_nWidthTypeIndex == -2 )
{
const_cast < XMLTextImportPropertyMapper * > ( this )
- ->nWidthTypeIndex = -1;
+ ->m_nWidthTypeIndex = -1;
sal_Int32 nCount = getPropertySetMapper()->GetEntryCount();
for( sal_Int32 j=0; j < nCount; j++ )
{
@@ -824,14 +824,14 @@ void XMLTextImportPropertyMapper::finished(
->GetEntryContextId( j ) )
{
const_cast < XMLTextImportPropertyMapper * > ( this )
- ->nWidthTypeIndex = j;
+ ->m_nWidthTypeIndex = j;
break;
}
}
}
- if( nWidthTypeIndex != -1 )
+ if( m_nWidthTypeIndex != -1 )
{
- XMLPropertyState aSizeTypeState( nWidthTypeIndex );
+ XMLPropertyState aSizeTypeState( m_nWidthTypeIndex );
aSizeTypeState.maValue <<= static_cast<sal_Int16>( bHasAnyMinWidth
? SizeType::MIN
: SizeType::FIX);
