diff options
author | Frank Schönheit <fs@openoffice.org> | 2002-11-08 12:20:09 +0000 |
---|---|---|
committer | Frank Schönheit <fs@openoffice.org> | 2002-11-08 12:20:09 +0000 |
commit | 095f9f53fdec27a433000017063be4aac807ce68 (patch) | |
tree | 2d2e12dc16cfb417b837e1dc8d3b1b980b2f1de9 /dbaccess | |
parent | 79fe6f32d7a451a3f4be2784ea2d53bf6f062b86 (diff) |
#104753# Closing now done with CloseWin, not CloseDoc anymore
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/browser/sbabrw.src | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/browserids.hxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/singledoccontroller.cxx | 9 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/query.src | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/relationdesign/relation.src | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableController.cxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/table.src | 6 |
7 files changed, 25 insertions, 23 deletions
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index 037fb9d4e310..5c783d2cad1d 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -2,9 +2,9 @@ * * $RCSfile: sbabrw.src,v $ * - * $Revision: 1.83 $ + * $Revision: 1.84 $ * - * last change: $Author: gt $ $Date: 2002-08-29 12:02:58 $ + * last change: $Author: fs $ $Date: 2002-11-08 13:11:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,6 @@ ID_BROWSER_QUERY_VIEW_TABLES;\ ID_BROWSER_QUERY_VIEW_ALIASES;\ ID_BROWSER_QUERY_DISTINCT_VALUES;\ - ID_BROWSER_CLOSE;\ ID_BROWSER_ESACPEPROCESSING;\ ID_BROWSER_SAVEASDOC;\ ID_QUERY_ZOOM_IN;\ @@ -123,6 +122,7 @@ ID_BROWSER_DOCUMENT_DATASOURCE;\ ID_BROWSER_SAVERECORD; \ ID_BROWSER_UNDORECORD; \ + ID_BROWSER_CLOSE; \ };\ IdCount = {\ 43;\ @@ -315,7 +315,7 @@ ToolBox RID_BRW_QRY_TOOLBOX CUR_ITEM { Identifier = ID_BROWSER_CLOSE ; - HelpId = SID_CLOSEDOC ; + HelpId = ID_BROWSER_CLOSE ; Hide = TRUE; Text = "Schlieen" ; Text [ ENGLISH ] = "Close" ; diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index c953099896cf..11e1ef4b48d1 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.28 $ + * $Revision: 1.29 $ * - * last change: $Author: fs $ $Date: 2002-09-24 15:07:30 $ + * last change: $Author: fs $ $Date: 2002-11-08 13:10:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,7 +152,7 @@ #define ID_BROWSER_QUERY_VIEW_TABLES SID_SBA_QUERY_VIEW_TABLES #define ID_BROWSER_QUERY_VIEW_ALIASES SID_SBA_QUERY_VIEW_ALIASES #define ID_BROWSER_QUERY_DISTINCT_VALUES SID_SBA_QUERY_DISTINCT_VALUES -#define ID_BROWSER_CLOSE SID_CLOSEDOC +#define ID_BROWSER_CLOSE SID_CLOSEWIN #define ID_BROWSER_ESACPEPROCESSING SID_FM_NATIVESQL #define ID_QUERY_FUNCTION (SID_SBA_START + 41) // Funktionen anzeigen diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 7e298541c325..f376dc766040 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: singledoccontroller.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: oj $ $Date: 2002-08-19 07:51:11 $ + * last change: $Author: fs $ $Date: 2002-11-08 13:18:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -533,7 +533,7 @@ namespace dbaui { switch(_nId) { - case SID_CLOSEDOC: + case ID_BROWSER_CLOSE: closeTask(); return; break; @@ -579,6 +579,9 @@ namespace dbaui /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.8 2002/08/19 07:51:11 oj + * #99473# change string resource files + * * Revision 1.7 2002/07/08 08:15:44 oj * #97156# check if we are already suspended * diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 04ee52cfe9ea..3f6a4f73a5a9 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -2,9 +2,9 @@ * * $RCSfile: query.src,v $ * - * $Revision: 1.71 $ + * $Revision: 1.72 $ * - * last change: $Author: rt $ $Date: 2002-11-04 17:51:33 $ + * last change: $Author: fs $ $Date: 2002-11-08 13:20:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1790,7 +1790,7 @@ Menu RID_QUERY_DESIGN_MAIN_MENU }; MenuItem { - ITEM_FILE_CLOSEDOC + ITEM_WINDOW_CLOSEWIN }; MenuItem { diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src index 3acf4e6071f5..31270dff0d76 100644 --- a/dbaccess/source/ui/relationdesign/relation.src +++ b/dbaccess/source/ui/relationdesign/relation.src @@ -2,9 +2,9 @@ * * $RCSfile: relation.src,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: cd $ $Date: 2002-10-24 05:50:21 $ + * last change: $Author: fs $ $Date: 2002-11-08 13:13:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -367,7 +367,7 @@ Menu RID_RELATION_DESIGN_MAIN_MENU }; MenuItem { - ITEM_FILE_CLOSEDOC + ITEM_WINDOW_CLOSEWIN }; MenuItem { diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index f1f8287ead35..980d1537ee32 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.82 $ + * $Revision: 1.83 $ * - * last change: $Author: oj $ $Date: 2002-09-24 09:48:19 $ + * last change: $Author: fs $ $Date: 2002-11-08 13:13:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -314,7 +314,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const switch (_nId) { - case SID_CLOSEDOC: + case ID_BROWSER_CLOSE: aReturn.bEnabled = sal_True; break; case ID_TABLE_DESIGN_NO_CONNECTION: @@ -799,7 +799,6 @@ void OTableController::AddSupportedFeatures() m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:DB/IndexDesign")] = SID_INDEXDESIGN; - m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:CloseDoc")] = SID_CLOSEDOC; m_aSupportedFeatures[ ::rtl::OUString::createFromAscii(".uno:DBSlots/EditDoc")] = ID_BROWSER_EDITDOC; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index 8f3d90e1fd84..30367f217ef6 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -2,9 +2,9 @@ * * $RCSfile: table.src,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: cd $ $Date: 2002-10-24 05:54:24 $ + * last change: $Author: fs $ $Date: 2002-11-08 13:17:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2015,7 +2015,7 @@ Menu RID_TABLE_DESIGN_MAIN_MENU }; MenuItem { - ITEM_FILE_CLOSEDOC + ITEM_WINDOW_CLOSEWIN }; MenuItem { |