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

Lionel Elie Mamane lionel at mamane.lu
Thu Apr 4 06:39:24 PDT 2013


 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e32fd065075d2baccb9284d1bf55538418806865
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Apr 4 15:37:51 2013 +0200

    more efficent & readable
    
    Change-Id: If24a2a8488f1b1142b12540e4b8b00eb26bd7873

diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index dac3441..3e85d37 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -495,8 +495,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
             // replace with alias.*
             if (aField.trim() == "*")
             {
-                aField = aTable;
-                aField += ".*";
+                aField = aTable + ".*";
             }
             m_pFieldCell->SetText(aField);
         }   break;
commit e60eca1cfcf4763571f7e87a88740e4517a7dabd
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Apr 4 15:37:31 2013 +0200

    replace only single wildcard by table.*
    
    not any string beginning with "*"
    
    Change-Id: I6afe4db0ae69632990eafb288f715ae9cf7ad837

diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 2b53c89..dac3441 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -493,7 +493,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
             getDesignView()->fillValidFields(aTable, m_pFieldCell);
 
             // replace with alias.*
-            if ((aField[0] == '*') && aTable.Len())
+            if (aField.trim() == "*")
             {
                 aField = aTable;
                 aField += ".*";


More information about the Libreoffice-commits mailing list