diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:37:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:37:44 +0000 |
| commit | be37c0f8ec13feea95bf78214cb8c404eb8649d9 (patch) | |
| tree | 559d1259edb8710cfc7ef93cce75efbb801ee1fe /reportdesign/source/ui/report/ReportWindow.cxx | |
| parent | INTEGRATION: CWS dba30d (1.9.24); FILE MERGED (diff) | |
| download | core-be37c0f8ec13feea95bf78214cb8c404eb8649d9.tar.gz core-be37c0f8ec13feea95bf78214cb8c404eb8649d9.zip | |
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)
Diffstat (limited to 'reportdesign/source/ui/report/ReportWindow.cxx')
| -rw-r--r-- | reportdesign/source/ui/report/ReportWindow.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 4bf279552108..58a8ede1f16c 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportWindow.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -200,7 +200,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const 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 @@ sal_Int32 OReportWindow::GetTotalWidth() const 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); |