writerfilter: make RTFParserState members private, part 8

Change-Id: I1e53b4282daa7ca1a5da4a8cec67a30516449b60
Reviewed-on: https://gerrit.libreoffice.org/72561
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

writerfilter/source/rtftok/rtfdispatchdestination.cxx

@@ -303,10 +303,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
                     }
                     if (bCustomMark)
                     {
-                        m_aStates.top().aCharacterAttributes.clear();
+                        m_aStates.top().getCharacterAttributes().clear();
                         m_aStates.top().aCharacterSprms.clear();
                         auto pValue = new RTFValue(1);
-                        m_aStates.top().aCharacterAttributes.set(
+                        m_aStates.top().getCharacterAttributes().set(
                             NS_ooxml::LN_CT_FtnEdnRef_customMarkFollows, pValue);
                         text(aCustomMark);
                     }
@@ -615,7 +615,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
             break;
             case RTF_FTNSEP:
                 m_aStates.top().eDestination = Destination::FOOTNOTESEPARATOR;
-                m_aStates.top().aCharacterAttributes.set(
+                m_aStates.top().getCharacterAttributes().set(
                     NS_ooxml::LN_CT_FtnEdn_type,
                     new RTFValue(NS_ooxml::LN_Value_doc_ST_FtnEdn_separator));
                 break;

writerfilter/source/rtftok/rtfdispatchsymbol.cxx

@@ -182,10 +182,10 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
             if (m_bNeedPap)
             {
                 // There were no runs in the cell, so we need to send paragraph and character properties here.
-                auto pPValue = new RTFValue(m_aStates.top().aParagraphAttributes,
-                                            m_aStates.top().aParagraphSprms);
+                auto pPValue = new RTFValue(m_aStates.top().getParagraphAttributes(),
+                                            m_aStates.top().getParagraphSprms());
                 bufferProperties(m_aTableBufferStack.back(), pPValue, nullptr);
-                auto pCValue = new RTFValue(m_aStates.top().aCharacterAttributes,
+                auto pCValue = new RTFValue(m_aStates.top().getCharacterAttributes(),
                                             m_aStates.top().aCharacterSprms);
                 bufferProperties(m_aTableBufferStack.back(), pCValue, nullptr);
             }

writerfilter/source/rtftok/rtfdocumentimpl.hxx

@@ -509,6 +509,9 @@ public:
     RTFSprms& getTableRowSprms() { return m_aTableRowSprms; }
     RTFSprms& getSectionAttributes() { return m_aSectionAttributes; }
     RTFSprms& getSectionSprms() { return m_aSectionSprms; }
+    RTFSprms& getParagraphAttributes() { return m_aParagraphAttributes; }
+    RTFSprms& getParagraphSprms() { return m_aParagraphSprms; }
+    RTFSprms& getCharacterAttributes() { return m_aCharacterAttributes; }
 
     RTFDocumentImpl* m_pDocumentImpl;
     RTFInternalState nInternalState;
@@ -520,12 +523,12 @@ public:
     RTFSprms aTableAttributes;
     // reset by plain
     RTFSprms aCharacterSprms;
-    RTFSprms aCharacterAttributes;
-    // reset by pard
-    RTFSprms aParagraphSprms;
-    RTFSprms aParagraphAttributes;
 
 private:
+    RTFSprms m_aCharacterAttributes;
+    // reset by pard
+    RTFSprms m_aParagraphSprms;
+    RTFSprms m_aParagraphAttributes;
     // reset by sectd
     RTFSprms m_aSectionSprms;
     RTFSprms m_aSectionAttributes;