[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/com

Noel Power noelp at kemper.freedesktop.org
Thu Aug 2 04:08:12 PDT 2012


 wizards/com/sun/star/wizards/db/CommandName.java |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 36f8fb4b4b716577142b8855cece13b699d0559a
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Aug 2 11:58:24 2012 +0200

    handle "no schema" case
    
    This is especially the case when the source is a (saved) query.
    Fixes: Report Builder wizard "Finish" button does nothing -> cannot create report through wizard
    
    Change-Id: I266772035435a7c623beb0c0f66fc88e6316be8e

diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java
index 09b4eec..f2a4b6b 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -117,8 +117,15 @@ public class CommandName
                     String[] NameList;
                     NameList = new String[0];
                     NameList = JavaTools.ArrayoutofString(_DisplayName, ".");
-                    SchemaName = NameList[0];
-                    TableName = NameList[1]; // TODO Was ist mit diesem Fall: CatalogSep = "." und CatalogName = PropertyNames.EMPTY_STRING
+                    if (NameList.length > 1)
+                    {
+                        SchemaName = NameList[0];
+                        TableName = NameList[1];
+                    }
+                    else
+                    {
+                        TableName = _DisplayName;
+                    }
                 }
                 else
                 {


More information about the Libreoffice-commits mailing list