make RTFDocumentImpl::runBreak private

Change-Id: I9af3521d5c7c78da522d02a4436b8eb6ca4f14ce

3 files changed, 14 insertions, 22 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index da0ae75a4f39..5ae93e1dd3f2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3673,14 +3673,7 @@ int RTFDocumentImpl::popState()
             xPropertySet->setPropertyValue("FillTransparence", uno::makeAny(sal_Int32(100)));
 
         Mapper().startShape(xShape);
-        Mapper().startParagraphGroup();
-        if (replayShapetext())
-        {
-            Mapper().startCharacterGroup();
-            runBreak();
-            Mapper().endCharacterGroup();
-        }
-        Mapper().endParagraphGroup();
+        replayShapetext();
         Mapper().endShape();
     }
     break;
@@ -3983,11 +3976,17 @@ void RTFDocumentImpl::setDestinationText(OUString& rString)
     m_aStates.top().aDestinationText.append(rString);
 }
 
-bool RTFDocumentImpl::replayShapetext()
+void RTFDocumentImpl::replayShapetext()
 {
-    bool bRet = !m_aShapetextBuffer.empty();
-    replayBuffer(m_aShapetextBuffer);
-    return bRet;
+    Mapper().startParagraphGroup();
+    if (!m_aShapetextBuffer.empty())
+    {
+        replayBuffer(m_aShapetextBuffer);
+        Mapper().startCharacterGroup();
+        runBreak();
+        Mapper().endCharacterGroup();
+    }
+    Mapper().endParagraphGroup();
 }
 
 bool RTFDocumentImpl::getSkipUnknown()
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index beec3b51fc3d..7a0319a14114 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -428,8 +428,7 @@ namespace writerfilter {
                 void setDestinationText(rtl::OUString& rString);
                 /// Resolve a picture: If not inline, then anchored.
                 int resolvePict(bool bInline);
-                void runBreak();
-                bool replayShapetext();
+                void replayShapetext();
                 bool getSkipUnknown();
                 void setSkipUnknown(bool bSkipUnknown);
 
@@ -471,6 +470,7 @@ namespace writerfilter {
                 void singleChar(sal_uInt8 nValue, bool bRunProps = false);
                 // Sends run properties to dmapper, taking care of buffering.
                 void runProps();
+                void runBreak();
                 void parBreak();
                 void tableBreak();
                 void checkNeedPap();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 40504a36b8e2..680845f7efbc 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -353,14 +353,7 @@ void RTFSdrImport::resolve(RTFShape& rShape)
 
     // Send it to dmapper
     m_rImport.Mapper().startShape(xShape);
-    m_rImport.Mapper().startParagraphGroup();
-    if (m_rImport.replayShapetext())
-    {
-        m_rImport.Mapper().startCharacterGroup();
-        m_rImport.runBreak();
-        m_rImport.Mapper().endCharacterGroup();
-    }
-    m_rImport.Mapper().endParagraphGroup();
+    m_rImport.replayShapetext();
     m_rImport.Mapper().endShape();
 }