summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/ui/inc/RelationDlg.hxx16
-rw-r--r--dbaccess/source/ui/inc/WCPage.hxx8
-rw-r--r--dbaccess/source/ui/inc/WColumnSelect.hxx18
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx9
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx12
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx11
-rw-r--r--dbaccess/source/ui/inc/adtabdlg.hxx10
-rw-r--r--dbaccess/source/ui/inc/queryfilter.hxx10
-rw-r--r--dbaccess/source/ui/inc/queryorder.hxx11
9 files changed, 42 insertions, 63 deletions
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 6c67b4413b55..743bdb1a8567 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RelationDlg.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:08:37 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,10 +65,6 @@
#include <vcl/dialog.hxx>
#endif
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
#endif
@@ -151,18 +147,18 @@ namespace dbaui
//========================================================================
class ORelationDialog : public ModalDialog
{
- GroupBox aGB_InvolvedTables;
+ FixedLine aFL_InvolvedTables;
ListBox m_lmbLeftTable,
m_lmbRightTable;
- GroupBox aGB_InvolvedFields;
+ FixedLine aFL_InvolvedFields;
- GroupBox aGB_CascUpd;
+ FixedLine aFL_CascUpd;
RadioButton aRB_NoCascUpd,
aRB_CascUpd,
aRB_CascUpdNull,
aRB_CascUpdDefault;
- GroupBox aGB_CascDel;
+ FixedLine aFL_CascDel;
RadioButton aRB_NoCascDel,
aRB_CascDel,
aRB_CascDelNull,
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 9a9c97333218..38e515e4c961 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: WCPage.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-23 14:58:43 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,11 +94,9 @@ namespace dbaui
class OCopyTable : public OWizardPage
{
protected:
- FixedBitmap m_aFBmpCopyTable;
- GroupBox m_aGB_Temp;
FixedText m_ftTableName;
Edit m_edTableName;
- GroupBox m_aGB_Options;
+ FixedLine m_aFL_Options;
RadioButton m_aRB_DefData;
RadioButton m_aRB_Def;
RadioButton m_aRB_View;
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx
index 32be1f3b01b2..5867a7c51900 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: WColumnSelect.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-23 14:59:21 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,8 +64,8 @@
#ifndef DBAUI_WIZ_TABBPAGE_HXX
#include "WTabPage.hxx"
#endif
-#ifndef _SV_GROUP_HXX
-#include <vcl/group.hxx>
+#ifndef _SV_FIXED_HXX
+#include <vcl/fixed.hxx>
#endif
#ifndef _SV_LSTBOX_HXX
#include <vcl/lstbox.hxx>
@@ -83,12 +83,12 @@ namespace dbaui
class OWizColumnSelect : public OWizardPage
{
- GroupBox m_gpColumns;
+ FixedLine m_flColumns;
MultiListBox m_lbOrgColumnNames; // left side
- PushButton m_pbColumn_RH;
- PushButton m_pbColumns_RH;
- PushButton m_pbColumn_LH;
- PushButton m_pbColumns_LH;
+ ImageButton m_ibColumn_RH;
+ ImageButton m_ibColumns_RH;
+ ImageButton m_ibColumn_LH;
+ ImageButton m_ibColumns_LH;
MultiListBox m_lbNewColumnNames; // right side
sal_Bool m_bAttrsChanged;
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 718f46adb907..48cf81d0fb5c 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: WCopyTable.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 08:44:07 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -130,10 +130,11 @@ namespace dbaui
ODatabaseExport::TColumns m_vSourceColumns;
ODatabaseExport::TColumnVector m_vSourceVec;
- OKButton m_pbFinish;
+ HelpButton m_pbHelp;
CancelButton m_pbCancel;
- PushButton m_pbNext;
PushButton m_pbPrev;
+ PushButton m_pbNext;
+ OKButton m_pbFinish;
String m_sTypeNames; // these type names are the ones out of the resource file
sal_uInt32 m_nPageCount;
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 252e1b8cf5d8..064bfe0fea9e 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: WNameMatch.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-23 14:59:32 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -110,10 +110,10 @@ namespace dbaui
FixedText m_FT_TABLE_RIGHT;
OColumnTreeBox m_CTRL_LEFT; // left side
OColumnTreeBox m_CTRL_RIGHT; // right side
- PushButton m_pbColumn_up;
- PushButton m_pbColumn_down;
- PushButton m_pbColumn_up_right;
- PushButton m_pbColumn_down_right;
+ ImageButton m_ibColumn_up;
+ ImageButton m_ibColumn_down;
+ ImageButton m_ibColumn_up_right;
+ ImageButton m_ibColumn_down_right;
PushButton m_pbAll;
PushButton m_pbNone;
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 9e718971e283..aec4fcf54486 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: WTypeSelect.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-23 14:58:35 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,9 +67,6 @@
#ifndef _SV_LSTBOX_HXX
#include <vcl/lstbox.hxx>
#endif
-#ifndef _SV_GROUP_HXX
-#include <vcl/group.hxx>
-#endif
#ifndef _SV_FIELD_HXX
#include <vcl/field.hxx>
#endif
@@ -147,9 +144,9 @@ namespace dbaui
protected:
OWizTypeSelectList m_lbColumnNames;
- GroupBox m_gpColumns;
+ FixedLine m_flColumns;
OWizTypeSelectControl m_aTypeControl;
- GroupBox m_gpAutoType;
+ FixedLine m_flAutoType;
FixedText m_ftAuto;
NumericField m_etAuto;
PushButton m_pbAuto;
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 96f79a6c24ae..84d48658673a 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: adtabdlg.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-03-19 12:41:58 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,10 +65,6 @@
#include <vcl/dialog.hxx>
#endif
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
#endif
@@ -103,7 +99,7 @@ namespace dbaui
PushButton aAddButton;
CancelButton aCloseButton;
HelpButton aHelpButton;
- GroupBox aGroupBoxTable;
+ FixedLine aFixedLineTable;
String aDefaultString;
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index ddc4090c58d9..21d08616888d 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: queryfilter.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2001-04-06 14:26:17 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -78,10 +78,6 @@
#include <vcl/fixed.hxx>
#endif
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
#endif
@@ -142,7 +138,7 @@ namespace dbaui
FixedText aFT_WHERECOMP;
FixedText aFT_WHEREVALUE;
FixedText aFT_WHEREOPER;
- GroupBox aGB_FIELDS;
+ FixedLine aFL_FIELDS;
OKButton aBT_OK;
CancelButton aBT_CANCEL;
HelpButton aBT_HELP;
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index 41b3e14d31ec..bda7bb5fa1c0 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: queryorder.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2000-11-10 16:10:13 $
+ * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,10 +77,6 @@
#include <vcl/fixed.hxx>
#endif
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
#endif
@@ -132,7 +128,6 @@ namespace dbaui
ListBox aLB_ORDERFIELD3;
ListBox aLB_ORDERVALUE3;
FixedText aFT_ORDERFIELD;
- FixedText aFT_ORDERVALUE;
FixedText aFT_ORDERAFTER1;
FixedText aFT_ORDERAFTER2;
FixedText aFT_ORDEROPER;
@@ -140,7 +135,7 @@ namespace dbaui
OKButton aBT_OK;
CancelButton aBT_CANCEL;
HelpButton aBT_HELP;
- GroupBox aGB_ORDER;
+ FixedLine aFL_ORDER;
String aSTR_NOENTRY;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer> m_xQueryComposer;