[Libreoffice-commits] core.git: 2 commits - svtools/source

[Noel Grandin]

 svtools/source/contnr/fileview.cxx |    2 +-
 svtools/source/uno/unoiface.cxx    |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit e0233480c674987cd0de301fde57248a7aba523d
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Aug 22 12:08:47 2013 +0200

    equalsIgnoreAsciiCaseAscii -> equalsIgnoreAsciiCase
    
    Change-Id: Ie3adf4cc83c7b2128565eab1a9d4df8beec36c99

diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 855ecb4..2ce4aa8 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -63,7 +63,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
 {
     Window* pWindow = NULL;
     OUString aServiceName( pDescriptor->WindowServiceName );
-    if ( aServiceName.equalsIgnoreAsciiCaseAscii( "MultiLineEdit" ) )
+    if ( aServiceName.equalsIgnoreAsciiCase( "MultiLineEdit" ) )
     {
         if ( pParent )
         {
@@ -77,7 +77,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "FileControl" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCase( "FileControl" ) )
     {
         if ( pParent )
         {
@@ -90,22 +90,22 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if (aServiceName.equalsIgnoreAsciiCaseAscii("FormattedField") )
+    else if (aServiceName.equalsIgnoreAsciiCase("FormattedField") )
     {
         pWindow = new FormattedField( pParent, nWinBits );
         *ppNewComp = new SVTXFormattedField;
     }
-    else if (aServiceName.equalsIgnoreAsciiCaseAscii("NumericField") )
+    else if (aServiceName.equalsIgnoreAsciiCase("NumericField") )
     {
         pWindow = new DoubleNumericField( pParent, nWinBits );
         *ppNewComp = new SVTXNumericField;
     }
-    else if (aServiceName.equalsIgnoreAsciiCaseAscii("LongCurrencyField") )
+    else if (aServiceName.equalsIgnoreAsciiCase("LongCurrencyField") )
     {
         pWindow = new DoubleCurrencyField( pParent, nWinBits );
         *ppNewComp = new SVTXCurrencyField;
     }
-    else if (aServiceName.equalsIgnoreAsciiCaseAscii("datefield") )
+    else if (aServiceName.equalsIgnoreAsciiCase("datefield") )
     {
         pWindow = new CalendarField( pParent, nWinBits);
         static_cast<CalendarField*>(pWindow)->EnableToday();
@@ -114,12 +114,12 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
         *ppNewComp = new SVTXDateField;
         ((VCLXFormattedSpinField*)*ppNewComp)->SetFormatter( (FormatterBase*)(DateField*)pWindow );
     }
-    else if (aServiceName.equalsIgnoreAsciiCaseAscii("roadmap") )
+    else if (aServiceName.equalsIgnoreAsciiCase("roadmap") )
     {
         pWindow = new ::svt::ORoadmap( pParent, WB_TABSTOP );
         *ppNewComp = new SVTXRoadmap;
     }
-    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "ProgressBar" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCase( "ProgressBar" ) )
     {
         if ( pParent )
         {
@@ -132,13 +132,13 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "Tree" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCase( "Tree" ) )
     {
         TreeControlPeer* pPeer = new TreeControlPeer;
         *ppNewComp = pPeer;
         pWindow = pPeer->createVclControl( pParent, nWinBits );
     }
-    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "FixedHyperlink" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCase( "FixedHyperlink" ) )
     {
         if ( pParent )
         {
@@ -151,7 +151,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
-    else if ( aServiceName.equalsIgnoreAsciiCaseAscii( "Grid" ) )
+    else if ( aServiceName.equalsIgnoreAsciiCase( "Grid" ) )
     {
         if ( pParent )
         {
commit d616f1aacb85dd8e3387ebcb0bcfa938a47b0026
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Aug 22 12:06:09 2013 +0200

    another attempt to fix windows build
    
    after my OUString changes. Seems like windows really doesn't like
      OUString tmp;
      bool b;
      tmp +=  b ? "1" : "0";
    
    Change-Id: Ie53b4fa36b5ae462fe922feec76e13588d38f1db

diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index cbd2917..bf52146 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1570,7 +1570,7 @@ OUString SvtFileView::GetConfigString() const
     sRet += ";";
     HeaderBarItemBits nBits = pBar->GetItemBits( mpImp->mnSortColumn );
     sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
-    sRet += OUString( bUp ? "1" : "0" );
+    sRet += bUp ? OUString("1") : OUString("0");
     sRet += ";";
 
     sal_uInt16 nCount = pBar->GetItemCount();