User: kz Date: 2008-04-04 15:11:53+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx
Log: INTEGRATION: CWS titles02 (1.6.6); FILE MERGED 2008/02/29 11:01:37 as 1.6.6.4: RESYNC: (1.8-1.10); FILE MERGED 2008/02/12 13:26:53 as 1.6.6.3: RESYNC: (1.6-1.8); FILE MERGED 2007/12/17 15:25:05 oj 1.6.6.2: #i45617# return correct report titles as well 2007/12/10 11:36:17 oj 1.6.6.1: #i45909# #i45617# #i71469# change title handling File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.12&r2=1.13 Delta lines: +19 -24 --------------------- --- ReportController.cxx 2008-03-06 18:43:55+0000 1.12 +++ ReportController.cxx 2008-04-04 15:11:51+0000 1.13 @@ -1744,7 +1744,7 @@ { if ( m_xReportDefinition.is() ) { - m_sName = m_xReportDefinition->getName(); + //m_sName = m_xReportDefinition->getName(); getView()->initialize(); // show the windows and fill with our informations getUndoMgr()->Clear(); // clear all undo redo things getSdrModel(); @@ -2143,26 +2143,6 @@ InvalidateAll(); } // ----------------------------------------------------------------------------- -void OReportController::updateTitle() -{ - ::rtl::OUString sName; - if ( m_xReportDefinition.is() ) - sName = m_xReportDefinition->getCaption(); - - if ( !sName.getLength() ) - sName = String(ModuleRes(RID_APP_NEW_DOC)); - - String sTitle = String(ModuleRes(RID_APP_TITLE)); - sName = sName + sTitle; -//#ifndef PRODUCT -// ::rtl::OUString aDefault; -// sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" [")); -// sName += utl::Bootstrap::getBuildIdData( aDefault ); -// sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); -//#endif - OGenericUnoController::setTitle(sName); -} -// ----------------------------------------------------------------------------- void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _xLayoutManager) { if ( _xLayoutManager.is() ) @@ -2286,8 +2266,9 @@ if ( !m_pMyOwnView->isAddFieldVisible() ) m_pMyOwnView->toggleAddField(); } - else if ( evt.PropertyName.equals( PROPERTY_CAPTION ) ) - updateTitle(); + /// TODO: check what we need to notify here TitleHelper + /*else if ( evt.PropertyName.equals( PROPERTY_CAPTION ) ) + updateTitle();*/ } // if ( evt.Source == m_xReportDefinition ) else { @@ -2392,7 +2373,7 @@ InvalidateFeature(SID_PASTE); return 0L; } -// ----------------------------------------------------------------------------- + namespace { // ----------------------------------------------------------------------------- @@ -3982,3 +3963,17 @@ } } +// css.frame.XTitle +::rtl::OUString SAL_CALL OReportController::getTitle() + throw (uno::RuntimeException) +{ + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + ::osl::MutexGuard aGuard(m_aMutex); + + uno::Reference< frame::XTitle> xTitle(m_xReportDefinition,uno::UNO_QUERY_THROW); + + return xTitle->getTitle (); +} +// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
