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

[Lionel Elie Mamane]

 dbaccess/source/ui/browser/unodatbr.cxx |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 95e74a5033ba3ddc6906baba5d3b5ed0510b3a27
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jul 2 15:21:13 2013 +0200

    i#112615 table names are allowed slashes
    
    Change-Id: I1b69c4575d79ba1b6a6e9cd83abaf18bad54fd79
    Reviewed-on: https://gerrit.libreoffice.org/4677
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index d7994ba..3513889 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1244,7 +1244,21 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour
                 sal_Int32 nIndex = 0;
                 do
                 {
-                    OUString sPath = sCommand.getToken( 0, '/', nIndex );
+                    OUString sPath;
+                    switch (_nCommandType)
+                    {
+                    case CommandType::TABLE:
+                        sPath = sCommand;
+                        nIndex = -1;
+                        break;
+
+                    default:
+                        assert(false);
+                        // in non-debug builds, fall through.
+                    case CommandType::QUERY:
+                        sPath = sCommand.getToken( 0, '/', nIndex );
+                        break;
+                    }
                     pObject = m_pTreeView->getListBox().GetEntryPosByName(sPath, pCommandType);
                     pCommandType = pObject;
                     if ( nIndex >= 0 )