diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:45 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:45 +0200 |
| commit | b6224ecfd043aad64d2224945db3fafb4f0a4064 (patch) | |
| tree | 273dae3224e0c19fb05209abc612b27803a79cec /wizards/com/sun/star/wizards/db/CommandMetaData.java | |
| parent | 78f7536260ca5edbf32f31d12a1642cf4b3da234 (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 797de40c4bb63a0f72a282f14e4704993a872c02 (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:24 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit 47bf9a3750fbccb561961a623b766b901fc3a024
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed Sep 15 08:43:41 2010 +0200
Commit missing files in setup_native/source/win32/customactions/sellang/
.../source/win32/customactions/sellang/exports.dxp | 1 +
.../source/win32/customactions/sellang/makefile.mk | 79 +++++
.../source/win32/customactions/sellang/sellang.cxx | 347 ++++++++++++++++++++
3 files changed, 427 insertions(+), 0 deletions(-)
commit 0b7ae4e620a78e2b9732f51d4f8dbcf6dff23461
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 17:21:03 2010 +0200
cjk-default-compatibility.diff: Don't expand spaces with manual breaks
i#54320
cui/source/options/optgdlg.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 0a6fc538714579edc7c613140ee60c44749c58ff
Author: Kalman Szalai - KAMI <kamihir@freemail.hu>
Date: Tue Sep 14 16:44:59 2010 +0200
premium-splitted-language-packages.diff: Language dependent definitions.
.../source/packinfo/packinfo_office_lang.txt | 104 ++++++++++++++++++++
1 files changed, 104 insertions(+), 0 deletions(-)
commit fc04f6fdba6a3e3a1ac3457cd8c84887447a30ae
Author: Kalman Szalai - KAMI <kamihir@freemail.hu>
Date: Tue Sep 14 16:41:16 2010 +0200
extensions_packinfo.diff: extension integration, setup_native part.
.../source/packinfo/packinfo_extensions.txt | 258 ++++++++++++++++++++
1 files changed, 258 insertions(+), 0 deletions(-)
commit 403e72fe876d9131a3759d49ba3cdff3a5b9454a
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 15:33:58 2010 +0200
metric-field-limits.diff: maximum values were wrong when changing unit
cui/source/tabpages/numpages.cxx | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
commit de753a15fecd0bf6b80feda4766b0d586e199b07
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Sep 14 14:51:52 2010 +0200
win32-multi-lang-installer.diff: Multi-language installer stuff
i#66062, i#88638, i#88639
setup_native/prj/build.lst | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit cbab5dec38efe13dd50455a1a9e50caeb8a6949e
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 13:11:23 2010 +0200
win32-vs2005-compat.diff: Fix build with Visual Studio 2005
.../source/win32/customactions/rebase/rebase.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit b41159c14ec698e01b43a545e6b93419d0206d5d
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:45:00 2010 +0200
cjk-character-units-fix-376788.diff: add a new character unit
i#376788
cui/source/tabpages/paragrph.cxx | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
commit 38d7e2c79e4207d8138a1740e077bf0e83c80856
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:37:50 2010 +0200
cjk-character-units-imp.diff: add a new unit 'character unit'
cui/source/tabpages/paragrph.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit ecd9e9d1a068915607ed0b4cc97e573839c9fe47
Merge: 5145c71 e8b8fec
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:02 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 5145c719bf38b11435c5562b1ef336ecb59b64ae
Merge: b14bcef b221612
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:01 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit e8b8fec48b3ad2464b6ce6744e419190efeb45b3 (tag: refs/tags/ooo/OOO330_m7)
Merge: b221612 86d169e
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:31:58 2010 +0200
CWS-TOOLING: integrate CWS fwk155
commit 86d169e89f39d3ddb7bac7f50d2adb1bb7e7d087
Author: Mikhail Voytenko <mav@openoffice.org>
Date: Tue Aug 31 09:17:25 2010 +0200
fwk155: #i107615# integrate the patch from CD
cui/source/customize/cfg.cxx | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
commit b221612dc355d7c219819db42207437eb4fe5fe5 (tag: refs/tags/ooo/OOO330_m6)
Merge: 4f48476 622fdb6
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu Aug 26 13:20:55 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl07
commit 4f48476894efff2739e6e25b7b2633d41904a252
Merge: 5f4ef9b 09e35e8
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:19:19 2010 +0200
CWS-TOOLING: integrate CWS sw33bf08
commit 5f4ef9be8671cf2940b83ea83d6ad5315126bd83
Merge: ae0c345 4fd95ed
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 12:49:35 2010 +0200
CWS-TOOLING: integrate CWS mib18
commit 622fdb67821d299bd8314cd9196e85c5d3d2ce84
Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>
Date: Tue Aug 24 11:00:05 2010 +0200
ooo33gsl07: #i114002# add missing license headers
extensions/source/plugin/unx/npnapi.cxx | 31 +++++++++++++++++++++++++------
extensions/source/plugin/unx/nppapi.cxx | 31 +++++++++++++++++++++++++------
2 files changed, 50 insertions(+), 12 deletions(-)
commit 09e35e845fc8941c56e54597ce679b258b97ba1c
Author: Thomas Lange [tl] <tl@openoffice.org>
Date: Wed Aug 18 13:53:28 2010 +0200
cws sw33bf08: #i113867# removing en-US dictionaries from Ukrainian language pack
.../source/packinfo/spellchecker_selection.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 825fb51589a6f29bedae00ee817edfc958597abc
Author: Thomas Lange [tl] <tl@openoffice.org>
Date: Wed Aug 18 13:50:02 2010 +0200
cws sw33bf08: #i113867# removing en-US dictionaries from Ukrainian language pack
.../source/packinfo/spellchecker_selection.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit ae0c34553de6ecabbc6420979a99829c11e472fa (tag: refs/tags/ooo/OOO330_m5)
Merge: 19c39d8 d5b054d
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 13:32:26 2010 +0200
CWS-TOOLING: integrate CWS native324
commit 19c39d8ca1d55ac1cd3349a319669ffd0bee7f18
Merge: ad50c65 e56c03d
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit d5b054dc43970313df80e253c78a424841a4eed4
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Aug 16 12:53:36 2010 +0200
native324 #i113835# preparing rpm installation on debian systems
.../openoffice/setup/Installer/LinuxInstaller.java | 130 +++++++++++---------
1 files changed, 72 insertions(+), 58 deletions(-)
commit 4fd95ed4edd92cff6667f6d237b9430d52ee5265
Merge: 329c134 ad50c65
Author: Daniel Rentz <dr@openoffice.org>
Date: Fri Aug 13 11:29:46 2010 +0200
mib18: rebase to OOO330m4
commit 9edf45e4490cbf5965cba1b7b80b5c20fab0f5bb
Author: Ingo Schmidt <is@openoffice.org>
Date: Fri Aug 13 11:15:11 2010 +0200
native324 #i113835# preparing rpm installation on debian systems
.../org/openoffice/setup/InstallData.java | 18 ++
.../openoffice/setup/Installer/LinuxInstaller.java | 182 +++++++++++++-------
.../setup/InstallerHelper/LinuxHelper.java | 21 +++
setup_native/scripts/install_linux.sh | 16 ++-
4 files changed, 172 insertions(+), 65 deletions(-)
commit e56c03da11bea148347bc37cd317af862f083d32
Merge: 64623c6 bd8d6fa
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
commit bd8d6faa1fdb424a68e50b4ce0dd3f2f72796e78
Merge: 92cc5ae 64623c6
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit 329c134bc2d01d41a2ab41cbe5a856b764dcf409
Author: Andreas Bregas <ab@openoffice.org>
Date: Fri Aug 6 09:35:51 2010 +0200
mib18: #163121# Declare Rework
basctl/source/basicide/baside2.cxx | 2 +-
basctl/source/basicide/basobj2.cxx | 18 ++++++++++++++----
basctl/source/basicide/macrodlg.cxx | 16 ++++++++++------
3 files changed, 25 insertions(+), 11 deletions(-)
commit 64623c655d414eac4c0e2b266bee913a5456043a
Merge: 28d217b c42035a
Author: Joachim Lingner <jl@openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
commit 28d217bc56c559e2439d39fdaa406380f32c9412
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 29 16:18:26 2010 +0200
jl154 #i162868# Copying from prereg/bundled to user/extensions/bundled failed because of file access right of temporary files in the registry data. The scripts run now chmod after unopkg sync
.../source/packinfo/shellscripts_extensions.txt | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
commit 6512191685b0f43b0938b44ee95b063de7463387
Author: Ingo Schmidt <is@openoffice.org>
Date: Fri Jul 23 18:25:10 2010 +0200
jl154 #162868# solaris postinstall script
.../source/packinfo/shellscripts_extensions.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 859ab84fcc0707bd6c895517325f1985e9d91d8c
Author: Ingo Schmidt <is@openoffice.org>
Date: Fri Jul 23 10:37:24 2010 +0200
jl154 #162868# bundled folder in prereg folder
setup_native/scripts/admin.pl | 2 +-
.../source/packinfo/shellscripts_extensions.txt | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
commit ee943cf4436ff8adbd9440211c39a5c27768369a
Author: Ingo Schmidt <is@openoffice.org>
Date: Thu Jul 22 17:43:35 2010 +0200
jl154 #162868# unopkg in shell script with several quotes
setup_native/scripts/admin.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 6ef1482d39a33925b245d245fe6127b4744d0dfd
Author: Ingo Schmidt <is@openoffice.org>
Date: Thu Jul 22 17:26:25 2010 +0200
jl154 #162868# unopkg in shell script with several quotes
.../source/packinfo/shellscripts_extensions.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit afd1eb5b6c81f59342bd8ee7a1b96429289d98dc
Merge: a1e6245 e234443
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Thu Jul 22 10:44:04 2010 +0200
jl154: Local branch merge
commit e234443c641e4bc2f5d89b031bbb30f2d560cb95
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 21 14:15:34 2010 +0200
jl154 #i162868# changed RemoveExtensions custom action (windows) to delete brand/share/prereg/bundled
.../shellextensions/registerextensions.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 62729bf5d94eb74bb1ff410cc543d8ffcf4f4bdc
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 21 13:29:14 2010 +0200
jl154 #i162868# unopkg sync removes share/prereg/bundled, changing registerExtensions
.../shellextensions/registerextensions.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c803ad8da4a88de0689afee5728f0407ff7d791f
Author: Ingo Schmidt <is@openoffice.org>
Date: Wed Jul 21 12:04:31 2010 +0200
jl154 #162868# new share/prereg folder
setup_native/scripts/admin.pl | 30 +++++++++----------
.../source/packinfo/shellscripts_extensions.txt | 16 +++++-----
2 files changed, 22 insertions(+), 24 deletions(-)
commit a1e6245b5e0a359f1f7e707a263ed1e45dd82067
Merge: 3a7ba2a ffa0e25
Author: Joerg Skottke [jsk] <jsk@openoffice.org>
Date: Mon Jul 19 14:42:46 2010 +0200
jl154: Local merge
commit ffa0e25150cabfc67705e3fc10cc02952b325966
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 19 14:23:27 2010 +0200
jl154 #162868# guarantee existence of extensions folder
setup_native/source/packinfo/package.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 3a7ba2ab93b4ec058d92064e7657497d9cbd4794
Merge: 8246234 f6b4bfd
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 16 15:45:18 2010 +0200
jl154 merging with OOO300_m1
commit 8246234a96c80f2dcb29126cf8f9e96597aa3e16
Author: Joachim Lingner <jl@openoffice.org>
Date: Fri Jul 16 11:52:44 2010 +0200
jl154 #162868# removing the package.txt from the extensions folder. Extensions folder will be created in a different way than installing a dummy file
setup_native/source/packinfo/package.txt | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit b8e2cf46d6a073c7fbcd51494a92d6da33181622
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 15 17:22:01 2010 +0200
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
setup_native/source/packinfo/package.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 757f1ada9215c698c650eba559e05a70322848b7
Author: Joachim Lingner <jl@openoffice.org>
Date: Thu Jul 15 16:28:33 2010 +0200
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
setup_native/scripts/admin.pl | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
commit 0809a24f900b5cf43a70d1f3ab11c681e1906692
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 14 15:17:57 2010 +0200
jl154 #162868# removing registration data folder if the last extension was removed
.../shellextensions/registerextensions.cxx | 56 ++++++++++----------
1 files changed, 28 insertions(+), 28 deletions(-)
commit f4230d177ad95e04566dc95859491308b606fdc1
Author: Ingo Schmidt <is@openoffice.org>
Date: Wed Jul 14 11:10:14 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
.../customactions/shellextensions/exports.dxp | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit 5e9dc05754c042aae338c22f91e35d6d19780be7
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jul 14 09:23:58 2010 +0200
jl154 #162868# windows custom action for running unopkg sync
.../win32/customactions/languagepacks/exports.dxp | 3 +-
.../source/win32/customactions/patch/exports.dxp | 2 +
.../source/win32/customactions/patch/makefile.mk | 1 +
.../shellextensions/registerextensions.cxx | 200 +++-----------------
4 files changed, 31 insertions(+), 175 deletions(-)
commit f423a7a32a7f0c9dc4740d21b3bfda2504eccd56
Author: Ingo Schmidt <is@openoffice.org>
Date: Tue Jul 13 18:57:19 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
setup_native/scripts/admin.pl | 7 +
setup_native/source/packinfo/packinfo_office.txt | 33 +++++
.../source/packinfo/shellscripts_extensions.txt | 129 +++-----------------
3 files changed, 56 insertions(+), 113 deletions(-)
commit 698b3cb962af8618f3e884ccdf9b9edf1df3b97f
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 18:24:42 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
.../win32/customactions/languagepacks/exports.dxp | 3 +++
.../win32/customactions/languagepacks/makefile.mk | 1 +
.../customactions/shellextensions/exports.dxp | 3 +++
.../customactions/shellextensions/makefile.mk | 1 +
4 files changed, 8 insertions(+), 0 deletions(-)
commit 929f5169397c101ec9fff3fb535376df3de09e2e
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 18:02:39 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
setup_native/scripts/admin.pl | 120 ++++++++++++++++++++++++++++++-----------
1 files changed, 88 insertions(+), 32 deletions(-)
commit b5c165ca38d0f3c8417540a6f185462eb11904f6
Author: Ingo Schmidt <is@openoffice.org>
Date: Mon Jul 12 16:20:39 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
setup_native/scripts/admin.pl | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
commit a5c95fbe4b239c7be2ba0569922bab29d0c21ad3
Merge: 1fad720 c04b382
Author: Joachim Lingner <jl@openoffice.org>
Date: Wed Jun 30 17:12:59 2010 +0200
jl154 merge with DEV300_m84
Notes
split repo tag: components_OOO_BUILD_3_2_98_1
Diffstat (limited to 'wizards/com/sun/star/wizards/db/CommandMetaData.java')
| -rw-r--r-- | wizards/com/sun/star/wizards/db/CommandMetaData.java | 212 |
1 files changed, 106 insertions, 106 deletions
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index ad54020e8645..4df1fc8378a8 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,22 +69,22 @@ public class CommandMetaData extends DBMetaData private XIndexAccess xIndexKeys; - public CommandMetaData(XMultiServiceFactory xMSF, Locale _aLocale, NumberFormatter oNumberFormatter) + public CommandMetaData(XMultiServiceFactory xMSF, Locale _aLocale, NumberFormatter oNumberFormatter) { super(xMSF, _aLocale, oNumberFormatter); } - - public CommandMetaData(XMultiServiceFactory xMSF) + + public CommandMetaData(XMultiServiceFactory xMSF) { super(xMSF); } - public void initializeFieldColumns(boolean _bgetDefaultValue, String _CommandName, String[] _FieldNames) + public void initializeFieldColumns(boolean _bgetDefaultValue, String _CommandName, String[] _FieldNames) { this.setCommandName(_CommandName); FieldColumns = new FieldColumn[_FieldNames.length]; - for (int i = 0; i < _FieldNames.length; i++) + for (int i = 0; i < _FieldNames.length; i++) { FieldColumns[i] = new FieldColumn(this, _FieldNames[i], this.getCommandName(), false); // if (_bgetDefaultValue) @@ -94,22 +94,22 @@ public class CommandMetaData extends DBMetaData } } - + public void initializeFieldColumns(String[] _FieldNames, XNameAccess _xColumns) { FieldColumns = new FieldColumn[_FieldNames.length]; - for (int i = 0; i < _FieldNames.length; i++) + for (int i = 0; i < _FieldNames.length; i++) { FieldColumns[i] = new FieldColumn(this,_xColumns, _FieldNames[i] ); } } - - - public void initializeFieldColumns(String[] _FieldNames, String _CommandName) + + + public void initializeFieldColumns(String[] _FieldNames, String _CommandName) { this.setCommandName(_CommandName); FieldColumns = new FieldColumn[_FieldNames.length]; - for (int i = 0; i < _FieldNames.length; i++) + for (int i = 0; i < _FieldNames.length; i++) { FieldColumns[i] = new FieldColumn(this, _FieldNames[i], _CommandName, false); if (FieldTitleSet != null) @@ -122,37 +122,37 @@ public class CommandMetaData extends DBMetaData FieldColumns[i].setFieldTitle( _FieldNames[i] ); FieldTitleSet.put(_FieldNames[i], _FieldNames[i]); } - } + } } } } - + public Map getFieldTitleSet() { return FieldTitleSet; } - - - public XPropertySet getColumnObjectByFieldName(String _FieldName, boolean _bgetByDisplayName) + + + public XPropertySet getColumnObjectByFieldName(String _FieldName, boolean _bgetByDisplayName) { - try + try { FieldColumn CurFieldColumn = null; if (_bgetByDisplayName) { - CurFieldColumn = this.getFieldColumnByDisplayName(_FieldName); + CurFieldColumn = this.getFieldColumnByDisplayName(_FieldName); } else { - CurFieldColumn = this.getFieldColumnByFieldName(_FieldName); + CurFieldColumn = this.getFieldColumnByFieldName(_FieldName); } String CurCommandName = CurFieldColumn.getCommandName(); CommandObject oCommand = getTableByName(CurCommandName); Object oColumn = oCommand.getColumns().getByName(CurFieldColumn.getFieldName()); XPropertySet xColumn = UnoRuntime.queryInterface( XPropertySet.class, oColumn ); return xColumn; - } - catch (Exception exception) + } + catch (Exception exception) { exception.printStackTrace(System.out); return null; @@ -170,12 +170,12 @@ public class CommandMetaData extends DBMetaData sSortFieldName[0] = _fieldnames[i]; int index = JavaTools.FieldInTable(SortFieldNames, _fieldnames[i]); if (index > -1) - + { sSortFieldName[1] = SortFieldNames[index][1]; } else - + { sSortFieldName[1] = "ASC"; } @@ -205,13 +205,13 @@ public class CommandMetaData extends DBMetaData { if (FieldColumns.length > 0) { - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { if (FieldColumns[i].getFieldName().equals(_FieldName)) - + { if (FieldColumns[i].getCommandName().equals(_CommandName)) - { + { return FieldColumns[i]; } } @@ -222,9 +222,9 @@ public class CommandMetaData extends DBMetaData - public FieldColumn getFieldColumnByFieldName(String _FieldName) + public FieldColumn getFieldColumnByFieldName(String _FieldName) { - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { String sFieldName = FieldColumns[i].getFieldName(); if (sFieldName.equals(_FieldName)) @@ -243,10 +243,10 @@ public class CommandMetaData extends DBMetaData throw new com.sun.star.uno.RuntimeException(); } - - public FieldColumn getFieldColumnByDisplayName(String _DisplayName) + + public FieldColumn getFieldColumnByDisplayName(String _DisplayName) { - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { String sDisplayName = FieldColumns[i].getDisplayFieldName(); if (sDisplayName.equals(_DisplayName)) @@ -265,10 +265,10 @@ public class CommandMetaData extends DBMetaData throw new com.sun.star.uno.RuntimeException(); } - - public FieldColumn getFieldColumnByTitle(String _FieldTitle) + + public FieldColumn getFieldColumnByTitle(String _FieldTitle) { - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { if (FieldColumns[i].getFieldTitle().equals(_FieldTitle)) { @@ -277,7 +277,7 @@ public class CommandMetaData extends DBMetaData } // throw new com.sun.star.uno.RuntimeException(); // LLA: Group works with fields direct - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { if (FieldColumns[i].getFieldName().equals(_FieldTitle)) { @@ -288,24 +288,24 @@ public class CommandMetaData extends DBMetaData } - public boolean getFieldNamesOfCommand(String _commandname, int _commandtype, boolean _bAppendMode) + public boolean getFieldNamesOfCommand(String _commandname, int _commandtype, boolean _bAppendMode) { - try + try { // Object oField; java.util.Vector<String> ResultFieldNames = new java.util.Vector<String>(10); String[] FieldNames; CommandObject oCommand = this.getCommandByName(_commandname, _commandtype); FieldNames = oCommand.getColumns().getElementNames(); - if (FieldNames.length > 0) + if (FieldNames.length > 0) { - for (int n = 0; n < FieldNames.length; n++) + for (int n = 0; n < FieldNames.length; n++) { final String sFieldName = FieldNames[n]; Object oField = oCommand.getColumns().getByName(sFieldName); int iType = AnyConverter.toInt(Helper.getUnoPropertyValue(oField, "Type")); // BinaryFieldTypes are not included in the WidthList - if (JavaTools.FieldInIntTable(WidthList, iType) >= 0) + if (JavaTools.FieldInIntTable(WidthList, iType) >= 0) { // if (_bAppendMode) // ResultFieldNames.addElement(_commandname + "." + FieldNames[n]); @@ -323,8 +323,8 @@ public class CommandMetaData extends DBMetaData ResultFieldNames.copyInto(m_aAllFieldNames); return true; } - } - catch (Exception exception) + } + catch (Exception exception) { exception.printStackTrace(System.out); } @@ -334,11 +334,11 @@ public class CommandMetaData extends DBMetaData showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgNoFieldsFromCommand); return false; } - - - - - + + + + + public String[] getOrderableColumns(String[] _fieldnames) { @@ -362,14 +362,14 @@ public class CommandMetaData extends DBMetaData /** * @return Returns the command. */ - public String getCommandName() + public String getCommandName() { return Command; } /** * @param _command The command to set. */ - public void setCommandName(String _command) + public void setCommandName(String _command) { Command = _command; } @@ -377,7 +377,7 @@ public class CommandMetaData extends DBMetaData /** * @return Returns the commandType. */ - public int getCommandType() + public int getCommandType() { return CommandType; } @@ -385,15 +385,15 @@ public class CommandMetaData extends DBMetaData /** * @param _commandType The commandType to set. */ - public void setCommandType(int _commandType) + public void setCommandType(int _commandType) { CommandType = _commandType; } - public boolean isnumeric(FieldColumn _oFieldColumn) + public boolean isnumeric(FieldColumn _oFieldColumn) { - try + try { CommandObject oTable = super.getTableByName(_oFieldColumn.getCommandName()); Object oField = oTable.getColumns().getByName(_oFieldColumn.getFieldName()); @@ -408,19 +408,19 @@ public class CommandMetaData extends DBMetaData return false; } } - catch (Exception exception) + catch (Exception exception) { exception.printStackTrace(System.out); return false; } } - public String[] setNumericFields() + public String[] setNumericFields() { - try + try { Vector<String> numericfieldsvector = new java.util.Vector<String>(); - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { if (isnumeric(FieldColumns[i])) { @@ -431,7 +431,7 @@ public class CommandMetaData extends DBMetaData numericfieldsvector.toArray(NumericFieldNames); return NumericFieldNames; } - catch (Exception exception) + catch (Exception exception) { exception.printStackTrace(System.out); return new String[]{}; @@ -441,39 +441,39 @@ public class CommandMetaData extends DBMetaData public String[] getFieldNames(String[] _sDisplayFieldNames, String _sCommandName) { Vector<String> sFieldNamesVector = new java.util.Vector<String>(); - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { - if (_sCommandName.equals(FieldColumns[i].getCommandName())) + if (_sCommandName.equals(FieldColumns[i].getCommandName())) { - if (JavaTools.FieldInList(_sDisplayFieldNames, FieldColumns[i].getDisplayFieldName()) > -1) + if (JavaTools.FieldInList(_sDisplayFieldNames, FieldColumns[i].getDisplayFieldName()) > -1) { sFieldNamesVector.addElement(FieldColumns[i].getFieldName()); } } } String[] sFieldNames = new String[sFieldNamesVector.size()]; - sFieldNamesVector.toArray(sFieldNames); + sFieldNamesVector.toArray(sFieldNames); return sFieldNames; } - + public String[] getFieldNames() { String[] sFieldNames = new String[FieldColumns.length]; - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { sFieldNames[i] = FieldColumns[i].getFieldName(); } return sFieldNames; } - + public String[] getDisplayFieldNames() { String[] sDisplayFieldNames = new String[FieldColumns.length]; - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { - sDisplayFieldNames[i] = FieldColumns[i].getDisplayFieldName(); + sDisplayFieldNames[i] = FieldColumns[i].getDisplayFieldName(); } return sDisplayFieldNames; } @@ -481,10 +481,10 @@ public class CommandMetaData extends DBMetaData public String[] setNonAggregateFieldNames() { - try + try { Vector<String> nonaggregatefieldsvector = new java.util.Vector<String>(); - for (int i = 0; i < FieldColumns.length; i++) + for (int i = 0; i < FieldColumns.length; i++) { if (JavaTools.FieldInTable(AggregateFieldNames, FieldColumns[i].getDisplayFieldName()) == -1) { @@ -494,8 +494,8 @@ public class CommandMetaData extends DBMetaData NonAggregateFieldNames = new String[nonaggregatefieldsvector.size()]; nonaggregatefieldsvector.toArray(NonAggregateFieldNames); return NonAggregateFieldNames; - } - catch (Exception exception) + } + catch (Exception exception) { exception.printStackTrace(System.out); return new String[]{}; @@ -507,15 +507,15 @@ public class CommandMetaData extends DBMetaData * @param _DisplayFieldNames * @return */ - public boolean hasNumericalFields(String[] _DisplayFieldNames) + public boolean hasNumericalFields(String[] _DisplayFieldNames) { - if (_DisplayFieldNames != null) + if (_DisplayFieldNames != null) { - if (_DisplayFieldNames.length > 0) + if (_DisplayFieldNames.length > 0) { for (int i = 0; i < _DisplayFieldNames.length; i++) - { + { if (isnumeric(getFieldColumnByDisplayName(_DisplayFieldNames[i]))) { return true; @@ -526,7 +526,7 @@ public class CommandMetaData extends DBMetaData return false; } - public String getFieldTitle(String FieldName) + public String getFieldTitle(String FieldName) { String FieldTitle = FieldName; if (this.FieldTitleSet != null) @@ -540,7 +540,7 @@ public class CommandMetaData extends DBMetaData return FieldTitle; } - + public void setFieldTitles(String[] sFieldTitles) { int nFieldColLength = FieldColumns.length; @@ -550,11 +550,11 @@ public class CommandMetaData extends DBMetaData { FieldColumns[i].setFieldTitle(sFieldTitles[i]); } - + } } - - + + public String[] getFieldTitles() { String[] sFieldTitles = new String[FieldColumns.length]; @@ -564,20 +564,20 @@ public class CommandMetaData extends DBMetaData } return sFieldTitles; } - - - public void setGroupFieldNames(String[] GroupFieldNames) + + + public void setGroupFieldNames(String[] GroupFieldNames) { this.GroupFieldNames = GroupFieldNames; } - - public String[] getGroupFieldNames() + + public String[] getGroupFieldNames() { return GroupFieldNames; } - public void createRecordFieldNames() + public void createRecordFieldNames() { String CurFieldName; int GroupFieldCount; @@ -587,10 +587,10 @@ public class CommandMetaData extends DBMetaData RecordFieldNames = new String[TotFieldCount - GroupFieldCount]; int a = 0; - for (int i = 0; i < TotFieldCount; i++) + for (int i = 0; i < TotFieldCount; i++) { CurFieldName = FieldColumns[i].getFieldName(); - if (JavaTools.FieldInList(GroupFieldNames, CurFieldName) < 0) + if (JavaTools.FieldInList(GroupFieldNames, CurFieldName) < 0) { RecordFieldNames[a] = CurFieldName; // a += 1; @@ -612,7 +612,7 @@ public class CommandMetaData extends DBMetaData } /**@deprecated use 'RelationController' class instead - * + * * @param _stablename * @param _ncommandtype * @return @@ -620,7 +620,7 @@ public class CommandMetaData extends DBMetaData public String[] getReferencedTables(String _stablename, int _ncommandtype) { String[] sTotReferencedTables = new String[]{}; - try + try { if (_ncommandtype == com.sun.star.sdb.CommandType.TABLE) { @@ -651,8 +651,8 @@ public class CommandMetaData extends DBMetaData } } } - } - catch (Exception e) + } + catch (Exception e) { e.printStackTrace(System.out); } @@ -660,14 +660,14 @@ public class CommandMetaData extends DBMetaData } /**@deprecated use 'RelationController' class instead - * + * * @param _sreferencedtablename * @return */ public String[][] getKeyColumns(String _sreferencedtablename) { String[][] skeycolumnnames = null; - try + try { for (int i = 0; i < xIndexKeys.getCount(); i++) { @@ -695,8 +695,8 @@ public class CommandMetaData extends DBMetaData } } } - } - catch (Exception e) + } + catch (Exception e) { e.printStackTrace(); } @@ -706,12 +706,12 @@ public class CommandMetaData extends DBMetaData public void openFormDocument(boolean _bReadOnly) { - try + try { Object oEmbeddedFactory = super.xMSF.createInstance("com.sun.star.embed.OOoEmbeddedObjectFactory"); int iEntryInitMode = EntryInitModes.DEFAULT_INIT; //TRUNCATE_INIT??? - } - catch (Exception e) + } + catch (Exception e) { e.printStackTrace(System.out); } @@ -720,14 +720,14 @@ public class CommandMetaData extends DBMetaData public void setCommandComposingAttributes() { - try + try { boolean bCatalogAtStart2 = xDBMetaData.isCatalogAtStart(); sCatalogSep = xDBMetaData.getCatalogSeparator(); sIdentifierQuote = xDBMetaData.getIdentifierQuoteString(); bCommandComposerAttributesalreadyRetrieved = true; - } - catch (SQLException e) + } + catch (SQLException e) { e.printStackTrace(System.out); } @@ -737,7 +737,7 @@ public class CommandMetaData extends DBMetaData /** * @return Returns the bCatalogAtStart. */ - public boolean isCatalogAtStart() + public boolean isCatalogAtStart() { if (!bCommandComposerAttributesalreadyRetrieved) { @@ -749,7 +749,7 @@ public class CommandMetaData extends DBMetaData /** * @return Returns the sCatalogSep. */ - public String getCatalogSeparator() + public String getCatalogSeparator() { if (!bCommandComposerAttributesalreadyRetrieved) { @@ -761,7 +761,7 @@ public class CommandMetaData extends DBMetaData /** * @return Returns the sIdentifierQuote. */ - public String getIdentifierQuote() + public String getIdentifierQuote() { if (!bCommandComposerAttributesalreadyRetrieved) { |