summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-02-25 16:38:20 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-02-25 16:46:43 +0100
commitddac853e0c1d8445471640c2f5f6c6d029986bd7 (patch)
tree6d610f802b32e143d50b9d8fab8f040b43b4ef21
parentc850cdc1bc7278116211b72b020431354f96907e (diff)
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
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx6
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx3
2 files changed, 5 insertions, 4 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 621e3a53d292..863d8bab003c 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 90609db9928b..b6985e99abca 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&);