[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   10 +++++-----
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |    5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit a23ee867ea419665769342f485f0144f188952de
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Nov 8 15:01:45 2011 +0100

    RTFDocumentImpl: rename m_bIsInShape to m_bIsInFrame
    
    The "in shape" term was confusing since it was false for non-text-frame
    shapes all the time.

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 39bbde2..50664df 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -298,7 +298,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
     m_nCurrentStyleIndex(0),
     m_bEq(false),
     m_bWasInFrame(false),
-    m_bIsInShape(false)
+    m_bIsInFrame(false)
 {
     OSL_ASSERT(xInputStream.is());
     m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, sal_True));
@@ -748,7 +748,7 @@ void RTFDocumentImpl::checkChangedFrame()
     // Check if this is a frame.
     if (inFrame() && !m_bWasInFrame)
     {
-        if (m_bIsInShape)
+        if (m_bIsInFrame)
             return;
         OSL_TRACE("%s starting frame", OSL_THIS_FUNC);
         uno::Reference<text::XTextFrame> xTextFrame;
@@ -776,11 +776,11 @@ void RTFDocumentImpl::checkChangedFrame()
 
         Mapper().startShape(xShape);
         Mapper().startParagraphGroup();
-        m_bIsInShape = true;
+        m_bIsInFrame = true;
     }
     else if (!inFrame() && m_bWasInFrame)
     {
-        if (!m_bIsInShape)
+        if (!m_bIsInFrame)
             return;
         OSL_TRACE("%s ending frame", OSL_THIS_FUNC);
         finishSubstream();
@@ -789,7 +789,7 @@ void RTFDocumentImpl::checkChangedFrame()
         Mapper().endParagraphGroup();
         Mapper().startParagraphGroup();
         m_bWasInFrame = false; // this is needed by invalid nested flies where the result is separate frames
-        m_bIsInShape = false;
+        m_bIsInFrame = false;
     }
 }
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 7b8a7e0..35098b2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -342,6 +342,7 @@ namespace writerfilter {
                 void checkNeedPap();
                 void sectBreak(bool bFinal);
                 void replayBuffer(RTFBuffer_t& rBuffer);
+                /// If we got tokens indicating we're in a frame.
                 bool inFrame();
                 void checkChangedFrame();
 
@@ -426,8 +427,8 @@ namespace writerfilter {
                 bool m_bEq;
                 /// If we were in a frame.
                 bool m_bWasInFrame;
-                /// If a shape is already started (nesting them is not OK).
-                bool m_bIsInShape;
+                /// If a frame start token is already sent to dmapper (nesting them is not OK).
+                bool m_bIsInFrame;
 
         };
     } // namespace rtftok