User: kz Date: 2008-06-25 11:37:32+0000 Modified: dba/reportdesign/source/ui/report/ReportWindow.cxx
Log: INTEGRATION: CWS dba30d (1.6.24); FILE MERGED 2008/06/02 08:50:14 fs 1.6.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]: ReportWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportWindow.cxx?r1=1.7&r2=1.8 Delta lines: +3 -3 ------------------- --- ReportWindow.cxx 2008-06-16 13:46:22+0000 1.7 +++ ReportWindow.cxx 2008-06-25 11:37:30+0000 1.8 @@ -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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
