icon-themes/breeze/links.txt | 3 +
icon-themes/galaxy/links.txt | 3 +
icon-themes/tango/links.txt | 6 +-
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 4 -
sc/source/core/opencl/op_statistical.cxx | 24
+++++-----
sc/source/filter/excel/excform.cxx | 2
sc/source/filter/excel/xetable.cxx | 2
sc/source/filter/excel/xihelper.cxx | 2
sc/source/filter/html/htmlpars.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 4 -
scaddins/source/analysis/analysishelper.cxx | 2
scaddins/source/datefunc/datefunc.cxx | 2
scaddins/source/pricing/pricing.cxx | 2
sd/source/core/EffectMigration.cxx | 2
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2
sd/source/ui/framework/configuration/Configuration.cxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/sidebar/MasterPagesSelector.cxx | 6 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 2
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 4 -
sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 4 -
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 4 -
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 4 -
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 4 -
sd/source/ui/tools/ConfigurationAccess.cxx | 2
sd/source/ui/unoidl/DrawController.cxx | 2
sd/source/ui/view/ViewTabBar.cxx | 4 -
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/frmview.cxx | 2
sd/source/ui/view/outlview.cxx | 2
sd/source/ui/view/sdview3.cxx | 2
sdext/source/minimizer/pppoptimizer.cxx | 2
sdext/source/minimizer/pppoptimizerdialog.cxx | 2
sdext/source/presenter/PresenterConfigurationAccess.cxx | 2
starmath/source/ElementsDockingWindow.cxx | 6 +-
starmath/source/dialog.cxx | 2
starmath/source/mathtype.cxx | 4 -
starmath/source/ooxmlexport.cxx | 2
starmath/source/parse.cxx | 2
starmath/source/rtfexport.cxx | 2
starmath/source/utility.cxx | 6 +-
svl/source/passwordcontainer/passwordcontainer.cxx | 4 -
sw/sdi/swriter.sdi | 2
sw/source/core/access/accselectionhelper.cxx | 4 -
sw/source/uibase/uiview/view0.cxx | 2
sw/uiconfig/sglobal/toolbar/toolbar.xml | 2
sw/uiconfig/sweb/toolbar/toolbar.xml | 2
sw/uiconfig/swform/toolbar/toolbar.xml | 2
sw/uiconfig/swreport/toolbar/toolbar.xml | 2
sw/uiconfig/swriter/menubar/menubar.xml | 2
sw/uiconfig/swriter/toolbar/toolbar.xml | 2
sw/uiconfig/swxform/toolbar/toolbar.xml | 2
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 4 -
ucb/source/ucp/ftp/ftpresultsetI.cxx | 4 -
ucb/source/ucp/ftp/ftpurl.cxx | 8 +--
ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 4 -
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 2
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 2
60 files changed, 101 insertions(+), 93 deletions(-)
New commits:
commit c7309a4822633423b0969757c494077fdc27b724
Author: Philippe Jung <phil.j...@free.fr>
Date: Mon Jun 1 01:11:37 2015 +0200
tdf#91783 - Reverse the toggle behaviour of .uno:Graphic Change
Rename:
- .uno:Graphic to .uno:ShowGraphics
- View->Hide Images to View->Images and Charts and invert toggle state
Change-Id: Ife4954e17f7e169b234f477d01409cae52c32efe
Reviewed-on: https://gerrit.libreoffice.org/16010
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 32d8aac..8a4be90 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -109,3 +109,6 @@ database/linked_text_table.png cmd/sc_dataimport.png
# text background colour Impress/Draw
cmd/sc_charbackcolor.png cmd/sc_backcolor.png
cmd/lc_charbackcolor.png cmd/lc_backcolor.png
+
+# Toggle graphics visibility in Writer
+cmd/sc_showgraphics.png cmd/sc_graphic.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 0a898a7..318946e 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -72,3 +72,6 @@ cmd/sc_showannotations.png cmd/sc_insertannotation.png
# text background colour Impress/Draw
cmd/sc_charbackcolor.png cmd/sc_backcolor.png
cmd/lc_charbackcolor.png cmd/lc_backcolor.png
+
+# Toggle graphics visibility in Writer
+cmd/sc_showgraphics.png cmd/sc_graphic.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e9590f4..c5d6914 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -208,8 +208,6 @@ cmd/lc_hyperlinkdialog.png cmd/lc_inserthyperlink.png
cmd/sc_hyperlinkdialog.png cmd/sc_inserthyperlink.png
cmd/lc_draw.png cmd/lc_reload.png
cmd/sc_draw.png cmd/sc_reload.png
-cmd/lc_graphic.png cmd/lc_insertgraphic.png
-cmd/sc_graphic.png cmd/sc_insertgraphic.png
cmd/lc_selectmode.png cmd/lc_selectobject.png
cmd/lc_drawselect.png cmd/lc_selectobject.png
cmd/sc_selectmode.png cmd/sc_selectobject.png
@@ -556,3 +554,7 @@ cmd/sc_showannotations.png cmd/sc_insertannotation.png
# text background colour Impress/Draw
cmd/sc_charbackcolor.png cmd/sc_backcolor.png
cmd/lc_charbackcolor.png cmd/lc_backcolor.png
+
+# Toggle graphics visibility in Writer
+cmd/sc_showgraphics.png cmd/sc_insertgraphic.png
+cmd/lc_showgraphics.png cmd/lc_insertgraphic.png
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7c6fbd2..501409e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2146,9 +2146,9 @@
<value xml:lang="en-US">~Line Numbering...</value>
</prop>
</node>
- <node oor:name=".uno:Graphic" oor:op="replace">
+ <node oor:name=".uno:ShowGraphics" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Hide ~Images</value>
+ <value xml:lang="en-US">~Images and Charts</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 76987c7..2368d9d 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3144,7 +3144,7 @@ SfxBoolItem GoUp FN_LINE_UP
GroupId = GID_NAVIGATOR;
]
-SfxBoolItem Graphic FN_VIEW_GRAPHIC
+SfxBoolItem ShowGraphics FN_VIEW_GRAPHIC
[
/* flags: */
diff --git a/sw/source/uibase/uiview/view0.cxx
b/sw/source/uibase/uiview/view0.cxx
index a77ae11..bd38b88 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -278,7 +278,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
case FN_VIEW_BOUNDS:
aBool.SetValue( SwViewOption::IsDocBoundaries()); break;
case FN_VIEW_GRAPHIC:
- aBool.SetValue( !pOpt->IsGraphic() ); break;
+ aBool.SetValue( pOpt->IsGraphic() ); break;
case FN_VIEW_FIELDS:
aBool.SetValue( SwViewOption::IsFieldShadings() ); break;
case FN_VIEW_FIELDNAME:
diff --git a/sw/uiconfig/sglobal/toolbar/toolbar.xml
b/sw/uiconfig/sglobal/toolbar/toolbar.xml
index e83bae6..d413866 100644
--- a/sw/uiconfig/sglobal/toolbar/toolbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
<toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
<toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog"
toolbar:helpid="20603"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
<toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/toolbar.xml
b/sw/uiconfig/sweb/toolbar/toolbar.xml
index 4cd15b8..44d62e9 100644
--- a/sw/uiconfig/sweb/toolbar/toolbar.xml
+++ b/sw/uiconfig/sweb/toolbar/toolbar.xml
@@ -23,6 +23,6 @@
<toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
<toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog"
toolbar:helpid="20603"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
<toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:helpid="10371"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/toolbar.xml
b/sw/uiconfig/swform/toolbar/toolbar.xml
index 76612ab..8e23f73 100644
--- a/sw/uiconfig/swform/toolbar/toolbar.xml
+++ b/sw/uiconfig/swform/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
<toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
<toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog"
toolbar:helpid="20603"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
<toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
</toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swreport/toolbar/toolbar.xml
b/sw/uiconfig/swreport/toolbar/toolbar.xml
index 76612ab..8e23f73 100644
--- a/sw/uiconfig/swreport/toolbar/toolbar.xml
+++ b/sw/uiconfig/swreport/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
<toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
<toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog"
toolbar:helpid="20603"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
<toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
</toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index 0a0cd00..8794c97 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -140,7 +140,7 @@
<menu:menuitem menu:id=".uno:ShowHiddenParagraphs"/>
<menu:menuitem menu:id=".uno:ControlCodes"/>
<menu:menuitem menu:id=".uno:ShowAnnotations"/>
- <menu:menuitem menu:id=".uno:Graphic"/>
+ <menu:menuitem menu:id=".uno:ShowGraphics"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuitem menu:id=".uno:Gallery"/>
diff --git a/sw/uiconfig/swriter/toolbar/toolbar.xml
b/sw/uiconfig/swriter/toolbar/toolbar.xml
index 76612ab..8e23f73 100644
--- a/sw/uiconfig/swriter/toolbar/toolbar.xml
+++ b/sw/uiconfig/swriter/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
<toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
<toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog"
toolbar:helpid="20603"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
<toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
</toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swxform/toolbar/toolbar.xml
b/sw/uiconfig/swxform/toolbar/toolbar.xml
index 76612ab..8e23f73 100644
--- a/sw/uiconfig/swxform/toolbar/toolbar.xml
+++ b/sw/uiconfig/swxform/toolbar/toolbar.xml
@@ -25,6 +25,6 @@
<toolbar:toolbaritem xlink:href=".uno:Hyphenate" toolbar:helpid="20605"/>
<toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog"
toolbar:helpid="20603"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Graphic" toolbar:helpid="20213"/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowGraphics" toolbar:helpid="20213"/>
<toolbar:toolbaritem xlink:href=".uno:BrowseView" toolbar:helpid="6313"/>
</toolbar:toolbar>
\ No newline at end of file
commit 1df41142451685d33b1821a839061c63f23e44fd
Author: Noel Grandin <n...@peralex.com>
Date: Fri May 29 13:34:26 2015 +0200
loplugin:loopvartoosmall
Change-Id: I809e408c994222cfa95ba8f56e4db7bd96be7080
diff --git a/sc/source/core/opencl/op_statistical.cxx
b/sc/source/core/opencl/op_statistical.cxx
index fcfb774..d9a16f7 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -7624,7 +7624,7 @@ void
OpHypGeomDist::GenSlidingWindowFunction(std::stringstream &ss,
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -7749,7 +7749,7 @@ void OpMinA::GenSlidingWindowFunction(
int isMixed = 0;
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -7899,7 +7899,7 @@ vSubArguments)
int isMixed = 0;
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -8039,7 +8039,7 @@ vSubArguments)
int isMixed = 0;
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -8190,7 +8190,7 @@ vSubArguments)
int isMixed = 0;
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -8342,7 +8342,7 @@ void OpVarA::GenSlidingWindowFunction(std::stringstream
&ss,
int isMixedSV = 0;
ss << "\ndouble " << sSymName;
ss << "_" << BinFuncName() << "(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -8712,7 +8712,7 @@ void OpVarPA::GenSlidingWindowFunction(std::stringstream
&ss,
int isMixedSV = 0;
ss << "\ndouble " << sSymName;
ss << "_" << BinFuncName() << "(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -9079,7 +9079,7 @@ void OpStDevA::GenSlidingWindowFunction(std::stringstream
&ss,
int isMixedSV = 0;
ss << "\ndouble " << sSymName;
ss << "_" << BinFuncName() << "(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -9447,7 +9447,7 @@ void
OpStDevPA::GenSlidingWindowFunction(std::stringstream &ss,
int isMixedSV = 0;
ss << "\ndouble " << sSymName;
ss << "_" << BinFuncName() << "(";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -9813,7 +9813,7 @@ void OpAveDev::
GenSlidingWindowFunction(std::stringstream &ss,
{
ss << "\ndouble " << sSymName;
ss << "_"<< BinFuncName() <<"( ";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
if (i)
ss << ",";
@@ -9826,7 +9826,7 @@ void OpAveDev::
GenSlidingWindowFunction(std::stringstream &ss,
ss << " double length;\n";
ss << " double totallength=0;\n";
ss << " double tmp = 0;\n";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
assert(pCur);
@@ -9876,7 +9876,7 @@ void OpAveDev::
GenSlidingWindowFunction(std::stringstream &ss,
}
ss << " double mean = sum * pow(totallength,-1);\n";
ss << " sum = 0.0;\n";
- for (unsigned i = 0; i < vSubArguments.size(); i++)
+ for (size_t i = 0; i < vSubArguments.size(); i++)
{
FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
assert(pCur);
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 0839955..f965021 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1946,7 +1946,7 @@ void ExcelToSc::ReadExtensions( const ExtensionTypeVec&
rExtensions,
{
unsigned int nArray = 0;
- for( unsigned int i = 0 ; i < rExtensions.size() ; i++ )
+ for( size_t i = 0 ; i < rExtensions.size() ; i++ )
{
ExtensionType eType = rExtensions[i];
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 230ece2..2ce7195 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1358,7 +1358,7 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos )
if( nNewLevel >= mnCurrLevel )
{
// new level(s) opened, or no level closed - update all level infos
- for( sal_uInt16 nScLevel = 0; nScLevel <= nNewOpenScLevel;
++nScLevel )
+ for( size_t nScLevel = 0; nScLevel <= nNewOpenScLevel; ++nScLevel )
{
/* In each level: check if a new group is started (there may
be
neighbored groups without gap - therefore check ALL
levels). */
diff --git a/sc/source/filter/excel/xihelper.cxx
b/sc/source/filter/excel/xihelper.cxx
index cdf1c17..1309d04 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -170,7 +170,7 @@ EditTextObject* lclCreateTextObject( const XclImpRoot&
rRoot,
aNextRun.mnChar = 0xFFFF;
sal_Int32 nLen = rString.GetText().getLength();
- for( sal_uInt16 nChar = 0; nChar < nLen; ++nChar )
+ for( sal_Int32 nChar = 0; nChar < nLen; ++nChar )
{
// reached new different formatted text portion
if( nChar >= aNextRun.mnChar )
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 57d0743..ce19c0b 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1412,7 +1412,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
if ( pActEntry->maImageList.size() > 0 )
{
long nWidth = 0;
- for ( sal_uInt32 i=0; i < pActEntry->maImageList.size(); ++i )
+ for ( size_t i=0; i < pActEntry->maImageList.size(); ++i )
{
ScHTMLImage* pI = &pActEntry->maImageList[ i ];
if ( pI->nDir & nHorizontal )
diff --git a/sc/source/filter/rtf/eeimpars.cxx
b/sc/source/filter/rtf/eeimpars.cxx
index c72336d..080a134 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -477,7 +477,7 @@ bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB
/*nTab*/, ScEEParseE
long nWidth, nHeight;
nWidth = nHeight = 0;
sal_Char nDir = nHorizontal;
- for ( sal_uInt32 i = 0; i < pE->maImageList.size() ; ++i )
+ for ( size_t i = 0; i < pE->maImageList.size() ; ++i )
{
ScHTMLImage* pI = &pE->maImageList[ i ];
if ( pI->pGraphic )
@@ -553,7 +553,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow,
SCTAB nTab,
Point aSpace;
Size aLogicSize;
sal_Char nDir = nHorizontal;
- for ( sal_uInt32 i = 0; i < pE->maImageList.size(); ++i )
+ for ( size_t i = 0; i < pE->maImageList.size(); ++i )
{
ScHTMLImage* pI = &pE->maImageList[ i ];
if ( nDir & nHorizontal )
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index 5f19fba..f5cd27c 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2106,7 +2106,7 @@ void Complex::Csch() throw( uno::RuntimeException,
lang::IllegalArgumentExceptio
ComplexList::~ComplexList()
{
- for( sal_uInt32 i = 0; i < maVector.size(); ++i )
+ for( size_t i = 0; i < maVector.size(); ++i )
delete maVector[i];
}
diff --git a/scaddins/source/datefunc/datefunc.cxx
b/scaddins/source/datefunc/datefunc.cxx
index adfd32f..d6305b2 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -108,7 +108,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData,
ResMgr& rResMgr ) :
ScaResStringArrLoader aArrLoader( RID_DATE_DEFFUNCTION_NAMES, nCompListID,
rResMgr );
const ResStringArray& rArr = aArrLoader.GetStringArray();
- for( sal_uInt16 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
+ for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
aCompList.Append( rArr.GetString( nIndex ) );
}
diff --git a/scaddins/source/pricing/pricing.cxx
b/scaddins/source/pricing/pricing.cxx
index ee23ef4..3e74ac4 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -113,7 +113,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData,
ResMgr& rResMgr ) :
ScaResStringArrLoader aArrLoader( RID_PRICING_DEFFUNCTION_NAMES,
nCompListID, rResMgr );
const ResStringArray& rArr = aArrLoader.GetStringArray();
- for( sal_uInt16 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
+ for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
aCompList.Append( rArr.GetString( nIndex ) );
}
diff --git a/sd/source/core/EffectMigration.cxx
b/sd/source/core/EffectMigration.cxx
index 855cb9f..cc5c20c 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1406,7 +1406,7 @@ void EffectMigration::CreateAnimatedGroup(SdrObjGroup&
rGroupObj, SdPage& rPage)
const double fDurationShow(0.2);
const double fDurationHide(0.001);
- for(sal_uInt32 a(0); a < aObjects.size(); a++)
+ for(size_t a(0); a < aObjects.size(); a++)
{
SdrObject* pLast = pNext;
pNext = aObjects[a];
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index a1f7fca..6c080b8 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -816,7 +816,7 @@ uno::Any SAL_CALL
AccessibleDocumentViewBase::getExtendedAttributes()
{
sValue += "note:";
const EditTextObject& rEdit = pPara->GetTextObject();
- for (sal_uInt16 i=0;i<rEdit.GetParagraphCount();i++)
+ for (sal_Int32 i=0;i<rEdit.GetParagraphCount();i++)
{
OUString strNote = rEdit.GetText(i);
strNote = strNote.replaceFirst( "\\", "\\\\" );
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx
b/sd/source/ui/framework/configuration/Configuration.cxx
index f64bcd5..82878ed 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -170,7 +170,7 @@ Sequence<Reference<XResourceId> > SAL_CALL
Configuration::getResources (
// Copy the resources from the vector into a new sequence.
Sequence<Reference<XResourceId> > aResult (aResources.size());
- for (sal_uInt32 nIndex=0; nIndex<aResources.size(); ++nIndex)
+ for (size_t nIndex=0; nIndex<aResources.size(); ++nIndex)
aResult[nIndex] = aResources[nIndex];
return aResult;
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index dd440ad..0d731a5 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -567,7 +567,7 @@ void LayoutMenu::Fill()
void LayoutMenu::Clear()
{
- for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++)
+ for (size_t nId=1; nId<=GetItemCount(); nId++)
delete static_cast<AutoLayout*>(GetItemData(nId));
ValueSet::Clear();
}
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 0ac4680..2dcf5c2 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -573,7 +573,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage*
pPage)
{
const ::osl::MutexGuard aGuard (maMutex);
- for (sal_uInt16 nIndex=1; nIndex<=PreviewValueSet::GetItemCount();
nIndex++)
+ for (size_t nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
{
UserData* pData = GetUserData(nIndex);
if (pData != NULL)
@@ -593,7 +593,7 @@ void MasterPagesSelector::UpdateAllPreviews()
{
const ::osl::MutexGuard aGuard (maMutex);
- for (sal_uInt16 nIndex=1; nIndex<=PreviewValueSet::GetItemCount();
nIndex++)
+ for (size_t nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
{
UserData* pData = GetUserData(nIndex);
if (pData != NULL)
@@ -613,7 +613,7 @@ void MasterPagesSelector::ClearPageSet()
{
const ::osl::MutexGuard aGuard (maMutex);
- for (sal_uInt16 nIndex=1; nIndex<=PreviewValueSet::GetItemCount();
nIndex++)
+ for (size_t nIndex=1; nIndex<=PreviewValueSet::GetItemCount(); nIndex++)
{
UserData* pData = GetUserData(nIndex);
if (pData != NULL)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index adce12b..dfc7a99 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2406,7 +2406,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow()
void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide )
{
- const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
+ const sal_uInt16 nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
if( nSlideCount )
{
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 7dfc356..6511aa0 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -360,7 +360,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex,
sal_Int32 nPageCount)
// after the nInsertIndex position.
PageSelector& rSelector (mrController.GetPageSelector());
rSelector.DeselectAllPages();
- for (sal_uInt16 i=0; i<nPageCount; i++)
+ for (sal_Int32 i=0; i<nPageCount; i++)
{
model::SharedPageDescriptor pDescriptor (
mrSlideSorter.GetModel().GetPageDescriptor(nFirstIndex + i));
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index c1428c8..1661844 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -469,7 +469,7 @@ void SlideSorterView::DeterminePageObjectVisibilities()
mbPreciousFlagUpdatePending |= true;
model::SharedPageDescriptor pDescriptor;
- for (int nIndex=aUnion.Min(); nIndex<=aUnion.Max(); nIndex++)
+ for (long nIndex=aUnion.Min(); nIndex<=aUnion.Max(); nIndex++)
{
pDescriptor = mrModel.GetPageDescriptor(nIndex);
if (pDescriptor.get() != NULL)
@@ -675,7 +675,7 @@ void SlideSorterView::Paint (
// Paint all page objects that are fully or partially inside the
// repaint region.
const Range aRange
(mpLayouter->GetRangeOfVisiblePageObjects(rRepaintArea));
- for (sal_Int32 nIndex=aRange.Min(); nIndex<=aRange.Max(); ++nIndex)
+ for (long nIndex=aRange.Min(); nIndex<=aRange.Max(); ++nIndex)
{
model::SharedPageDescriptor pDescriptor
(mrModel.GetPageDescriptor(nIndex));
if (!pDescriptor || !
pDescriptor->HasState(PageDescriptor::ST_Visible))
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
index dd0c03f..f89330e 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
@@ -218,8 +218,8 @@ void FramePainter::OffsetBitmap::PaintCenter (
const Rectangle& rBox) const
{
const Size aBitmapSize (maBitmap.GetSizePixel());
- for (sal_Int32 nY=rBox.Top(); nY<=rBox.Bottom(); nY+=aBitmapSize.Height())
- for (sal_Int32 nX=rBox.Left(); nX<=rBox.Right();
nX+=aBitmapSize.Width())
+ for (long nY=rBox.Top(); nY<=rBox.Bottom(); nY+=aBitmapSize.Height())
+ for (long nX=rBox.Left(); nX<=rBox.Right(); nX+=aBitmapSize.Width())
rDevice.DrawBitmapEx(
Point(nX,nY),
Size(
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index cb23745..d10615f 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -199,8 +199,8 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
const sal_Int32 nIconHeight
(aExclusionOverlay.GetSizePixel().Height());
if (nIconWidth>0 && nIconHeight>0)
{
- for (sal_Int32 nX=0; nX<rPreviewSize.Width(); nX+=nIconWidth)
- for (sal_Int32 nY=0; nY<rPreviewSize.Height();
nY+=nIconHeight)
+ for (long nX=0; nX<rPreviewSize.Width(); nX+=nIconWidth)
+ for (long nY=0; nY<rPreviewSize.Height(); nY+=nIconHeight)
rContent.DrawBitmapEx(Point(nX,nY)+aPageOffset,
aExclusionOverlay);
}
rContent.SetClipRegion(aSavedClipRegion);
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index d22f5cf..72cecd6 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -187,13 +187,13 @@ void LayeredDevice::Invalidate (
void LayeredDevice::InvalidateAllLayers (const Rectangle& rInvalidationArea)
{
- for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer)
+ for (size_t nLayer=0; nLayer<mpLayers->size(); ++nLayer)
(*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea);
}
void LayeredDevice::InvalidateAllLayers (const vcl::Region&
rInvalidationRegion)
{
- for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer)
+ for (size_t nLayer=0; nLayer<mpLayers->size(); ++nLayer)
(*mpLayers)[nLayer]->InvalidateRegion(rInvalidationRegion);
}
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 79eea55..91b7e8e 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -174,8 +174,8 @@ Bitmap PageObjectPainter::CreateMarkedPreview (
const sal_Int32 nIconHeight (rOverlay.GetSizePixel().Height());
if (nIconWidth>0 && nIconHeight>0)
{
- for (sal_Int32 nX=0; nX<rSize.Width(); nX+=nIconWidth)
- for (sal_Int32 nY=0; nY<rSize.Height(); nY+=nIconHeight)
+ for (long nX=0; nX<rSize.Width(); nX+=nIconWidth)
+ for (long nY=0; nY<rSize.Height(); nY+=nIconHeight)
pDevice->DrawBitmapEx(Point(nX,nY), rOverlay);
}
return pDevice->GetBitmap(Point(0,0), rSize);
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx
b/sd/source/ui/tools/ConfigurationAccess.cxx
index 565a152..29c237b 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -147,7 +147,7 @@ void ConfigurationAccess::ForAll (
{
// Get from the current item of the container the children
// that match the names in the rArguments list.
- for (sal_uInt32 nValueIndex=0; nValueIndex<aValues.size();
++nValueIndex)
+ for (size_t nValueIndex=0; nValueIndex<aValues.size();
++nValueIndex)
aValues[nValueIndex] =
xSetItem->getByName(rArguments[nValueIndex]);
}
rFunctor(rsKey, aValues);
diff --git a/sd/source/ui/unoidl/DrawController.cxx
b/sd/source/ui/unoidl/DrawController.cxx
index e12a15b..fed8f31 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -684,7 +684,7 @@ IPropertyArrayHelper & DrawController::getInfoHelper()
::std::vector<beans::Property> aProperties;
FillPropertyTable (aProperties);
Sequence<beans::Property> aPropertySequence (aProperties.size());
- for (unsigned int i=0; i<aProperties.size(); i++)
+ for (size_t i=0; i<aProperties.size(); i++)
aPropertySequence[i] = aProperties[i];
mpPropertyArrayHelper.reset(new
OPropertyArrayHelper(aPropertySequence, sal_False));
}
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index c32b92f..181fa15 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -483,7 +483,7 @@ bool ViewTabBar::HasTabBarButton (
{
bool bResult (false);
- for (sal_uInt32 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
+ for (size_t nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
{
if (IsEqual(maTabBarButtons[nIndex], rButton))
{
@@ -517,7 +517,7 @@ void ViewTabBar::UpdateActiveButton()
if (xView.is())
{
Reference<XResourceId> xViewId (xView->getResourceId());
- for (sal_uInt16 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
+ for (size_t nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
{
if (maTabBarButtons[nIndex].ResourceId->compareTo(xViewId) == 0)
{
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 030c676..1c34b17 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -466,7 +466,7 @@ void DrawViewShell::ReadUserDataSequence ( const
::com::sun::star::uno::Sequence
const sal_Int32 nLength = rSequence.getLength();
const com::sun::star::beans::PropertyValue *pValue =
rSequence.getConstArray();
- for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
+ for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ )
{
if ( pValue->Name == sUNO_View_ZoomOnPage )
{
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 329fa9c..fe12af2 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -566,7 +566,7 @@ void FrameView::ReadUserDataSequence ( const
::com::sun::star::uno::Sequence < :
sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator();
const com::sun::star::beans::PropertyValue *pValue =
rSequence.getConstArray();
- for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
+ for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ )
{
if ( pValue->Name == sUNO_View_ViewId )
{
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 277d262..455640e 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1086,7 +1086,7 @@ void OutlineView::FillOutliner()
mrOutliner.SetUpdateMode(false);
Paragraph* pTitleToSelect = NULL;
- sal_uLong nPageCount = mrDoc.GetSdPageCount(PK_STANDARD);
+ sal_uInt16 nPageCount = mrDoc.GetSdPageCount(PK_STANDARD);
// fill outliner with paragraphs from slides title & (outlines|subtitles)
for (sal_uInt16 nPage = 0; nPage < nPageCount; nPage++)
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index a02ec4e..f0dd922 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -105,7 +105,7 @@ struct ImpRememberOrigAndClone
SdrObject* ImpGetClone(std::vector<ImpRememberOrigAndClone*>&
aConnectorContainer, SdrObject* pConnObj)
{
- for(sal_uInt32 a(0); a < aConnectorContainer.size(); a++)
+ for(size_t a(0); a < aConnectorContainer.size(); a++)
{
if(pConnObj == aConnectorContainer[a]->pOrig)
return aConnectorContainer[a]->pClone;
diff --git a/sdext/source/minimizer/pppoptimizer.cxx
b/sdext/source/minimizer/pppoptimizer.cxx
index c2c5b6b..f6341f6 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -70,7 +70,7 @@ Sequence< Reference< com::sun::star::frame::XDispatch > >
SAL_CALL PPPOptimizer:
Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn(
aDescripts.getLength() );
Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray();
const com::sun::star::frame::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/sdext/source/minimizer/pppoptimizerdialog.cxx
b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 49064f18..67e5613 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -86,7 +86,7 @@ Sequence< Reference< com::sun::star::frame::XDispatch > >
SAL_CALL PPPOptimizerD
Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn(
aDescripts.getLength() );
Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray();
const com::sun::star::frame::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/sdext/source/presenter/PresenterConfigurationAccess.cxx
b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 16914a9..96e0da6 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -203,7 +203,7 @@ void PresenterConfigurationAccess::ForAll (
{
// Get from the current item of the container the children
// that match the names in the rArguments list.
- for (sal_uInt32 nValueIndex=0; nValueIndex<aValues.size();
++nValueIndex)
+ for (size_t nValueIndex=0; nValueIndex<aValues.size();
++nValueIndex)
{
if ( ! xSetItem->hasByName(rArguments[nValueIndex]))
bHasAllValues = false;
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 87680d2..a74de69 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -287,7 +287,7 @@ void SmElementsControl::Paint(vcl::RenderContext&
rRenderContext, const Rectangl
else
boxX = nControlWidth / perLine;
- for (sal_uInt16 i = 0; i < maElementList.size() ; i++)
+ for (size_t i = 0; i < maElementList.size() ; i++)
{
SmElement* element = maElementList[i].get();
if (element->isSeparator())
@@ -390,7 +390,7 @@ void SmElementsControl::MouseMove( const MouseEvent&
rMouseEvent )
OUString tooltip;
if (Rectangle(Point(0, 0),
GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel()))
{
- for (sal_uInt16 i = 0; i < maElementList.size() ; i++)
+ for (size_t i = 0; i < maElementList.size() ; i++)
{
SmElement* element = maElementList[i].get();
Rectangle rect(element->mBoxLocation, element->mBoxSize);
@@ -419,7 +419,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent&
rMouseEvent)
if (rMouseEvent.IsLeft() && Rectangle(Point(0, 0),
GetOutputSizePixel()).IsInside(rMouseEvent.GetPosPixel()))
{
- for (sal_uInt16 i = 0; i < maElementList.size() ; i++)
+ for (size_t i = 0; i < maElementList.size() ; i++)
{
SmElement* element = maElementList[i].get();
Rectangle rect(element->mBoxLocation, element->mBoxSize);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 5754b83..dad3302 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1148,7 +1148,7 @@ void SmShowSymbolSetWindow::Paint(vcl::RenderContext&
rRenderContext, const Rect
size_t nSymbols = aSymbolSet.size();
Color aTxtColor(rRenderContext.GetTextColor());
- for (sal_uInt16 i = v; i < nSymbols ; i++)
+ for (size_t i = v; i < nSymbols ; i++)
{
SmSym aSymbol(*aSymbolSet[i]);
vcl::Font aFont(aSymbol.GetFace());
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 09eb7e1..b3dccf7 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2078,12 +2078,12 @@ void MathType::HandleSmMatrix(SmMatrixNode *pMatrix,int
nLevel)
int nBytes=(pMatrix->GetNumRows()+1)*2/8;
if (((pMatrix->GetNumRows()+1)*2)%8)
nBytes++;
- for (sal_uInt16 j = 0; j < nBytes; j++)
+ for (int j = 0; j < nBytes; j++)
pS->WriteUChar( 0x00 ); //row_parts
nBytes=(pMatrix->GetNumCols()+1)*2/8;
if (((pMatrix->GetNumCols()+1)*2)%8)
nBytes++;
- for (sal_uInt16 k = 0; k < nBytes; k++)
+ for (int k = 0; k < nBytes; k++)
pS->WriteUChar( 0x00 ); //col_parts
sal_uInt16 nSize = pMatrix->GetNumSubNodes();
for (sal_uInt16 i = 0; i < nSize; i++)
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 9cccd74..0573e64 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -496,7 +496,7 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode,
int nLevel )
FSNS( XML_m, XML_val ), mathSymbolToString(
pNode->ClosingBrace()).getStr(), FSEND );
m_pSerializer->endElementNS( XML_m, XML_dPr );
- for( unsigned int i = 0; i < subnodes.size(); ++i )
+ for( size_t i = 0; i < subnodes.size(); ++i )
{
m_pSerializer->startElementNS( XML_m, XML_e, FSEND );
HandleNode( subnodes[ i ], nLevel + 1 );
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index d70ca9d..04843d0 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1235,7 +1235,7 @@ void SmParser::SubSup(sal_uLong nActiveGroup)
SmNodeArray aSubNodes;
aSubNodes.resize(1 + SUBSUP_NUM_ENTRIES);
aSubNodes[0] = popOrZero(m_aNodeStack);
- for (sal_uInt16 i = 1; i < aSubNodes.size(); i++)
+ for (size_t i = 1; i < aSubNodes.size(); i++)
aSubNodes[i] = NULL;
// process all sub-/supscripts
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index 5c38a4e..bb08685 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -433,7 +433,7 @@ void SmRtfExport::HandleBrace(const SmBraceNode* pNode, int
nLevel)
m_pBuffer->append(mathSymbolToString(pNode->ClosingBrace(), m_nEncoding));
m_pBuffer->append("}"); // mendChr
m_pBuffer->append("}"); // mdPr
- for (unsigned int i = 0; i < subnodes.size(); ++i)
+ for (size_t i = 0; i < subnodes.size(); ++i)
{
m_pBuffer->append("{" LO_STRING_SVTOOLS_RTF_ME " ");
HandleNode(subnodes[ i ], nLevel + 1);
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 00485da..8814636 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -60,7 +60,7 @@ SmFontPickList& SmFontPickList::operator = (const
SmFontPickList& rList)
{
Clear();
nMaxItems = rList.nMaxItems;
- for (sal_uInt16 nPos = 0; nPos < rList.aFontVec.size(); nPos++)
+ for (size_t nPos = 0; nPos < rList.aFontVec.size(); nPos++)
aFontVec.push_back( rList.aFontVec[nPos] );
return *this;
@@ -116,7 +116,7 @@ void SmFontPickList::Insert(const vcl::Font &rFont)
void SmFontPickList::Update(const vcl::Font &rFont, const vcl::Font &rNewFont)
{
- for (sal_uInt16 nPos = 0; nPos < aFontVec.size(); nPos++)
+ for (size_t nPos = 0; nPos < aFontVec.size(); nPos++)
if (CompareItem( aFontVec[nPos], rFont ))
{
aFontVec[nPos] = rNewFont;
@@ -126,7 +126,7 @@ void SmFontPickList::Update(const vcl::Font &rFont, const
vcl::Font &rNewFont)
void SmFontPickList::Remove(const vcl::Font &rFont)
{
- for (sal_uInt16 nPos = 0; nPos < aFontVec.size(); nPos++)
+ for (size_t nPos = 0; nPos < aFontVec.size(); nPos++)
if (CompareItem( aFontVec[nPos], rFont))
{
aFontVec.erase( aFontVec.begin() + nPos );
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx
b/svl/source/passwordcontainer/passwordcontainer.cxx
index b6b2d52..a216b1e 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -51,7 +51,7 @@ static OUString createIndex(const vector< OUString >& lines)
{
OString aResult;
- for( unsigned int i = 0; i < lines.size(); i++ )
+ for( size_t i = 0; i < lines.size(); i++ )
{
if( i )
aResult += OString( "__" );
@@ -180,7 +180,7 @@ static ::rtl::ByteSequence getBufFromAsciiLine( const
OUString& line )
static Sequence< OUString > copyVectorToSequence( const vector< OUString >&
original )
{
Sequence< OUString > newOne ( original.size() );
- for( unsigned int i = 0; i < original.size() ; i++ )
+ for( size_t i = 0; i < original.size() ; i++ )
newOne[i] = original[i];
return newOne;
diff --git a/sw/source/core/access/accselectionhelper.cxx
b/sw/source/core/access/accselectionhelper.cxx
index cec0612..842badc 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -130,8 +130,8 @@ static bool lcl_getSelectedState(const SwAccessibleChild&
aChild,
if( pRStateSet.is() )
{
Sequence<short> pStates = pRStateSet->getStates();
- long count = pStates.getLength();
- for( int i = 0; i < count; i++ )
+ sal_Int32 count = pStates.getLength();
+ for( sal_Int32 i = 0; i < count; i++ )
{
if( pStates[i] == AccessibleStateType::SELECTED)
return true;
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index a31a4b2..35afa61 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -246,7 +246,7 @@ bool FTPContentProvider::forHost( const OUString& host,
OUString& account)
{
osl::MutexGuard aGuard(m_aMutex);
- for(unsigned int i = 0; i < m_ServerInfo.size(); ++i)
+ for(size_t i = 0; i < m_ServerInfo.size(); ++i)
if(host == m_ServerInfo[i].host &&
port == m_ServerInfo[i].port &&
username == m_ServerInfo[i].username )
@@ -274,7 +274,7 @@ bool FTPContentProvider::setHost( const OUString& host,
bool present(false);
osl::MutexGuard aGuard(m_aMutex);
- for(unsigned int i = 0; i < m_ServerInfo.size(); ++i)
+ for(size_t i = 0; i < m_ServerInfo.size(); ++i)
if(host == m_ServerInfo[i].host &&
port == m_ServerInfo[i].port &&
username == m_ServerInfo[i].username)
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx
b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 1bfcddc..89e1367 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -46,7 +46,7 @@ ResultSetI::ResultSetI(const Reference<XComponentContext>&
rxContext,
const std::vector<FTPDirentry>& dirvec)
: ResultSetBase(rxContext,xProvider,nOpenMode,seqProp,seqSort)
{
- for( unsigned int i = 0; i < dirvec.size(); ++i)
+ for( size_t i = 0; i < dirvec.size(); ++i)
m_aPath.push_back(dirvec[i].m_aURL);
// m_aIdents holds the contentidentifiers
@@ -54,7 +54,7 @@ ResultSetI::ResultSetI(const Reference<XComponentContext>&
rxContext,
m_aItems.resize( m_aPath.size() );
m_aIdents.resize( m_aPath.size() );
- for(unsigned n = 0; n < m_aItems.size(); ++n) {
+ for(size_t n = 0; n < m_aItems.size(); ++n) {
rtl::Reference<ucbhelper::PropertyValueSet> xRow =
new ucbhelper::PropertyValueSet(rxContext);
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 8bbcfbd..8ede7cd 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -275,7 +275,7 @@ OUString FTPURL::ident(bool withslash,bool internal) const
else
bff.append('/');
- for(unsigned i = 0; i < m_aPathSegmentVec.size(); ++i)
+ for(size_t i = 0; i < m_aPathSegmentVec.size(); ++i)
if(i == 0)
bff.append(m_aPathSegmentVec[i]);
else
@@ -323,7 +323,7 @@ OUString FTPURL::parent(bool internal) const
OUString last;
- for(unsigned int i = 0; i < m_aPathSegmentVec.size(); ++i)
+ for(size_t i = 0; i < m_aPathSegmentVec.size(); ++i)
if(1+i == m_aPathSegmentVec.size())
last = m_aPathSegmentVec[i];
else if(i == 0)
@@ -614,7 +614,7 @@ FTPDirentry FTPURL::direntry() const
std::vector<FTPDirentry> aList = aURL.list(OpenMode::ALL);
- for(unsigned i = 0; i < aList.size(); ++i) {
+ for(size_t i = 0; i < aList.size(); ++i) {
if(aList[i].m_aName == nettitle) { // the relevant file is found
aDirentry = aList[i];
break;
@@ -778,7 +778,7 @@ void FTPURL::del() const
if(aDirentry.m_nMode & INETCOREFTP_FILEMODE_ISDIR) {
std::vector<FTPDirentry> vec = list(sal_Int16(OpenMode::ALL));
- for( unsigned int i = 0; i < vec.size(); ++i )
+ for( size_t i = 0; i < vec.size(); ++i )
try {
FTPURL url(vec[i].m_aURL,m_pFCP);
url.del();
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 8f718a0..6df724c 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -398,7 +398,7 @@ bool DataSupplier::getData()
aPath = NeonUri::unescape( aPath );
bool bFoundParent = false;
- for ( sal_uInt32 n = 0; n < resources.size(); ++n )
+ for ( size_t n = 0; n < resources.size(); ++n )
{
const DAVResource & rRes = resources[ n ];
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 98a6bb2..19a28f9 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -741,7 +741,7 @@ void KeywordInfo::KeywordElement::init( Databases
*pDatabases,helpdatafileproxy:
listAnchor.realloc( id.size() );
listTitle.realloc( id.size() );
- for( sal_uInt32 i = 0; i < id.size(); ++i )
+ for( size_t i = 0; i < id.size(); ++i )
{
listId[i] = id[i];
listAnchor[i] = anchor[i];
@@ -771,7 +771,7 @@ KeywordInfo::KeywordInfo( const std::vector< KeywordElement
>& aVec )
listAnchor( aVec.size() ),
listTitle( aVec.size() )
{
- for( unsigned int i = 0; i < aVec.size(); ++i )
+ for( size_t i = 0; i < aVec.size(); ++i )
{
listKey[i] = aVec[i].key;
listId[i] = aVec[i].listId;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index dbb3cea..bd6ebaa 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -180,7 +180,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference<
uno::XComponentConte
if( nQueryListSize > 1 )
aSet.clear();
- for (unsigned j = 0; j < aPathVector.size(); ++j) {
+ for (size_t j = 0; j < aPathVector.size(); ++j) {
pQueryResultVector->push_back(HitItem(aPathVector[j],
aScoreVector[j]));
if (nQueryListSize > 1)
aSet.insert(aPathVector[j]);
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index c269d57..46645b6 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -49,7 +49,7 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference<
uno::XComponentContext
aCommand.Name = "getPropertyValues";
aCommand.Argument <<= m_sProperty;
- for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
+ for( size_t i = 0; i < m_aPath.size(); ++i )
{
m_aPath[i] =
"vnd.sun.star.help://" +
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
