[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

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

New commits:
commit ddac853e0c1d8445471640c2f5f6c6d029986bd7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Feb 25 16:38:20 2014 +0100

    rtftok: pushProperties -> sendProperties
    
    We're not pushing these properties to the parser stack (as the old name
    suggested), but sending them to dmapper.
    
    Change-Id: I9725b7b92e653064c18d723f48a350ebc8e740c8

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 621e3a5..863d8ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1265,7 +1265,7 @@ void RTFDocumentImpl::prepareProperties(
             rState.aTableRowAttributes, rState.aTableRowSprms));
 }
 
-void RTFDocumentImpl::pushProperties(
+void RTFDocumentImpl::sendProperties(
     writerfilter::Reference<Properties>::Pointer_t const& pParagraphProperties,
     writerfilter::Reference<Properties>::Pointer_t const& pFrameProperties,
     writerfilter::Reference<Properties>::Pointer_t const& pTableRowProperties)
@@ -1326,7 +1326,7 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer,
             replayRowBuffer(rRowBuffer.buffer, rRowBuffer.cellsSprms,
                     rRowBuffer.cellsAttributes, rRowBuffer.nCells);
 
-            pushProperties(rRowBuffer.pParaProperties,
+            sendProperties(rRowBuffer.pParaProperties,
                     rRowBuffer.pFrameProperties, rRowBuffer.pRowProperties);
         }
         else if (boost::get<0>(aTuple) == BUFFER_CELLEND)
@@ -2102,7 +2102,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
                 prepareProperties(m_aStates.top(),
                         paraProperties, frameProperties, rowProperties,
                         m_nTopLevelCells, m_nTopLevelCurrentCellX);
-                pushProperties(paraProperties, frameProperties, rowProperties);
+                sendProperties(paraProperties, frameProperties, rowProperties);
 
                 m_bNeedPap = true;
                 m_bNeedFinalPar = true;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 90609db..b6985e9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -391,7 +391,8 @@ namespace writerfilter {
                     writerfilter::Reference<Properties>::Pointer_t &,
                     writerfilter::Reference<Properties>::Pointer_t &,
                     int const nCells, int const nCurrentCellX);
-                void pushProperties(
+                /// Send the passed properties to dmapper.
+                void sendProperties(
                     writerfilter::Reference<Properties>::Pointer_t const&,
                     writerfilter::Reference<Properties>::Pointer_t const&,
                     writerfilter::Reference<Properties>::Pointer_t const&);