Tag: mws_ooo300 User: kz Date: 2008-09-12 14:38:39+0000 Modified: dba/dbaccess/source/ui/app/AppControllerGen.cxx
Log: INTEGRATION: CWS dba30z (1.37.46); FILE MERGED 2008/09/11 07:15:56 fs 1.37.46.1: #i93737# don't cache the database name, instead retrieve it when needed (else it is wrong after a 'Save As') File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.37&r2=1.37.18.1 Delta lines: +20 -1 -------------------- --- AppControllerGen.cxx 2008-06-25 12:36:04+0000 1.37 +++ AppControllerGen.cxx 2008-09-12 14:38:37+0000 1.37.18.1 @@ -671,9 +671,28 @@ } // ----------------------------------------------------------------------------- +::rtl::OUString OApplicationController::getDatabaseName() const +{ + ::rtl::OUString sDatabaseName; + try + { + if ( m_xDataSource.is() ) + { + OSL_VERIFY( m_xDataSource->getPropertyValue( PROPERTY_NAME ) >>= sDatabaseName ); + } + } + catch ( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return sDatabaseName; +} + +// ----------------------------------------------------------------------------- ::rtl::OUString OApplicationController::getStrippedDatabaseName() const { - return ::dbaui::getStrippedDatabaseName(m_xDataSource,m_sDatabaseName); + ::rtl::OUString sDatabaseName; + return ::dbaui::getStrippedDatabaseName( m_xDataSource, sDatabaseName ); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
