[Libreoffice-commits] core.git: 4 commits - accessibility/source basctl/source basic/source canvas/source chart2/source compilerplugins/clang connectivity/source cpputools/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source framework/source helpcompiler/source i18npool/source idl/source oox/source rsc/source sfx2/source svtools/source svx/source toolkit/source writerfilter/source xmloff/source xmlscript/source
Noel Grandin
noel at peralex.com
Thu May 28 23:49:39 PDT 2015
accessibility/source/extended/AccessibleGridControlTable.cxx | 2
basctl/source/accessibility/accessibledialogwindow.cxx | 12 +--
basctl/source/basicide/baside2b.cxx | 6 -
basctl/source/basicide/basobj2.cxx | 2
basctl/source/basicide/layout.cxx | 2
basctl/source/basicide/macrodlg.cxx | 2
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/dlged/dlgedobj.cxx | 2
basic/source/classes/propacc.cxx | 2
basic/source/classes/sbunoobj.cxx | 2
basic/source/comp/symtbl.cxx | 2
basic/source/sbx/sbxarray.cxx | 4 -
basic/source/sbx/sbxstr.cxx | 2
canvas/source/vcl/impltools.cxx | 10 +-
chart2/source/controller/main/DrawCommandDispatch.cxx | 2
chart2/source/view/main/GL3DRenderer.cxx | 2
compilerplugins/clang/loopvartoosmall.cxx | 34 ++++----
connectivity/source/commontools/dbtools.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 2
connectivity/source/drivers/file/FNoException.cxx | 2
connectivity/source/drivers/file/FResultSet.cxx | 4 -
connectivity/source/drivers/file/FStatement.cxx | 10 +-
connectivity/source/drivers/file/fanalyzer.cxx | 2
connectivity/source/drivers/file/fcomp.cxx | 8 +-
connectivity/source/drivers/mork/MPreparedStatement.cxx | 2
connectivity/source/drivers/mork/MResultSet.cxx | 2
connectivity/source/drivers/mork/MStatement.cxx | 2
connectivity/source/parse/sqliterator.cxx | 8 +-
connectivity/source/parse/sqlnode.cxx | 2
cpputools/source/sp2bv/sp2bv.cxx | 2
cui/source/customize/cfg.cxx | 16 ++--
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 2
cui/source/dialogs/multipat.cxx | 4 -
cui/source/dialogs/showcols.cxx | 4 -
cui/source/dialogs/srchxtra.cxx | 2
cui/source/inc/treeopt.hxx | 16 ++--
cui/source/options/dbregister.cxx | 2
cui/source/options/optgdlg.cxx | 2
cui/source/options/optopencl.cxx | 6 -
cui/source/options/optpath.cxx | 4 -
cui/source/options/optsave.cxx | 2
cui/source/options/treeopt.cxx | 8 +-
cui/source/tabpages/autocdlg.cxx | 16 ++--
cui/source/tabpages/numpages.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 4 -
dbaccess/source/ui/browser/exsrcbrw.cxx | 2
dbaccess/source/ui/browser/formadapter.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 2
dbaccess/source/ui/browser/sbamultiplex.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/misc/WColumnSelect.cxx | 6 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2
desktop/source/app/dispatchwatcher.cxx | 2
desktop/source/migration/migration.cxx | 4 -
desktop/source/migration/services/oo3extensionmigration.cxx | 4 -
drawinglayer/source/animation/animationtiming.cxx | 8 +-
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx | 2
drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx | 2
drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx | 2
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 2
drawinglayer/source/primitive2d/helplineprimitive2d.cxx | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 8 +-
drawinglayer/source/primitive2d/patternfillprimitive2d.cxx | 2
drawinglayer/source/primitive2d/textprimitive2d.cxx | 2
drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx | 2
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 4 -
drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx | 10 +-
drawinglayer/source/primitive3d/sdrprimitive3d.cxx | 2
drawinglayer/source/processor3d/shadow3dextractor.cxx | 2
editeng/source/editeng/editdbg.cxx | 6 -
editeng/source/editeng/editdoc.cxx | 2
editeng/source/editeng/impedit2.cxx | 2
editeng/source/editeng/impedit3.cxx | 2
editeng/source/editeng/impedit5.cxx | 2
editeng/source/items/textitem.cxx | 2
editeng/source/misc/svxacorr.cxx | 4 -
editeng/source/rtf/svxrtf.cxx | 2
extensions/source/bibliography/bibconfig.cxx | 6 -
extensions/source/bibliography/datman.cxx | 4 -
extensions/source/bibliography/toolbar.cxx | 2
extensions/source/dbpilots/commonpagesdbp.cxx | 2
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/plugin/base/manager.cxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/scanner/grid.cxx | 4 -
extensions/source/scanner/sanedlg.cxx | 2
filter/source/msfilter/svdfppt.cxx | 6 -
framework/source/classes/menumanager.cxx | 2
framework/source/fwi/helper/mischelper.cxx | 2
framework/source/uiconfiguration/imagemanagerimpl.cxx | 2
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 4 -
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 6 -
framework/source/uielement/objectmenucontroller.cxx | 2
framework/source/xml/imagesdocumenthandler.cxx | 6 -
helpcompiler/source/HelpCompiler.cxx | 2
helpcompiler/source/HelpSearch.cxx | 2
i18npool/source/collator/collatorImpl.cxx | 2
i18npool/source/indexentry/indexentrysupplier_default.cxx | 2
idl/source/objects/object.cxx | 2
idl/source/objects/types.cxx | 2
oox/source/crypto/Standard2007Engine.cxx | 2
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 4 -
oox/source/drawingml/shape.cxx | 2
oox/source/vml/vmlshape.cxx | 4 -
rsc/source/rsc/rsc.cxx | 4 -
sfx2/source/appl/appchild.cxx | 2
sfx2/source/appl/appreg.cxx | 6 -
sfx2/source/appl/appuno.cxx | 14 +--
sfx2/source/appl/childwin.cxx | 12 +--
sfx2/source/appl/helpinterceptor.cxx | 2
sfx2/source/appl/module.cxx | 8 +-
sfx2/source/appl/newhelp.cxx | 10 +-
sfx2/source/appl/sfxpicklist.cxx | 4 -
sfx2/source/appl/workwin.cxx | 38 +++++-----
sfx2/source/bastyp/bitset.cxx | 2
sfx2/source/control/bindings.cxx | 6 -
sfx2/source/control/dispatch.cxx | 4 -
sfx2/source/control/msgpool.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 10 +-
sfx2/source/dialog/splitwin.cxx | 4 -
sfx2/source/dialog/templdlg.cxx | 6 -
sfx2/source/doc/docinsert.cxx | 2
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/menu/mnuitem.cxx | 4 -
sfx2/source/menu/mnumgr.cxx | 4 -
sfx2/source/menu/virtmenu.cxx | 2
sfx2/source/statbar/stbitem.cxx | 4 -
sfx2/source/toolbox/imgmgr.cxx | 6 -
sfx2/source/view/viewfrm.cxx | 2
sfx2/source/view/viewsh.cxx | 8 +-
svtools/source/brwbox/brwbox1.cxx | 6 -
svtools/source/brwbox/brwbox2.cxx | 2
svtools/source/brwbox/brwbox3.cxx | 2
svtools/source/contnr/fileview.cxx | 2
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/contnr/svimpbox.cxx | 4 -
svtools/source/control/calendar.cxx | 2
svtools/source/control/ruler.cxx | 4 -
svtools/source/edit/editsyntaxhighlighter.cxx | 2
svtools/source/graphic/transformer.cxx | 4 -
svtools/source/svhtml/htmlout.cxx | 2
svtools/source/uno/framestatuslistener.cxx | 2
svtools/source/uno/statusbarcontroller.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
svx/source/dialog/dlgctrl.cxx | 4 -
svx/source/dialog/pagectrl.cxx | 2
svx/source/dialog/rubydialog.cxx | 4 -
svx/source/dialog/srchdlg.cxx | 8 +-
svx/source/dialog/svxbmpnumvalueset.cxx | 4 -
svx/source/dialog/svxruler.cxx | 4 -
svx/source/engine3d/helperhittest3d.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 6 -
svx/source/fmcomp/fmgridif.cxx | 12 +--
svx/source/fmcomp/gridcell.cxx | 4 -
svx/source/form/fmshimp.cxx | 4 -
svx/source/form/fmsrcimp.cxx | 2
svx/source/form/formdispatchinterceptor.cxx | 2
svx/source/items/numfmtsh.cxx | 6 -
svx/source/items/numinf.cxx | 4 -
svx/source/mnuctrls/SmartTagCtl.cxx | 4 -
svx/source/sidebar/nbdtmg.cxx | 4 -
svx/source/smarttags/SmartTagMgr.cxx | 6 -
svx/source/stbctrls/zoomsliderctrl.cxx | 2
svx/source/svdraw/clonelist.cxx | 2
svx/source/svdraw/svddrgmt.cxx | 2
svx/source/svdraw/svdedtv.cxx | 2
svx/source/svdraw/svdfmtf.cxx | 8 +-
svx/source/svdraw/svdoashp.cxx | 4 -
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdopath.cxx | 2
svx/source/svdraw/svdotextpathdecomposition.cxx | 6 -
svx/source/svdraw/svdxcgv.cxx | 2
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2
svx/source/xoutdev/xtabdash.cxx | 2
toolkit/source/awt/animatedimagespeer.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/controls/unocontrol.cxx | 2
toolkit/source/controls/unocontrolmodel.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 4 -
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 8 +-
writerfilter/source/dmapper/StyleSheetTable.cxx | 6 -
xmloff/source/forms/propertyimport.cxx | 6 -
xmloff/source/style/xmlnumfe.cxx | 2
xmloff/source/style/xmlnumfi.cxx | 2
xmloff/source/text/txtimp.cxx | 2
xmloff/source/text/txtparai.cxx | 2
xmlscript/source/xml_helper/xml_impctx.cxx | 2
193 files changed, 393 insertions(+), 393 deletions(-)
New commits:
commit 49ea2258d482950ad3af16f9c8ac4fef7f192fc0
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 28 16:48:15 2015 +0200
loplugin:loopvartoosmall
Change-Id: I5518e40a30bdad53470cc52b59eff04ab6d873d4
diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx
index a742af6..bba8854 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -112,7 +112,7 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
}
-loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", true);
+loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", false);
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 36f3997..b5ebf1a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1861,7 +1861,7 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* )
{
bool result = false;
- for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
+ for ( sal_Int32 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
{
SaveInData* pData =
static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( i ));
@@ -2264,7 +2264,7 @@ void SvxMenuConfigPage::Init()
void SvxMenuConfigPage::dispose()
{
- for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
+ for ( sal_Int32 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
{
MenuSaveInData* pData =
static_cast<MenuSaveInData*>(m_pSaveInListBox->GetEntryData( i ));
@@ -2963,7 +2963,7 @@ SvxToolbarConfigPage::~SvxToolbarConfigPage()
void SvxToolbarConfigPage::dispose()
{
- for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
+ for ( sal_Int32 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
{
ToolbarSaveInData* pData =
static_cast<ToolbarSaveInData*>(m_pSaveInListBox->GetEntryData( i ));
@@ -3201,7 +3201,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo
sal_uInt16 nSelectionPos = 0;
// find position of entry within the list
- for ( sal_uInt16 i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
{
if ( m_pContentsListBox->GetEntry( 0, i ) == pActEntry )
{
@@ -3299,7 +3299,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo
sal_uInt16 nSelectionPos = 0;
// find position of entry within the list
- for ( sal_uInt16 i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
{
if ( m_pContentsListBox->GetEntry( 0, i ) == pActEntry )
{
@@ -3377,7 +3377,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo
sal_uInt16 nSelectionPos = 0;
// find position of entry within the list
- for ( sal_uInt16 i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < m_pContentsListBox->GetEntryCount(); ++i )
{
if ( m_pContentsListBox->GetEntry( 0, i ) == pActEntry )
{
@@ -3447,7 +3447,7 @@ void SvxToolbarConfigPage::Init()
sal_uInt16 nPos = 0;
if ( !m_aURLToSelect.isEmpty() )
{
- for ( sal_uInt16 i = 0 ; i < m_pTopLevelListBox->GetEntryCount(); ++i )
+ for ( sal_Int32 i = 0 ; i < m_pTopLevelListBox->GetEntryCount(); ++i )
{
SvxConfigEntry* pData =
static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( i ));
@@ -4437,7 +4437,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
VclPtrInstance< SvxNewToolbarDialog > pNameDialog( nullptr, aNewName );
sal_uInt16 nInsertPos;
- for ( sal_uInt16 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
+ for ( sal_Int32 i = 0 ; i < m_pSaveInListBox->GetEntryCount(); ++i )
{
SaveInData* pData =
static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( i ));
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index b0657ee..798731a 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -136,7 +136,7 @@ void SvxHyperlinkNewDocTp::dispose()
{
if (m_pLbDocTypes)
{
- for ( sal_uInt16 n=0; n<m_pLbDocTypes->GetEntryCount(); n++ )
+ for ( sal_Int32 n=0; n<m_pLbDocTypes->GetEntryCount(); n++ )
delete static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData ( n ));
m_pLbDocTypes = NULL;
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 686734d..ec76ff1 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -841,7 +841,7 @@ short IconChoiceDialog::Ok()
void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId )
{
// set focus to icon for the current visible page
- for ( sal_uInt16 i=0; i<m_pIconCtrl->GetEntryCount(); i++)
+ for ( sal_uLong i=0; i<m_pIconCtrl->GetEntryCount(); i++)
{
SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i );
sal_uInt16* pUserData = static_cast<sal_uInt16*>(pEntry->GetUserData());
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 8cdc644..75c8b88 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -270,7 +270,7 @@ OUString SvxMultiPathDialog::GetPath() const
sal_Unicode cDelim = SVT_SEARCHPATH_DELIMITER;
OUString sWritable;
- for ( sal_uInt16 i = 0; i < m_pRadioLB->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < m_pRadioLB->GetEntryCount(); ++i )
{
SvTreeListEntry* pEntry = m_pRadioLB->GetEntry(i);
if ( m_pRadioLB->GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
@@ -294,7 +294,7 @@ OUString SvxPathSelectDialog::GetPath() const
OUString sNewPath;
sal_Unicode cDelim = SVT_SEARCHPATH_DELIMITER;
- for ( sal_uInt16 i = 0; i < m_pPathLB->GetEntryCount(); ++i )
+ for ( sal_Int32 i = 0; i < m_pPathLB->GetEntryCount(); ++i )
{
if ( !sNewPath.isEmpty() )
sNewPath += OUString(cDelim);
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 4c86ac4..79bdda9 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -57,7 +57,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
if (m_xColumns.is())
{
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xCol;
- for (sal_uInt16 i=0; i < m_pList->GetSelectEntryCount(); ++i)
+ for (sal_Int32 i=0; i < m_pList->GetSelectEntryCount(); ++i)
{
m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectEntryPos(i))))) >>= xCol;
if (xCol.is())
@@ -90,7 +90,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xCurCol;
OUString sCurName;
- for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
+ for (sal_Int32 i=0; i<xCols->getCount(); ++i)
{
sCurName.clear();
xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 4497601..5bd9284 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -196,7 +196,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
SearchAttrItem aInvalidItem;
aInvalidItem.pItem = reinterpret_cast<SfxPoolItem*>(-1);
- for ( sal_uInt16 i = 0; i < m_pAttrLB->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < m_pAttrLB->GetEntryCount(); ++i )
{
sal_uInt16 nSlot = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pAttrLB->GetEntryData(i));
bool bChecked = m_pAttrLB->IsChecked(i);
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 86f7af9..63ffc2c 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -87,11 +87,11 @@ typedef ::std::vector< VectorOfLeaves > VectorOfGroupedLeaves;
struct OptionsNode
{
- OUString m_sId;
- OUString m_sLabel;
- OUString m_sPageURL;
+ OUString m_sId;
+ OUString m_sLabel;
+ OUString m_sPageURL;
bool m_bAllModules;
- OUString m_sGroupId;
+ OUString m_sGroupId;
sal_Int32 m_nGroupIndex;
VectorOfLeaves m_aLeaves;
VectorOfGroupedLeaves m_aGroupedLeaves;
@@ -111,7 +111,7 @@ struct OptionsNode
~OptionsNode()
{
- for ( sal_uInt32 i = 0; i < m_aLeaves.size(); ++i )
+ for ( size_t i = 0; i < m_aLeaves.size(); ++i )
delete m_aLeaves[i];
m_aLeaves.clear();
m_aGroupedLeaves.clear();
@@ -122,9 +122,9 @@ typedef ::std::vector< OptionsNode* > VectorOfNodes;
struct LastPageSaver
{
- sal_uInt16 m_nLastPageId;
- OUString m_sLastPageURL_Tools;
- OUString m_sLastPageURL_ExtMgr;
+ sal_uInt16 m_nLastPageId;
+ OUString m_sLastPageURL_Tools;
+ OUString m_sLastPageURL_ExtMgr;
LastPageSaver() : m_nLastPageId( USHRT_MAX ) {}
};
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index ba17c70..3bf5f84 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -168,7 +168,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
void DbRegistrationOptionsPage::dispose()
{
- for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < pPathBox->GetEntryCount(); ++i )
delete static_cast< DatabaseRegistration* >( pPathBox->GetEntry(i)->GetUserData() );
pPathBox.disposeAndClear();
m_pPathCtrl.clear();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b82189f..11b37a7 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1171,7 +1171,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
if (!m_sUserLocaleValue.isEmpty())
{
sal_Int32 d = 0;
- for (sal_uInt16 i=0; i < m_pUserInterfaceLB->GetEntryCount(); i++)
+ for (sal_Int32 i=0; i < m_pUserInterfaceLB->GetEntryCount(); i++)
{
d = (sal_Int32)reinterpret_cast<sal_IntPtr>(m_pUserInterfaceLB->GetEntryData(i));
if ( d > 0 && seqInstalledLanguages.getLength() > d-1 && seqInstalledLanguages[d-1].equals(m_sUserLocaleValue))
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 465bb4a..4c97609 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -109,9 +109,9 @@ SvxOpenCLTabPage::~SvxOpenCLTabPage()
void SvxOpenCLTabPage::dispose()
{
- for ( sal_uInt16 i = 0; i < mpBlackList->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < mpBlackList->GetEntryCount(); ++i )
delete static_cast<OpenCLConfig::ImplMatcher*>(mpBlackList->GetEntry(i)->GetUserData());
- for ( sal_uInt16 i = 0; i < mpWhiteList->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < mpWhiteList->GetEntryCount(); ++i )
delete static_cast<OpenCLConfig::ImplMatcher*>(mpWhiteList->GetEntry(i)->GetUserData());
mpBlackList.disposeAndClear();
mpWhiteList.disposeAndClear();
@@ -176,7 +176,7 @@ void fillListBox(SvSimpleTable* pListBox, const OpenCLConfig::ImplMatcherSet& rS
{
pListBox->SetUpdateMode(false);
// kill added UserData to treeitem
- for ( sal_uInt16 i = 0; i < pListBox->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < pListBox->GetEntryCount(); ++i )
delete static_cast<OpenCLConfig::ImplMatcher*>(pListBox->GetEntry(i)->GetUserData());
pListBox->Clear();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 0bab1a9..5e13382 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -243,7 +243,7 @@ void SvxPathTabPage::dispose()
{
if ( pPathBox )
{
- for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < pPathBox->GetEntryCount(); ++i )
delete static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData());
pPathBox.disposeAndClear();
}
@@ -263,7 +263,7 @@ VclPtr<SfxTabPage> SvxPathTabPage::Create( vcl::Window* pParent,
bool SvxPathTabPage::FillItemSet( SfxItemSet* )
{
- for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
+ for ( sal_uLong i = 0; i < pPathBox->GetEntryCount(); ++i )
{
PathUserData_Impl* pPathImpl = static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData());
sal_uInt16 nRealId = pPathImpl->nRealId;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index f6c5741..8c1c67a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -419,7 +419,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet* )
Reference< XContainerQuery > xQuery(pImpl->xFact, UNO_QUERY);
if(xQuery.is())
{
- for(sal_uInt16 n = 0; n < aDocTypeLB->GetEntryCount(); n++)
+ for(sal_Int32 n = 0; n < aDocTypeLB->GetEntryCount(); n++)
{
sal_IntPtr nData = reinterpret_cast<sal_IntPtr>(aDocTypeLB->GetEntryData(n));
OUString sCommand;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 6146c5db..a3d1b90 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1796,7 +1796,7 @@ bool isNodeActive( OptionsNode* pNode, Module* pModule )
// search node in active module
if ( pModule->m_bActive )
{
- for ( sal_uInt32 j = 0; j < pModule->m_aNodeList.size(); ++j )
+ for ( size_t j = 0; j < pModule->m_aNodeList.size(); ++j )
if ( pModule->m_aNodeList[j]->m_sId == pNode->m_sId )
return true;
}
@@ -1990,7 +1990,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
bool bAlreadyOpened = false;
if ( pNode->m_aGroupedLeaves.size() > 0 )
{
- for ( sal_uInt32 k = 0;
+ for ( size_t k = 0;
k < pNode->m_aGroupedLeaves.size(); ++k )
{
if ( pNode->m_aGroupedLeaves[k].size() > 0 &&
@@ -2106,7 +2106,7 @@ static void lcl_insertLeaf(
void OfaTreeOptionsDialog::InsertNodes( const VectorOfNodes& rNodeList )
{
- for ( sal_uInt32 i = 0; i < rNodeList.size(); ++i )
+ for ( size_t i = 0; i < rNodeList.size(); ++i )
{
OptionsNode* pNode = rNodeList[i];
@@ -2115,7 +2115,7 @@ void OfaTreeOptionsDialog::InsertNodes( const VectorOfNodes& rNodeList )
sal_uInt32 j = 0;
for ( ; j < pNode->m_aGroupedLeaves.size(); ++j )
{
- for ( sal_uInt32 k = 0; k < pNode->m_aGroupedLeaves[j].size(); ++k )
+ for ( size_t k = 0; k < pNode->m_aGroupedLeaves[j].size(); ++k )
{
OptionsLeaf* pLeaf = pNode->m_aGroupedLeaves[j][k];
lcl_insertLeaf( this, pNode, pLeaf, *pTreeLB );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a4da64e..ce474e3 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -982,14 +982,14 @@ bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet* )
std::vector<SvxAutocorrWord> aDeleteWords;
std::vector<SvxAutocorrWord> aNewWords;
- for (sal_uInt32 i = 0; i < rStringChangeList.aDeletedEntries.size(); i++)
+ for (size_t i = 0; i < rStringChangeList.aDeletedEntries.size(); i++)
{
DoubleString& deleteEntry = rStringChangeList.aDeletedEntries[i];
SvxAutocorrWord aDeleteWord( deleteEntry.sShort, deleteEntry.sLong );
aDeleteWords.push_back( aDeleteWord );
}
- for (sal_uInt32 i = 0; i < rStringChangeList.aNewEntries.size(); i++)
+ for (size_t i = 0; i < rStringChangeList.aNewEntries.size(); i++)
{
DoubleString& newEntry = rStringChangeList.aNewEntries[i];
@@ -1055,7 +1055,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset,
if( aDoubleStringTable.find(eLang) != aDoubleStringTable.end() )
{
DoubleStringArray& rArray = aDoubleStringTable[eNewLanguage];
- for( sal_uInt32 i = 0; i < rArray.size(); i++ )
+ for( size_t i = 0; i < rArray.size(); i++ )
{
DoubleString& rDouble = rArray[i];
bool bTextOnly = 0 == rDouble.pUserData;
@@ -1183,7 +1183,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
void OfaAutocorrReplacePage::NewEntry(const OUString& sShort, const OUString& sLong, bool bKeepSourceFormatting)
{
DoubleStringArray& rNewArray = aChangesTable[eLang].aNewEntries;
- for (sal_uInt32 i = 0; i < rNewArray.size(); i++)
+ for (size_t i = 0; i < rNewArray.size(); i++)
{
if (rNewArray[i].sShort == sShort)
{
@@ -1193,7 +1193,7 @@ void OfaAutocorrReplacePage::NewEntry(const OUString& sShort, const OUString& sL
}
DoubleStringArray& rDeletedArray = aChangesTable[eLang].aDeletedEntries;
- for (sal_uInt32 i = 0; i < rDeletedArray.size(); i++)
+ for (size_t i = 0; i < rDeletedArray.size(); i++)
{
if (rDeletedArray[i].sShort == sShort)
{
@@ -1213,7 +1213,7 @@ void OfaAutocorrReplacePage::NewEntry(const OUString& sShort, const OUString& sL
void OfaAutocorrReplacePage::DeleteEntry(const OUString& sShort, const OUString& sLong)
{
DoubleStringArray& rNewArray = aChangesTable[eLang].aNewEntries;
- for (sal_uInt32 i = 0; i < rNewArray.size(); i++)
+ for (size_t i = 0; i < rNewArray.size(); i++)
{
if (rNewArray[i].sShort == sShort)
{
@@ -1223,7 +1223,7 @@ void OfaAutocorrReplacePage::DeleteEntry(const OUString& sShort, const OUString&
}
DoubleStringArray& rDeletedArray = aChangesTable[eLang].aDeletedEntries;
- for (sal_uInt32 i = 0; i < rDeletedArray.size(); i++)
+ for (size_t i = 0; i < rDeletedArray.size(); i++)
{
if (rDeletedArray[i].sShort == sShort)
{
@@ -1324,7 +1324,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
bool bFound = false;
bool bTmpSelEntry=false;
- for(sal_uInt32 i = 0; i < m_pReplaceTLB->GetEntryCount(); i++)
+ for(sal_uLong i = 0; i < m_pReplaceTLB->GetEntryCount(); i++)
{
SvTreeListEntry* pEntry = m_pReplaceTLB->GetEntry( i );
OUString aTestStr = SvTabListBox::GetEntryText(pEntry, 0);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 4d721af..57efff5 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2670,7 +2670,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectan
if (aBlackColor == aBackColor)
aBlackColor.Invert();
- for (sal_uInt8 nLevel = 0; nLevel < pActNum->GetLevelCount(); ++nLevel, nYStart = nYStart + nYStep)
+ for (sal_uInt16 nLevel = 0; nLevel < pActNum->GetLevelCount(); ++nLevel, nYStart = nYStart + nYStep)
{
const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel);
aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart();
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 8bbc094..4ba23fa 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -884,7 +884,7 @@ void SbaXDataBrowserController::removeModelListeners(const Reference< XControlMo
if (xColumns.is())
{
sal_Int32 nCount = xColumns->getCount();
- for (sal_uInt16 i=0; i < nCount; ++i)
+ for (sal_Int32 i=0; i < nCount; ++i)
{
Reference< XPropertySet > xCol(xColumns->getByIndex(i),UNO_QUERY);
RemoveColumnListener(xCol);
@@ -2642,7 +2642,7 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::
if (xColumns.is())
{
sal_Int32 nCount = xColumns->getCount();
- for (sal_uInt16 i=0; i < nCount; ++i)
+ for (sal_Int32 i=0; i < nCount; ++i)
{
Reference< XPropertySet > xCol(xColumns->getByIndex(i),UNO_QUERY);
AddColumnListener(xCol);
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 803237f..9630d44 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -218,7 +218,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
Reference< XRowSet > xMasterForm;
// search the arguments for the master form
- for (sal_uInt16 i=0; i<aArgs.getLength(); ++i, ++pArguments)
+ for (sal_Int32 i=0; i<aArgs.getLength(); ++i, ++pArguments)
{
if ( (pArguments->Name == "MasterForm") && (pArguments->Value.getValueTypeClass() == TypeClass_INTERFACE) )
{
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 5b2fbb5..a8da578 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -1338,7 +1338,7 @@ Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL SbaXFormAdapter::getP
// set them all to DEFAULT
Sequence< ::com::sun::star::beans::PropertyState> aReturn(aPropertyName.getLength());
::com::sun::star::beans::PropertyState* pStates = aReturn.getArray();
- for (sal_uInt16 i=0; i<aPropertyName.getLength(); ++i, ++pStates)
+ for (sal_Int32 i=0; i<aPropertyName.getLength(); ++i, ++pStates)
*pStates = ::com::sun::star::beans::PropertyState_DEFAULT_VALUE;
return aReturn;
}
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index c2509dc..e7fbbd4 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -430,7 +430,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa
SolarMutexGuard aGuard;
sal_Int16 nColId = -1;
const PropertyValue* pArgs = aArgs.getConstArray();
- for (sal_uInt16 i=0; i<aArgs.getLength(); ++i, ++pArgs)
+ for (sal_Int32 i=0; i<aArgs.getLength(); ++i, ++pArgs)
{
if (pArgs->Name == "ColumnViewPos")
{
diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx
index 815f674..4f8bbe0 100644
--- a/dbaccess/source/ui/browser/sbamultiplex.cxx
+++ b/dbaccess/source/ui/browser/sbamultiplex.cxx
@@ -86,7 +86,7 @@ void SbaXPropertiesChangeMultiplexer::propertiesChange(const ::com::sun::star::u
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent> aMulti(aEvts);
::com::sun::star::beans::PropertyChangeEvent* pMulti = aMulti.getArray();
- for (sal_uInt16 i=0; i<aMulti.getLength(); ++i, ++pMulti)
+ for (sal_Int32 i=0; i<aMulti.getLength(); ++i, ++pMulti)
pMulti->Source = &m_rParent;
::cppu::OInterfaceIteratorHelper aIt(*this);
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 67d464a..a2490f3 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -833,7 +833,7 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
::std::vector< OUString> aInsertList;
aInsertList.resize(aDestColumnNames.getLength()+1);
sal_Int32 i = 0;
- for(sal_uInt32 j=0; j < aInsertList.size() ;++i,++j)
+ for(size_t j=0; j < aInsertList.size() ;++i,++j)
{
ODatabaseExport::TPositions::const_iterator aFind = ::std::find_if(_rvColumns.begin(),_rvColumns.end(),
::o3tl::compose1(::std::bind2nd(::std::equal_to<sal_Int32>(),i+1),::o3tl::select2nd<ODatabaseExport::TPositions::value_type>()));
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 71df15d..ca24bc2 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -884,7 +884,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent,
{
const sal_uInt32* pDeletedKeys = pInfoItem->GetDelArray();
- for (sal_uInt16 i=0; i< pInfoItem->GetDelCount(); ++i, ++pDeletedKeys)
+ for (sal_uInt32 i=0; i< pInfoItem->GetDelCount(); ++i, ++pDeletedKeys)
_pFormatter->DeleteEntry(*pDeletedKeys);
}
}
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index d9ca01b..bfe001a 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -167,7 +167,7 @@ bool OWizColumnSelect::LeavePage()
m_pParent->clearDestColumns();
- for(sal_uInt16 i=0 ; i< m_pNewColumnNames->GetEntryCount();++i)
+ for(sal_Int32 i=0 ; i< m_pNewColumnNames->GetEntryCount();++i)
{
OFieldDescription* pField = static_cast<OFieldDescription*>(m_pNewColumnNames->GetEntryData(i));
OSL_ENSURE(pField,"The field information can not be null!");
@@ -226,7 +226,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton )
if(!bAll)
{
- for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i)
+ for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase);
for(sal_uInt16 j=pLeft->GetSelectEntryCount(); j ; --j)
@@ -272,7 +272,7 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox )
::std::vector< OUString> aRightColumns;
fillColumns(pRight,aRightColumns);
- for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i)
+ for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase);
for(sal_uInt16 j=pLeft->GetSelectEntryCount(); j ; --j)
pLeft->RemoveEntry(pLeft->GetSelectEntry(j-1));
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8cdb101..153579f 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2303,7 +2303,7 @@ namespace
OQueryController& rController = static_cast<OQueryController&>(_pView->getController());
EOrderDir eOrderDir;
- for( sal_uInt32 i=0 ; i<pNode->count() ; i++ )
+ for( size_t i=0 ; i<pNode->count() ; i++ )
{
OTableFieldDescRef aDragLeft = new OTableFieldDesc();
eOrderDir = ORDER_ASC;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index c474a19..098ba2d 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2047,7 +2047,7 @@ void OSelectionBrowseBox::SetRowVisible(sal_uInt16 _nWhich, bool _bVis)
long OSelectionBrowseBox::GetBrowseRow(long nRowId) const
{
sal_uInt16 nCount(0);
- for(sal_uInt16 i = 0 ; i < nRowId ; ++i)
+ for(long i = 0 ; i < nRowId ; ++i)
{
if ( m_bVisibleRow[i] )
++nCount;
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index fddfb42..f0b29ec 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -709,7 +709,7 @@ bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequ
aArgs[1].Name = "SynchronMode";
aArgs[1].Value <<= sal_True;
- for ( sal_uInt32 n = 0; n < aDispatches.size(); n++ )
+ for ( size_t n = 0; n < aDispatches.size(); n++ )
{
Reference< XDispatch > xDispatch = aDispatches[n].xDispatch;
Reference < XNotifyingDispatch > xDisp( xDispatch, UNO_QUERY );
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 74f6174..ef8517c 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -253,7 +253,7 @@ bool MigrationImpl::doMigration()
const OUString sMenubarResourceURL("private:resource/menubar/menubar");
const OUString sToolbarResourcePre("private:resource/toolbar/");
- for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
+ for (size_t i=0; i<vModulesInfo.size(); ++i)
{
OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
if (sModuleIdentifier.isEmpty())
@@ -1322,7 +1322,7 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules
uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = ui::theModuleUIConfigurationManagerSupplier::get( ::comphelper::getProcessComponentContext() );
- for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i)
+ for (size_t i=0; i<vModulesInfo.size(); ++i)
{
OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName);
if (!sModuleIdentifier.isEmpty())
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index ef82a5b..eb1b005 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -258,7 +258,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
if ( !aExtIdentifier.isEmpty() )
{
// scan extension identifier and try to match with our black list entries
- for ( sal_uInt32 i = 0; i < m_aBlackList.size(); i++ )
+ for ( size_t i = 0; i < m_aBlackList.size(); i++ )
{
utl::SearchParam param(m_aBlackList[i], utl::SearchParam::SRCH_REGEXP);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
@@ -283,7 +283,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
// Try to use the folder name to match our black list
// as some extensions don't provide an identifier in the
// description.xml!
- for ( sal_uInt32 i = 0; i < m_aBlackList.size(); i++ )
+ for ( size_t i = 0; i < m_aBlackList.size(); i++ )
{
utl::SearchParam param(m_aBlackList[i], utl::SearchParam::SRCH_REGEXP);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 86157c8..649ff8a 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -159,7 +159,7 @@ BibConfig::BibConfig()
Sequence<OUString> aAssignmentPropertyNames(aAssignmentNodeNames.getLength() * 2);
OUString* pAssignmentPropertyNames = aAssignmentPropertyNames.getArray();
sal_Int16 nFieldIdx = 0;
- for(sal_Int16 nField = 0; nField < aAssignmentNodeNames.getLength(); nField++)
+ for(sal_Int32 nField = 0; nField < aAssignmentNodeNames.getLength(); nField++)
{
OUString sSubPrefix(sPrefix);
sSubPrefix += "/";
@@ -294,7 +294,7 @@ void BibConfig::ImplCommit()
const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
{
- for(sal_uInt16 i = 0; i < pMappingsArr->size(); i++)
+ for(size_t i = 0; i < pMappingsArr->size(); i++)
{
Mapping& rMapping = (*pMappingsArr)[i];
bool bURLEqual = rDesc.sDataSource.equals(rMapping.sURL);
@@ -306,7 +306,7 @@ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapping)
{
- for(sal_uInt16 i = 0; i < pMappingsArr->size(); i++)
+ for(size_t i = 0; i < pMappingsArr->size(); i++)
{
Mapping& rMapping = (*pMappingsArr)[i];
bool bURLEqual = rDesc.sDataSource.equals(rMapping.sURL);
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 8f5871c..a1fc5b8 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -354,7 +354,7 @@ MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMa
aListBoxes[0]->SetSelectHdl(aLnk);
for(sal_uInt16 i = 1; i < COLUMN_COUNT; i++)
{
- for(sal_uInt16 j = 0; j < aListBoxes[0]->GetEntryCount();j++)
+ for(sal_Int32 j = 0; j < aListBoxes[0]->GetEntryCount();j++)
aListBoxes[i]->InsertEntry(aListBoxes[0]->GetEntry(j));
aListBoxes[i]->SelectEntryPos(0);
aListBoxes[i]->SetSelectHdl(aLnk);
@@ -581,7 +581,7 @@ void BibInterceptorHelper::ReleaseInterceptor()
Sequence< Reference< XDispatch> > aReturn( aDescripts.getLength() );
Reference< XDispatch >* pReturn = aReturn.getArray();
const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
- for ( sal_Int16 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts )
+ for ( sal_Int32 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts )
{
*pReturn = queryDispatch( pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags );
}
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index d2f252c..ddedd34 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -518,7 +518,7 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, MenuHdl, ToolBox*, void)
void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent)
throw( uno::RuntimeException )
{
- for(sal_uInt16 i = 0; i < aListenerArr.size(); i++)
+ for(size_t i = 0; i < aListenerArr.size(); i++)
{
BibToolBarListenerRef* pListener = &aListenerArr[i];
(*pListener)->statusChanged(rEvent);
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 822839a..48a27d8 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -137,7 +137,7 @@ namespace dbp
OSL_VERIFY( rContext.xForm->getPropertyValue("CommandType") >>= nCommandType );
// search the entry of the given type with the given name
- for ( sal_uInt16 nLookup = 0; nLookup < m_pTable->GetEntryCount(); ++nLookup )
+ for ( sal_Int32 nLookup = 0; nLookup < m_pTable->GetEntryCount(); ++nLookup )
{
if (sCommand.equals(m_pTable->GetEntry(nLookup)))
{
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index eb8b8e1..e6bc4d9 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -251,7 +251,7 @@ namespace dbp
rSettings.aValues.clear();
rSettings.aLabels.reserve(m_pExistingRadios->GetEntryCount());
rSettings.aValues.reserve(m_pExistingRadios->GetEntryCount());
- for (::svt::WizardTypes::WizardState i=0; i<m_pExistingRadios->GetEntryCount(); ++i)
+ for (sal_Int32 i=0; i<m_pExistingRadios->GetEntryCount(); ++i)
{
rSettings.aLabels.push_back(m_pExistingRadios->GetEntry(i));
rSettings.aValues.push_back(OUString::number((i + 1)));
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 84d4571..c78cb0f 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -90,7 +90,7 @@ const Sequence< OUString >& PluginManager::getAdditionalSearchPaths()
{
sal_Int32 nPaths = comphelper::string::getTokenCount(aPluginPath, ';');
aPaths.realloc( nPaths );
- for( sal_uInt16 i = 0; i < nPaths; i++ )
+ for( sal_Int32 i = 0; i < nPaths; i++ )
aPaths.getArray()[i] = aPluginPath.getToken(i, ';');
}
}
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 2bd9564..d22cec4 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -474,7 +474,7 @@ namespace pcr
m_aVScroll->SetPosSizePixel( aVScrollPos, aVScrollSize );
}
- for ( sal_uInt16 i = 0; i < m_aLines.size(); ++i )
+ for ( size_t i = 0; i < m_aLines.size(); ++i )
m_aOutOfDateLines.insert( i );
// repaint
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 53a9bd4..7a8a026 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2744,7 +2744,7 @@ namespace pcr
{
const sal_uInt32* pDeletedKeys = pInfoItem->GetDelArray();
- for (sal_uInt16 i=0; i< pInfoItem->GetDelCount(); ++i, ++pDeletedKeys)
+ for (sal_uInt32 i=0; i< pInfoItem->GetDelCount(); ++i, ++pDeletedKeys)
pFormatter->DeleteEntry(*pDeletedKeys);
}
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 9cf73d7..ed4d1df 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -683,7 +683,7 @@ namespace pcr
if ( pColorList.is() )
{
- for (sal_uInt16 i = 0; i < pColorList->Count(); ++i)
+ for (long i = 0; i < pColorList->Count(); ++i)
{
XColorEntry* pEntry = pColorList->GetColor( i );
getTypedControlWindow()->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 6fa2dc7..496542f 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -525,7 +525,7 @@ void GridWindow::drawNew(vcl::RenderContext& rRenderContext)
void GridWindow::drawHandles(vcl::RenderContext& rRenderContext)
{
- for(sal_uInt32 i(0L); i < m_aHandles.size(); i++)
+ for(size_t i(0L); i < m_aHandles.size(); i++)
{
m_aHandles[i].draw(rRenderContext, m_aMarkerBitmap);
}
@@ -678,7 +678,7 @@ void GridWindow::ChangeMode(int nType)
if (m_pNewYValues)
{
- for(sal_uInt32 i(0L); i < m_aHandles.size(); i++)
+ for(size_t i(0); i < m_aHandles.size(); i++)
{
// find nearest xvalue
double x, y;
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 0aee63f..57e80bb 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -426,7 +426,7 @@ void SaneDlg::InitFields()
// workaround: offer at least some more standard dpi resolution between
// min and max value
int bGot300 = 0;
- for ( int nRes = (long) pDouble[0] * 2; nRes < (long) pDouble[1]; nRes = nRes * 2 )
+ for ( long nRes = (long) pDouble[0] * 2; nRes < (long) pDouble[1]; nRes = nRes * 2 )
{
if ( !bGot300 && nRes > 300 ) {
nRes = 300; bGot300 = 1;
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index a45b356..2f67295 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -464,7 +464,7 @@ bool HelpCompiler::compile()
std::string title;
// returns a clone of the document with switch-cases resolved
std::string appl = module.substr(1);
- for (unsigned int i = 0; i < appl.length(); ++i)
+ for (size_t i = 0; i < appl.length(); ++i)
{
appl[i]=toupper(appl[i]);
}
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 2c93144..6d64b2f 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -74,7 +74,7 @@ sal_Int32 SAL_CALL
CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException, std::exception)
{
const Sequence< Implementation > &imp = mxLocaleData->getCollatorImplementations(rLocale);
- for (sal_Int16 i = 0; i < imp.getLength(); i++)
+ for (sal_Int32 i = 0; i < imp.getLength(); i++)
if (imp[i].isDefault)
return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions);
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 7fccfb4..69f5aeb 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -271,7 +271,7 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (
sal_Int16 j=0;
sal_Unicode start = unicode::getUnicodeScriptStart((UnicodeScript)0);
sal_Unicode end = unicode::getUnicodeScriptEnd((UnicodeScript)0);
- for (sal_Int16 i= (scriptList[0] == (UnicodeScript)0) ? 1 : 0; i< scriptList.getLength(); i++) {
+ for (sal_Int32 i= (scriptList[0] == (UnicodeScript)0) ? 1 : 0; i< scriptList.getLength(); i++) {
if (unicode::getUnicodeScriptStart(scriptList[i]) != end+1) {
tables[j++].init(start, end, keys, key_count, this);
start = unicode::getUnicodeScriptStart(scriptList[i]);
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 08cc318..9ecf275 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -626,7 +626,7 @@ void DomainMapperTableManager::endOfRowAction()
// a grid of "20:40:20" and it doesn't have to do something with the tableWidth
// -> so we have get the sum of each grid entry for the fullWidthRelative:
int nFullWidthRelative = 0;
- for (unsigned int i = 0 ; i < (*pTableGrid.get()).size(); i++ )
+ for (size_t i = 0 ; i < (*pTableGrid.get()).size(); i++ )
nFullWidthRelative += (*pTableGrid.get())[ i ];
if( pTableGrid->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) && m_nCell.back( ) > 0 )
@@ -664,7 +664,7 @@ void DomainMapperTableManager::endOfRowAction()
throw o3tl::divide_by_zero();
::std::vector< sal_Int32 >::const_iterator aSpansIter = pCurrentSpans->begin( );
- for( sal_uInt32 nBorder = 0; nBorder < nWidthsBound; ++nBorder )
+ for( size_t nBorder = 0; nBorder < nWidthsBound; ++nBorder )
{
double fGridWidth = 0.;
for ( sal_Int32 nGridCount = *aSpansIter; nGridCount > 0; --nGridCount )
@@ -707,7 +707,7 @@ void DomainMapperTableManager::endOfRowAction()
sal_uInt32 nPos = 0;
// Avoid divide by zero (if there's no grid, position using cell widths).
if( nFullWidthRelative == 0 )
- for (sal_uInt32 i = 0; i < pCellWidths->size(); ++i)
+ for (size_t i = 0; i < pCellWidths->size(); ++i)
nFullWidthRelative += (*pCellWidths.get())[i];
size_t nWidthsBound = pCellWidths->size() - 1;
@@ -716,7 +716,7 @@ void DomainMapperTableManager::endOfRowAction()
if (nFullWidthRelative == 0)
throw o3tl::divide_by_zero();
- for (sal_uInt32 i = 0; i < nWidthsBound; ++i)
+ for (size_t i = 0; i < nWidthsBound; ++i)
{
nSum += (*pCellWidths.get())[i];
pSeparators[nPos].Position = (nSum * 10000) / nFullWidthRelative; // Relative position
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 211d2a0..a732d02 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1239,7 +1239,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const OUString& sIndex)
{
StyleSheetEntryPtr pRet;
- for( sal_uInt32 nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
+ for( size_t nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
{
if( m_pImpl->m_aStyleSheetEntries[nPos]->sStyleIdentifierD == sIndex)
{
@@ -1254,7 +1254,7 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const OUString& s
const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const OUString& sIndex)
{
StyleSheetEntryPtr pRet;
- for( sal_uInt32 nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
+ for( size_t nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
{
if( m_pImpl->m_aStyleSheetEntries[nPos]->sStyleName == sIndex)
{
@@ -1269,7 +1269,7 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const OUStri
const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(const OUString& sIndex)
{
StyleSheetEntryPtr pRet;
- for( sal_uInt32 nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
+ for( size_t nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
{
if( m_pImpl->m_aStyleSheetEntries[nPos]->sConvertedStyleName == sIndex)
{
commit e0b2e6e3f767240016133dd2d55e0bfb9192ca39
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 28 16:18:34 2015 +0200
loplugin:loopvartoosmall
Change-Id: Icbe68b31d4ab04ca3cd9f572e3598413946a75c7
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 1d00867..fee62f9 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -156,7 +156,7 @@ AccessibleDialogWindow::~AccessibleDialogWindow()
void AccessibleDialogWindow::UpdateFocused()
{
- for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+ for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
{
Reference< XAccessible > xChild( m_aAccessibleChildren[i].rxAccessible );
if ( xChild.is() )
@@ -174,7 +174,7 @@ void AccessibleDialogWindow::UpdateSelected()
{
NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
- for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+ for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
{
Reference< XAccessible > xChild( m_aAccessibleChildren[i].rxAccessible );
if ( xChild.is() )
@@ -190,7 +190,7 @@ void AccessibleDialogWindow::UpdateSelected()
void AccessibleDialogWindow::UpdateBounds()
{
- for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+ for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
{
Reference< XAccessible > xChild( m_aAccessibleChildren[i].rxAccessible );
if ( xChild.is() )
@@ -436,7 +436,7 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
m_pDlgEdModel = NULL;
// dispose all children
- for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+ for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
{
Reference< XComponent > xComponent( m_aAccessibleChildren[i].rxAccessible, UNO_QUERY );
if ( xComponent.is() )
@@ -586,7 +586,7 @@ void AccessibleDialogWindow::disposing()
m_pDlgEdModel = NULL;
// dispose all children
- for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+ for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
{
Reference< XComponent > xComponent( m_aAccessibleChildren[i].rxAccessible, UNO_QUERY );
if ( xComponent.is() )
@@ -787,7 +787,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
OExternalLockGuard aGuard( this );
Reference< XAccessible > xChild;
- for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+ for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
{
Reference< XAccessible > xAcc = getAccessibleChild( i );
if ( xAcc.is() )
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 2c98fde..658b9b9 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -899,7 +899,7 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const std::vector< OUString >& a
// clear the listbox
pCodeCompleteWnd->ClearListBox();
// fill the listbox
- for(unsigned int l = 0; l < aEntryVect.size(); ++l)
+ for(size_t l = 0; l < aEntryVect.size(); ++l)
{
pCodeCompleteWnd->InsertEntry( aEntryVect[l] );
}
@@ -1013,7 +1013,7 @@ void EditorWindow::CreateEditEngine()
aSyntaxIdle.Stop();
bDoSyntaxHighlight = bWasDoSyntaxHighlight;
- for (sal_uInt16 nLine = 0; nLine < nLines; nLine++)
+ for (sal_Int32 nLine = 0; nLine < nLines; nLine++)
aSyntaxLineTable.insert(nLine);
ForceSyntaxTimeout();
@@ -2669,7 +2669,7 @@ void CodeCompleteListBox::InsertSelectedEntry()
void CodeCompleteListBox::SetMatchingEntries()
{
- for(sal_uInt16 i=0; i< GetEntryCount(); ++i)
+ for(sal_Int32 i=0; i< GetEntryCount(); ++i)
{
OUString sEntry = GetEntry(i);
if( sEntry.startsWithIgnoreAsciiCase( aFuncBuffer.toString() ) )
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 987c1aa..ce19f5c 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -72,7 +72,7 @@ void Organize( sal_Int16 tabId )
bool IsValidSbxName( const OUString& rName )
{
- for ( sal_uInt16 nChar = 0; nChar < rName.getLength(); nChar++ )
+ for ( sal_Int32 nChar = 0; nChar < rName.getLength(); nChar++ )
{
sal_Unicode c = rName[nChar];
bool bValid = (
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 12ad627..43813e2 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -381,7 +381,7 @@ IMPL_LINK(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter)
else
{
// Item::nStartPos, Item::nLength
- for (unsigned i = 1; i < vItems.size(); ++i)
+ for (size_t i = 1; i < vItems.size(); ++i)
{
if (vItems[i].pSplit.get() == pSplitter)
{
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 23e2597..9c34023 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -586,7 +586,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
{
OUString aEdtText( m_pMacroNameEdit->GetText() );
bool bFound = false;
- for ( sal_uInt16 n = 0; n < m_pMacroBox->GetEntryCount(); n++ )
+ for ( sal_uLong n = 0; n < m_pMacroBox->GetEntryCount(); n++ )
{
SvTreeListEntry* pEntry = m_pMacroBox->GetEntry( n );
DBG_ASSERT( pEntry, "Entry ?!" );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 70c4f58..822c065 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -872,7 +872,7 @@ void LibPage::InsertLib()
bool bRemove = false;
bool bReplace = pLibDlg->IsReplace();
bool bReference = pLibDlg->IsReference();
- for ( sal_uInt16 nLib = 0; nLib < pLibDlg->GetLibBox().GetEntryCount(); nLib++ )
+ for ( sal_uLong nLib = 0; nLib < pLibDlg->GetLibBox().GetEntryCount(); nLib++ )
{
if ( pLibDlg->GetLibBox().IsChecked( nLib ) )
{
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index e4647eb..66a49a2 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1444,7 +1444,7 @@ void DlgEdForm::UpdateTabIndices()
// create a map of tab indices and control names, sorted by tab index
IndexToNameMap aIndexToNameMap;
- for ( sal_Int16 i = 0; i < nCtrls; ++i )
+ for ( sal_Int32 i = 0; i < nCtrls; ++i )
{
// get name
OUString aName( pNames[i] );
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index cc25ea0..26a26cf 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -330,7 +330,7 @@ namespace vclcanvas
aTransform.invert();
// for the time being, always read as ARGB
- for( int y=0; y<aDestBmpSize.Height(); ++y )
+ for( long y=0; y<aDestBmpSize.Height(); ++y )
{
if( bModulateColors )
{
@@ -346,7 +346,7 @@ namespace vclcanvas
if( rBitmap.IsTransparent() )
{
// Handling alpha and mask just the same...
- for( int x=0; x<aDestBmpSize.Width(); ++x )
+ for( long x=0; x<aDestBmpSize.Width(); ++x )
{
::basegfx::B2DPoint aPoint(x,y);
aPoint *= aTransform;
@@ -392,7 +392,7 @@ namespace vclcanvas
}
else
{
- for( int x=0; x<aDestBmpSize.Width(); ++x )
+ for( long x=0; x<aDestBmpSize.Width(); ++x )
{
::basegfx::B2DPoint aPoint(x,y);
aPoint *= aTransform;
@@ -449,7 +449,7 @@ namespace vclcanvas
if( rBitmap.IsTransparent() )
{
// Handling alpha and mask just the same...
- for( int x=0; x<aDestBmpSize.Width(); ++x )
+ for( long x=0; x<aDestBmpSize.Width(); ++x )
{
::basegfx::B2DPoint aPoint(x,y);
aPoint *= aTransform;
@@ -471,7 +471,7 @@ namespace vclcanvas
}
else
{
- for( int x=0; x<aDestBmpSize.Width(); ++x )
+ for( long x=0; x<aDestBmpSize.Width(); ++x )
{
::basegfx::B2DPoint aPoint(x,y);
aPoint *= aTransform;
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 27479169..ac0f1fd 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -127,7 +127,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
::std::vector< OUString > aObjList;
if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
{
- for ( sal_uInt16 i = 0; i < aObjList.size(); ++i )
+ for ( size_t i = 0; i < aObjList.size(); ++i )
{
if ( aObjList[ i ].equalsIgnoreAsciiCase( m_aCustomShapeType ) )
{
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 1b7f67a..93164ba 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -568,7 +568,7 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float fRadius, int iSubDivY, int
{
m_RoundBarMesh.iElementSizes[k] = indices[k].size() - m_RoundBarMesh.iElementStartIndices[k];
m_RoundBarMesh.iElementStartIndices[k] = m_Indices.size() * sizeof(unsigned short);
- for (unsigned int IdxCnt = 0; IdxCnt < indices[k].size(); IdxCnt++)
+ for (size_t IdxCnt = 0; IdxCnt < indices[k].size(); IdxCnt++)
{
m_Indices.push_back(indices[k][IdxCnt]);
}
diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx
index cee6f02..a742af6 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -49,7 +49,7 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
{
if (ignoreLocation( stmt ))
return true;
- // ignore SAL for now
+ // ignore sal/ module for now
StringRef aFileName = getFilename(stmt->getLocStart());
if (aFileName.startswith(SRCDIR "/sal/")) {
return true;
@@ -76,8 +76,9 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
if (binOp->getOpcode() != BO_LT && binOp->getOpcode() != BO_LE)
return true;
const Expr* binOpRHS = binOp->getRHS();
- // ignore complex expressions for now
- if (isa<BinaryOperator>(binOpRHS))
+ // ignore complex expressions for now, promotion rules on conditions like "i < (size()+1)"
+ // make it hard to guess at a correct type.
+ if (isa<BinaryOperator>(binOpRHS) || isa<ParenExpr>(binOpRHS))
return true;
if (isa<ImplicitCastExpr>(binOpRHS)) {
const ImplicitCastExpr* castExpr = dyn_cast<ImplicitCastExpr>(binOpRHS);
@@ -105,13 +106,13 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
"loop index type is smaller than length type. " + qt.getAsString() + " < " + qt2.getAsString(),
stmt->getInit()->getLocStart())
<< stmt->getInit()->getSourceRange();
-// stmt->getCond()->dump();
+ //stmt->getCond()->dump();
}
return true;
}
-loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", false);
+loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", true);
}
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3f05fe6..cc4202e 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1604,7 +1604,7 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
Reference<XPropertySet> xCol;
OUString aColName;
::comphelper::UStringMixEqual aCase(isCaseSensitive());
- for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
+ for (sal_Int32 i = 0; i < m_pColumns->getCount(); i++)
{
Reference<XPropertySet> xIndex = isUniqueByColumnName(i);
if (xIndex.is())
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 70f5dfb..ad2b150 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -83,7 +83,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
}
// Further descend in Parse Tree
- for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
+ for (size_t i = 0; i < pParseNode->count(); i++)
scanParameter(pParseNode->getChild(i),_rParaNodes);
}
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 3dedc86..ce34129 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1359,8 +1359,8 @@ bool OResultSet::OpenImpl()
// order of columns that are not specified in ORDER BY
// clause is undefined, so it doesn't hurt to sort on
// these; pad the vectors to include them.
- for (sal_Int32 i = 1; // 0: bookmark (see setBoundedColumns)
- static_cast<size_t>(i) < m_aColMapping.size(); ++i)
+ for (size_t i = 1; // 0: bookmark (see setBoundedColumns)
+ i < m_aColMapping.size(); ++i)
{
if (::std::find(m_aOrderbyColumnNumber.begin(),
m_aOrderbyColumnNumber.end(), i)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index f3b3e5d..7833200 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -341,7 +341,7 @@ void OStatement_Base::anylizeSQL()
OSQLParseNode * pOrderingSpecCommalist = pOrderbyClause->getChild(2);
OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Fehler im Parse Tree");
- for (sal_uInt32 m = 0; m < pOrderingSpecCommalist->count(); m++)
+ for (size_t m = 0; m < pOrderingSpecCommalist->count(); m++)
{
OSQLParseNode * pOrderingSpec = pOrderingSpecCommalist->getChild(m);
OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Fehler im Parse Tree");
@@ -548,7 +548,7 @@ void OStatement_Base::GetAssignValues()
OSL_ENSURE(pColumnCommalist->count() > 0,"OResultSet: Fehler im Parse Tree");
// All Columns in the column_commalist ...
- for (sal_uInt32 i = 0; i < pColumnCommalist->count(); i++)
+ for (size_t i = 0; i < pColumnCommalist->count(); i++)
{
OSQLParseNode * pCol = pColumnCommalist->getChild(i);
OSL_ENSURE(pCol != NULL,"OResultSet: Fehler im Parse Tree");
@@ -576,7 +576,7 @@ void OStatement_Base::GetAssignValues()
OSL_ENSURE(pInsertAtomCommalist->count() > 0,"OResultSet: pInsertAtomCommalist <= 0");
sal_Int32 nIndex=0;
- for (sal_uInt32 i = 0; i < pInsertAtomCommalist->count(); i++)
+ for (size_t i = 0; i < pInsertAtomCommalist->count(); i++)
{
OSQLParseNode * pRow_Value_Const = pInsertAtomCommalist->getChild(i); // row_value_constructor
OSL_ENSURE(pRow_Value_Const != NULL,"OResultSet: pRow_Value_Const darf nicht NULL sein!");
@@ -590,7 +590,7 @@ void OStatement_Base::GetAssignValues()
{
if(pRow_Value_Const->count() == aColumnNameList.size())
{
- for (sal_uInt32 j = 0; j < pRow_Value_Const->count(); ++j)
+ for (size_t j = 0; j < pRow_Value_Const->count(); ++j)
ParseAssignValues(aColumnNameList,pRow_Value_Const->getChild(j),nIndex++);
}
else
@@ -618,7 +618,7 @@ void OStatement_Base::GetAssignValues()
// work on all assignments (commalist) ...
::std::vector< OUString> aList(1);
- for (sal_uInt32 i = 0; i < pAssignmentCommalist->count(); i++)
+ for (size_t i = 0; i < pAssignmentCommalist->count(); i++)
{
OSQLParseNode * pAssignment = pAssignmentCommalist->getChild(i);
OSL_ENSURE(pAssignment != NULL,"OResultSet: pAssignment == NULL");
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 3c01fab..00e9f38 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -64,7 +64,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
OSQLParseNode* pSelection = pSQLParseNode->getChild(2);
if ( SQL_ISRULE(pSelection,scalar_exp_commalist) )
{
- for (sal_uInt32 i = 0; i < pSelection->count(); i++)
+ for (size_t i = 0; i < pSelection->count(); i++)
{
OSQLParseNode *pColumnRef = pSelection->getChild(i)->getChild(0);
if ( ( SQL_ISRULE(pColumnRef,set_fct_spec) && pColumnRef->count() == 4 )
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 682e5d9..69168cf 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -88,7 +88,7 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
OSQLParseNode* pSelection = pSQLParseNode->getChild(2);
if ( SQL_ISRULE(pSelection,scalar_exp_commalist) )
{
- for (sal_uInt32 i = 0; i < pSelection->count(); i++)
+ for (size_t i = 0; i < pSelection->count(); i++)
{
OSQLParseNode *pColumnRef = pSelection->getChild(i)->getChild(0);
if ( SQL_ISRULE(pColumnRef,general_set_fct) && pColumnRef->count() != 4 )
@@ -797,7 +797,7 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
{
m_aCodeList.push_back(new OStopOperand);
OSQLParseNode* pList = pPredicateNode->getChild(2);
- for (sal_uInt32 i=0; i < pList->count(); ++i)
+ for (size_t i=0; i < pList->count(); ++i)
execute(pList->getChild(i));
switch( nTokenId )
@@ -869,7 +869,7 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
if ( pPredicateNode->count() == 4 ) //char_substring_fct
{
OSQLParseNode* pList = pPredicateNode->getChild(2);
- for (sal_uInt32 i=0; i < pList->count(); ++i)
+ for (size_t i=0; i < pList->count(); ++i)
execute(pList->getChild(i));
}
else
@@ -886,7 +886,7 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
if ( pPredicateNode->count() == 4 ) //position_exp
{
OSQLParseNode* pList = pPredicateNode->getChild(2);
- for (sal_uInt32 i=0; i < pList->count(); ++i)
+ for (size_t i=0; i < pList->count(); ++i)
execute(pList->getChild(i));
}
else
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 0124eaf..ead3e77 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -500,7 +500,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
}
// Search on in Parse Tree
- for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
+ for (size_t i = 0; i < pParseNode->count(); i++)
scanParameter(pParseNode->getChild(i),_rParaNodes);
}
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index ff5351a..bea2b0f 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1543,7 +1543,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin
{
m_aColMapping = _aColumnMapping;
#if OSL_DEBUG_LEVEL > 0
- for ( sal_uInt32 i = 0; i < m_aColMapping.size(); i++ )
+ for ( size_t i = 0; i < m_aColMapping.size(); i++ )
SAL_INFO(
"connectivity.mork",
"Set Mapped: " << i << " -> " << m_aColMapping[i]);
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 7989c75..8645c38 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -476,7 +476,7 @@ void OCommonStatement::analyseSQL()
OSQLParseNode * pOrderingSpecCommalist = pOrderbyClause->getChild(2);
OSL_ENSURE(SQL_ISRULE(pOrderingSpecCommalist,ordering_spec_commalist),"OResultSet: Fehler im Parse Tree");
- for (sal_uInt32 m = 0; m < pOrderingSpecCommalist->count(); m++)
+ for (size_t m = 0; m < pOrderingSpecCommalist->count(); m++)
{
OSQLParseNode * pOrderingSpec = pOrderingSpecCommalist->getChild(m);
OSL_ENSURE(SQL_ISRULE(pOrderingSpec,ordering_spec),"OResultSet: Fehler im Parse Tree");
diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index b3853fc..f3b9135 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -112,7 +112,7 @@ int main(int argc, char **argv)
static bool hasOption(char const * szOption, int argc, char** argv)
{
bool retVal = false;
- for(sal_Int16 i= 1; i < argc; i++)
+ for(int i= 1; i < argc; i++)
{
if( ! strcmp(argv[i], szOption))
{
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 75faa09..d07b692 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -204,7 +204,7 @@ PptSlidePersistList::~PptSlidePersistList() {}
sal_uInt16 PptSlidePersistList::FindPage(sal_uInt32 nId) const
{
- for ( sal_uInt16 i=0; i < mvEntries.size(); i++ )
+ for ( size_t i=0; i < mvEntries.size(); i++ )
{
if (mvEntries[ i ].GetSlideId()==nId) return i;
}
@@ -1543,7 +1543,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
for ( nPageListNum = 0; nPageListNum < 3; nPageListNum++ )
{
PptSlidePersistList* pPageList = GetPageList( PptPageKind( nPageListNum ) );
- for ( sal_uInt16 nPageNum = 0; nPageNum < pPageList->size(); nPageNum++ )
+ for ( size_t nPageNum = 0; nPageNum < pPageList->size(); nPageNum++ )
{
PptSlidePersistEntry& rE2 = (*pPageList)[ nPageNum ];
sal_uLong nPersist = rE2.aPersistAtom.nPsrReference;
@@ -1618,7 +1618,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
else if ( pHeadersFootersHd->nRecInstance == 4 ) // notes master
ImportHeaderFooterContainer( *pHeadersFootersHd, aNotesMaster );
}
- for ( sal_uInt16 i = 0; i < pMasterPages->size(); i++ )
+ for ( size_t i = 0; i < pMasterPages->size(); i++ )
{
if ( (*pMasterPages)[ i ].bNotesMaster )
(*pMasterPages)[ i ].pHeaderFooterEntry = new HeaderFooterEntry( aNotesMaster );
diff --git a/helpcompiler/source/HelpSearch.cxx b/helpcompiler/source/HelpSearch.cxx
index c5d1e4e..6b0c420 100644
--- a/helpcompiler/source/HelpSearch.cxx
+++ b/helpcompiler/source/HelpSearch.cxx
@@ -39,7 +39,7 @@ bool HelpSearch::query(OUString const &queryStr, bool captionOnly,
pQuery = _CLNEW lucene::search::TermQuery(_CLNEW lucene::index::Term(field, &aQueryStr[0]));
lucene::search::Hits *hits = searcher.search(pQuery);
- for (unsigned i = 0; i < hits->length(); ++i) {
+ for (size_t i = 0; i < hits->length(); ++i) {
lucene::document::Document &doc = hits->doc(i); // Document* belongs to Hits.
wchar_t const *path = doc.get(L"path");
rDocuments.push_back(TCHARArrayToOUString(path != 0 ? path : L""));
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index bcaba30..09035d7 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -138,7 +138,7 @@ bool Standard2007Engine::calculateEncryptionKey(const OUString& rPassword)
// derive key
vector<sal_uInt8> buffer(64, 0x36);
- for( sal_uInt32 i = 0; i < hash.size(); ++i )
+ for( size_t i = 0; i < hash.size(); ++i )
buffer[i] ^= hash[i];
Digest::sha1(hash, buffer);
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 8edffb9..034a76a 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -339,12 +339,12 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
const sal_Int32 nHackyFontHeight=50;
const sal_Int32 nHackyFontWidth=20;
awt::Size aTotalSize;
- for( sal_uInt32 nPara=0; nPara<pTextBody->getParagraphs().size(); ++nPara )
+ for( size_t nPara=0; nPara<pTextBody->getParagraphs().size(); ++nPara )
{
aTotalSize.Height += nHackyFontHeight;
sal_Int32 nLocalWidth=0;
- for( sal_uInt32 nRun=0; nRun<pTextBody->getParagraphs().at(nPara)->getRuns().size(); ++nRun )
+ for( size_t nRun=0; nRun<pTextBody->getParagraphs().at(nPara)->getRuns().size(); ++nRun )
nLocalWidth +=
pTextBody->getParagraphs().at(nPara)->getRuns().at(nRun)->getText().getLength()
* nHackyFontWidth;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1f10a74..f4e2e41 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -915,7 +915,7 @@ Reference< XShape > Shape::createAndInsert(
{
Sequence< PropertyValue > aGradientStops( aFillProperties.maGradientProps.maGradientStops.size() );
::std::map< double, Color >::iterator aIt = aFillProperties.maGradientProps.maGradientStops.begin();
- for( sal_uInt32 i = 0; i < aFillProperties.maGradientProps.maGradientStops.size(); ++i )
+ for( size_t i = 0; i < aFillProperties.maGradientProps.maGradientStops.size(); ++i )
{ // for each stop in the gradient definition:
// save position
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 6342140..55b17d9 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -939,11 +939,11 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
}
aBezierCoords.Coordinates.realloc( aCoordLists.size() );
- for ( unsigned int i = 0; i < aCoordLists.size(); i++ )
+ for ( size_t i = 0; i < aCoordLists.size(); i++ )
aBezierCoords.Coordinates[i] = ContainerHelper::vectorToSequence( aCoordLists[i] );
aBezierCoords.Flags.realloc( aFlagLists.size() );
- for ( unsigned int i = 0; i < aFlagLists.size(); i++ )
+ for ( size_t i = 0; i < aFlagLists.size(); i++ )
aBezierCoords.Flags[i] = ContainerHelper::vectorToSequence( aFlagLists[i] );
if( !aCoordLists.front().empty() && !aCoordLists.back().empty()
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 4d6debd..dbd51ee 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1452,9 +1452,9 @@ namespace
{
const Size aBitmapSize(rBitmapEx.GetSizePixel());
- for(sal_Int32 y(0); y < rSize.Height(); y += aBitmapSize.Height())
+ for(long y(0); y < rSize.Height(); y += aBitmapSize.Height())
{
- for(sal_Int32 x(0); x < rSize.Width(); x += aBitmapSize.Width())
+ for(long x(0); x < rSize.Width(); x += aBitmapSize.Width())
{
pVirtualDevice->DrawBitmapEx(
Point(x, y),
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 6f8a356..ed61268 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -289,7 +289,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
break;
}
sText += OUString(cArrow);
- for (sal_uInt16 i = 0; i < sText.getLength(); i++)
+ for (sal_Int32 i = 0; i < sText.getLength(); i++)
{
OUString sDraw(sText.copy(i,1));
long nHDiff = 0;
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index b22e5f8..af49dcd 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -309,7 +309,7 @@ void SvxRubyDialog::dispose()
void SvxRubyDialog::ClearCharStyleList()
{
- for (sal_uInt16 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
+ for (sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
{
void* pData = m_pCharStyleLB->GetEntryData(i);
delete static_cast<OUString*>(pData);
@@ -528,7 +528,7 @@ void SvxRubyDialog::Update()
sCharStyleName = cRubies;
if (!sCharStyleName.isEmpty())
{
- for (sal_uInt16 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
+ for (sal_Int32 i = 0; i < m_pCharStyleLB->GetEntryCount(); i++)
{
const OUString* pCoreName = static_cast<const OUString*>(m_pCharStyleLB->GetEntryData(i));
if (pCoreName && sCharStyleName == *pCoreName)
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 33dbbb8..7b2b7e6 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -142,7 +142,7 @@ void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox
{
std::vector<OUString> aLst = pSrchItem->GetList();
- for ( sal_uInt16 i = 0; i < aLst.size(); ++i )
+ for ( size_t i = 0; i < aLst.size(); ++i )
{
rStrLst.push_back(aLst[i]);
rCBox.InsertEntry(aLst[i]);
@@ -159,7 +159,7 @@ void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst )
SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) :
SrchAttrItemList(rList)
{
- for ( sal_uInt16 i = 0; i < size(); ++i )
+ for ( size_t i = 0; i < size(); ++i )
if ( !IsInvalidItem( (*this)[i].pItem ) )
(*this)[i].pItem = (*this)[i].pItem->Clone();
}
@@ -213,7 +213,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
{
SfxItemPool* pPool = rSet.GetPool();
- for ( sal_uInt16 i = 0; i < size(); ++i )
+ for ( size_t i = 0; i < size(); ++i )
if ( IsInvalidItem( (*this)[i].pItem ) )
rSet.InvalidateItem( pPool->GetWhich( (*this)[i].nSlot ) );
else
@@ -225,7 +225,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
void SearchAttrItemList::Clear()
{
- for ( sal_uInt16 i = 0; i < size(); ++i )
+ for ( size_t i = 0; i < size(); ++i )
if ( !IsInvalidItem( (*this)[i].pItem ) )
delete (*this)[i].pItem;
SrchAttrItemList::clear();
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index e392e7a..8242a78 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -440,7 +440,7 @@ void SvxNumValueSet::SetNumberingSettings(
aLocale = rLocale;
if(aNum.getLength() > 8)
SetStyle( GetStyle()|WB_VSCROLL);
- for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ )
+ for ( sal_Int32 i = 0; i < aNum.getLength(); i++ )
{
InsertItem( i + 1, i );
if( i < 8 )
@@ -458,7 +458,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings(
aLocale = rLocale;
if(aOutlineSettings.getLength() > 8)
SetStyle( GetStyle() | WB_VSCROLL );
- for ( sal_uInt16 i = 0; i < aOutlineSettings.getLength(); i++ )
+ for ( sal_Int32 i = 0; i < aOutlineSettings.getLength(); i++ )
{
InsertItem( i + 1, i );
if( i < 8 )
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index cbca4a2..2565c95 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -291,7 +291,7 @@ SvxRuler::SvxRuler(
mpIndents.resize(5 + INDENT_GAP);
- for(sal_uInt32 nIn = 0; nIn < mpIndents.size(); nIn++)
+ for(size_t nIn = 0; nIn < mpIndents.size(); nIn++)
{
mpIndents[nIn].nPos = 0;
mpIndents[nIn].nStyle = RULER_STYLE_DONTKNOW;
@@ -3681,7 +3681,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
if(mxColumnItem->IsTable())
{
sal_uInt16 nVisCols = 0;
- for(sal_uInt16 i = GetActRightColumn(false, nCol); i < mpBorders.size();)
+ for(size_t i = GetActRightColumn(false, nCol); i < mpBorders.size();)
{
if((*mxColumnItem.get())[i].bVisible)
nVisCols++;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 413bae0..95f466d 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -724,7 +724,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe
// check for hidden cols
Reference< ::com::sun::star::beans::XPropertySet > xCurCol;
Any aHidden,aName;
- for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
+ for (sal_Int32 i=0; i<xCols->getCount(); ++i)
{
xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
DBG_ASSERT(xCurCol.is(), "FmGridHeader::PreExecuteColumnContextMenu : the Peer has invalid columns !");
@@ -879,7 +879,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
{
// just iterate through all the cols ...
Reference< ::com::sun::star::beans::XPropertySet > xCurCol;
- for (sal_uInt16 i=0; i<xCols->getCount(); ++i)
+ for (sal_Int32 i=0; i<xCols->getCount(); ++i)
{
xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(false));
@@ -1097,7 +1097,7 @@ void FmGridControl::SetDesignMode(bool bMode)
if (aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE)
xColumn.set(aSelection, css::uno::UNO_QUERY);
Reference< XInterface > xCurrent;
- for (sal_uInt16 i=0; i<xColumns->getCount(); ++i)
+ for (sal_Int32 i=0; i<xColumns->getCount(); ++i)
{
xCurrent.set(xColumns->getByIndex(i), css::uno::UNO_QUERY);
if (xCurrent == xColumn)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 5adf0c8..48bd74e 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2665,7 +2665,7 @@ Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots()
};
aSupported.realloc(sizeof(nSupported)/sizeof(nSupported[0]));
sal_uInt16* pSupported = aSupported.getArray();
- for (sal_uInt16 i=0; i<aSupported.getLength(); ++i, ++pSupported)
+ for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported)
*pSupported = nSupported[i];
}
return aSupported;
@@ -2716,7 +2716,7 @@ void FmXGridPeer::UpdateDispatches()
const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs();
const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
Reference< ::com::sun::star::frame::XDispatch > xNewDispatch;
- for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+ for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
{
xNewDispatch = queryDispatch(*pSupportedURLs, OUString(), 0);
if (xNewDispatch != m_pDispatchers[i])
@@ -2758,7 +2758,7 @@ void FmXGridPeer::ConnectToDispatcher()
sal_uInt16 nDispatchersGot = 0;
const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
- for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+ for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
{
m_pStateCache[i] = false;
m_pDispatchers[i] = queryDispatch(*pSupportedURLs, OUString(), 0);
@@ -2787,7 +2787,7 @@ void FmXGridPeer::DisConnectFromDispatcher()
const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs();
const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray();
- for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
+ for (sal_Int32 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
{
if (m_pDispatchers[i].is())
m_pDispatchers[i]->removeStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs);
@@ -2810,7 +2810,7 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot)
// search the given slot with our supported sequence
Sequence<sal_uInt16>& aSupported = getSupportedGridSlots();
const sal_uInt16* pSlots = aSupported.getConstArray();
- for (sal_uInt16 i=0; i<aSupported.getLength(); ++i)
+ for (sal_Int32 i=0; i<aSupported.getLength(); ++i)
{
if (pSlots[i] == nSlot)
{
@@ -2839,7 +2839,7 @@ IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot)
DBG_ASSERT(aSlots.getLength() == aUrls.getLength(), "FmXGridPeer::OnExecuteGridSlot : inconstent data returned by getSupportedURLs/getSupportedGridSlots !");
sal_uInt16 nSlot = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(pSlot);
- for (sal_uInt16 i=0; i<aSlots.getLength(); ++i, ++pUrls, ++pSlots)
+ for (sal_Int32 i=0; i<aSlots.getLength(); ++i, ++pUrls, ++pSlots)
{
if (*pSlots == nSlot)
{
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 3ea3c54..4e7cb83 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4100,7 +4100,7 @@ void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItem
if (m_pBox)
{
sal_uInt16 nP = nPos;
- for ( sal_uInt16 n = 0; n < aItems.getLength(); n++ )
+ for ( sal_Int32 n = 0; n < aItems.getLength(); n++ )
{
m_pBox->InsertEntry( aItems.getConstArray()[n], nP );
if ( nPos != -1 ) // Nicht wenn 0xFFFF, weil LIST_APPEND
@@ -4430,7 +4430,7 @@ void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal
if ( m_pComboBox )
{
sal_uInt16 nP = _Pos;
- for ( sal_uInt16 n = 0; n < _Items.getLength(); n++ )
+ for ( sal_Int32 n = 0; n < _Items.getLength(); n++ )
{
m_pComboBox->InsertEntry( _Items.getConstArray()[n], nP );
if ( _Pos != -1 )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0c11947..574e935 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1341,7 +1341,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
Reference< XIndexContainer> xControlModels(m_xActiveForm, UNO_QUERY);
if (xControlModels.is())
{
- for (sal_Int16 i=0; i<xControlModels->getCount(); ++i)
+ for (sal_Int32 i=0; i<xControlModels->getCount(); ++i)
{
Reference< XPropertySet> xModelSet;
xControlModels->getByIndex(i) >>= xModelSet;
@@ -2422,7 +2422,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
DBG_ASSERT(xModelColumns->getCount() >= xPeerContainer->getCount(), "FmXFormShell::OnSearchContextRequest : impossible : have more view than model columns !");
Reference< XInterface> xCurrentColumn;
- for (sal_Int16 nViewPos=0; nViewPos<xPeerContainer->getCount(); ++nViewPos)
+ for (sal_Int32 nViewPos=0; nViewPos<xPeerContainer->getCount(); ++nViewPos)
{
xPeerContainer->getByIndex(nViewPos) >>= xCurrentColumn;
if (!xCurrentColumn.is())
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index a3ed1a3..9d4db96 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -791,7 +791,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
{
clearControlTexts();
Reference< XInterface > xCurrent;
- for (sal_uInt32 i=0; i<arrFields.size(); ++i)
+ for (size_t i=0; i<arrFields.size(); ++i)
{
xCurrent = arrFields.at(i);
DBG_ASSERT(xCurrent.is(), "FmSearchEngine::fillControlTexts : invalid field interface !");
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 2fae8db..8e11b18 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -100,7 +100,7 @@ namespace svxform
Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength());
Reference< XDispatch>* pReturn = aReturn.getArray();
const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
- for (sal_Int16 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
+ for (sal_Int32 i=0; i<aDescripts.getLength(); ++i, ++pReturn, ++pDescripts)
{
*pReturn = queryDispatch(pDescripts->FeatureURL, pDescripts->FrameName, pDescripts->SearchFlags);
}
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index ceb5dfb..e4d86fe 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1566,7 +1566,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat( const OUString& rFmtString
{
nStart=nCount;
}
- for(sal_uInt16 j=nStart;j<aCurCurrencyList.size();j++)
+ for(size_t j=nStart;j<aCurCurrencyList.size();j++)
{
if(aCurCurrencyList[j]==nPos) return j;
}
@@ -1649,7 +1649,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC
{
nStart=nCount;
}
- for(sal_uInt16 j=nStart;j<aCurCurrencyList.size();j++)
+ for(size_t j=nStart;j<aCurCurrencyList.size();j++)
{
if(aCurCurrencyList[j]==nPos) return j;
}
@@ -1677,7 +1677,7 @@ bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos,
pFormatter->GetCurrencyFormatStrings( aWSStringsDtor,
*pTmpCurrencyEntry, bTmpBanking );
- for(sal_uInt16 i=0;i<aWSStringsDtor.size();i++)
+ for(size_t i=0;i<aWSStringsDtor.size();i++)
{
if (aWSStringsDtor[i] == rFmtString)
{
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 5a855d5..fe37831 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -101,7 +101,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
{
pDelFormatArr = new sal_uInt32[ rItem.nDelCount ];
- for ( sal_uInt16 i = 0; i < rItem.nDelCount; ++i )
+ for ( sal_uInt32 i = 0; i < rItem.nDelCount; ++i )
pDelFormatArr[i] = rItem.pDelFormatArr[i];
}
}
@@ -202,7 +202,7 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData,
if ( pData != NULL )
{
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ for ( sal_uInt32 i = 0; i < nCount; ++i )
pDelFormatArr[i] = pData[i];
}
}
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 71e917c..97b887f 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -71,7 +71,7 @@ void SvxSmartTagsControl::FillMenu()
const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange();
const Reference<frame::XController>& xController = mpSmartTagItem->GetController();
- for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
+ for ( sal_Int32 j = 0; j < rActionComponentsSequence.getLength(); ++j )
{
Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j];
@@ -109,7 +109,7 @@ void SvxSmartTagsControl::FillMenu()
pSbMenu->InsertSeparator(OString(), nSubMenuPos++);
// Add subitem for every action reference for the current smart tag type:
- for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
+ for ( sal_Int32 i = 0; i < rActionComponents.getLength(); ++i )
{
xAction = rActionComponents[i];
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 7c7e2c4..d70386a 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -557,7 +557,7 @@ void GraphyicBulletsTypeMgr::Init()
{
std::vector<OUString> aGrfNames;
GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
- for(sal_uInt16 i = 0; i < aGrfNames.size(); i++)
+ for(size_t i = 0; i < aGrfNames.size(); i++)
{
OUString sGrfNm = aGrfNames[i];
INetURLObject aObj(sGrfNm);
@@ -599,7 +599,7 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI
if ( pGrf )
{
Graphic aGraphic;
- for (sal_uInt16 i=0; i < aGrfDataLst.size(); ++i)
+ for (size_t i=0; i < aGrfDataLst.size(); ++i)
{
GrfBulDataRelation* pEntry = aGrfDataLst[i];
bool bExist = false;
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index df96a6b..f4ba704 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -91,7 +91,7 @@ void SmartTagMgr::RecognizeString( const OUString& rText,
const lang::Locale& rLocale,
sal_uInt32 nStart, sal_uInt32 nLen ) const
{
- for ( sal_uInt32 i = 0; i < maRecognizerList.size(); i++ )
+ for ( size_t i = 0; i < maRecognizerList.size(); i++ )
{
Reference < smarttags::XSmartTagRecognizer > xRecognizer = maRecognizerList[i];
@@ -121,7 +121,7 @@ void SmartTagMgr::RecognizeTextRange(const Reference< text::XTextRange>& xRange,
const Reference< text::XTextMarkup >& xMarkup,
const Reference< frame::XController >& xController) const
{
- for ( sal_uInt32 i = 0; i < maRecognizerList.size(); i++ )
+ for ( size_t i = 0; i < maRecognizerList.size(); i++ )
{
Reference < smarttags::XSmartTagRecognizer > xRecognizer = maRecognizerList[i];
@@ -159,7 +159,7 @@ void SmartTagMgr::GetActionSequences( Sequence < OUString >& rSmartTagTypes,
rActionComponentsSequence.realloc( rSmartTagTypes.getLength() );
rActionIndicesSequence.realloc( rSmartTagTypes.getLength() );
- for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j )
+ for ( sal_Int32 j = 0; j < rSmartTagTypes.getLength(); ++j )
{
const OUString& rSmartTagType = rSmartTagTypes[j];
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 0bb522c..81f2b23 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -218,7 +218,7 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat
// get all snapping points:
std::set< sal_uInt16 > aTmpSnappingPoints;
- for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
+ for ( sal_Int32 j = 0; j < rSnappingPoints.getLength(); ++j )
{
const sal_Int32 nSnappingPoint = rSnappingPoints[j];
aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index e84014b..f589d3f 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -617,7 +617,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
if(aDelta.X() || aDelta.Y())
{
- for(sal_uInt32 a(0); a < mpSdrPathDragData->maHandles.size(); a++)
+ for(size_t a(0); a < mpSdrPathDragData->maHandles.size(); a++)
{
SdrHdl* pHandle = mpSdrPathDragData->maHandles[a];
const sal_uInt16 nPolyIndex((sal_uInt16)pHandle->GetPolyNum());
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index a96a714..5a7ca17 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -219,7 +219,7 @@ namespace
drawinglayer::primitive2d::TextLayouterDevice aTextLayouter;
double fRetval(0.0);
- for(sal_uInt32 a(0L); a < rTextPortions.size(); a++)
+ for(size_t a(0); a < rTextPortions.size(); a++)
{
const impPathTextPortion* pCandidate = rTextPortions[a];
@@ -595,7 +595,7 @@ namespace
{
std::vector< drawinglayer::primitive2d::BasePrimitive2D* > aNewPrimitives;
- for(sal_uInt32 a(0L); a < rSource.size(); a++)
+ for(size_t a(0); a < rSource.size(); a++)
{
const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pTextCandidate = dynamic_cast< const drawinglayer::primitive2d::TextSimplePortionPrimitive2D* >(rSource[a]);
@@ -722,7 +722,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
// filter text portions for this paragraph
::std::vector< const impPathTextPortion* > aParagraphTextPortions;
- for(sal_uInt32 b(0L); b < rPathTextPortions.size(); b++)
+ for(size_t b(0); b < rPathTextPortions.size(); b++)
{
const impPathTextPortion& rCandidate = rPathTextPortions[b];
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 9f4bd1c..b915c09 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -745,7 +745,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
// New mechanism to re-create the connections of cloned connectors
CloneList aCloneList;
- for( sal_uInt32 i(0); i < aSdrObjects.size(); i++ )
+ for( size_t i(0); i < aSdrObjects.size(); i++ )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list