Tag: cws_dev300_dba30d User: fs Date: 2008-06-02 08:50:18+0000 Modified: dba/reportdesign/source/ui/inc/DesignView.hxx dba/reportdesign/source/ui/report/DesignView.cxx dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/source/ui/report/ReportSection.cxx dba/reportdesign/source/ui/report/ReportWindow.cxx dba/reportdesign/source/ui/report/ScrollHelper.cxx dba/reportdesign/source/ui/report/SectionsWindow.cxx dba/reportdesign/source/ui/report/ViewsWindow.cxx dba/reportdesign/source/ui/report/dlgedfunc.cxx dba/reportdesign/source/ui/report/propbrw.cxx
Log: ReportController help as reference now, not as pointer (cause by change in ODataView which does this, too) File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: DesignView.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/DesignView.hxx?r1=1.5&r2=1.5.24.1 Delta lines: +5 -5 ------------------- --- DesignView.hxx 2008-04-10 19:01:08+0000 1.5 +++ DesignView.hxx 2008-06-02 08:50:13+0000 1.5.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DesignView.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.24.1 $ * * This file is part of OpenOffice.org. * @@ -77,7 +77,7 @@ SplitWindow* m_pSplitWin; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; - OReportController* m_pReportController; + OReportController& m_rReportController; OScrollWindowHelper* m_pScrollWindow; Window* m_pTaskPane; PropBrw* m_pPropWin; @@ -112,7 +112,7 @@ public: ODesignView(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, - OReportController* _pController); + OReportController& _rController); virtual ~ODesignView(); // window overloads @@ -125,7 +125,7 @@ virtual void initialize(); - inline OReportController* getController() const { return m_pReportController; } + inline OReportController& getController() const { return m_rReportController; } void SetMode( DlgEdMode m_eMode ); void SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: DesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/DesignView.cxx?r1=1.5&r2=1.5.24.1 Delta lines: +24 -25 --------------------- --- DesignView.cxx 2008-04-10 19:13:30+0000 1.5 +++ DesignView.cxx 2008-06-02 08:50:13+0000 1.5.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DesignView.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.24.1 $ * * This file is part of OpenOffice.org. * @@ -153,10 +153,10 @@ //------------------------------------------------------------------------------ ODesignView::ODesignView( Window* pParent, const Reference< XMultiServiceFactory >& _rxOrb, - OReportController* _pController) : - ODataView( pParent,_pController,_rxOrb,WB_DIALOGCONTROL ) + OReportController& _rController) : + ODataView( pParent, _rController, _rxOrb, WB_DIALOGCONTROL ) //,m_aSplitter(this,WB_HSCROLL) - ,m_pReportController( _pController ) + ,m_rReportController( _rController ) ,m_pPropWin(NULL) ,m_pAddField(NULL) ,m_pCurrentView(NULL) @@ -268,12 +268,12 @@ const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); if ( handleKeyEvent(*pKeyEvent) ) nRet = 1L; - else if ( nRet == 1L && m_pAccel.get() && m_pController ) + else if ( nRet == 1L && m_pAccel.get() ) { const KeyCode& rCode = pKeyEvent->GetKeyCode(); util::URL aUrl; aUrl.Complete = m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode)); - if ( !aUrl.Complete.getLength() || !m_pController->isCommandEnabled( aUrl.Complete ) ) + if ( !aUrl.Complete.getLength() || !m_rController.isCommandEnabled( aUrl.Complete ) ) nRet = 0L; } } @@ -292,7 +292,7 @@ const Size aPlaygroundSize( _rPlayground.GetSize() ); // calc the split pos, and forward it to the controller - sal_Int32 nSplitPos = getController()->getSplitPos(); + sal_Int32 nSplitPos = getController().getSplitPos(); if ( 0 != aPlaygroundSize.Width() ) { if ( ( -1 == nSplitPos ) @@ -303,7 +303,7 @@ if ( m_pPropWin && m_pPropWin->IsVisible() ) nMinWidth = m_pPropWin->GetMinOutputSizePixel().Width(); nSplitPos = static_cast<sal_Int32>(_rPlayground.Right() - nMinWidth); - getController()->setSplitPos(nSplitPos); + getController().setSplitPos(nSplitPos); } } // if ( 0 != _rPlaygroundSize.Width() ) @@ -322,7 +322,7 @@ aTaskPanePos.X() = aPlaygroundSize.Width() - nMinWidth; } nSplitPos = aTaskPanePos.X() - nSplitterWidth; - getController()->setSplitPos(nSplitPos); + getController().setSplitPos(nSplitPos); const long nTaskPaneSize = static_cast<long>((aPlaygroundSize.Width() - aTaskPanePos.X())*100/aPlaygroundSize.Width()); if ( m_pSplitWin->GetItemSize( TASKPANE_ID ) != nTaskPaneSize ) @@ -518,8 +518,8 @@ if ( (aOutputSize.Width() - nTest) >= nMinWidth && nTest > m_pScrollWindow->getMaxMarkerWidth(sal_False) ) { - long nOldSplitPos = getController()->getSplitPos(); - getController()->setSplitPos(nTest); + long nOldSplitPos = getController().getSplitPos(); + getController().setSplitPos(nTest); if ( nOldSplitPos != -1 && nOldSplitPos <= nTest ) { Invalidate(INVALIDATE_NOCHILDREN); @@ -547,7 +547,7 @@ { if ( !m_pPropWin && _bToogleOn ) { - m_pPropWin = new PropBrw(getController()->getORB(),m_pTaskPane,this); + m_pPropWin = new PropBrw(getController().getORB(),m_pTaskPane,this); m_pPropWin->Invalidate(); static_cast<OTaskWindow*>(m_pTaskPane)->setPropertyBrowser(m_pPropWin); notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::AddWindow)); @@ -555,7 +555,7 @@ if ( m_pPropWin && _bToogleOn != m_pPropWin->IsVisible() ) { if ( !m_pCurrentView && !m_xReportComponent.is() ) - m_xReportComponent = getController()->getReportDefinition(); + m_xReportComponent = getController().getReportDefinition(); const sal_Bool bWillBeVisible = _bToogleOn; m_pPropWin->Show(bWillBeVisible); @@ -594,9 +594,9 @@ { if ( !m_pReportExplorer ) { - OReportController* pReportController = getController(); - m_pReportExplorer = new ONavigator(this,pReportController); - m_pReportExplorer->AddEventListener(LINK(pReportController,OReportController,EventLstHdl)); + OReportController& rReportController = getController(); + m_pReportExplorer = new ONavigator(this,&rReportController); + m_pReportExplorer->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } else @@ -614,22 +614,22 @@ { uno::Reference< report::XReportDefinition > xReport(m_xReportComponent,uno::UNO_QUERY); uno::Reference< report::XReportComponent > xReportComponent(m_xReportComponent,uno::UNO_QUERY); - OReportController* pReportController = getController(); + OReportController& rReportController = getController(); if ( !m_pCurrentView && !xReport.is() ) { if ( xReportComponent.is() ) xReport = xReportComponent->getSection()->getReportDefinition(); else - xReport = pReportController->getReportDefinition().get(); + xReport = rReportController.getReportDefinition().get(); } else if ( m_pCurrentView ) { uno::Reference< report::XSection > xSection = m_pCurrentView->getSectionWindow()->getSection(); xReport = xSection->getReportDefinition(); } - m_pAddField = new OAddFieldWindow(*pReportController,this); + m_pAddField = new OAddFieldWindow(rReportController,this); m_pAddField->Update(); - m_pAddField->AddEventListener(LINK(pReportController,OReportController,EventLstHdl)); + m_pAddField->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } else @@ -645,9 +645,8 @@ // why do we need the code below? //else // { - // OReportController* pReportController = getController(); - // if ( pReportController ) - // xSection = pReportController->getReportDefinition()->getDetail(); + // OReportController& rReportController = getController(); + // xSection = rReportController.getReportDefinition()->getDetail(); // } return xSection; } @@ -755,7 +754,7 @@ if ( rMEvt.IsLeft() ) { const uno::Sequence< beans::PropertyValue> aArgs; - getController()->executeChecked(SID_SELECT_REPORT,aArgs); + getController().executeChecked(SID_SELECT_REPORT,aArgs); } ODataView::MouseButtonDown(rMEvt); } File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.14&r2=1.14.20.1 Delta lines: +3 -3 ------------------- --- ReportController.cxx 2008-04-10 19:14:22+0000 1.14 +++ ReportController.cxx 2008-06-02 08:50:13+0000 1.14.20.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportController.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.20.1 $ * * This file is part of OpenOffice.org. * @@ -1691,7 +1691,7 @@ // ----------------------------------------------------------------------------- sal_Bool OReportController::Construct(Window* pParent) { - m_pMyOwnView = new ODesignView(pParent,getORB(),this); + m_pMyOwnView = new ODesignView(pParent,getORB(),*this); StartListening(*(m_pMyOwnView)); m_pView = m_pMyOwnView; File [changed]: ReportSection.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportSection.cxx?r1=1.9&r2=1.9.24.1 Delta lines: +12 -12 --------------------- --- ReportSection.cxx 2008-04-10 19:14:53+0000 1.9 +++ ReportSection.cxx 2008-06-02 08:50:14+0000 1.9.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportSection.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.24.1 $ * * This file is part of OpenOffice.org. * @@ -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() ); @@ -350,7 +350,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; } @@ -438,7 +438,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>()); } //---------------------------------------------------------------------------- @@ -487,7 +487,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(); @@ -506,8 +506,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(); @@ -522,7 +522,7 @@ aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")); aArgs[0].Value <<= m_xSection; } - pController->executeChecked(nId,aArgs); + rController.executeChecked(nId,aArgs); } } break; @@ -808,7 +808,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); @@ -821,7 +821,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; File [changed]: ReportWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportWindow.cxx?r1=1.6&r2=1.6.24.1 Delta lines: +5 -5 ------------------- --- ReportWindow.cxx 2008-04-10 19:15:09+0000 1.6 +++ ReportWindow.cxx 2008-06-02 08:50:14+0000 1.6.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportWindow.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.24.1 $ * * This file is part of OpenOffice.org. * @@ -200,7 +200,7 @@ sal_Int32 nWidth = 0; if ( m_pViews && !m_pViews->empty() ) { - const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController()->getReportDefinition(),PROPERTY_PAPERSIZE).Width; + const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width; const Size aPageSize = LogicToPixel(Size(nPaperWidth,0),MAP_100TH_MM); nWidth = aPageSize.Width() + REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH; @@ -211,12 +211,12 @@ void OReportWindow::Resize() { Window::Resize(); - if ( m_pView->getController() && m_pViews && !m_pViews->empty() && m_pSections ) + if ( m_pViews && !m_pViews->empty() && m_pSections ) { const Size aTotalOutputSize = GetOutputSizePixel(); Point aStartPoint(REPORT_STARTMARKER_WIDTH,0); - uno::Reference<report::XReportDefinition> xReportDefinition = getReportView()->getController()->getReportDefinition(); + uno::Reference<report::XReportDefinition> xReportDefinition = getReportView()->getController().getReportDefinition(); const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(xReportDefinition,PROPERTY_PAPERSIZE).Width; sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN); sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN); File [changed]: ScrollHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ScrollHelper.cxx?r1=1.6&r2=1.6.24.1 Delta lines: +3 -3 ------------------- --- ScrollHelper.cxx 2008-04-10 19:15:25+0000 1.6 +++ ScrollHelper.cxx 2008-06-02 08:50:14+0000 1.6.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ScrollHelper.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.24.1 $ * * This file is part of OpenOffice.org. * @@ -110,7 +110,7 @@ // ----------------------------------------------------------------------------- void OScrollWindowHelper::initialize() { - uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController()->getReportDefinition(); + uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController().getReportDefinition(); m_pReportDefintionMultiPlexer = addStyleListener(xReportDefinition,this); if ( m_pChild ) m_pChild->initialize(); File [changed]: SectionsWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/SectionsWindow.cxx?r1=1.4&r2=1.4.26.1 Delta lines: +3 -3 ------------------- --- SectionsWindow.cxx 2008-04-10 19:15:59+0000 1.4 +++ SectionsWindow.cxx 2008-06-02 08:50:14+0000 1.4.26.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SectionsWindow.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.26.1 $ * * This file is part of OpenOffice.org. * @@ -326,7 +326,7 @@ { GrabFocus(); uno::Sequence< beans::PropertyValue> aArgs; - m_pParent->getReportView()->getController()->executeChecked(SID_SELECT_REPORT,aArgs); + m_pParent->getReportView()->getController().executeChecked(SID_SELECT_REPORT,aArgs); } Window::MouseButtonDown(rMEvt); } File [changed]: ViewsWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ViewsWindow.cxx?r1=1.8&r2=1.8.24.1 Delta lines: +9 -9 ------------------- --- ViewsWindow.cxx 2008-04-10 19:16:33+0000 1.8 +++ ViewsWindow.cxx 2008-06-02 08:50:14+0000 1.8.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ViewsWindow.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.24.1 $ * * This file is part of OpenOffice.org. * @@ -392,20 +392,20 @@ IMPL_LINK( OViewsWindow, StartSplitHdl, Splitter*, ) { const String sEmpty(ModuleRes(RID_STR_UNDO_CHANGE_SIZE)); - getView()->getReportView()->getController()->getUndoMgr()->EnterListAction(sEmpty,String()); + getView()->getReportView()->getController().getUndoMgr()->EnterListAction(sEmpty,String()); return 0L; } //------------------------------------------------------------------------------ IMPL_LINK( OViewsWindow, EndSplitHdl, Splitter*, ) { - getView()->getReportView()->getController()->getUndoMgr()->LeaveListAction(); + getView()->getReportView()->getController().getUndoMgr()->LeaveListAction(); Resize(); return 0L; } //----------------------------------------------------------------------------- IMPL_LINK( OViewsWindow, SplitHdl, Splitter*, _pSplitter ) { - if ( !getView()->getReportView()->getController()->isEditable() ) + if ( !getView()->getReportView()->getController().isEditable() ) { m_bInSplitHandler = sal_False; return 0L; @@ -688,7 +688,7 @@ { GrabFocus(); const uno::Sequence< beans::PropertyValue> aArgs; - getView()->getReportView()->getController()->executeChecked(SID_SELECT_REPORT,aArgs); + getView()->getReportView()->getController().executeChecked(SID_SELECT_REPORT,aArgs); } Window::MouseButtonDown(rMEvt); } @@ -1471,7 +1471,7 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSection,const Point& _aPnt) { const String sUndoAction = String((ModuleRes(RID_STR_UNDO_CHANGEPOSITION))); - UndoManagerListAction aListAction(*getView()->getReportView()->getController()->getUndoMgr(),sUndoAction); + UndoManagerListAction aListAction(*getView()->getReportView()->getController().getUndoMgr(),sUndoAction); Point aNewPos = _aPnt; OSectionView* pInSection = getSectionRelativeToPosition(_pSection, aNewPos); @@ -1505,7 +1505,7 @@ const beans::NamedValue* pEnd = pIter + aAllreadyCopiedObjects.getLength(); try { - uno::Reference<report::XReportDefinition> xReportDefinition = getView()->getReportView()->getController()->getReportDefinition(); + uno::Reference<report::XReportDefinition> xReportDefinition = getView()->getReportView()->getController().getReportDefinition(); const sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN); const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN); const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(xReportDefinition,PROPERTY_PAPERSIZE).Width; @@ -1550,7 +1550,7 @@ } pInSection->getSectionWindow()->Paste(aAllreadyCopiedObjects,true); } - getView()->getReportView()->getController()->getUndoMgr()->LeaveListAction(); + getView()->getReportView()->getController().getUndoMgr()->LeaveListAction(); } else { File [changed]: dlgedfunc.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/dlgedfunc.cxx?r1=1.8&r2=1.8.24.1 Delta lines: +5 -5 ------------------- --- dlgedfunc.cxx 2008-04-10 19:17:26+0000 1.8 +++ dlgedfunc.cxx 2008-06-02 08:50:15+0000 1.8.24.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dlgedfunc.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.24.1 $ * * This file is part of OpenOffice.org. * @@ -197,7 +197,7 @@ uno::Sequence<beans::PropertyValue> aArgs(1); aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowProperties")); aArgs[0].Value <<= sal_True; - m_pParent->getViewsWindow()->getView()->getReportView()->getController()->executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs); + m_pParent->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs); m_pParent->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_pParent->getView()); // TODO character in shapes // SdrViewEvent aVEvt; @@ -610,7 +610,7 @@ bReturn = m_pView->AreObjectsMarked(); if ( bReturn ) { - OReportController* pController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); + OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList(); for (sal_uInt32 i = 0; i < rMarkList.GetMarkCount();++i ) { @@ -619,7 +619,7 @@ OOle2Obj* pObj = dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj()); if ( pObj && !pObj->IsEmpty() ) { - InitializeChart(pController->getModel(),pObj->GetObjRef()); + InitializeChart(rController.getModel(),pObj->GetObjRef()); } } } File [changed]: propbrw.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/propbrw.cxx?r1=1.6&r2=1.6.26.1 Delta lines: +9 -9 ------------------- --- propbrw.cxx 2008-04-10 19:18:22+0000 1.6 +++ propbrw.cxx 2008-06-02 08:50:15+0000 1.6.26.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: propbrw.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.26.1 $ * * This file is part of OpenOffice.org. * @@ -153,15 +153,15 @@ xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), UNO_QUERY_THROW ); - /*uno::Reference< XComponent> xModel = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController()->getModel(),uno::UNO_QUERY) ); + /*uno::Reference< XComponent> xModel = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getModel(),uno::UNO_QUERY) ); uno::Reference< XComponent> xDialogParentWindow = new OContextHelper(m_xORB,uno::Reference< XComponent>(VCLUnoHelper::GetInterface ( this ),uno::UNO_QUERY) ); - uno::Reference< XComponent> xConnection = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController()->getConnection(),uno::UNO_QUERY) );*/ + uno::Reference< XComponent> xConnection = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getConnection(),uno::UNO_QUERY) );*/ // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_pDesignView->getController()->getModel() )), + ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_pDesignView->getController().getModel() )), ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) )), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( m_pDesignView->getController()->getConnection() ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( m_pDesignView->getController().getConnection() ) ), }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), @@ -312,7 +312,7 @@ if( IsRollUp() ) RollDown(); - m_pDesignView->getController()->executeUnChecked(SID_PROPERTYBROWSER_LAST_PAGE,uno::Sequence< beans::PropertyValue>()); + m_pDesignView->getController().executeUnChecked(SID_PROPERTYBROWSER_LAST_PAGE,uno::Sequence< beans::PropertyValue>()); return TRUE; } @@ -461,7 +461,7 @@ xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormComponent")),uno::makeAny(_xFormComponent)); xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(_xReportComponent)); xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowSet")) - ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController()->getRowSet()))); + ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); return xNameCont.get(); } @@ -620,7 +620,7 @@ void PropBrw::LoseFocus() { DockingWindow::LoseFocus(); - m_pDesignView->getController()->InvalidateAll(); + m_pDesignView->getController().InvalidateAll(); } //---------------------------------------------------------------------------- } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
