[Libreoffice-commits] .: 3 commits - dbaccess/source reportdesign/source

[Caolán McNamara]

 dbaccess/source/core/dataaccess/databasecontext.cxx |    5 -----
 dbaccess/source/core/misc/services.cxx              |   20 ++++++++++++++++----
 dbaccess/source/ui/misc/TokenWriter.cxx             |    4 ++--
 reportdesign/source/ui/misc/UITools.cxx             |    2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit dc41786b465c9670c341ff1787ee15f9cb6b370a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 20 08:51:54 2011 +0100

    adjust for return by ref instead of pointer

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 776a6ba..7faf777 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -700,8 +700,8 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "OHTMLImportExport::OHTMLImportExport" );
     // set HTML configuration
-    SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get();
-    m_eDestEnc = pHtmlOptions->GetTextEncoding();
+    SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
+    m_eDestEnc = rHtmlOptions.GetTextEncoding();
     strncpy( sIndent, sIndentSource ,std::min(sizeof(sIndent),sizeof(sIndentSource)));
     sIndent[0] = 0;
 }
commit 4f271aa5b2fdb014c9cc29c45be07c9e20dc4424
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 17 10:14:35 2011 +0100

    adjust for modified singleton

diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index a41ac76..5ef2626 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -771,7 +771,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
             // #i74099# by default, the dialog deletes the current color table if a different one is loaded
             // (see SwDrawShell::ExecDrawDlg)
             const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) );
-            if (pColorItem && pColorItem->GetColorTable() == XColorTable::GetStdColorTable())
+            if (pColorItem && pColorItem->GetColorTable() == &XColorTable::GetStdColorTable())
                 pDialog->DontDeleteColorTable();
             bSuccess = ( RET_OK == pDialog->Execute() );
             if ( bSuccess )
commit 956c70875e56f055fafc344202858b44b8ab0b63
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 6 11:34:20 2011 +0100

    config leaks: drop dodgy LegacySingleton foo

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 6889551..1461525 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -102,11 +102,6 @@ using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING;
 using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING_PATH;
 
 
-extern "C" void SAL_CALL createRegistryInfo_ODatabaseContext()
-{
-    static ::dba::OLegacySingletonRegistration< ::dbaccess::ODatabaseContext > aODatabaseContext_AutoRegistration;
-}
-
 namespace dbaccess
 {
 
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index a631150..dcd6278 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -36,6 +36,8 @@
 #include "DatabaseDataProvider.hxx"
 #include "dbadllapi.hxx"
 
+#include <../dataaccess/databasecontext.hxx>
+
 /********************************************************************************************/
 
 using namespace ::com::sun::star::uno;
@@ -45,7 +47,6 @@ using namespace ::com::sun::star::registry;
 //***************************************************************************************
 //
 // registry functions
-extern "C" void SAL_CALL createRegistryInfo_ODatabaseContext();
 extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition();
 extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition();
 extern "C" void SAL_CALL createRegistryInfo_ORowSet();
@@ -56,8 +57,20 @@ extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory();
 namespace dba{
 //--------------------------------------------------------------------------
     ::cppu::ImplementationEntry entries[] = {
-        { &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static,
-            &cppu::createSingleComponentFactory, 0, 0 },
+        {
+            &::dbaccess::DatabaseDataProvider::Create,
+            &::dbaccess::DatabaseDataProvider::getImplementationName_Static,
+            &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static,
+            &cppu::createSingleComponentFactory, 0, 0
+        },
+
+        {
+            &dbaccess::ODatabaseContext::Create,
+            &dbaccess::ODatabaseContext::getImplementationName_static,
+            &dbaccess::ODatabaseContext::getSupportedServiceNames_static,
+            &cppu::createOneInstanceComponentFactory, 0, 0
+        },
+
         { 0, 0, 0, 0, 0, 0 } 
     };
 }
@@ -72,7 +85,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBA()
     static sal_Bool bInit = sal_False;
     if (!bInit)
     {
-        createRegistryInfo_ODatabaseContext();
         createRegistryInfo_OCommandDefinition();
         createRegistryInfo_OComponentDefinition();
         createRegistryInfo_ORowSet();