[Libreoffice-commits] .: dbaccess/source

Lionel Elie Mamane lmamane at kemper.freedesktop.org
Wed Nov 30 08:15:41 PST 2011


 dbaccess/source/ui/dlg/ConnectionPage.cxx         |    5 +++--
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |    5 +++--
 dbaccess/source/ui/dlg/detailpages.cxx            |    3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 7b0f53a5ea218d053eba2bf85a46c892267b3bb1
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Nov 30 17:12:44 2011 +0100

    Success to load JDBC driver is still info, not an error

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index e444815..1aa3a94 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -343,8 +343,9 @@ namespace dbaui
         {
         }
 
-        sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
-        OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String() );
+        const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
+        OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), WB_OK | WB_DEF_OK, mt );
         aMsg.Execute();
         return 0L;
     }
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 2f54e75..6d48a65 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -577,8 +577,9 @@ DBG_NAME(OMySQLIntroPageSetup)
         {
         }
 
-        sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
-        OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), WB_OK | WB_DEF_OK, OSQLMessageBox::MessageType::Error );
+        const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
+        OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), WB_OK | WB_DEF_OK, mt );
         aMsg.Execute();
         return 0L;
     }
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 734bba1..b9836ed 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -647,7 +647,8 @@ namespace dbaui
         }
 
         sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
-        OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), WB_OK | WB_DEF_OK, OSQLMessageBox::MessageType::Error );
+        const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error;
+        OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String(), WB_OK | WB_DEF_OK, mt );
         aMsg.Execute();
         return 0L;
     }


More information about the Libreoffice-commits mailing list