[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dbaccess/source

Petr Mladek pmladek at suse.cz
Mon Jul 1 06:05:46 PDT 2013


 dbaccess/source/ui/dlg/generalpage.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 40d76398f2be1f6efb11f79865c3b8adc3186f24
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue May 21 10:46:45 2013 +0200

    allow to create new database using the wizard again (fdo#62937)
    
    To be honest, I do not userstand the code much. Julien pointed out that
    the setParentTitle and onTypeSelected were newer called. The condition
    looked like an optimisation and it helped to remove it.
    
    It would be great to put it back. It might be enough to hand the
    intial values.
    
    Change-Id: Id06cc9c63a9e578cb3c698c8526851fec71ef9da
    Reviewed-on: https://gerrit.libreoffice.org/4429
    Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index f637155..354d3e9 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -357,7 +357,6 @@ namespace dbaui
             sConnectURL = pUrlItem->GetValue();
         }
 
-        ::rtl::OUString eOldSelection = m_eCurrentSelection;
         m_eNotSupportedKnownType =  ::dbaccess::DST_UNKNOWN;
         implSetCurrentType(  ::rtl::OUString() );
 
@@ -388,11 +387,9 @@ namespace dbaui
         m_pDatasourceType->SelectEntry(sDisplayName);
 
         // notify our listener that our type selection has changed (if so)
-        if ( eOldSelection != m_eCurrentSelection )
-        {
-            setParentTitle(m_eCurrentSelection);
-            onTypeSelected(m_eCurrentSelection);
-        }
+        // FIXME: how to detect that it did not changed? (fdo#62937)
+        setParentTitle(m_eCurrentSelection);
+        onTypeSelected(m_eCurrentSelection);
 
         // a special message for the current page state
         switchMessage(m_eCurrentSelection);


More information about the Libreoffice-commits mailing list