[Libreoffice-commits] core.git: writerfilter/source
Julien Nabet
serval2412 at yahoo.fr
Sun Jun 23 01:31:52 PDT 2013
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3dac2c4b5d6aab37181cf6b113ec1a6732c2d2da
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Jun 23 10:31:17 2013 +0200
cppcheck: fix inefficient checking
Change-Id: If015900345304a9545ab0b66c6998a9d6bad9d1f
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2a33d96..7c4f545 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -513,7 +513,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false)
dispatchFlag(RTF_PARD);
dispatchSymbol(RTF_PAR);
}
- while (m_nHeaderFooterPositions.size())
+ while (!m_nHeaderFooterPositions.empty())
{
std::pair<Id, sal_uInt32> aPair = m_nHeaderFooterPositions.front();
m_nHeaderFooterPositions.pop();
@@ -4563,7 +4563,7 @@ int RTFDocumentImpl::popState()
case DESTINATION_SHPPICT:
case DESTINATION_SHAPE:
m_aStates.top().aFrame = aState.aFrame;
- if (aState.nDestinationState == DESTINATION_SHPPICT && m_aStates.size() && m_aStates.top().nDestinationState == DESTINATION_LISTPICTURE)
+ if (aState.nDestinationState == DESTINATION_SHPPICT && !m_aStates.empty() && m_aStates.top().nDestinationState == DESTINATION_LISTPICTURE)
{
RTFSprms aAttributes;
aAttributes.set(NS_ooxml::LN_CT_NumPicBullet_numPicBulletId, RTFValue::Pointer_t(new RTFValue(m_nListPictureId++)));
@@ -4609,7 +4609,7 @@ int RTFDocumentImpl::popState()
m_bHasFootnote = false;
}
- if (m_aStates.size())
+ if (!m_aStates.empty())
{
m_aStates.top().nCells = aState.nCells;
m_aStates.top().aTableCellsSprms = aState.aTableCellsSprms;
More information about the Libreoffice-commits
mailing list