[Libreoffice-commits] core.git: cui/source

[Andras Timar]

 cui/source/dialogs/cuifmsearch.cxx |    2 +-
 cui/source/options/optjava.cxx     |    3 +--
 cui/source/tabpages/labdlg.cxx     |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a5b9d4fba2464f1ba87ee2d0fc34a3195fabfeb8
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Thu Nov 7 20:32:49 2013 +0100

    xub_Strlen to sal_Int32
    
    Change-Id: I5cf06c6d9648f8f447b7669edfab8436e6f948ab

diff --git a/cui/source/dialogs/cuifmsearch.cxx 
b/cui/source/dialogs/cuifmsearch.cxx
index a13345a..e9ac03d 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -127,7 +127,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const 
OUString& sInitialText, co
     fmscInitial.nContext = nInitialContext;
     m_lnkContextSupplier.Call(&fmscInitial);
     DBG_ASSERT(fmscInitial.xCursor.is(), "FmSearchDialog::FmSearchDialog : 
invalid data supplied by ContextSupplier !");
-    DBG_ASSERT(comphelper::string::getTokenCount(fmscInitial.strUsedFields, 
';') == (xub_StrLen)fmscInitial.arrFields.size(),
+    DBG_ASSERT(comphelper::string::getTokenCount(fmscInitial.strUsedFields, 
';') == (sal_Int32)fmscInitial.arrFields.size(),
         "FmSearchDialog::FmSearchDialog : invalid data supplied by 
ContextSupplied !");
 #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
     for (sal_Int32 i=0; i<(sal_Int32)fmscInitial.arrFields.size(); ++i)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 8679154..348c411 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -1072,10 +1072,9 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& 
_rPath )
     if ( m_sOldPath.isEmpty() )
         m_sOldPath = _rPath;
     m_pPathList->Clear();
-    xub_StrLen i;
     sal_Int32 nIdx = 0;
     sal_Int32 nCount = comphelper::string::getTokenCount(_rPath, 
CLASSPATH_DELIMITER);
-    for ( i = 0; i < nCount; ++i )
+    for ( sal_Int32 i = 0; i < nCount; ++i )
     {
         OUString sToken = _rPath.getToken( 0, CLASSPATH_DELIMITER, nIdx );
         INetURLObject aURL( sToken, INetURLObject::FSYS_DETECT );
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 51ed6a2..5fac817 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -385,7 +385,7 @@ sal_uInt16* SvxCaptionTabPage::GetRanges()
 
 void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
 {
-    xub_StrLen  nCnt=0, nIdx=0;
+    sal_Int32 nCnt=0, nIdx=0;
 
     switch( nType )
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits