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

[Julien Nabet (via logerrit)]

 dbaccess/source/ui/misc/databaseobjectview.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c50e4b25b2eb278685698182e2a4b541739f2d42
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Jun 3 10:01:47 2023 +0200
Commit:     Lionel Mamane <lio...@mamane.lu>
CommitDate: Sat Jun 3 11:46:15 2023 +0200

    Simplify a bit DatabaseObjectView::fillDispatchArgs
    
    Change-Id: Ic6d4c80813286d6b5dbe33dc0289d0f0d9cedfc9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152569
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Reviewed-by: Lionel Mamane <lio...@mamane.lu>
    Tested-by: Lionel Mamane <lio...@mamane.lu>

diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx 
b/dbaccess/source/ui/misc/databaseobjectview.cxx
index f10921d6fdb6..e84f36e7f58f 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -253,22 +253,22 @@ namespace dbaui
     {
         DatabaseObjectView::fillDispatchArgs( i_rDispatchArgs, _aDataSource, 
_rQualifiedName );
         OSL_ENSURE( !_rQualifiedName.isEmpty(),"A Table name must be set");
-        OUString sCatalog;
-        OUString sSchema;
-        OUString sTable;
-        if ( m_bTable )
-            ::dbtools::qualifiedNameComponents( 
getConnection()->getMetaData(), _rQualifiedName, sCatalog, sSchema, sTable, 
::dbtools::EComposeRule::InDataManipulation );
-
-        i_rDispatchArgs.put( PROPERTY_COMMAND_TYPE, (m_bTable ? 
CommandType::TABLE : CommandType::QUERY) );
         i_rDispatchArgs.put( PROPERTY_COMMAND, _rQualifiedName );
         i_rDispatchArgs.put( PROPERTY_ENABLE_BROWSER, false );
 
         if ( m_bTable )
         {
+            OUString sCatalog;
+            OUString sSchema;
+            OUString sTable;
+            ::dbtools::qualifiedNameComponents( 
getConnection()->getMetaData(), _rQualifiedName, sCatalog, sSchema, sTable, 
::dbtools::EComposeRule::InDataManipulation );
             i_rDispatchArgs.put( PROPERTY_UPDATE_CATALOGNAME, sCatalog );
             i_rDispatchArgs.put( PROPERTY_UPDATE_SCHEMANAME, sSchema );
             i_rDispatchArgs.put( PROPERTY_UPDATE_TABLENAME, sTable );
+            i_rDispatchArgs.put( PROPERTY_COMMAND_TYPE, CommandType::TABLE );
         }
+        else
+            i_rDispatchArgs.put( PROPERTY_COMMAND_TYPE, CommandType::QUERY );
     }
 
     // RelationDesigner