User: kz Date: 2008-06-25 13:20:57+0000 Modified: dba/reportdesign/source/ui/report/ViewsWindow.cxx
Log: INTEGRATION: CWS dba30d (1.8.24); FILE MERGED 2008/06/02 08:50:14 fs 1.8.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]: ViewsWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ViewsWindow.cxx?r1=1.9&r2=1.10 Delta lines: +6 -6 ------------------- --- ViewsWindow.cxx 2008-06-16 13:47:21+0000 1.9 +++ ViewsWindow.cxx 2008-06-25 13:20:55+0000 1.10 @@ -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; @@ -691,7 +691,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); } @@ -1475,7 +1475,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); @@ -1510,7 +1510,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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
