User: kz Date: 2008-06-25 11:37:20+0000 Modified: dba/reportdesign/source/ui/report/ReportSection.cxx
Log: INTEGRATION: CWS dba30d (1.9.24); FILE MERGED 2008/06/02 08:50:14 fs 1.9.24.1: ReportController help as reference now, not as pointer (cause by change in ODataView which does this, too) File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportSection.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportSection.cxx?r1=1.10&r2=1.11 Delta lines: +10 -10 --------------------- --- ReportSection.cxx 2008-06-16 13:46:04+0000 1.10 +++ ReportSection.cxx 2008-06-25 11:37:18+0000 1.11 @@ -114,7 +114,7 @@ } m_pFunc.reset(new DlgEdFuncSelect( this )); - m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( /* m_pParent->getView()->getReportView()->getController()->getORB() */ ) ); + m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( /* m_pParent->getView()->getReportView()->getController().getORB() */ ) ); Show(); } @@ -199,7 +199,7 @@ m_pReportListener = addStyleListener(m_xSection->getReportDefinition(),this); - m_pModel = m_pParent->getView()->getReportView()->getController()->getSdrModel(); + m_pModel = m_pParent->getView()->getReportView()->getController().getSdrModel(); m_pPage = m_pModel->getPage(m_xSection); m_pView = new OSectionView( m_pModel.get(), this, m_pParent->getView() ); @@ -326,7 +326,7 @@ { m_pFunc.reset(new DlgEdFuncSelect( this )); } - m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( /* m_pParent->getView()->getReportView()->getController()->getORB() */ ) ); + m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( /* m_pParent->getView()->getReportView()->getController().getORB() */ ) ); m_pModel->SetReadOnly(eNewMode == RPTUI_READONLY); m_eMode = eNewMode; } @@ -414,7 +414,7 @@ void OReportSection::MouseButtonUp( const MouseEvent& rMEvt ) { if ( !m_pFunc->MouseButtonUp( rMEvt ) ) - getViewsWindow()->getView()->getReportView()->getController()->executeUnChecked(SID_OBJECT_SELECT,uno::Sequence< beans::PropertyValue>()); + getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_OBJECT_SELECT,uno::Sequence< beans::PropertyValue>()); } //---------------------------------------------------------------------------- @@ -442,7 +442,7 @@ { case COMMAND_CONTEXTMENU: { - OReportController* pController = getViewsWindow()->getView()->getReportView()->getController(); + OReportController& rController = getViewsWindow()->getView()->getReportView()->getController(); PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) ); uno::Reference< report::XReportDefinition> xReportDefinition = getSection()->getReportDefinition(); const USHORT nCount = aContextMenu.GetItemCount(); @@ -461,8 +461,8 @@ String sText = String(ModuleRes((xReportDefinition.is() && xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT)); aContextMenu.SetItemText(nId,sText); } - aContextMenu.CheckItem(nId,pController->isCommandChecked(nId)); - aContextMenu.EnableItem(nId,pController->isCommandEnabled(nId)); + aContextMenu.CheckItem(nId,rController.isCommandChecked(nId)); + aContextMenu.EnableItem(nId,rController.isCommandEnabled(nId)); } } // for (USHORT i = 0; i < nCount; ++i) Point aPos = _rCEvt.GetMousePosPixel(); @@ -477,7 +477,7 @@ aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")); aArgs[0].Value <<= m_xSection; } - pController->executeChecked(nId,aArgs); + rController.executeChecked(nId,aArgs); } } break; @@ -769,7 +769,7 @@ ::svx::ODataAccessDescriptor aDescriptor = ::svx::OColumnTransferable::extractColumnDescriptor(aDropped); // we use this way to create undo actions - OReportController* pController = getViewsWindow()->getView()->getReportView()->getController(); + OReportController& rController = getViewsWindow()->getView()->getReportView()->getController(); uno::Sequence<beans::PropertyValue> aValues( aDescriptor.createPropertyValueSequence() ); sal_Int32 nLength = aValues.getLength(); aValues.realloc(nLength + 3); @@ -782,7 +782,7 @@ aValues[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Section")); aValues[nLength++].Value <<= getSection(); - pController->executeChecked(SID_ADD_CONTROL_PAIR,aValues); + rController.executeChecked(SID_ADD_CONTROL_PAIR,aValues); nDropOption = DND_ACTION_COPY; } return nDropOption; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
