writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 6 +--
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 2 -
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 24 +++++++--------
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 6 +--
writerfilter/source/ooxml/OOXMLParserState.cxx | 28 +++++++++---------
writerfilter/source/ooxml/OOXMLParserState.hxx | 8 ++---
6 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 09ada9cf6e15f3a735d2c94737b045c5e0f001ef
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Feb 27 08:02:04 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 27 09:56:50 2023 +0000
sw: prefix members of OOXMLDocumentImpl, OOXMLFastContextHandler, ...
... OOXMLFastContextHandlerLinear and OOXMLParserState
See tdf#94879 for motivation.
Change-Id: I65f1b98918da40d9e3dbc27af54dadd38aaba8be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147854
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 8e0cd9aa8a86..3a7359df22e4 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -786,7 +786,7 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const
OOXMLStream::Pointer_t& pS
{
embeddingsTemp.Name = embeddingsTarget;
embeddingsTemp.Value <<= mxEmbeddings;
- aEmbeddings.push_back(embeddingsTemp);
+ m_aEmbeddings.push_back(embeddingsTemp);
mxEmbeddings.clear();
}
bFound = false;
@@ -794,8 +794,8 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const
OOXMLStream::Pointer_t& pS
}
}
}
- if (!aEmbeddings.empty())
- mxEmbeddingsList = comphelper::containerToSequence(aEmbeddings);
+ if (!m_aEmbeddings.empty())
+ mxEmbeddingsList = comphelper::containerToSequence(m_aEmbeddings);
}
uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::getGlossaryDocDom( )
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 3f57696b2d25..1983ed2583a5 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -54,7 +54,7 @@ class OOXMLDocumentImpl : public OOXMLDocument
css::uno::Reference<css::xml::dom::XDocument> mxCustomXmlProsDom;
css::uno::Reference<css::io::XInputStream> mxEmbeddings;
css::uno::Sequence < css::beans::PropertyValue > mxEmbeddingsList;
- std::vector<css::beans::PropertyValue> aEmbeddings;
+ std::vector<css::beans::PropertyValue> m_aEmbeddings;
bool mbIsSubstream;
bool mbSkipImages;
/// How many paragraphs equal to 1 percent?
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6d8d149fa0a7..3db1a7d92338 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -73,7 +73,7 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
mbIsMathPara(false),
mpStream(nullptr),
mnTableDepth(0),
- inPositionV(false),
+ m_inPositionV(false),
mbAllowInCell(true),
mbIsVMLfound(false),
m_xContext(context),
@@ -96,7 +96,7 @@
OOXMLFastContextHandler::OOXMLFastContextHandler(OOXMLFastContextHandler * pCont
mpStream(pContext->mpStream),
mpParserState(pContext->mpParserState),
mnTableDepth(pContext->mnTableDepth),
- inPositionV(pContext->inPositionV),
+ m_inPositionV(pContext->m_inPositionV),
mbAllowInCell(pContext->mbAllowInCell),
mbIsVMLfound(pContext->mbIsVMLfound),
m_xContext(pContext->m_xContext),
@@ -229,9 +229,9 @@ void OOXMLFastContextHandler::lcl_startFastElement
{
OOXMLFactory::startAction(this);
if( Element == (NMSP_dmlWordDr|XML_positionV) )
- inPositionV = true;
+ m_inPositionV = true;
else if( Element == (NMSP_dmlWordDr|XML_positionH) )
- inPositionV = false;
+ m_inPositionV = false;
}
void OOXMLFastContextHandler::lcl_endFastElement
@@ -715,7 +715,7 @@ void OOXMLFastContextHandler::text(const OUString & sText)
void OOXMLFastContextHandler::positionOffset(const OUString& rText)
{
if (isForwardEvents())
- mpStream->positionOffset(rText, inPositionV);
+ mpStream->positionOffset(rText, m_inPositionV);
}
void OOXMLFastContextHandler::ignore()
@@ -2227,21 +2227,21 @@ Token_t OOXMLFastContextHandlerWrapper::getToken() const
OOXMLFastContextHandlerLinear::OOXMLFastContextHandlerLinear(OOXMLFastContextHandler*
pContext)
: OOXMLFastContextHandlerProperties(pContext)
- , depthCount( 0 )
+ , m_depthCount( 0 )
{
}
void OOXMLFastContextHandlerLinear::lcl_startFastElement(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList >& Attribs)
{
- buffer.appendOpeningTag( Element, Attribs );
- ++depthCount;
+ m_buffer.appendOpeningTag( Element, Attribs );
+ ++m_depthCount;
}
void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element)
{
- buffer.appendClosingTag( Element );
- if( --depthCount == 0 )
+ m_buffer.appendClosingTag( Element );
+ if( --m_depthCount == 0 )
process();
}
@@ -2256,7 +2256,7 @@
OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t,
void OOXMLFastContextHandlerLinear::lcl_characters(const OUString& aChars)
{
- buffer.appendCharacters( aChars );
+ m_buffer.appendCharacters( aChars );
}
/*
@@ -2283,7 +2283,7 @@ void OOXMLFastContextHandlerMath::process()
uno::Reference< uno::XInterface > component(ref->getComponent(),
uno::UNO_QUERY_THROW);
if( oox::FormulaImExportBase* import
= dynamic_cast< oox::FormulaImExportBase* >( component.get()))
- import->readFormulaOoxml( buffer );
+ import->readFormulaOoxml( m_buffer );
if (!isForwardEvents())
return;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 14dd62f00d64..4dfb05d91503 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -232,7 +232,7 @@ protected:
void startAction();
void endAction();
- bool inPositionV;
+ bool m_inPositionV;
bool mbAllowInCell; // o:allowincell
bool mbIsVMLfound;
OOXMLValue::Pointer_t mpGridAfter;
@@ -584,10 +584,10 @@ protected:
virtual void lcl_characters(const OUString & aChars) override;
// should be private, but not much point in making deep copies of it
- oox::formulaimport::XmlStreamBuilder buffer;
+ oox::formulaimport::XmlStreamBuilder m_buffer;
private:
- int depthCount;
+ int m_depthCount;
};
class OOXMLFastContextHandlerMath: public OOXMLFastContextHandlerLinear
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index a11afde8fb37..fa87146e1169 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -37,10 +37,10 @@ OOXMLParserState::OOXMLParserState() :
mnContexts(0),
mnHandle(0),
mpDocument(nullptr),
- inTxbxContent(false),
- savedInParagraphGroup(false),
- savedInCharacterGroup(false),
- savedLastParagraphInSection(false),
+ m_inTxbxContent(false),
+ m_savedInParagraphGroup(false),
+ m_savedInCharacterGroup(false),
+ m_savedLastParagraphInSection(false),
mbStartFootnote(false)
{
}
@@ -248,14 +248,14 @@ void OOXMLParserState::incContextCount()
void OOXMLParserState::startTxbxContent()
{
- SAL_WARN_IF(inTxbxContent, "writerfilter", "Nested w:txbxContent");
+ SAL_WARN_IF(m_inTxbxContent, "writerfilter", "Nested w:txbxContent");
- inTxbxContent = true;
+ m_inTxbxContent = true;
// Do not save and reset section group state, it'd cause a new page.
// savedInSectionGroup = mbInSectionGroup;
- savedInParagraphGroup = mbInParagraphGroup;
- savedInCharacterGroup = mbInCharacterGroup;
- savedLastParagraphInSection = mbLastParagraphInSection;
+ m_savedInParagraphGroup = mbInParagraphGroup;
+ m_savedInCharacterGroup = mbInCharacterGroup;
+ m_savedLastParagraphInSection = mbLastParagraphInSection;
// mbInSectionGroup = false;
mbInParagraphGroup = false;
mbInCharacterGroup = false;
@@ -264,16 +264,16 @@ void OOXMLParserState::startTxbxContent()
void OOXMLParserState::endTxbxContent()
{
- if( !inTxbxContent )
+ if( !m_inTxbxContent )
{
SAL_WARN( "writerfilter", "Non-matching closing w:txbxContent" );
return;
}
// mbInSectionGroup = savedInSectionGroup;
- mbInParagraphGroup = savedInParagraphGroup;
- mbInCharacterGroup = savedInCharacterGroup;
- mbLastParagraphInSection = savedLastParagraphInSection;
- inTxbxContent = false;
+ mbInParagraphGroup = m_savedInParagraphGroup;
+ mbInCharacterGroup = m_savedInCharacterGroup;
+ mbLastParagraphInSection = m_savedLastParagraphInSection;
+ m_inTxbxContent = false;
}
void OOXMLParserState::setStartFootnote(bool bStartFootnote)
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx
b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 5bb9a7dc7900..454cabb4c73c 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -50,11 +50,11 @@ class OOXMLParserState final : public virtual SvRefBase
std::stack<OOXMLPropertySet::Pointer_t> mCellProps;
std::stack<OOXMLPropertySet::Pointer_t> mRowProps;
std::stack<OOXMLPropertySet::Pointer_t> mTableProps;
- bool inTxbxContent;
+ bool m_inTxbxContent;
// these 4 save when inTxbxContent
- bool savedInParagraphGroup;
- bool savedInCharacterGroup;
- bool savedLastParagraphInSection;
+ bool m_savedInParagraphGroup;
+ bool m_savedInCharacterGroup;
+ bool m_savedLastParagraphInSection;
std::vector<SavedAlternateState> maSavedAlternateStates;
std::vector<OOXMLPropertySet::Pointer_t> mvPostponedBreaks;
bool mbStartFootnote;
