[Libreoffice-commits] .: 5 commits - dbaccess/Library_dbu.mk dbaccess/source

[Tor Lillqvist]

 dbaccess/Library_dbu.mk                              |    4 ++--
 dbaccess/source/core/api/RowSet.cxx                  |    4 ++--
 dbaccess/source/core/dataaccess/databasedocument.cxx |    8 ++++----
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit ec059f87f4b214a9e7590eb913abda6ad491c2e1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 26 13:31:46 2011 +0300

    WaE: illegal copy-initialization

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index f11df1c..abf9686 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -437,7 +437,7 @@ void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibrar
                 sDialogUrl = sDialogUrl.concat( sLibraries[ i ] ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("." ) ) ).concat (  sDialogs[ j ]  ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
 
                 Reference< ::com::sun::star::awt::XControl > xDialog( xDlgPrv->createDialog( sDialogUrl ), UNO_QUERY );
-                Reference< XInterface > xModel = xDialog->getModel();
+                Reference< XInterface > xModel( xDialog->getModel() );
                 GraphicObject::InspectForGraphicObjectImageURL( xModel, vEmbedImgUrls );
             }
         }
@@ -1804,7 +1804,7 @@ void ODatabaseDocument::disposing()
     // the document. And upon closing, our controllers are closed, too
 
     {
-        uno::Reference<uno::XInterface> xUIInterface = m_xUIConfigurationManager;
+        uno::Reference<uno::XInterface> xUIInterface( m_xUIConfigurationManager );
         aKeepAlive.push_back( xUIInterface );
     }
     m_xUIConfigurationManager = NULL;
@@ -1829,13 +1829,13 @@ void ODatabaseDocument::disposing()
     impl_disposeControllerFrames_nothrow();
 
     {
-        uno::Reference<uno::XInterface> xModuleInterface = m_xModuleManager;
+        uno::Reference<uno::XInterface> xModuleInterface( m_xModuleManager );
         aKeepAlive.push_back( xModuleInterface );
     }
     m_xModuleManager.clear();
 
     {
-        uno::Reference<uno::XInterface> xTitleInterface = m_xTitleHelper;
+        uno::Reference<uno::XInterface> xTitleInterface( m_xTitleHelper );
         aKeepAlive.push_back( xTitleInterface );
     }
     m_xTitleHelper.clear();
commit 45a5fdc7355ba7f6b94e9d754cbe3c39ebfbbaf1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 26 13:26:30 2011 +0300

    WaE: unreferenced local variable

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index c74d75e..c2a3812 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2184,11 +2184,11 @@ Reference< XConnection >  ORowSet::calcConnection(const Reference< XInteractionH
                     xNewConn = xDataSource->getConnection( m_aUser, m_aPassword );
                 }
             }
-            catch ( const SQLException& e )
+            catch ( const SQLException& )
             {
                 throw;
             }
-            catch ( const Exception& e )
+            catch ( const Exception& )
             {
                 Any aError = ::cppu::getCaughtException();
                 ::rtl::OUString sMessage = ResourceManager::loadString( RID_NO_SUCH_DATA_SOURCE,
commit 94f9419aecd3715e23a9a19374bd4e1dd404f4f1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 26 13:03:39 2011 +0300

    WaE: C++ exception handler used, but unwind semantics are not enabled

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index a54fc6b..0f7ca59 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -286,7 +286,7 @@ $(eval $(call gb_Library_add_noexception_objects,dbu,\
 ))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_noexception_objects,dbu,\
+$(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/dlg/adodatalinks \
 ))
 endif
commit 717024f3aee555de93e404794618c805a5d5b320
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 26 13:02:20 2011 +0300

    WaE: C++ exception handler used, but unwind semantics are not enabled

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 8107152..a54fc6b 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -214,6 +214,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/misc/WTypeSelect \
     dbaccess/source/ui/querydesign/ConnectionLine \
     dbaccess/source/ui/querydesign/ConnectionLineAccess \
+    dbaccess/source/ui/querydesign/ConnectionLineData \
     dbaccess/source/ui/querydesign/JAccess \
     dbaccess/source/ui/querydesign/JoinController \
     dbaccess/source/ui/querydesign/JoinDesignView \
@@ -281,7 +282,6 @@ $(eval $(call gb_Library_add_noexception_objects,dbu,\
     dbaccess/source/shared/dbustrings \
     dbaccess/source/ui/control/ScrollHelper \
     dbaccess/source/ui/dlg/optionalboolitem \
-    dbaccess/source/ui/querydesign/ConnectionLineData \
     dbaccess/source/ui/querydesign/TableFieldInfo \
 ))
 
commit 6d000e84f66b09b6024fd4a4bd6cde3293e92a29
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 26 12:58:49 2011 +0300

    WaE: illegal copy-initialization
    
    more than one user-defined conversion has been implicitly applied. So
    use the other style of initialisation then.

diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index b03b08c..25f7fa2 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -255,8 +255,8 @@ namespace dbaui
             aRelations.reserve(5); // just guessing
             for (; aIter != aEnd ; ++aIter )
             {
-                uno::Reference<uno::XInterface> xInterface =
-                    getParentChild(aIter - pConnectionList->begin());
+                uno::Reference<uno::XInterface> xInterface(
+                    getParentChild(aIter - pConnectionList->begin()));
                 aRelations.push_back(xInterface);
             }