#82371# new interface for database beamer

7 files changed, 20 insertions, 73 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index be71afdc1479..052c911ab12b 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmdid.h,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: os $ $Date: 2001-06-08 13:47:27 $
+ *  last change: $Author: os $ $Date: 2001-06-25 13:42:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -410,7 +410,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 //#define FN_QRY_GET_RECORD_ID  (FN_INSERT + 61)    /* Datensatznummer erfragen (Basic) */
 //#define FN_QRY_GET_COLUMN_NUM (FN_INSERT + 62)    /* Anzahl der Spalten (Basic) */
 
-#define FN_QRY                  (FN_INSERT + 63)    /* Datensatz einfuegen */
+
 #define FN_QRY_MERGE            (FN_INSERT + 64)    /* Datensatz einfuegen (Serienbrief) */
 #define FN_QRY_OPEN_TABLE       (FN_INSERT + 65)    /* Datenbank oeffnen (Basic) */
 #define FN_TOOL_ANKER_FRAME     (FN_INSERT + 66)    /* Draw-Objekt am Rahmen verankern */
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 524a6615799f..9a0233013271 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbmgr.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: os $ $Date: 2001-06-08 13:47:27 $
+ *  last change: $Author: os $ $Date: 2001-06-25 13:42:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -314,9 +314,6 @@ public:
     sal_uInt32      GetSelectedRecordId();
     sal_Bool        ToRecordId(sal_Int32 nSet);
 
-    BOOL            ShowInBeamer(const String& rDBName, const String& rTableName,
-                                                BYTE nType, const String& rStatement);
-
     const SwDBData& GetAddressDBName();
 
     static String GetDBField(
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 58b71bc368b7..9f10275d33a0 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swmodule.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: jp $ $Date: 2001-03-23 13:47:58 $
+ *  last change: $Author: os $ $Date: 2001-06-25 13:42:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -233,8 +233,7 @@ public:
     sal_Bool IsEmbeddedLoadSave() const         { return bEmbeddedLoadSave; }
     void SetEmbeddedLoadSave( sal_Bool bFlag )  { bEmbeddedLoadSave = bFlag; }
 
-    void ShowDBObj( SwWrtShell& rShell, const SwDBData& rData,
-                    sal_Bool bShowError = sal_False );
+    void ShowDBObj( SwView& rView, const SwDBData& rData, BOOL bOnlyIfAvailable = FALSE);
 
     // Tabellenmodi
     sal_Bool            IsInsTblFormatNum(sal_Bool bHTML) const;
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index d80a57fe03ce..287aedc4e6cb 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -2,7 +2,7 @@
 
     $Workfile:   _VIEWSH.SDI  $
 
-    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/_viewsh.sdi,v 1.4 2001-04-27 11:53:53 os Exp $
+    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/_viewsh.sdi,v 1.5 2001-06-25 13:42:52 os Exp $
 
     Beschreibung:   allgemeine interfaces fuer View
 
@@ -454,6 +454,11 @@ interface BaseTextEditView : View
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
+    SID_VIEW_DATA_SOURCE_BROWSER   // status()
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState;
+    ]
 }
 
 interface GlobalContents : Collection
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index a672ea6007ac..29c584eff259 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -5754,29 +5754,6 @@ SfxVoidItem EditRegion FN_EDIT_REGION
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem DataBaseBrowser FN_QRY
-()
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = TRUE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_DATA;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem GoToEndOfPrevPageSel FN_END_OF_PREV_PAGE_SEL
 ()
 [
diff --git a/sw/sdi/swslots.src b/sw/sdi/swslots.src
index 73b926acfc5c..e255be5f74a9 100644
--- a/sw/sdi/swslots.src
+++ b/sw/sdi/swslots.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swslots.src,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: kz $ $Date: 2001-06-15 21:56:48 $
+ *  last change: $Author: os $ $Date: 2001-06-25 13:42:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -6324,34 +6324,6 @@ SfxSlotInfo FN_PRINT_PAGEPREVIEW
     SlotName[ catalan ] = "Imprimir previsualizaci�n";
     SlotName[ finnish ] = "Sivun tulostusn�kym�";
 };
-SfxSlotInfo FN_QRY
-{
-    SlotName = "Datenbankmanager aufrufen";
-    SlotName [ english ] =  "Datenbankmanager aufrufen";
-    SlotName[ english_us ] = "Call Database Manager";
-    SlotName[ portuguese ] = "Gestor da Base de Dados";
-    SlotName[ russian ] = "����� �������������� ���� ������";
-    SlotName[ dutch ] = "Databasemanager oproepen";
-    SlotName[ french ] = "Gestionnaire de base de donn�es";
-    SlotName[ spanish ] = "Activar administrador de bases de datos";
-    SlotName[ italian ] = "Richiama gestione database";
-    SlotName[ danish ] = "Aktiver databasemanager";
-    SlotName[ swedish ] = "Anropa databas";
-    SlotName[ polish ] = "Wywo�aj mened�era bazy danych";
-    SlotName[ portuguese_brazilian ] = "InsertDatabase";
-    SlotName[ japanese ] = "�ް��ް��Ȱ�ެ�̎��s";
-    SlotName[ chinese_simplified ] = "�������ݿ��������";
-    SlotName[ chinese_traditional ] = "�Ұʸ�Ʈw�޲z�{��";
-    SlotName[ arabic ] = "���� ����� ��������";
-    SlotName[ dutch ] = "Databasemanager oproepen";
-    SlotName[ chinese_simplified ] = "�������ݿ��������";
-    SlotName[ greek ] = "������������ ����������� ����� ���������";
-    SlotName[ korean ] = "�����ͺ��̽� ������ ȣ��";
-    SlotName[ turkish ] = "Veritaban� y�neticisini �al��t�r";
-    SlotName[ language_user1 ] = " ";
-    SlotName[ catalan ] = "Activar administrador de bases de datos";
-    SlotName[ finnish ] = "Kutsutietokannan hallinta";
-};
 SfxSlotInfo FN_QRY_MERGE
 {
     SlotName = "Seriendruck vorbereiten";
diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi
index cbbf3582a3a0..bb8c7076db13 100644
--- a/sw/sdi/wrtapp.sdi
+++ b/sw/sdi/wrtapp.sdi
@@ -2,7 +2,7 @@
 
     $Workfile:   wrtapp.sdi  $
 
-    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/wrtapp.sdi,v 1.2 2001-02-15 08:57:16 os Exp $
+    $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/wrtapp.sdi,v 1.3 2001-06-25 13:42:52 os Exp $
 
     Beschreibung:   IDL - File SwWriterApp - Shell fuer Sw3
 
@@ -81,12 +81,6 @@ interface StarWriter : Module
         StateMethod = NoState ;
     ]*/
 
-    FN_QRY   // status()
-    [
-        ExecMethod = ExecDB ;
-        StateMethod = StateIsView ;
-    ]
-
     FN_QRY_MERGE  // status()
     [
         ExecMethod = ExecDB ;
@@ -248,6 +242,9 @@ shell SwModule
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2001/02/15 08:57:16  os
+    #83369# FormLetter: status method changed
+
     Revision 1.1.1.1  2000/09/18 17:14:31  hr
     initial import