[Libreoffice-commits] core.git: desktop/source include/sfx2 oox/source sd/qa sfx2/source starmath/source sw/qa sw/source writerfilter/source xmlsecurity/qa xmlsecurity/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Apr 4 09:12:13 UTC 2016
desktop/source/lib/lokclipboard.cxx | 2 -
desktop/source/lib/lokclipboard.hxx | 2 -
include/sfx2/lokhelper.hxx | 9 ++++---
oox/source/shape/WpsContext.cxx | 4 +--
sd/qa/unit/tiledrendering/tiledrendering.cxx | 6 ++---
sfx2/source/view/lokhelper.cxx | 14 +++++------
starmath/source/rtfexport.cxx | 2 -
sw/qa/extras/tiledrendering/tiledrendering.cxx | 6 ++---
sw/source/core/doc/textboxhelper.cxx | 14 +++++------
sw/source/filter/ww8/docxtablestyleexport.cxx | 2 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 4 +--
sw/source/filter/ww8/rtfexport.cxx | 16 ++++++-------
writerfilter/source/dmapper/SdtHelper.cxx | 4 +--
writerfilter/source/dmapper/TableManager.cxx | 4 +--
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 12 +++++-----
writerfilter/source/rtftok/rtfsdrimport.cxx | 2 -
writerfilter/source/rtftok/rtfsprm.hxx | 2 -
xmlsecurity/qa/unit/signing/signing.cxx | 16 ++++++-------
xmlsecurity/source/helper/documentsignaturemanager.cxx | 20 ++++++++---------
19 files changed, 71 insertions(+), 70 deletions(-)
New commits:
commit 4e444871a4c9d819c136b383c81b7f7df386a78d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Apr 4 08:57:19 2016 +0200
Use std::size_t
And include <cstddef> where necessary.
Change-Id: Icc1208528d6a8b04375d55ccbf3cd6ef046b454f
Reviewed-on: https://gerrit.libreoffice.org/23796
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index 376bcd7..fa74fa0 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -30,7 +30,7 @@ OUString SAL_CALL LOKClipboard::getName() throw (uno::RuntimeException, std::exc
return OUString();
}
-LOKTransferable::LOKTransferable(const char* pMimeType, const char* pData, size_t nSize)
+LOKTransferable::LOKTransferable(const char* pMimeType, const char* pData, std::size_t nSize)
: m_aMimeType(pMimeType),
m_aSequence(reinterpret_cast<const sal_Int8*>(pData), nSize)
{
diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx
index a0ab645..59b8cdf 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -41,7 +41,7 @@ class LOKTransferable : public cppu::WeakImplHelper<css::datatransfer::XTransfer
std::vector<css::datatransfer::DataFlavor> getTransferDataFlavorsAsVector();
public:
- LOKTransferable(const char* pMimeType, const char* pData, size_t nSize);
+ LOKTransferable(const char* pMimeType, const char* pData, std::size_t nSize);
virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor)
throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index 99f2076..399c152 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SFX2_LOKHELPER_HXX
#include <sfx2/dllapi.h>
+#include <cstddef>
class SfxViewShell;
@@ -20,13 +21,13 @@ public:
/// Create a new view shell from the current view frame.
static int createView();
/// Destroy a view shell from the global shell list.
- static void destroyView(size_t nId);
+ static void destroyView(std::size_t nId);
/// Set a view shell as current one.
- static void setView(size_t nId);
+ static void setView(std::size_t nId);
/// Get the currently active view.
- static size_t getView();
+ static std::size_t getView();
/// Get the number of views of the current object shell.
- static size_t getViews();
+ static std::size_t getViews();
};
#endif
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 26a7d2f..ea596c8 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -114,7 +114,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
// Handle inset attributes for Writer textframes.
sal_Int32 aInsets[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns };
boost::optional<sal_Int32> oInsets[4];
- for (size_t i = 0; i < SAL_N_ELEMENTS(aInsets); ++i)
+ for (std::size_t i = 0; i < SAL_N_ELEMENTS(aInsets); ++i)
{
OptValue<OUString> oValue = rAttribs.getString(aInsets[i]);
if (oValue.has())
@@ -125,7 +125,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
}
OUString aProps[] = { OUString("LeftBorderDistance"), OUString("TopBorderDistance"), OUString("RightBorderDistance"), OUString("BottomBorderDistance") };
OUString aShapeProps[] = { OUString("TextLeftDistance"), OUString("TextUpperDistance"), OUString("TextRightDistance"), OUString("TextLowerDistance") };
- for (size_t i = 0; i < SAL_N_ELEMENTS(bTextFrame ? aProps : aShapeProps); ++i)
+ for (std::size_t i = 0; i < SAL_N_ELEMENTS(bTextFrame ? aProps : aShapeProps); ++i)
if (oInsets[i])
xPropertySet->setPropertyValue((bTextFrame ? aProps : aShapeProps)[i], uno::makeAny(*oInsets[i]));
}
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 585c3f9..3d1b0b5 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -435,14 +435,14 @@ void SdTiledRenderingTest::testSearch()
CPPUNIT_ASSERT_EQUAL(OUString("bbb"), rEditView.GetSelected());
// Did the selection callback fire?
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), m_aSelection.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(1), m_aSelection.size());
// Search for something on the second slide, and make sure that the set-part callback fired.
lcl_search("bbb");
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), m_nPart);
CPPUNIT_ASSERT_EQUAL(true, m_bFound);
// This was 0; should be 1 match for "find".
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), m_aSearchResultSelection.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(1), m_aSearchResultSelection.size());
// Result is on the second slide.
CPPUNIT_ASSERT_EQUAL(1, m_aSearchResultPart[0]);
@@ -482,7 +482,7 @@ void SdTiledRenderingTest::testSearchAllSelections()
// Make sure this is found on the 3rd slide.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), m_nPart);
// This was 1: only the first match was highlighted.
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), m_aSelection.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(2), m_aSelection.size());
comphelper::LibreOfficeKit::setActive(false);
}
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index c20eca2..0522c60 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -25,7 +25,7 @@ int SfxLokHelper::createView()
return rViewArr.size() - 1;
}
-void SfxLokHelper::destroyView(size_t nId)
+void SfxLokHelper::destroyView(std::size_t nId)
{
SfxViewShellArr_Impl& rViewArr = SfxGetpApp()->GetViewShells_Impl();
if (nId > rViewArr.size() - 1)
@@ -37,7 +37,7 @@ void SfxLokHelper::destroyView(size_t nId)
pViewFrame->Exec_Impl(aRequest);
}
-void SfxLokHelper::setView(size_t nId)
+void SfxLokHelper::setView(std::size_t nId)
{
SfxViewShellArr_Impl& rViewArr = SfxGetpApp()->GetViewShells_Impl();
if (nId > rViewArr.size() - 1)
@@ -51,11 +51,11 @@ void SfxLokHelper::setView(size_t nId)
pViewFrame->MakeActive_Impl(false);
}
-size_t SfxLokHelper::getView()
+std::size_t SfxLokHelper::getView()
{
SfxViewShellArr_Impl& rViewArr = SfxGetpApp()->GetViewShells_Impl();
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
- for (size_t i = 0; i < rViewArr.size(); ++i)
+ for (std::size_t i = 0; i < rViewArr.size(); ++i)
{
if (rViewArr[i]->GetViewFrame() == pViewFrame)
return i;
@@ -64,13 +64,13 @@ size_t SfxLokHelper::getView()
return 0;
}
-size_t SfxLokHelper::getViews()
+std::size_t SfxLokHelper::getViews()
{
- size_t nRet = 0;
+ std::size_t nRet = 0;
SfxObjectShell* pObjectShell = SfxViewFrame::Current()->GetObjectShell();
SfxViewShellArr_Impl& rViewArr = SfxGetpApp()->GetViewShells_Impl();
- for (size_t i = 0; i < rViewArr.size(); ++i)
+ for (std::size_t i = 0; i < rViewArr.size(); ++i)
{
if (rViewArr[i]->GetObjectShell() == pObjectShell)
++nRet;
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index 1abce82..0d50829 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -432,7 +432,7 @@ void SmRtfExport::HandleBrace(const SmBraceNode* pNode, int nLevel)
m_pBuffer->append(mathSymbolToString(pNode->ClosingBrace(), m_nEncoding));
m_pBuffer->append("}"); // mendChr
m_pBuffer->append("}"); // mdPr
- for (size_t i = 0; i < subnodes.size(); ++i)
+ for (std::size_t i = 0; i < subnodes.size(); ++i)
{
m_pBuffer->append("{" LO_STRING_SVTOOLS_RTF_ME " ");
HandleNode(subnodes[ i ], nLevel + 1);
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 933982d..37e5cf5 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -339,12 +339,12 @@ void SwTiledRenderingTest::testSearch()
SwXTextDocument* pXTextDocument = createDoc("search.odt");
pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
- size_t nNode = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
+ std::size_t nNode = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
// First hit, in the second paragraph, before the shape.
lcl_search(false);
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
- size_t nActual = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
+ std::size_t nActual = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
/// Make sure we get search result selection for normal find as well, not only find all.
CPPUNIT_ASSERT(!m_aSearchResultSelection.empty());
@@ -468,7 +468,7 @@ void SwTiledRenderingTest::testSearchAll()
}));
comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
// This was 0; should be 2 results in the body text.
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), m_aSearchResultSelection.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(2), m_aSearchResultSelection.size());
// Writer documents are always a single part.
CPPUNIT_ASSERT_EQUAL(0, m_aSearchResultPart[0]);
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index b52c9cd..3c55e28 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -162,7 +162,7 @@ std::set<const SwFrameFormat*> SwTextBoxHelper::findTextBoxes(const SwNode& rNod
const SwSortedObjs* pSortedObjs = pContentFrame->GetDrawObjs();
if (pSortedObjs)
{
- for (size_t i = 0; i < pSortedObjs->size(); ++i)
+ for (std::size_t i = 0; i < pSortedObjs->size(); ++i)
{
SwAnchoredObject* pAnchoredObject = (*pSortedObjs)[i];
SwFrameFormat* pTextBox = findTextBox(&pAnchoredObject->GetFrameFormat());
@@ -212,7 +212,7 @@ bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes)
{
sal_Int32 nRet = 0;
- for (size_t i = 0; i < pPage->GetObjCount(); ++i)
+ for (std::size_t i = 0; i < pPage->GetObjCount(); ++i)
{
if (lcl_isTextBox(pPage->GetObj(i), rTextBoxes))
continue;
@@ -228,7 +228,7 @@ uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<
SdrObject* pRet = nullptr;
sal_Int32 nCount = 0; // Current logical index.
- for (size_t i = 0; i < pPage->GetObjCount(); ++i)
+ for (std::size_t i = 0; i < pPage->GetObjCount(); ++i)
{
if (lcl_isTextBox(pPage->GetObj(i), rTextBoxes))
continue;
@@ -251,7 +251,7 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject, std::set<const Sw
if (const SdrPage* pPage = pObject->GetPage())
{
sal_Int32 nOrder = 0; // Current logical order.
- for (size_t i = 0; i < pPage->GetObjCount(); ++i)
+ for (std::size_t i = 0; i < pPage->GetObjCount(); ++i)
{
if (lcl_isTextBox(pPage->GetObj(i), rTextBoxes))
continue;
@@ -590,7 +590,7 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_u
void SwTextBoxHelper::saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks)
{
- for (size_t i = 0; i < rFormats.size(); ++i)
+ for (std::size_t i = 0; i < rFormats.size(); ++i)
{
const SwFrameFormat* pFormat = rFormats[i];
if (pFormat->Which() != RES_DRAWFRMFMT)
@@ -612,13 +612,13 @@ void SwTextBoxHelper::resetLink(SwFrameFormat* pShape, std::map<const SwFrameFor
void SwTextBoxHelper::restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent)
{
- size_t i = 0;
+ std::size_t i = 0;
for (std::set<_ZSortFly>::iterator aSetIt = rOld.begin(); aSetIt != rOld.end(); ++aSetIt, ++i)
{
SavedLink::iterator aTextBoxIt = rSavedLinks.find(aSetIt->GetFormat());
if (aTextBoxIt != rSavedLinks.end())
{
- size_t j = 0;
+ std::size_t j = 0;
for (std::set<_ZSortFly>::iterator aSetJt = rOld.begin(); aSetJt != rOld.end(); ++aSetJt, ++j)
{
if (aSetJt->GetFormat() == aTextBoxIt->second)
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx
index 3d6d075..86e20e9 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -673,7 +673,7 @@ void DocxTableStyleExport::Impl::TableStyle(uno::Sequence<beans::PropertyValue>&
tableStyleRPr(aRPr);
tableStyleTablePr(aTablePr);
tableStyleTcPr(aTcPr);
- for (size_t i = 0; i < aTableStylePrs.size(); ++i)
+ for (std::size_t i = 0; i < aTableStylePrs.size(); ++i)
tableStyleTableStylePr(aTableStylePrs[i]);
m_pSerializer->endElementNS(XML_w, XML_style);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9d9f461..337a65f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1881,7 +1881,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi
lcl_TextFrameShadow(m_aFlyProperties, rFrameFormat);
lcl_TextFrameRelativeSize(m_aFlyProperties, rFrameFormat);
- for (size_t i = 0; i < m_aFlyProperties.size(); ++i)
+ for (std::size_t i = 0; i < m_aFlyProperties.size(); ++i)
{
m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{");
m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " ");
@@ -3974,7 +3974,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat
if (!pFlyFrameFormat->GetOpaque().GetValue())
aFlyProperties.push_back(std::make_pair<OString, OString>("fBehindDocument", "1"));
- for (size_t i = 0; i < aFlyProperties.size(); ++i)
+ for (std::size_t i = 0; i < aFlyProperties.size(); ++i)
{
m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{");
m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " ");
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 6ce1099..1752e3c 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -253,7 +253,7 @@ void RtfExport::WriteRevTab()
// RTF always seems to use Unknown as the default first entry
GetRedline(OUString("Unknown"));
- for (size_t i = 0; i < m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++i)
+ for (std::size_t i = 0; i < m_pDoc->getIDocumentRedlineAccess().GetRedlineTable().size(); ++i)
{
const SwRangeRedline* pRedl = m_pDoc->getIDocumentRedlineAccess().GetRedlineTable()[ i ];
@@ -262,7 +262,7 @@ void RtfExport::WriteRevTab()
// Now write the table
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVTBL).WriteChar(' ');
- for (size_t i = 0; i < m_aRedlineTable.size(); ++i)
+ for (std::size_t i = 0; i < m_aRedlineTable.size(); ++i)
{
const OUString* pAuthor = GetRedline(i);
Strm().WriteChar('{');
@@ -394,7 +394,7 @@ void RtfExport::WriteMainText()
std::vector< std::pair<OString, OString> > aProperties;
aProperties.push_back(std::make_pair<OString, OString>("shapeType", "1"));
aProperties.push_back(std::make_pair<OString, OString>("fillColor", OString::number(msfilter::util::BGRToRGB(oBrush->GetColor().GetColor()))));
- for (size_t i = 0; i < aProperties.size(); ++i)
+ for (std::size_t i = 0; i < aProperties.size(); ++i)
{
Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{");
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_SN " ");
@@ -536,14 +536,14 @@ void RtfExport::WriteUserProps()
void RtfExport::WritePageDescTable()
{
// Write page descriptions (page styles)
- size_t nSize = m_pDoc->GetPageDescCnt();
+ std::size_t nSize = m_pDoc->GetPageDescCnt();
if (!nSize)
return;
Strm().WriteCharPtr(SAL_NEWLINE_STRING);
m_bOutPageDescs = true;
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_IGNORE).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PGDSCTBL);
- for (size_t n = 0; n < nSize; ++n)
+ for (std::size_t n = 0; n < nSize; ++n)
{
const SwPageDesc& rPageDesc = m_pDoc->GetPageDesc(n);
@@ -554,7 +554,7 @@ void RtfExport::WritePageDescTable()
OutPageDescription(rPageDesc, false, false);
// search for the next page description
- size_t i = nSize;
+ std::size_t i = nSize;
while (i)
if (rPageDesc.GetFollow() == &m_pDoc->GetPageDesc(--i))
break;
@@ -670,7 +670,7 @@ void RtfExport::ExportDocument_Impl()
if (pSet)
{
- size_t nPosInDoc;
+ std::size_t nPosInDoc;
pSttPgDsc = static_cast<const SwFormatPageDesc*>(&pSet->Get(RES_PAGEDESC));
if (!pSttPgDsc->GetPageDesc())
pSttPgDsc = nullptr;
@@ -1183,7 +1183,7 @@ void RtfExport::OutColorTable()
InsColor(pItem->GetColorValue());
}
- for (size_t n = 0; n < m_aColTable.size(); ++n)
+ for (std::size_t n = 0; n < m_aColTable.size(); ++n)
{
const Color& rCol = m_aColTable[ n ];
if (n || COL_AUTO != rCol.GetColor())
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 88c8030..6fad59e 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 0db5646..793aff5 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 06dc99a..a526fc2 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 fcc20d4..0c67801 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 2479b40..ee7088d 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();
}
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 0090015..83fdd8d8 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -172,7 +172,7 @@ void SigningTest::testDescription()
// Read back the signature and make sure that the description survives the roundtrip.
aManager.read(/*bUseTempStream=*/true);
std::vector<SignatureInformation>& rInformations = aManager.maCurrentSignatureInformations;
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(1), rInformations.size());
CPPUNIT_ASSERT_EQUAL(aDescription, rInformations[0].ouDescription);
}
@@ -205,7 +205,7 @@ void SigningTest::testOOXMLDescription()
// Read back the signature and make sure that the description survives the roundtrip.
aManager.read(/*bUseTempStream=*/true);
std::vector<SignatureInformation>& rInformations = aManager.maCurrentSignatureInformations;
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(1), rInformations.size());
CPPUNIT_ASSERT_EQUAL(aDescription, rInformations[0].ouDescription);
}
@@ -226,7 +226,7 @@ void SigningTest::testOOXMLAppend()
aManager.maSignatureHelper.SetStorage(xStorage, "1.2");
aManager.read(/*bUseTempStream=*/false);
std::vector<SignatureInformation>& rInformations = aManager.maCurrentSignatureInformations;
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(1), rInformations.size());
// Then add a second document signature.
uno::Reference<security::XCertificate> xCertificate = getCertificate(aManager.maSignatureHelper);
@@ -237,7 +237,7 @@ void SigningTest::testOOXMLAppend()
// Read back the signatures and make sure that we have the expected amount.
aManager.read(/*bUseTempStream=*/true);
// This was 1: the original signature was lost.
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(2), rInformations.size());
}
void SigningTest::testOOXMLRemove()
@@ -252,7 +252,7 @@ void SigningTest::testOOXMLRemove()
aManager.maSignatureHelper.SetStorage(xStorage, "1.2");
aManager.read(/*bUseTempStream=*/false);
std::vector<SignatureInformation>& rInformations = aManager.maCurrentSignatureInformations;
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(2), rInformations.size());
// Then remove the last added signature.
uno::Reference<security::XCertificate> xCertificate = getCertificate(aManager.maSignatureHelper);
@@ -261,7 +261,7 @@ void SigningTest::testOOXMLRemove()
// Read back the signatures and make sure that only purpose1 is left.
aManager.read(/*bUseTempStream=*/true);
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(1), rInformations.size());
CPPUNIT_ASSERT_EQUAL(OUString("purpose1"), rInformations[0].ouDescription);
}
@@ -282,7 +282,7 @@ void SigningTest::testOOXMLRemoveAll()
aManager.maSignatureHelper.SetStorage(xStorage, "1.2");
aManager.read(/*bUseTempStream=*/false);
std::vector<SignatureInformation>& rInformations = aManager.maCurrentSignatureInformations;
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(1), rInformations.size());
// Then remove the only signature in the document.
uno::Reference<security::XCertificate> xCertificate = getCertificate(aManager.maSignatureHelper);
@@ -292,7 +292,7 @@ void SigningTest::testOOXMLRemoveAll()
aManager.write();
// Make sure that the signature count is zero and the whole signature storage is removed completely.
- CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), rInformations.size());
+ CPPUNIT_ASSERT_EQUAL(static_cast<std::size_t>(0), rInformations.size());
uno::Reference<container::XNameAccess> xNameAccess(xStorage, uno::UNO_QUERY);
CPPUNIT_ASSERT(!xNameAccess->hasByName("_xmlsignatures"));
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 47d416f..3c8f7d5 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -249,8 +249,8 @@ bool DocumentSignatureManager::add(const uno::Reference<security::XCertificate>&
// Export old signatures...
uno::Reference<xml::sax::XDocumentHandler> xDocumentHandler(xSaxWriter, uno::UNO_QUERY_THROW);
- size_t nInfos = maCurrentSignatureInformations.size();
- for (size_t n = 0; n < nInfos; n++)
+ std::size_t nInfos = maCurrentSignatureInformations.size();
+ for (std::size_t n = 0; n < nInfos; n++)
XMLSignatureHelper::ExportSignature(xDocumentHandler, maCurrentSignatureInformations[n]);
// Create a new one...
@@ -270,7 +270,7 @@ bool DocumentSignatureManager::add(const uno::Reference<security::XCertificate>&
maSignatureHelper.ExportSignatureRelations(aStreamHelper.xSignatureStorage, nSignatureCount);
// Export old signatures.
- for (size_t i = 0; i < maCurrentSignatureInformations.size(); ++i)
+ for (std::size_t i = 0; i < maCurrentSignatureInformations.size(); ++i)
maSignatureHelper.ExportOOXMLSignature(mxStore, aStreamHelper.xSignatureStorage, maCurrentSignatureInformations[i], i + 1);
// Create a new signature.
@@ -303,8 +303,8 @@ void DocumentSignatureManager::remove(sal_uInt16 nPosition)
uno::Reference<xml::sax::XWriter> xSaxWriter = maSignatureHelper.CreateDocumentHandlerWithHeader(xOutputStream);
uno::Reference< xml::sax::XDocumentHandler> xDocumentHandler(xSaxWriter, uno::UNO_QUERY_THROW);
- size_t nInfos = maCurrentSignatureInformations.size();
- for (size_t n = 0 ; n < nInfos ; ++n)
+ std::size_t nInfos = maCurrentSignatureInformations.size();
+ for (std::size_t n = 0 ; n < nInfos ; ++n)
XMLSignatureHelper::ExportSignature(xDocumentHandler, maCurrentSignatureInformations[n]);
XMLSignatureHelper::CloseDocumentHandler(xDocumentHandler);
@@ -318,7 +318,7 @@ void DocumentSignatureManager::remove(sal_uInt16 nPosition)
maSignatureHelper.ExportSignatureRelations(aStreamHelper.xSignatureStorage, nSignatureCount);
// Export old signatures.
- for (size_t i = 0; i < maCurrentSignatureInformations.size(); ++i)
+ for (std::size_t i = 0; i < maCurrentSignatureInformations.size(); ++i)
maSignatureHelper.ExportOOXMLSignature(mxStore, aStreamHelper.xSignatureStorage, maCurrentSignatureInformations[i], i + 1);
// Flush objects.
@@ -363,8 +363,8 @@ void DocumentSignatureManager::write()
uno::Reference<xml::sax::XWriter> xSaxWriter = maSignatureHelper.CreateDocumentHandlerWithHeader(xOutputStream);
uno::Reference< xml::sax::XDocumentHandler> xDocumentHandler(xSaxWriter, uno::UNO_QUERY_THROW);
- size_t nInfos = maCurrentSignatureInformations.size();
- for (size_t n = 0 ; n < nInfos ; ++n)
+ std::size_t nInfos = maCurrentSignatureInformations.size();
+ for (std::size_t n = 0 ; n < nInfos ; ++n)
XMLSignatureHelper::ExportSignature(xDocumentHandler, maCurrentSignatureInformations[n]);
XMLSignatureHelper::CloseDocumentHandler(xDocumentHandler);
@@ -373,7 +373,7 @@ void DocumentSignatureManager::write()
else if (aStreamHelper.xSignatureStorage.is() && aStreamHelper.nStorageFormat == embed::StorageFormats::OFOPXML)
{
// OOXML
- size_t nSignatureCount = maCurrentSignatureInformations.size();
+ std::size_t nSignatureCount = maCurrentSignatureInformations.size();
maSignatureHelper.ExportSignatureContentTypes(mxStore, nSignatureCount);
if (nSignatureCount > 0)
maSignatureHelper.ExportSignatureRelations(aStreamHelper.xSignatureStorage, nSignatureCount);
@@ -386,7 +386,7 @@ void DocumentSignatureManager::write()
mxStore->removeElement("_xmlsignatures");
}
- for (size_t i = 0; i < nSignatureCount; ++i)
+ for (std::size_t i = 0; i < nSignatureCount; ++i)
maSignatureHelper.ExportOOXMLSignature(mxStore, aStreamHelper.xSignatureStorage, maCurrentSignatureInformations[i], i + 1);
}
More information about the Libreoffice-commits
mailing list