[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    4 +---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |    2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit df2a76d988ad11b20ce7cec9cff06a1bc5c94788
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Thu Apr 19 16:26:02 2012 +0200

    RTFDocumentImpl: get rid of practically unused m_bWasInFrame

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 54fdac2..e2fa851 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -278,7 +278,6 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
     m_nCurrentStyleIndex(0),
     m_bEq(false),
     m_bFormField(false),
-    m_bWasInFrame(false),
     m_bIsInFrame(false),
     m_aUnicodeBuffer(),
     m_aHexBuffer()
@@ -1408,8 +1407,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
                 }
                 // but don't emit properties yet, since they may change till the first text token arrives
                 m_bNeedPap = true;
-                m_bWasInFrame = m_aStates.top().aFrame.inFrame();
-                if (!m_bWasInFrame)
+                if (!m_aStates.top().aFrame.inFrame())
                     m_bNeedPar = false;
             }
             break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 81f05c3..3a1bad4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -478,8 +478,6 @@ namespace writerfilter {
                 int m_nCurrentStyleIndex;
                 bool m_bEq;
                 bool m_bFormField;
-                /// If we were in a frame.
-                bool m_bWasInFrame;
                 /// If a frame start token is already sent to dmapper (nesting them is not OK).
                 bool m_bIsInFrame;
                 // Unicode characters are collected here so we don't have to send them one by one.