[ooo-build-commit] Branch 'ooo/master' - wizards/com
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jul 6 17:18:27 PDT 2009
wizards/com/sun/star/wizards/db/RelationController.java | 6 +++---
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 14 ++++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 574764c281f3dca8c32d66e740a84a819b46f006
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Mon Jul 6 09:00:26 2009 +0000
CWS-TOOLING: integrate CWS dba32d
2009-06-30 08:58:13 +0200 fs r273488 : merging latest changes from CWS dba32c
2009-06-29 11:40:42 +0200 oj r273459 : #i101652# fix token handling
2009-06-26 09:27:30 +0200 oj r273394 : #i101994# wrong condition checked
2009-06-22 12:09:04 +0200 fs r273210 : merging latest changes from CWS dba32c
2009-06-18 11:01:06 +0200 fs r273108 : merge latest changes from CWS dba32c
2009-06-17 14:19:33 +0200 oj r273072 : handle images at the correct position
2009-06-17 13:37:19 +0200 oj r273067 : compile error
2009-06-17 13:35:58 +0200 oj r273066 : #i102201# handle images
2009-06-17 13:27:21 +0200 oj r273065 : #i80917# disable checkbox for internal copy
2009-06-17 13:25:38 +0200 oj r273064 : #i80917# disable checkbox for internal copy
2009-06-15 12:59:16 +0200 fs r272978 : merging latest changes from CWS dba32c
2009-06-15 10:45:58 +0200 fs r272967 : CWS-TOOLING: rebase CWS dba32d to trunk at 272827 (milestone: DEV300:m50)
2009-06-15 08:41:05 +0200 fs r272960 : merging changes from CWS dba32c (resulting from rebasing dba32c to m50)
2009-06-03 12:22:32 +0200 fs r272554 : merging latest changes from CWS dba32c
2009-06-03 11:11:27 +0200 fs r272549 : #i100818# special treatment for DataAwareness not needed anymore
2009-06-03 11:07:01 +0200 fs r272548 : #i10000# removed package declaration
2009-06-03 09:21:03 +0200 oj r272537 : #i93465# save window states
2009-06-03 08:56:25 +0200 oj r272535 : solve compiler warnings
2009-06-03 08:55:02 +0200 oj r272534 : #i102295# export shapes i the first cell
2009-06-03 07:35:18 +0200 oj r272533 : #i101994# check for - and + prefix
2009-06-03 06:51:38 +0200 oj r272531 : #i101463# use uncomposed table name
2009-06-03 06:33:06 +0200 oj r272530 : #i102019# word corrected
2009-06-02 14:58:28 +0200 fs r272507 : #i102443# call initializeParser from LoadFinished
2009-06-02 14:30:10 +0200 oj r272504 : #i102019# introduce static ints
2009-06-02 13:51:02 +0200 oj r272501 : #i102439# wrong method used
2009-06-02 13:44:09 +0200 fs r272500 : #i102440# when tampering with Order/GroupBy, reset the cached columns
2009-06-02 10:53:01 +0200 fs r272487 : #i102234# preserve the original filter when using a 0=1 filter
2009-06-02 10:21:21 +0200 oj r272486 : #i100535# handle time values as float
2009-06-02 10:19:07 +0200 fs r272485 : merging latest changes from CWS dba32c
2009-05-29 16:00:15 +0200 fs r272467 : merging latest changes from dba32c
2009-05-29 15:31:25 +0200 fs r272462 : merging latest changes from dba32c
2009-05-29 10:58:03 +0200 oj r272438 : #101135# export embedded-text
2009-05-29 08:17:57 +0200 oj r272431 : #i80917# make attribute not optional
2009-05-29 08:17:32 +0200 oj r272430 : remoe unused token
2009-05-29 07:17:15 +0200 oj r272429 : #i80917# make attribute not optional
2009-05-28 12:48:14 +0200 oj r272401 : #i102201# insert images in context menu
2009-05-28 12:47:44 +0200 oj r272400 : #i80917# add new attribute to handle first line
2009-05-28 12:16:12 +0200 oj r272397 : #i96134# add / to path when it doesn't exist
2009-05-28 12:11:08 +0200 oj r272390 : #i80917# add new attribute to handle first line
2009-05-28 11:33:35 +0200 oj r272388 : #i101652# add new checkbox to handle header line as column names
2009-05-28 11:30:15 +0200 oj r272387 : #i101652# add localize
2009-05-28 11:15:53 +0200 oj r272386 : merge from dba32c
2009-05-28 09:08:25 +0200 fs r272378 : merged a build fix from CWS dba32c
diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java
index 7609600..5041ee5 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.java
@@ -115,7 +115,7 @@ public class RelationController extends CommandName
try
{
CommandName oLocCommandName = new CommandName(super.getCommandMetaData(), _sreferencedtablename);
- XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getImportedKeys(getCatalogName(oLocCommandName), oLocCommandName.getSchemaName(), _sreferencedtablename);
+ XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getImportedKeys(getCatalogName(oLocCommandName), oLocCommandName.getSchemaName(), oLocCommandName.getTableName());
XRow xRow = (XRow) UnoRuntime.queryInterface(XRow.class, xResultSet);
boolean bleaveLoop = false;
Vector aMasterFieldNamesVector = new Vector();
@@ -128,7 +128,7 @@ public class RelationController extends CommandName
{
sPrimaryCatalog = xRow.getString(PKTABLE_CAT);
}
- if (super.getCommandMetaData().xDBMetaData.supportsCatalogsInDataManipulation())
+ if (super.getCommandMetaData().xDBMetaData.supportsSchemasInDataManipulation())
{
sPrimarySchema = xRow.getString(PKTABLE_SCHEM);
}
@@ -137,7 +137,7 @@ public class RelationController extends CommandName
String sForeignColumnName = xRow.getString(FKCOLUMN_NAME);
if (JavaTools.isSame(getTableName(), sPrimaryTableName))
{
- if (JavaTools.isSame(getSchemaName(), sPrimarySchema))
+ if (sPrimarySchema == null || JavaTools.isSame(getSchemaName(), sPrimarySchema))
{
if (JavaTools.isSame(getCatalogName(), sPrimaryCatalog))
{
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 9c23ed5..d9f251f 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -59,7 +59,9 @@ import com.sun.star.wizards.ui.XFieldSelectionListener;
*/
public class ScenarioSelector extends FieldSelection implements XItemListener, XFieldSelectionListener
{
-
+ final static int PRIVATE = 0;
+ final static int BUSINESS = 1;
+
private XFixedText lblExplanation;
private XFixedText lblCategories;
private XRadioButton optBusiness;
@@ -163,18 +165,18 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
{
e.printStackTrace(System.out);
}
- initializeCategory(0);
+ initializeCategory(BUSINESS);
}
public int getCategory()
{
if (optBusiness.getState())
{
- curcategory = 0;
+ curcategory = BUSINESS;
}
else
{
- curcategory = 1;
+ curcategory = PRIVATE;
}
return curcategory;
}
@@ -183,11 +185,11 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
{
if (optBusiness.getState())
{
- initializeCategory(0);
+ initializeCategory(BUSINESS);
}
else
{
- initializeCategory(1);
+ initializeCategory(PRIVATE);
}
}
More information about the ooo-build-commit
mailing list