summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx4
-rw-r--r--vcl/win/source/gdi/winlayout.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index a0f930ad7d35..40ed84b84bac 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -280,7 +280,7 @@ static bool checkSomeExtensionInRegistry( const int nStart, const int nEnd )
int nIndex = nStart;
bool bFound = false;
- while ( !bFound && ( g_Extensions[nIndex] != 0 ) && ( nIndex < nEnd ) )
+ while ( !bFound && (nIndex < nEnd) && (g_Extensions[nIndex] != 0) )
{
bFound = ! CheckExtensionInRegistry( g_Extensions[nIndex] );
@@ -296,7 +296,7 @@ static void registerSomeExtensions( MSIHANDLE handle, const int nStart, const in
{ // Check all file extensions
int nIndex = nStart;
- while ( ( g_Extensions[nIndex] != 0 ) && ( nIndex < nEnd ) )
+ while ( (nIndex < nEnd) && (g_Extensions[nIndex] != 0) )
{
registerForExtension( handle, nIndex++, bRegister );
}
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 80f94aea354c..78a2d2d3b588 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2047,7 +2047,7 @@ void UniscribeLayout::Simplify( bool /*bIsBase*/ )
int nMinGlyphPos, nEndGlyphPos, nOrigMinGlyphPos = rVI.mnMinGlyphPos;
GetItemSubrange( rVI, nMinGlyphPos, nEndGlyphPos );
i = nMinGlyphPos;
- while( (mpOutGlyphs[i] == cDroppedGlyph) && (i < nEndGlyphPos) )
+ while( (i < nEndGlyphPos) && (mpOutGlyphs[i] == cDroppedGlyph) )
{
rVI.mnMinGlyphPos = ++i;
}