User: kz Date: 2008-04-04 14:00:47+0000 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: INTEGRATION: CWS titles02 (1.192.8); FILE MERGED 2008/02/12 13:25:00 as 1.192.8.3: RESYNC: (1.192-1.193); FILE MERGED 2007/12/17 15:29:55 oj 1.192.8.2: #i45617# title feature 2007/12/10 11:38:44 oj 1.192.8.1: #i45909# #i45617# #i71469# change title handling File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.196&r2=1.197 Delta lines: +11 -22 --------------------- --- unodatbr.cxx 2008-03-06 18:15:05+0000 1.196 +++ unodatbr.cxx 2008-04-04 14:00:44+0000 1.197 @@ -2401,7 +2401,7 @@ String sDataSourceName( getDataSourceAcessor( pConnection ) ); if ( implLoadAnything( sDataSourceName, aName, nCommandType, sal_True, pConData->xConnection ) ) // set the title of the beamer - updateTitle(); + ;/*updateTitle();*/ else { // clean up criticalFail(); @@ -2837,9 +2837,6 @@ { OSL_ENSURE(sal_False, "SbaTableQueryBrowser::unloadAndCleanup: could not reset the form"); } - - // set a default title - setDefaultTitle(); } // ------------------------------------------------------------------------- @@ -3049,11 +3046,6 @@ OSL_ENSURE(sal_False, "SbaTableQueryBrowser::impl_initialize: could not set the update related names!"); } } - else - { - // set a default title - setDefaultTitle(); - } InvalidateAll(); } @@ -3439,12 +3431,6 @@ return sal_True; // handled } // ----------------------------------------------------------------------------- -void SbaTableQueryBrowser::setDefaultTitle() -{ - ::rtl::OUString sTitle = String(ModuleRes(STR_DSBROWSER_TITLE)); - setTitle(sTitle); -} -// ----------------------------------------------------------------------------- sal_Bool SbaTableQueryBrowser::implGetQuerySignature( ::rtl::OUString& _rCommand, sal_Bool& _bEscapeProcessing ) { _rCommand = ::rtl::OUString(); @@ -3551,25 +3537,28 @@ } } // ----------------------------------------------------------------------------- -void SbaTableQueryBrowser::updateTitle() +::rtl::OUString SbaTableQueryBrowser::getPrivateTitle() const { + ::rtl::OUString sTitle; if ( m_pCurrentlyDisplayed ) { SvLBoxEntry* pContainer = m_pTreeModel->GetParent(m_pCurrentlyDisplayed); // get the entry for the datasource SvLBoxEntry* pConnection = m_pTreeModel->GetParent(pContainer); ::rtl::OUString sName = m_pTreeView->getListBox()->GetEntryText(m_pCurrentlyDisplayed); - ::rtl::OUString sTitle = GetEntryText( pConnection ); + sTitle = GetEntryText( pConnection ); INetURLObject aURL(sTitle); if ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) sTitle = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET); - if(sName.getLength()) + if ( sName.getLength() ) { - sTitle += ::rtl::OUString::createFromAscii(": "); - sTitle += sName; + sName += ::rtl::OUString::createFromAscii(" - "); + sName += sTitle; + sTitle = sName; } - setTitle(sTitle); } + + return sTitle; } // ----------------------------------------------------------------------------- sal_Bool SbaTableQueryBrowser::preReloadForm() @@ -3604,7 +3593,7 @@ { InitializeGridModel(getFormComponent()); LoadFinished(sal_True); - updateTitle(); + //updateTitle(); } //------------------------------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
