summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/ui/inc/JoinController.hxx5
-rw-r--r--dbaccess/source/ui/inc/RelationController.hxx5
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx5
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx14
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc13
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx11
6 files changed, 40 insertions, 13 deletions
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index da218d8704f7..cb6fe445a65e 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.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-03-14 10:35:10 $
+ * last change: $Author: oj $ $Date: 2001-04-24 14:34:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -159,6 +159,7 @@ namespace dbaui
protected:
virtual OTableWindowData* createTableWindowData() = 0;
+ virtual void AddSupportedFeatures();
};
}
#endif // DBAUI_JOINCONTROLLER_HXX
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index d324c8136553..70e97c855c18 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.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2001-03-22 08:03:35 $
+ * last change: $Author: oj $ $Date: 2001-04-24 14:34:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,6 +81,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTables;
sal_Bool m_bRelationsPossible;
protected:
+ virtual String getMenu() const;
// all the features which should be handled by this class
virtual void AddSupportedFeatures();
// state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot.
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index c6c34b82bddd..c353f75afc2c 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.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: oj $ $Date: 2001-04-11 11:36:03 $
+ * last change: $Author: oj $ $Date: 2001-04-24 14:34:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -138,6 +138,7 @@ namespace dbaui
::rtl::OUString createUniqueName(const ::rtl::OUString& _rName);
protected:
+ virtual String getMenu() const;
// all the features which should be handled by this class
virtual void AddSupportedFeatures();
// state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot.
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index d62fb9f81faa..2305ee044723 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: TableDesignView.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-03-22 07:45:19 $
+ * last change: $Author: oj $ $Date: 2001-04-24 14:34:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -103,10 +103,17 @@ namespace dbaui
//==================================================================
class OTableDesignView : public ODataView
{
+ enum ChildFocusState
+ {
+ DESCRIPTION,
+ EDITOR,
+ NONE
+ };
private:
::com::sun::star::lang::Locale m_aLocale;
OTableBorderWindow* m_pWin;
OTableController* m_pController;
+ ChildFocusState m_eChildFocus;
protected:
@@ -120,6 +127,9 @@ namespace dbaui
OTableController* _pController);
virtual ~OTableDesignView();
+ // window overloads
+ virtual long PreNotify( NotifyEvent& rNEvt );
+
OTableEditorCtrl* GetEditorCtrl() const { return m_pWin->GetEditorCtrl(); }
OTableFieldDescWin* GetDescWin() const { return m_pWin->GetDescWin(); }
OTableController* getController() const { return m_pController; }
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 64361c4709c2..0917b59cc0fd 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.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: fs $ $Date: 2001-04-12 15:30:17 $
+ * last change: $Author: oj $ $Date: 2001-04-24 14:34:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -220,6 +220,9 @@
#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7
#define RID_BRW_TABLEDESIGN_TOOLBOX RID_MENU_START + 8
#define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9
+#define RID_TABLE_DESIGN_MAIN_MENU RID_MENU_START + 10
+#define RID_QUERY_DESIGN_MAIN_MENU RID_MENU_START + 11
+#define RID_RELATION_DESIGN_MAIN_MENU RID_MENU_START + 12
//========================================================================
// strings
@@ -378,6 +381,9 @@
#define STR_CONNECTING_DATASOURCE RID_STRING_START + 147
#define STR_LOADING_QUERY RID_STRING_START + 148
#define STR_LOADING_TABLE RID_STRING_START + 149
+#define STR_VIEW_TITLE RID_STRING_START + 150
+#define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STRING_START + 151
+#define STR_QUERYDESIGN_NO_VIEW_ASK RID_STRING_START + 152
//========================================================================
// untyped resources
@@ -392,6 +398,9 @@
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.38 2001/04/12 15:30:17 fs
+ * +STR_LOADING_TABLE/-QUERY
+ *
* Revision 1.37 2001/04/11 11:36:03 oj
* #85699# check if pkey already exists
*
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 6cb98ab18fa4..ef628f55bea2 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.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: fs $ $Date: 2001-04-23 09:30:05 $
+ * last change: $Author: oj $ $Date: 2001-04-24 14:34:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -140,14 +140,19 @@ namespace dbaui
sal_Bool m_bViewTable; // show the table row in the design view
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
+ sal_Bool m_bCreateView; // set to true when we should create a view otherwise we create a normal query
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getQueries();
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getElements() const;
+ void askForNewName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xElements,
+ sal_Bool _bSaveAs);
// creates the querycomposer
void setQueryComposer();
void deleteIterator();
void executeQuery();
+ void doSaveAsDoc(sal_Bool _bSaveAs);
protected:
+ virtual String getMenu() const;
// all the features which should be handled by this class
virtual void AddSupportedFeatures();
// state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot.