[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon May 28 08:14:52 UTC 2018
sw/source/filter/xml/xmltbli.cxx | 128 +++++++++++++++++++--------------------
1 file changed, 64 insertions(+), 64 deletions(-)
New commits:
commit e7fe9094831036c295bf448737869a47f1873e3f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon May 28 09:08:36 2018 +0200
sw: prefix members of SwXMLTableCellContext_Impl
Change-Id: Ifb10b563e90c79469652af95133301f3909f8393
Reviewed-on: https://gerrit.libreoffice.org/54897
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 98ddb181baf1..6f75cf0ea7d7 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -391,30 +391,30 @@ void SwXMLTableRow_Impl::Dispose()
class SwXMLTableCellContext_Impl : public SvXMLImportContext
{
- OUString aStyleName;
- OUString sFormula;
- OUString sSaveParaDefault;
+ OUString m_aStyleName;
+ OUString m_sFormula;
+ OUString m_sSaveParaDefault;
OUString mXmlId;
OUString m_StringValue;
- SvXMLImportContextRef xMyTable;
+ SvXMLImportContextRef m_xMyTable;
- double fValue;
- bool bHasValue;
+ double m_fValue;
+ bool m_bHasValue;
bool m_bHasStringValue;
bool m_bValueTypeIsString;
- bool bProtect;
+ bool m_bProtect;
- sal_uInt32 nRowSpan;
- sal_uInt32 nColSpan;
- sal_uInt32 nColRepeat;
+ sal_uInt32 m_nRowSpan;
+ sal_uInt32 m_nColSpan;
+ sal_uInt32 m_nColRepeat;
- bool bHasTextContent : 1;
- bool bHasTableContent : 1;
+ bool m_bHasTextContent : 1;
+ bool m_bHasTableContent : 1;
- SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(xMyTable.get()); }
+ SwXMLTableContext *GetTable() { return static_cast<SwXMLTableContext *>(m_xMyTable.get()); }
- bool HasContent() const { return bHasTextContent || bHasTableContent; }
+ bool HasContent() const { return m_bHasTextContent || m_bHasTableContent; }
inline void InsertContent_();
inline void InsertContent();
inline void InsertContent( SwXMLTableContext *pTable );
@@ -439,20 +439,20 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
- sFormula(),
- xMyTable( pTable ),
- fValue( 0.0 ),
- bHasValue( false ),
+ m_sFormula(),
+ m_xMyTable( pTable ),
+ m_fValue( 0.0 ),
+ m_bHasValue( false ),
m_bHasStringValue(false),
m_bValueTypeIsString(false),
- bProtect( false ),
- nRowSpan( 1 ),
- nColSpan( 1 ),
- nColRepeat( 1 ),
- bHasTextContent( false ),
- bHasTableContent( false )
-{
- sSaveParaDefault = GetImport().GetTextImport()->GetCellParaStyleDefault();
+ m_bProtect( false ),
+ m_nRowSpan( 1 ),
+ m_nColSpan( 1 ),
+ m_nColRepeat( 1 ),
+ m_bHasTextContent( false ),
+ m_bHasTableContent( false )
+{
+ m_sSaveParaDefault = GetImport().GetTextImport()->GetCellParaStyleDefault();
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
@@ -471,31 +471,31 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
mXmlId = rValue;
break;
case XML_TOK_TABLE_STYLE_NAME:
- aStyleName = rValue;
+ m_aStyleName = rValue;
GetImport().GetTextImport()->SetCellParaStyleDefault(rValue);
break;
case XML_TOK_TABLE_NUM_COLS_SPANNED:
- nColSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32()));
- if (nColSpan > 256)
+ m_nColSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32()));
+ if (m_nColSpan > 256)
{
- SAL_INFO("sw.xml", "ignoring huge table:number-columns-spanned " << nColSpan);
- nColSpan = 1;
+ SAL_INFO("sw.xml", "ignoring huge table:number-columns-spanned " << m_nColSpan);
+ m_nColSpan = 1;
}
break;
case XML_TOK_TABLE_NUM_ROWS_SPANNED:
- nRowSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32()));
- if (nRowSpan > 8192 || (nRowSpan > 256 && utl::ConfigManager::IsFuzzing()))
+ m_nRowSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32()));
+ if (m_nRowSpan > 8192 || (m_nRowSpan > 256 && utl::ConfigManager::IsFuzzing()))
{
- SAL_INFO("sw.xml", "ignoring huge table:number-rows-spanned " << nRowSpan);
- nRowSpan = 1;
+ SAL_INFO("sw.xml", "ignoring huge table:number-rows-spanned " << m_nRowSpan);
+ m_nRowSpan = 1;
}
break;
case XML_TOK_TABLE_NUM_COLS_REPEATED:
- nColRepeat = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32()));
- if (nColRepeat > 256)
+ m_nColRepeat = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32()));
+ if (m_nColRepeat > 256)
{
- SAL_INFO("sw.xml", "ignoring huge table:number-columns-repeated " << nColRepeat);
- nColRepeat = 1;
+ SAL_INFO("sw.xml", "ignoring huge table:number-columns-repeated " << m_nColRepeat);
+ m_nColRepeat = 1;
}
break;
case XML_TOK_TABLE_FORMULA:
@@ -503,7 +503,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
OUString sTmp;
const sal_uInt16 nPrefix2 = GetImport().GetNamespaceMap().
GetKeyByAttrName_( rValue, &sTmp );
- sFormula = XML_NAMESPACE_OOOW == nPrefix2 ? sTmp : rValue;
+ m_sFormula = XML_NAMESPACE_OOOW == nPrefix2 ? sTmp : rValue;
}
break;
case XML_TOK_TABLE_VALUE:
@@ -511,8 +511,8 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
double fTmp;
if (::sax::Converter::convertDouble(fTmp, rValue))
{
- fValue = fTmp;
- bHasValue = true;
+ m_fValue = fTmp;
+ m_bHasValue = true;
}
}
break;
@@ -521,8 +521,8 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
double fTmp;
if (::sax::Converter::convertDuration(fTmp, rValue))
{
- fValue = fTmp;
- bHasValue = true;
+ m_fValue = fTmp;
+ m_bHasValue = true;
}
}
break;
@@ -532,8 +532,8 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
if (GetImport().GetMM100UnitConverter().convertDateTime(fTmp,
rValue))
{
- fValue = fTmp;
- bHasValue = true;
+ m_fValue = fTmp;
+ m_bHasValue = true;
}
}
break;
@@ -542,8 +542,8 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
bool bTmp(false);
if (::sax::Converter::convertBool(bTmp, rValue))
{
- fValue = (bTmp ? 1.0 : 0.0);
- bHasValue = true;
+ m_fValue = (bTmp ? 1.0 : 0.0);
+ m_bHasValue = true;
}
}
break;
@@ -552,7 +552,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
bool bTmp(false);
if (::sax::Converter::convertBool(bTmp, rValue))
{
- bProtect = bTmp;
+ m_bProtect = bTmp;
}
}
break;
@@ -581,26 +581,26 @@ inline void SwXMLTableCellContext_Impl::InsertContent_()
{
SwStartNode const*const pStartNode( GetTable()->InsertTableSection(nullptr,
(m_bHasStringValue && m_bValueTypeIsString &&
- !aStyleName.isEmpty()) ? & aStyleName : nullptr) );
- GetTable()->InsertCell( aStyleName, nRowSpan, nColSpan,
+ !m_aStyleName.isEmpty()) ? & m_aStyleName : nullptr) );
+ GetTable()->InsertCell( m_aStyleName, m_nRowSpan, m_nColSpan,
pStartNode,
mXmlId,
- nullptr, bProtect, &sFormula, bHasValue, fValue,
+ nullptr, m_bProtect, &m_sFormula, m_bHasValue, m_fValue,
(m_bHasStringValue && m_bValueTypeIsString) ? &m_StringValue : nullptr);
}
inline void SwXMLTableCellContext_Impl::InsertContent()
{
OSL_ENSURE( !HasContent(), "content already there" );
- bHasTextContent = true;
+ m_bHasTextContent = true;
InsertContent_();
}
inline void SwXMLTableCellContext_Impl::InsertContent(
SwXMLTableContext *pTable )
{
- GetTable()->InsertCell( aStyleName, nRowSpan, nColSpan, nullptr, mXmlId, pTable, bProtect );
- bHasTableContent = true;
+ GetTable()->InsertCell( m_aStyleName, m_nRowSpan, m_nColSpan, nullptr, mXmlId, pTable, m_bProtect );
+ m_bHasTableContent = true;
}
SvXMLImportContextRef SwXMLTableCellContext_Impl::CreateChildContext(
@@ -670,10 +670,10 @@ void SwXMLTableCellContext_Impl::EndElement()
{
if( GetTable()->IsValid() )
{
- if( bHasTextContent )
+ if( m_bHasTextContent )
{
GetImport().GetTextImport()->DeleteParagraph();
- if( nColRepeat > 1 && nColSpan == 1 )
+ if( m_nColRepeat > 1 && m_nColSpan == 1 )
{
// The original text is invalid after deleting the last
// paragraph
@@ -690,7 +690,7 @@ void SwXMLTableCellContext_Impl::EndElement()
SwDoc *pDoc = pSrcTextCursor->GetDoc();
const SwPaM *pSrcPaM = pSrcTextCursor->GetPaM();
- while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() )
+ while( m_nColRepeat > 1 && GetTable()->IsInsertCellPossible() )
{
InsertContent_();
@@ -704,24 +704,24 @@ void SwXMLTableCellContext_Impl::EndElement()
SwPosition aDstPos( *pDstTextCursor->GetPaM()->GetPoint() );
pDoc->getIDocumentContentOperations().CopyRange( aSrcPaM, aDstPos, /*bCopyAll=*/false, /*bCheckPos=*/true );
- nColRepeat--;
+ m_nColRepeat--;
}
}
}
- else if( !bHasTableContent )
+ else if( !m_bHasTableContent )
{
InsertContent();
- if( nColRepeat > 1 && nColSpan == 1 )
+ if( m_nColRepeat > 1 && m_nColSpan == 1 )
{
- while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() )
+ while( m_nColRepeat > 1 && GetTable()->IsInsertCellPossible() )
{
InsertContent_();
- nColRepeat--;
+ m_nColRepeat--;
}
}
}
}
- GetImport().GetTextImport()->SetCellParaStyleDefault(sSaveParaDefault);
+ GetImport().GetTextImport()->SetCellParaStyleDefault(m_sSaveParaDefault);
}
class SwXMLTableColContext_Impl : public SvXMLImportContext
More information about the Libreoffice-commits
mailing list