[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/unotools

[Noel Grandin (via logerrit)]

 dbaccess/source/ui/uno/copytablewizard.cxx |    2 +-
 include/unotools/weakref.hxx               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5fdf20eac1e071e68d4eea7d9f15bd8b3e7046d1
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Nov 4 10:51:23 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 4 13:15:02 2022 +0100

    address review comments in unotools::WeakReference
    
    from commit 4e0856fa11674e386c9b84dd40a702c83450166f
    
    Change-Id: I0dbd6a115b36be8030120a8006959e611f637f07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142266
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/include/unotools/weakref.hxx b/include/unotools/weakref.hxx
index 9cf326d99625..554bd433b687 100644
--- a/include/unotools/weakref.hxx
+++ b/include/unotools/weakref.hxx
@@ -117,7 +117,7 @@ public:
         css::uno::Reference<css::uno::XInterface> xInterface = 
WeakReferenceHelper::get();
         // If XInterface is an ambiguous base of interface_type, we have to 
use dynamic_cast,
         // otherwise we can use the faster static_cast.
-        if constexpr (std::is_convertible_v<css::uno::XInterface, 
interface_type>)
+        if constexpr (std::is_convertible_v<interface_type*, 
css::uno::XInterface*>)
             return static_cast<interface_type*>(xInterface.get());
         else
             return dynamic_cast<interface_type*>(xInterface.get());
commit 493c88ab4e597c55e920dbec2262058ecc6b6922
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Nov 4 09:47:05 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Nov 4 13:14:47 2022 +0100

    calling getCaughtException twice in one catch block is not allowed
    
    It seems to work, but it's not guaranteed to do so, and violates the
    documented contract.
    
    Regression from
        commit 85a5233275ab83fe0d6b943b298695387d97accd
        Author: Noel Grandin <noel.gran...@collabora.co.uk>
        Date:   Mon Oct 31 12:08:50 2022 +0200
    error when copying table and the copy table wizard creates the
    primary key
    
    Change-Id: Ib8422017e627e825865c96dd9fbacbe0e518e96b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142264
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx 
b/dbaccess/source/ui/uno/copytablewizard.cxx
index 5fd10ee37e75..fab5e3966cbd 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1416,8 +1416,8 @@ void CopyTableWizard::impl_doCopy_nothrow()
     }
     catch( const Exception& )
     {
-        TOOLS_WARN_EXCEPTION("dbaccess", "");
         aError = ::cppu::getCaughtException();
+        SAL_WARN("dbaccess", exceptionToString(aError));
 
         // silence the error of the user cancelling the parameter's dialog
         SQLException aSQLError;