diff options
| author | Oliver Specht <os@openoffice.org> | 2000-10-27 10:26:20 +0000 |
|---|---|---|
| committer | Oliver Specht <os@openoffice.org> | 2000-10-27 10:26:20 +0000 |
| commit | a41b2c1f4b2de6d8db78978a70ee4c90aad017b9 (patch) | |
| tree | add34140527c291dd8dcd8be1a5da256b82cfa84 /sw/source/ui/app/swmodul1.cxx | |
| parent | c76770721cf7bcc9c37bb6c3a68bfbb265550bc8 (diff) | |
old database API removed
Diffstat (limited to 'sw/source/ui/app/swmodul1.cxx')
| -rw-r--r-- | sw/source/ui/app/swmodul1.cxx | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 9ec4c33c75f5..e35a6037f1d0 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swmodul1.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2000-10-20 13:03:03 $ + * last change: $Author: os $ $Date: 2000-10-27 11:24:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -619,13 +619,11 @@ void SwModule::ExecDB(SfxRequest &rReq) { SwWrtShell &rSh = GetView()->GetWrtShell(); sDBName = rSh.GetDBName(); -#ifdef REPLACE_OFADBMGR #ifdef DEBUG sDBName = String::CreateFromAscii("Address Book File"); sDBName += DB_DELIM; sDBName += String::CreateFromAscii("address"); #endif //DEBUG -#endif //REPLACE_OFADBMGR rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer // das Mischen von DB-Feldern notwendig. @@ -695,29 +693,8 @@ void SwModule::ShowDBObj(SwWrtShell& rSh, const String& rDBName, sal_Bool bShowE { String sDBName(rDBName.GetToken(0, DB_DELIM)); -#ifdef REPLACE_OFADBMGR - String sTable(rDBName.GetToken(1, DB_DELIM)); - rSh.GetNewDBMgr()->ShowInBeamer( sDBName, sTable, SW_DB_SELECT_UNKNOWN, aEmptyStr ); -#else - if (sDBName.Len()) - { - OfaDBMgr *pDBMgr = OFF_APP()->GetOfaDBMgr(); - SbaDatabaseRef pConnection = pDBMgr->GetSbaObject()-> - GetDatabase(sDBName, bShowError); - if ( pConnection ) - { - String sTable(rDBName.GetToken(1, DB_DELIM)); - DBObject eType; - if( !pConnection->HasObject( eType = dbTable, sTable ) && - !pConnection->HasObject( eType = dbQuery , sTable )) - eType = dbTable; - - //wenn keine Connection gefunden wurde, dann braucht man auch - //den Beamer nicht - pDBMgr->ShowInBeamer( sDBName, sTable, eType, aEmptyStr ); - } - } -#endif + String sTable(rDBName.GetToken(1, DB_DELIM)); + rSh.GetNewDBMgr()->ShowInBeamer( sDBName, sTable, SW_DB_SELECT_UNKNOWN, aEmptyStr ); } /*-------------------------------------------------------------------- |