cui/source/options/optcolor.cxx | 10 +++----
cui/source/options/optgenrl.cxx | 30 +++++++++++------------
cui/source/options/treeopt.cxx | 52 +++++++++++++++++++---------------------
cui/source/tabpages/tpline.cxx | 4 +--
4 files changed, 47 insertions(+), 49 deletions(-)
New commits:
commit 8455409cf81ba540558c2eb22a29fd12bea8bcff
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 7 19:45:59 2017 +0100
loplugin:loopvartoosmall
Change-Id: Ica7a45456a979af62206f4fff0209f326e613aed
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index d6f72af..ec9a663 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -653,8 +653,8 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll,
HeaderBar *pHeaderHB)
void ColorConfigWindow_Impl::SetLinks (
Link<Button*,void> const& aCheckLink, Link<SvxColorListBox&,void> const&
aColorLink, Link<Control&,void> const& aGetFocusLink
) {
- for (unsigned i = 0; i != vEntries.size(); ++i)
- vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
+ for (auto const & i: vEntries)
+ i->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
}
// Update()
@@ -672,7 +672,7 @@ void ColorConfigWindow_Impl::Update (
}
// updating extended entries
- unsigned i = ColorConfigEntryCount;
+ decltype(vEntries)::size_type i = ColorConfigEntryCount;
unsigned const nExtCount = pExtConfig->GetComponentCount();
for (unsigned j = 0; j != nExtCount; ++j)
{
@@ -784,8 +784,8 @@ void ColorConfigWindow_Impl::DataChanged (DataChangedEvent
const& rDCEvt)
StyleSettings const& rStyleSettings = GetSettings().GetStyleSettings();
bool const bHighContrast = rStyleSettings.GetHighContrastMode();
Wallpaper const aBackWall(Color(bHighContrast ? COL_TRANSPARENT :
COL_LIGHTGRAY));
- for (unsigned i = 0; i != vChapters.size(); ++i)
- vChapters[i]->SetBackground(aBackWall);
+ for (auto const & i: vChapters)
+ i->SetBackground(aBackWall);
SetBackground(Wallpaper(rStyleSettings.GetWindowColor()));
}
}
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 385f580..d7cffba 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -277,8 +277,8 @@ VclPtr<SfxTabPage> SvxGeneralTabPage::Create( vcl::Window*
pParent, const SfxIte
bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
{
// remove leading and trailing whitespaces
- for (unsigned i = 0; i != vFields.size(); ++i)
-
vFields[i]->pEdit->SetText(comphelper::string::strip(vFields[i]->pEdit->GetText(),
' '));
+ for (auto const & i: vFields)
+ i->pEdit->SetText(comphelper::string::strip(i->pEdit->GetText(), ' '));
bool bModified = false;
bModified |= GetData_Impl();
@@ -302,9 +302,9 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
EditPosition nField = static_cast<EditPosition>(static_cast<const
SfxUInt16Item&>(rSet->Get(nWhich)).GetValue());
if (nField != EditPosition::UNKNOWN)
{
- for (unsigned i = 0; i != vFields.size(); ++i)
- if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId)
- vFields[i]->pEdit->GrabFocus();
+ for (auto const & i: vFields)
+ if (nField == vFieldInfo[i->iField].nGrabFocusId)
+ i->pEdit->GrabFocus();
}
else
vFields.front()->pEdit->GrabFocus();
@@ -340,14 +340,14 @@ bool SvxGeneralTabPage::GetData_Impl()
{
// updating
SvtUserOptions aUserOpt;
- for (unsigned i = 0; i != vFields.size(); ++i)
+ for (auto const & i: vFields)
{
aUserOpt.SetToken(
- vFieldInfo[vFields[i]->iField].nUserOptionsId,
- vFields[i]->pEdit->GetText()
+ vFieldInfo[i->iField].nUserOptionsId,
+ i->pEdit->GetText()
);
// Blank out first name and father's name which aren't kept separately
any longer
- if (vFieldInfo[vFields[i]->iField].nUserOptionsId ==
UserOptToken::LastName)
+ if (vFieldInfo[i->iField].nUserOptionsId == UserOptToken::LastName)
{
aUserOpt.SetToken(UserOptToken::FirstName, "");
aUserOpt.SetToken(UserOptToken::FathersName, "");
@@ -355,8 +355,8 @@ bool SvxGeneralTabPage::GetData_Impl()
}
// modified?
- for (unsigned i = 0; i != vFields.size(); ++i)
- if (vFields[i]->pEdit->IsValueChangedFromSaved())
+ for (auto const & i: vFields)
+ if (i->pEdit->IsValueChangedFromSaved())
return true;
return false;
}
@@ -366,9 +366,9 @@ void SvxGeneralTabPage::SetData_Impl()
{
// updating and disabling edit boxes
SvtUserOptions aUserOpt;
- for (unsigned iRow = 0; iRow != vRows.size(); ++iRow)
+ for (auto const & i: vRows)
{
- Row& rRow = *vRows[iRow];
+ Row& rRow = *i;
// the label is enabled if any of its edit fields are enabled
bool bEnableLabel = false;
for (unsigned iField = rRow.nFirstField; iField != rRow.nLastField;
++iField)
@@ -419,8 +419,8 @@ void SvxGeneralTabPage::SetData_Impl()
}
// saving
- for (unsigned i = 0; i != vFields.size(); ++i)
- vFields[i]->pEdit->SaveValue();
+ for (auto const & i: vFields)
+ i->pEdit->SaveValue();
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index aa61dea..1831df9 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1453,7 +1453,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
sal_uInt16 nGroup = 0;
SvtOptionsDialogOptions aOptionsDlgOpt;
- sal_uInt16 i, nPageId;
+ sal_uInt16 nPageId;
// %PRODUCTNAME options
if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) )
@@ -1463,7 +1463,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
nGroup = AddGroup( rGeneralArray.GetString(0), nullptr, nullptr,
SID_GENERAL_OPTIONS );
sal_uInt16 nEnd = static_cast< sal_uInt16 >( rGeneralArray.Count() );
- for ( i = 1; i < nEnd; ++i )
+ for ( sal_uInt16 i = 1; i < nEnd; ++i )
{
OUString sNewTitle = rGeneralArray.GetString(i);
nPageId = (sal_uInt16)rGeneralArray.GetValue(i);
@@ -1503,7 +1503,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
ResStringArray& rFilterArray = aDlgResource.GetFilterArray();
setGroupName( "LoadSave", rFilterArray.GetString(0) );
nGroup = AddGroup( rFilterArray.GetString(0), nullptr, nullptr,
SID_FILTER_DLG );
- for ( i = 1; i < rFilterArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < rFilterArray.Count(); ++i )
{
nPageId = (sal_uInt16)rFilterArray.GetValue(i);
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1518,7 +1518,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
ResStringArray& rLangArray = aDlgResource.GetLangArray();
setGroupName( "LanguageSettings", rLangArray.GetString(0) );
nGroup = AddGroup( rLangArray.GetString(0), nullptr, nullptr,
SID_LANGUAGE_OPTIONS );
- for ( i = 1; i < rLangArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < rLangArray.Count(); ++i )
{
nPageId = (sal_uInt16)rLangArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1552,7 +1552,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
else
setGroupName( "Writer", rTextArray.GetString(0) );
nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod,
SID_SW_EDITOPTIONS );
- for ( i = 1; i < rTextArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < rTextArray.Count(); ++i )
{
nPageId = (sal_uInt16)rTextArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1572,7 +1572,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
{
ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray();
nGroup = AddGroup(rHTMLArray.GetString(0), pSwMod, pSwMod,
SID_SW_ONLINEOPTIONS );
- for( i = 1; i < rHTMLArray.Count(); ++i )
+ for( sal_uInt32 i = 1; i < rHTMLArray.Count(); ++i )
{
nPageId = (sal_uInt16)rHTMLArray.GetValue(i);
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1597,7 +1597,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
setGroupName( "Calc", rCalcArray.GetString(0) );
nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod,
SID_SC_EDITOPTIONS );
const sal_uInt16 nCount = static_cast< const sal_uInt16 >(
rCalcArray.Count() );
- for ( i = 1; i < nCount; ++i )
+ for ( sal_uInt16 i = 1; i < nCount; ++i )
{
nPageId = (sal_uInt16)rCalcArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1621,7 +1621,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
setGroupName( "Impress", rImpressArray.GetString(0) );
nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod,
pSdMod, SID_SD_EDITOPTIONS );
const sal_uInt16 nCount = static_cast< const sal_uInt16 >(
rImpressArray.Count() );
- for ( i = 1; i < nCount; ++i )
+ for ( sal_uInt16 i = 1; i < nCount; ++i )
{
nPageId = (sal_uInt16)rImpressArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1644,7 +1644,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
setGroupName( "Draw", rDrawArray.GetString(0) );
nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod,
SID_SD_GRAPHIC_OPTIONS );
const sal_uInt16 nCount = static_cast< const sal_uInt16 >(
rDrawArray.Count() );
- for ( i = 1; i < nCount; ++i )
+ for ( sal_uInt16 i = 1; i < nCount; ++i )
{
nPageId = (sal_uInt16)rDrawArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1667,7 +1667,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
SfxModule* pSmMod =
SfxApplication::GetModule(SfxToolsModule::Math);
setGroupName( "Math", rStarMathArray.GetString(0) );
nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod,
SID_SM_EDITOPTIONS );
- for ( i = 1; i < rStarMathArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < rStarMathArray.Count(); ++i )
{
nPageId = (sal_uInt16)rStarMathArray.GetValue(i);
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1687,7 +1687,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray();
setGroupName( "Base", rDSArray.GetString(0) );
nGroup = AddGroup( rDSArray.GetString(0), nullptr, nullptr,
SID_SB_STARBASEOPTIONS );
- for ( i = 1; i < rDSArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < rDSArray.Count(); ++i )
{
nPageId = (sal_uInt16)rDSArray.GetValue(i);
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1701,7 +1701,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
ResStringArray& rChartArray = aDlgResource.GetChartArray();
setGroupName( "Charts", rChartArray.GetString(0) );
nGroup = AddGroup( rChartArray.GetString(0), nullptr, nullptr,
SID_SCH_EDITOPTIONS );
- for ( i = 1; i < rChartArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < rChartArray.Count(); ++i )
{
nPageId = (sal_uInt16)rChartArray.GetValue(i);
if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1716,7 +1716,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference<
XFrame >& _xFrame )
setGroupName( "Internet", rInetArray.GetString(0) );
nGroup = AddGroup(rInetArray.GetString(0), nullptr, nullptr,
SID_INET_DLG );
- for ( i = 1; i < rInetArray.Count(); ++i )
+ for ( sal_uInt32 i = 1; i < rInetArray.Count(); ++i )
{
nPageId = (sal_uInt16)rInetArray.GetValue(i);
if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
@@ -1851,7 +1851,7 @@ Module* OfaTreeOptionsDialog::LoadModule(
else
{
// search position of the node
- sal_uInt32 y = 0;
+ std::vector<OrderedEntry *>::size_type y = 0;
for ( ; y < pModule->m_aNodeList.size(); ++y )
{
sal_Int32 nNodeIdx =
pModule->m_aNodeList[y]->m_nIndex;
@@ -1953,7 +1953,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
if ( rGroup.size() > 0 &&
rGroup[0]->m_sGroupId ==
sLeafGrpId )
{
- sal_uInt32 l = 0;
+ std::vector<OptionsLeaf
*>::size_type l = 0;
for ( ; l < rGroup.size(); ++l )
{
if ( rGroup[l]->m_nGroupIndex
>= nLeafGrpIdx )
@@ -1991,11 +1991,10 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
if ( pModule && aNodeList.size() > 0 )
{
- sal_uInt32 i = 0, j = 0;
- for ( ; i < pModule->m_aNodeList.size(); ++i )
+ for ( auto const & i: pModule->m_aNodeList )
{
- OUString sNodeId = pModule->m_aNodeList[i]->m_sId;
- for ( j = 0; j < aNodeList.size(); ++j )
+ OUString sNodeId = i->m_sId;
+ for ( VectorOfNodes::size_type j = 0; j < aNodeList.size(); ++j )
{
OptionsNode* pNode = aNodeList[j];
if ( pNode->m_sId == sNodeId )
@@ -2007,8 +2006,8 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
}
}
- for ( i = 0; i < aNodeList.size(); ++i )
- aOutNodeList.push_back( aNodeList[i] );
+ for ( auto const & i: aNodeList )
+ aOutNodeList.push_back( i );
}
return aOutNodeList;
}
@@ -2063,19 +2062,18 @@ void OfaTreeOptionsDialog::InsertNodes( const
VectorOfNodes& rNodeList )
{
if ( pNode->m_aLeaves.size() > 0 || pNode->m_aGroupedLeaves.size() > 0
)
{
- sal_uInt32 j = 0;
- for ( ; j < pNode->m_aGroupedLeaves.size(); ++j )
+ for ( auto const & j: pNode->m_aGroupedLeaves )
{
- for ( size_t k = 0; k < pNode->m_aGroupedLeaves[j].size(); ++k
)
+ for ( size_t k = 0; k < j.size(); ++k )
{
- OptionsLeaf* pLeaf = pNode->m_aGroupedLeaves[j][k];
+ OptionsLeaf* pLeaf = j[k];
lcl_insertLeaf( this, pNode, pLeaf, *pTreeLB );
}
}
- for ( j = 0; j < pNode->m_aLeaves.size(); ++j )
+ for ( auto const & j: pNode->m_aLeaves )
{
- OptionsLeaf* pLeaf = pNode->m_aLeaves[j];
+ OptionsLeaf* pLeaf = j;
lcl_insertLeaf( this, pNode, pLeaf, *pTreeLB );
}
}
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 4cb5798..03cd65e 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1262,7 +1262,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
bool bSelected(false);
const basegfx::B2DPolyPolygon& rItemPolygon = static_cast<const
XLineStartItem&>(rAttrs->Get(XATTR_LINESTART)).GetLineStartValue();
- for(sal_Int32 a(0);!bSelected && a < m_pLineEndList->Count(); a++)
+ for(long a(0);!bSelected && a < m_pLineEndList->Count(); a++)
{
const XLineEndEntry* pEntry = m_pLineEndList->GetLineEnd(a);
const basegfx::B2DPolyPolygon& rEntryPolygon =
pEntry->GetLineEnd();
@@ -1294,7 +1294,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
bool bSelected(false);
const basegfx::B2DPolyPolygon& rItemPolygon = static_cast<const
XLineEndItem&>(rAttrs->Get(XATTR_LINEEND)).GetLineEndValue();
- for(sal_Int32 a(0);!bSelected && a < m_pLineEndList->Count(); a++)
+ for(long a(0);!bSelected && a < m_pLineEndList->Count(); a++)
{
const XLineEndEntry* pEntry = m_pLineEndList->GetLineEnd(a);
const basegfx::B2DPolyPolygon& rEntryPolygon =
pEntry->GetLineEnd();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
