[Libreoffice-commits] .: 2 commits - dbaccess/source

[Caolán McNamara]

 dbaccess/source/ui/browser/brwctrlr.cxx |   34 --------------------------------
 dbaccess/source/ui/misc/TokenWriter.cxx |    8 ++-----
 2 files changed, 3 insertions(+), 39 deletions(-)

New commits:
commit 51eb081f6d9113be975270435f8f4f8e73e5a5c9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 31 23:52:16 2011 +0100

    callcatcher: remove unused code

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index fab1123..f66f5b5 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2872,13 +2872,6 @@ public:
     // ::com::sun::star::lang::XEventListener
     virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException );
 
-
-    bool WaitUntilReallyLoaded(bool _bOnlyIfLoaded);
-        // waits 'til the first positioned event after the loaded event. returns true if successfull,
-        // false if the form was disposed or unloaded before or while waiting
-        // if _bOnlyIfLoaded is false and the form isn't loaded already loaded, false will be returned
-        // (without any wating)
-
     void cancel();
 
 protected:
@@ -2984,33 +2977,6 @@ void LoadFormHelper::cancel()
     implDispose();
 }
 
-//------------------------------------------------------------------------------
-bool LoadFormHelper::WaitUntilReallyLoaded(bool _bOnlyIfLoaded)
-{
-    ::osl::ResettableMutexGuard aGuard( m_aAccessSafety );
-    if (DISPOSED == m_eState)
-        return false;
-
-    if (_bOnlyIfLoaded && (STARTED == m_eState))
-        // we did't get a "loaded" event ....
-        return false;
-
-    sal_Bool bDone = (POSITIONED == m_eState);
-    aGuard.clear();
-
-    while (!bDone)
-    {
-        aGuard.reset();
-        bDone = (POSITIONED == m_eState);
-        aGuard.clear();
-    }
-
-    aGuard.reset();
-    implDispose();
-
-    return true;
-}
-
 // -----------------------------------------------------------------------------
 sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
 {
commit 418a853461a6a059468b87e10af852b57bc50d49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 29 23:28:34 2011 +0100

    convert to new api
    
    this code looks suspiciously like a no-op, i.e. that the intent
    is to append the generated string, but the old code threw
    away the string, so not a new bug but in there since 2001

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index b460343..78938c6 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -1014,13 +1014,11 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
         try
         {
             fVal = m_xFormatter->convertStringToNumber(nFormat,rValue);
-            ByteString aTmpString(aStrTD);
-            HTMLOutFuncs::CreateTableDataOptionsValNum( aTmpString, sal_False, fVal,nFormat, *pFormatter );
+            HTMLOutFuncs::CreateTableDataOptionsValNum(sal_False, fVal,nFormat, *pFormatter);
         }
-        catch(Exception&)
+        catch(const Exception&)
         {
-            ByteString aTmpString(aStrTD);
-            HTMLOutFuncs::CreateTableDataOptionsValNum( aTmpString, sal_False, fVal,nFormat, *pFormatter );
+            HTMLOutFuncs::CreateTableDataOptionsValNum(sal_False, fVal,nFormat, *pFormatter);
         }
     }