diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
-rw-r--r-- | dbaccess/source/ui/inc/FieldControls.hxx | 41 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/JoinController.hxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/RelationController.hxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableController.hxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/browserids.hxx | 5 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 10 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/querycontroller.hxx | 5 |
7 files changed, 62 insertions, 22 deletions
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 70ceb79ee972..450398a56c52 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -2,9 +2,9 @@ * * $RCSfile: FieldControls.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: oj $ $Date: 2001-02-14 14:36:47 $ + * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,9 +61,6 @@ #ifndef DBAUI_FIELDCONTROLS_HXX #define DBAUI_FIELDCONTROLS_HXX -#ifndef _SV_EDIT_HXX -#include <vcl/edit.hxx> -#endif #ifndef _SV_FIELD_HXX #include <vcl/field.hxx> #endif @@ -76,6 +73,10 @@ #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> #endif +#ifndef DBAUI_SQLNAMEEDIT_HXX +#include "SqlNameEdit.hxx" +#endif + namespace dbaui { @@ -93,6 +94,36 @@ namespace dbaui virtual void SetSpecialReadOnly(BOOL _bReadOnly) = 0; }; //================================================================== + class OPropColumnEditCtrl : public OSQLNameEdit + ,public OSpecialReadOnly + { + short m_nPos; + String m_strHelpText; + public: + inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, INT32 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + + inline BOOL IsModified() { return GetText() != GetSavedValue(); } + + short GetPos() const { return m_nPos; } + String GetHelp() const { return m_strHelpText; } + + virtual void SetSpecialReadOnly(BOOL _bReadOnly) + { + SetReadOnly(_bReadOnly); + OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + } + }; + inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, + ::rtl::OUString& _rAllowedChars, + INT32 nHelpId, + short nPosition, + WinBits nWinStyle) + :OSQLNameEdit(pParent, _rAllowedChars,nWinStyle) + ,m_nPos(nPosition) + { + m_strHelpText = String(ModuleRes(nHelpId)); + } + //================================================================== class OPropEditCtrl : public Edit ,public OSpecialReadOnly { diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 22141e62f7f0..da218d8704f7 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -2,9 +2,9 @@ * * $RCSfile: JoinController.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: oj $ $Date: 2001-03-01 15:17:54 $ + * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,9 @@ #ifndef _COM_SUN_STAR_IO_XOBJECTINPUTSTREAM_HPP_ #include <com/sun/star/io/XObjectInputStream.hpp> #endif +#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ +#include <com/sun/star/beans/XPropertySet.hpp> +#endif #ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" #endif @@ -103,6 +106,7 @@ namespace dbaui Fraction m_aZoom; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; ::rtl::OUString m_sDataSourceName; // is set in initialze diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 5f6a65effddf..7f30f1bdd20c 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -2,9 +2,9 @@ * * $RCSfile: RelationController.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: fs $ $Date: 2001-03-01 13:27:03 $ + * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,6 @@ #ifndef DBAUI_JOINCONTROLLER_HXX #include "JoinController.hxx" #endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ -#include <com/sun/star/beans/XPropertySet.hpp> -#endif #ifndef DBAUI_RELATIONDESIGNVIEW_HXX #include "RelationDesignView.hxx" #endif @@ -81,7 +78,6 @@ namespace dbaui class OTableWindow; class ORelationController : public OJoinController { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables; protected: // all the features which should be handled by this class diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 2b06bf9d91bb..2aa7b8e236fc 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -2,9 +2,9 @@ * * $RCSfile: TableController.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-03-12 14:05:44 $ + * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #endif - +class FixedText; namespace dbaui { class OTableRow; @@ -112,6 +112,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier + FixedText* m_pNoConnection; // set in toolbox when no connection is available ::rtl::OUString m_sDataSourceName; // is set in initialze ::rtl::OUString m_sCatalogName; // catalog for update data ::rtl::OUString m_sSchemaName; // schema for update data diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index dfdd670e4f53..b3fd86d3a90b 100644 --- a/dbaccess/source/ui/inc/browserids.hxx +++ b/dbaccess/source/ui/inc/browserids.hxx @@ -2,9 +2,9 @@ * * $RCSfile: browserids.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: fs $ $Date: 2001-03-01 10:33:23 $ + * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,6 +114,7 @@ #define ID_TREE_QUERY_COPY 12 #define ID_TREE_TABLE_PASTE 13 #define ID_TREE_RELATION_DESIGN 14 +#define ID_TABLE_DESIGN_NO_CONNECTION 15 #define ID_BROWSER_QUERY_EXECUTE SID_FM_EXECUTE #define ID_BROWSER_CLEAR_QUERY SID_SBA_CLEAR_QUERY diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 08b14e7679b2..ede961eb1ce9 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -2,9 +2,9 @@ * * $RCSfile: dbu_resource.hrc,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: fs $ $Date: 2001-03-02 17:05:09 $ + * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,6 +148,7 @@ #define QUERY_BRW_DELETE_QUERY_CONFIRM RID_QUERYBOX_START + 3 #define QUERY_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 4 #define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5 +#define TABLE_QUERY_CONNECTION_LOST RID_QUERYBOX_START + 6 //======================================================================== // warning boxes @@ -346,6 +347,7 @@ #define STR_RELATIONDESIGN_NOT_AVAILABLE RID_STRING_START + 127 #define STR_OPENTABLES_WARNINGS RID_STRING_START + 128 #define STR_OPENTABLES_WARNINGS_DETAILS RID_STRING_START + 129 +#define STR_TABLEDESIGN_CONNECTION_MISSING RID_STRING_START + 130 //======================================================================== @@ -354,12 +356,16 @@ #define RSC_DATASOURCE_TYPES RID_UNTYPED_START + 1 #define RSC_CHARSETS RID_UNTYPED_START + 2 #define PB_FORMAT RID_UNTYPED_START + 3 +#define FIXED_NO_CONNECTION RID_UNTYPED_START + 4 #endif // _DBU_RESOURCE_HRC_ /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.29 2001/03/02 17:05:09 fs + * +RID_OPENTABLES_WARNINGS* + * * Revision 1.28 2001/03/01 15:22:17 oj * #84511# change message * diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 03ce6099210f..86e8d555314f 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -2,9 +2,9 @@ * * $RCSfile: querycontroller.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: oj $ $Date: 2001-03-01 15:17:54 $ + * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,6 +141,7 @@ namespace dbaui sal_Bool m_bViewFunction; // show the function row in the design view sal_Bool m_bEsacpeProcessing;// is true when we shouldn't parse the statement + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getQueries(); // creates the querycomposer void setQueryComposer(); |