[Libreoffice-commits] .: 2 commits - avmedia/source connectivity/source

[Caolán McNamara]

 avmedia/source/viewer/mediawindow_impl.cxx   |    7 -------
 avmedia/source/viewer/mediawindow_impl.hxx   |    2 --
 connectivity/source/drivers/dbase/DIndex.cxx |   12 ++++++------
 connectivity/source/drivers/dbase/DTable.cxx |    2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 1f13fe6f8e092c8760bbefdd85cc3296d7d27749
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 3 01:20:24 2011 +0100

    callcatcher: unused hasInternalMediaControl

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 48cd33b..353ac83 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -331,13 +331,6 @@ const Pointer& MediaWindowImpl::getPointer() const
 
 // ---------------------------------------------------------------------
 
-bool MediaWindowImpl::hasInternalMediaControl() const
-{
-    return( mpMediaWindowControl != NULL );
-}
-
-// ---------------------------------------------------------------------
-
 void MediaWindowImpl::Resize()
 {
     uno::Reference< media::XPlayerWindow >	xPlayerWindow( getPlayerWindow() );
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index f8abda9..ee7807d 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -111,8 +111,6 @@ namespace avmedia
             void			setPointer( const Pointer& rPointer );
             const Pointer&	getPointer() const;
 
-            bool			hasInternalMediaControl() const;
-
         protected:
 
             // Window
commit 9a09bd8451ad469fbd358245a21f842538ea9868
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 2 22:30:05 2011 +0100

    ByteString::CreateFromInt32->rtl::OString::valueOf

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index b367c50..9dbae67 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -402,18 +402,18 @@ void ODbaseIndex::createINFEntry()
     aInfFile.SetGroup(dBASE_III_GROUP);
 
     sal_uInt16 nSuffix = aInfFile.GetKeyCount();
-    ByteString aNewEntry,aKeyName;
+    rtl::OString aNewEntry,aKeyName;
     sal_Bool bCase = isCaseSensitive();
-    while (!aNewEntry.Len())
+    while (aNewEntry.isEmpty())
     {
-        aNewEntry = "NDX";
-        aNewEntry += ByteString::CreateFromInt32(++nSuffix);
+        aNewEntry = rtl::OString(RTL_CONSTASCII_STRINGPARAM("NDX"));
+        aNewEntry += rtl::OString::valueOf(static_cast<sal_Int32>(++nSuffix));
         for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++)
         {
             aKeyName = aInfFile.GetKeyName(i);
-            if (bCase ? aKeyName == aNewEntry : aKeyName.EqualsIgnoreCaseAscii(aNewEntry))
+            if (bCase ? aKeyName.equals(aNewEntry) : aKeyName.equalsIgnoreAsciiCase(aNewEntry))
             {
-                aNewEntry.Erase();
+                aNewEntry = rtl::OString();
                 break;
             }
         }
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index e844efa..a71e966 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1952,7 +1952,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,c
                         break;
 
                     ByteString aStr;
-                    ByteString aBlock(ByteString::CreateFromInt32(nBlockNo));
+                    ByteString aBlock(rtl::OString::valueOf(static_cast<sal_Int32>(nBlockNo)));
                     aStr.Expand(static_cast<sal_uInt16>(nLen - aBlock.Len()), '0' );
                     aStr += aBlock;
                     // Copy characters: