Use std::size_t

And include <cstddef> where necessary.

Change-Id: Icc1208528d6a8b04375d55ccbf3cd6ef046b454f
Reviewed-on: https://gerrit.libreoffice.org/23796
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

5 files changed, 12 insertions, 12 deletions

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 88c8030e6936..6fad59ef1b56 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -29,7 +29,7 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr pStyleSheet, OUString& rDefault
 {
     OUString aLongest = rDefault;
     sal_Int32 nHeight = 0;
-    for (size_t i = 0; i < rItems.size(); ++i)
+    for (std::size_t i = 0; i < rItems.size(); ++i)
         if (rItems[i].getLength() > aLongest.getLength())
             aLongest = rItems[i];
 
@@ -190,7 +190,7 @@ sal_Int32 SdtHelper::getInteropGrabBagSize()
 
 bool SdtHelper::containedInInteropGrabBag(const OUString& rValueName)
 {
-    for (size_t i=0; i < m_aGrabBag.size(); ++i)
+    for (std::size_t i=0; i < m_aGrabBag.size(); ++i)
         if (m_aGrabBag[i].Name == rValueName)
             return true;
 
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 0db564655e11..793aff594cdb 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -120,7 +120,7 @@ void TableManager::cellProps(TablePropertyMapPtr pProps)
 #endif
 }
 
-void TableManager::utext(const sal_uInt8* data, size_t len)
+void TableManager::utext(const sal_uInt8* data, std::size_t len)
 {
     // optimization: cell/row end characters are the last characters in a run
 
@@ -132,7 +132,7 @@ void TableManager::utext(const sal_uInt8* data, size_t len)
     }
 }
 
-void TableManager::text(const sal_uInt8* data, size_t len)
+void TableManager::text(const sal_uInt8* data, std::size_t len)
 {
     // optimization: cell/row end characters are the last characters in a run
     if (len > 0)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 06dc99a05283..a526fc2f77ea 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1434,7 +1434,7 @@ void RTFDocumentImpl::replayRowBuffer(
         rCellsSrpms.pop_front();
         rCellsAttributes.pop_front();
     }
-    for (size_t i = 0; i < rBuffer.size(); ++i)
+    for (std::size_t i = 0; i < rBuffer.size(); ++i)
     {
         SAL_WARN_IF(BUFFER_CELLEND == std::get<0>(rBuffer[i]),
                     "writerfilter.rtf", "dropping table cell!");
@@ -1815,7 +1815,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
         case RTF_DPTXBXTEXT:
         {
             bool bPictureFrame = false;
-            for (size_t i = 0; i < m_aStates.top().aShape.aProperties.size(); ++i)
+            for (std::size_t i = 0; i < m_aStates.top().aShape.aProperties.size(); ++i)
             {
                 std::pair<OUString, OUString>& rProperty = m_aStates.top().aShape.aProperties[i];
                 if (rProperty.first == "shapeType" && rProperty.second == OUString::number(ESCHER_ShpInst_PictureFrame))
@@ -2286,7 +2286,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
                 "mismatch between \\itap and number of \\nestrow", nullptr);
         }
         // note: there may be several states pointing to table buffer!
-        for (size_t i = 0; i < m_aStates.size(); ++i)
+        for (std::size_t i = 0; i < m_aStates.size(); ++i)
         {
             if (m_aStates[i].pCurrentBuffer == &m_aTableBufferStack.back())
             {
@@ -2345,7 +2345,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
         {
             SAL_WARN("writerfilter.rtf", "dropping extra table buffer");
             // note: there may be several states pointing to table buffer!
-            for (size_t i = 0; i < m_aStates.size(); ++i)
+            for (std::size_t i = 0; i < m_aStates.size(); ++i)
             {
                 if (m_aStates[i].pCurrentBuffer == &m_aTableBufferStack.back())
                 {
@@ -3448,7 +3448,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         {
             m_aStates.top().aDrawingObject.xShape.set(getModelFactory()->createInstance("com.sun.star.text.TextFrame"), uno::UNO_QUERY);
             std::vector<beans::PropertyValue> aDefaults = RTFSdrImport::getTextFrameDefaults(false);
-            for (size_t i = 0; i < aDefaults.size(); ++i)
+            for (std::size_t i = 0; i < aDefaults.size(); ++i)
             {
                 if (!lcl_findPropertyName(m_aStates.top().aDrawingObject.aPendingProperties, aDefaults[i].Name))
                     m_aStates.top().aDrawingObject.aPendingProperties.push_back(aDefaults[i]);
@@ -3746,7 +3746,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
         m_aStates.top().aParagraphSprms.set(nSprm, pIntValue);
         if (nKeyword == RTF_ITAP && nParam > 0)
         {
-            while (m_aTableBufferStack.size() < sal::static_int_cast<size_t>(nParam))
+            while (m_aTableBufferStack.size() < sal::static_int_cast<std::size_t>(nParam))
             {
                 m_aTableBufferStack.push_back(RTFBuffer_t());
             }
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index fcc20d4ee421..0c67801ec32e 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -296,7 +296,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape,
             createShape("com.sun.star.text.TextFrame", o_xShape, o_xPropSet);
             m_bTextFrame = true;
             std::vector<beans::PropertyValue> aDefaults = getTextFrameDefaults(true);
-            for (size_t j = 0; j < aDefaults.size(); ++j)
+            for (std::size_t j = 0; j < aDefaults.size(); ++j)
                 o_xPropSet->setPropertyValue(aDefaults[j].Name, aDefaults[j].Value);
             break;
         }
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 2479b407c7ab..ee7088dba34f 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -70,7 +70,7 @@ public:
     /// Also insert default values to override attributes of style
     /// (yes, really; that's what Word does).
     RTFSprms cloneAndDeduplicate(RTFSprms& rReference) const;
-    size_t size() const
+    std::size_t size() const
     {
         return m_pSprms->size();
     }