summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-10-16 15:30:32 +0200
committerDavid Tardon <dtardon@redhat.com>2014-10-16 17:44:44 +0200
commit582ef22d3e8e30ffd58f092d37ffda30bd07bd9e (patch)
tree80c42b34da7e7ee05843b572f7311b3c230de9dd /reportdesign
parentada4862afc3227b04c12960ded761db24f61257e (diff)
fdo#84854 it seems long is not enough on 32 bit
Fraction used BigInt internally for computations, rational does nothing like that. Change-Id: I3e9b25074f979bc291208f7c6362c3c40eb77ff5
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/inc/RptObject.hxx6
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx6
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx2
-rw-r--r--reportdesign/source/ui/inc/SectionWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/StartMarker.hxx2
-rw-r--r--reportdesign/source/ui/inc/UITools.hxx2
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx2
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx2
-rw-r--r--reportdesign/source/ui/report/EndMarker.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx20
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx6
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx6
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx6
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx6
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx2
20 files changed, 42 insertions, 42 deletions
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index d91e271277bc..293a169f292b 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -148,7 +148,7 @@ protected:
OCustomShape(const OUString& _sComponentName);
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
- virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
+ virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
@@ -196,7 +196,7 @@ protected:
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
- virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
+ virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
@@ -244,7 +244,7 @@ protected:
virtual ~OUnoObject();
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
- virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
+ virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 5c0d525dae60..b9c0b5dbbb69 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -538,7 +538,7 @@ void OCustomShape::NbcMove( const Size& rSize )
SdrObjCustomShape::NbcMove( rSize );
}
-void OCustomShape::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
+void OCustomShape::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrObjCustomShape::NbcResize( rRef, xFract, yFract );
@@ -749,7 +749,7 @@ void OUnoObject::NbcMove( const Size& rSize )
-void OUnoObject::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
+void OUnoObject::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrUnoObj::NbcResize( rRef, xFract, yFract );
@@ -1050,7 +1050,7 @@ void OOle2Obj::NbcMove( const Size& rSize )
-void OOle2Obj::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
+void OOle2Obj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrOle2Obj::NbcResize( rRef, xFract, yFract );
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 4c36ab743abe..e9d7671152eb 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -257,7 +257,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
- void zoom(const boost::rational<long>& _aZoom);
+ void zoom(const boost::rational<sal_Int64>& _aZoom);
/** fills the vector with all selected control models
/param _rSelection The vector will be filled and will not be cleared before.
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index fec4e81de722..724c36809409 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -211,7 +211,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
- void zoom(const boost::rational<long>& _aZoom);
+ void zoom(const boost::rational<sal_Int64>& _aZoom);
/** fills the vector with all selected control models
/param _rSelection The vector will be filled and will not be cleared before.
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index f00ceb8b8123..d1315cad5852 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -202,7 +202,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
- void zoom(const boost::rational<long>& _aZoom);
+ void zoom(const boost::rational<sal_Int64>& _aZoom);
/** fills the vector with all selected control models
/param _rSelection The vector will be filled and will not be cleared before.
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index e57769c3721d..5b28d97e1278 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -120,7 +120,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
- void zoom(const boost::rational<long>& _aZoom);
+ void zoom(const boost::rational<sal_Int64>& _aZoom);
void scrollChildren(long _nThumbPosX);
};
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 83d4d7aee857..d96cfa064f90 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -71,7 +71,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
- void zoom(const boost::rational<long>& _aZoom);
+ void zoom(const boost::rational<sal_Int64>& _aZoom);
};
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index facbd129a8c9..01a65aa7fa2f 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -176,7 +176,7 @@ namespace rptui
@param _aZoom the zoom scale
@param _rWindow where to set the map mode
*/
- void setZoomFactor(const boost::rational<long>& _aZoom, ::vcl::Window& _rWindow);
+ void setZoomFactor(const boost::rational<sal_Int64>& _aZoom, ::vcl::Window& _rWindow);
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 5fe5ab29fe98..5963b42a7845 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -331,7 +331,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
- void zoom(const boost::rational<long>& _aZoom);
+ void zoom(const boost::rational<sal_Int64>& _aZoom);
void scrollChildren(const Point& _aThumbPos);
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 2ca816ddede2..59e0121fe22b 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -991,7 +991,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo
rSectionView.InsertObjectAtView(_pControl,*rSectionView.GetSdrPageView(),SDRINSERT_ADDMARK);
}
-void setZoomFactor(const boost::rational<long>& _aZoom, vcl::Window& _rWindow)
+void setZoomFactor(const boost::rational<sal_Int64>& _aZoom, vcl::Window& _rWindow)
{
MapMode aMapMode( _rWindow.GetMapMode() );
aMapMode.SetScaleX(_aZoom);
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 853358ef6ccc..09d0626c16cd 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -684,7 +684,7 @@ sal_uInt32 ODesignView::getMarkedObjectCount() const
return m_aScrollWindow.getMarkedObjectCount();
}
-void ODesignView::zoom(const boost::rational<long>& _aZoom)
+void ODesignView::zoom(const boost::rational<sal_Int64>& _aZoom)
{
m_aScrollWindow.zoom(_aZoom);
}
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index eacba6c64ffe..ec3851be4173 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -45,7 +45,7 @@ OEndMarker::~OEndMarker()
void OEndMarker::Paint( const Rectangle& /*rRect*/ )
{
- boost::rational<long> aCornerSpace(long(CORNER_SPACE));
+ boost::rational<sal_Int64> aCornerSpace(long(CORNER_SPACE));
aCornerSpace *= GetMapMode().GetScaleX();
const long nCornerSpace = boost::rational_cast<long>(aCornerSpace);
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index bdfa22448d81..89dbb5a767bd 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -4171,7 +4171,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui:
void OReportController::impl_zoom_nothrow()
{
- boost::rational<long> aZoom(m_nZoomValue,100);
+ boost::rational<sal_Int64> aZoom(m_nZoomValue,100);
setZoomFactor( aZoom,*getDesignView() );
getDesignView()->zoom(aZoom);
InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(), true);
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 519a0abb7e59..5111ecc04ba5 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -202,8 +202,8 @@ void OReportSection::fill()
m_pView->SetGridFine(aGridSizeFine);
// #i93595# set snap grid width to snap to all existing subdivisions
- const boost::rational<long> aX(aGridSizeFine.A());
- const boost::rational<long> aY(aGridSizeFine.B());
+ const boost::rational<sal_Int64> aX(aGridSizeFine.A());
+ const boost::rational<sal_Int64> aY(aGridSizeFine.B());
m_pView->SetSnapGridWidth(aX, aY);
m_pView->SetGridSnap( pDesignView->isGridSnap() );
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 57afd5c0dcba..db1b6aa13aaa 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -141,10 +141,10 @@ void OReportWindow::showRuler(bool _bShow)
sal_Int32 OReportWindow::getMaxMarkerWidth(bool _bWithEnd) const
{
- boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= m_aViewsWindow.GetMapMode().GetScaleX();
if ( _bWithEnd )
- aStartWidth += boost::rational<long>(long(REPORT_ENDMARKER_WIDTH));
+ aStartWidth += boost::rational<sal_Int64>(long(REPORT_ENDMARKER_WIDTH));
return sal_Int32(boost::rational_cast<long>(aStartWidth));
}
@@ -153,11 +153,11 @@ sal_Int32 OReportWindow::GetTotalWidth() const
sal_Int32 nWidth = 0;
if ( !m_aViewsWindow.empty() )
{
- boost::rational<long> aStartWidth(long(REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH ));
- const boost::rational<long> aZoom(m_pView->getController().getZoomValue(),100);
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH ));
+ const boost::rational<sal_Int64> aZoom(m_pView->getController().getZoomValue(),100);
aStartWidth *= aZoom;
const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width;
- boost::rational<long> aPaperWidth(nPaperWidth,1);
+ boost::rational<sal_Int64> aPaperWidth(nPaperWidth,1);
aPaperWidth *= aZoom;
const Size aPageSize = LogicToPixel(Size(boost::rational_cast<long>(aPaperWidth),0));
nWidth = aPageSize.Width() + boost::rational_cast<long>(aStartWidth);
@@ -171,7 +171,7 @@ void OReportWindow::Resize()
if ( !m_aViewsWindow.empty() )
{
const Size aTotalOutputSize = GetOutputSizePixel();
- boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH)*m_pView->getController().getZoomValue(),100);
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH)*m_pView->getController().getZoomValue(),100);
const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, 0 ), MAP_APPFONT );
Point aStartPoint(boost::rational_cast<long>(aStartWidth) + aOffset.X(),0);
@@ -372,7 +372,7 @@ sal_uInt32 OReportWindow::getMarkedObjectCount() const
return m_aViewsWindow.getMarkedObjectCount();
}
-void OReportWindow::zoom(const boost::rational<long>& _aZoom)
+void OReportWindow::zoom(const boost::rational<sal_Int64>& _aZoom)
{
m_aHRuler.SetZoom(_aZoom);
m_aHRuler.Invalidate();
@@ -414,14 +414,14 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const
break;
case SVX_ZOOM_WHOLEPAGE:
{
- nZoom = (sal_uInt16) boost::rational_cast<long>( boost::rational<long>(aSize.Width() * 100, impl_getRealPixelWidth()) );
+ nZoom = (sal_uInt16) boost::rational_cast<long>( boost::rational<sal_Int64>(aSize.Width() * 100, impl_getRealPixelWidth()) );
MapMode aMap( MAP_100TH_MM );
const Size aHeight = m_aViewsWindow.LogicToPixel(m_aViewsWindow.PixelToLogic(Size(0,GetTotalHeight() + m_aHRuler.GetSizePixel().Height())),aMap);
- nZoom = ::std::min(nZoom, (sal_uInt16) boost::rational_cast<long>( boost::rational<long>(aSize.Height() * 100, aHeight.Height()) ));
+ nZoom = ::std::min(nZoom, (sal_uInt16) boost::rational_cast<long>( boost::rational<sal_Int64>(aSize.Height() * 100, aHeight.Height()) ));
}
break;
case SVX_ZOOM_PAGEWIDTH:
- nZoom = (sal_uInt16)boost::rational_cast<long>( boost::rational<long>(aSize.Width() * 100, this->impl_getRealPixelWidth()) );
+ nZoom = (sal_uInt16)boost::rational_cast<long>( boost::rational<sal_Int64>(aSize.Width() * 100, this->impl_getRealPixelWidth()) );
break;
default:
break;
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 59d1f6de1efd..5db2bf003377 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -101,7 +101,7 @@ void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight)
m_aTotalPixelSize.Height() = _nHeight;
// now set the ranges without start marker
- boost::rational<long> aStartWidth(REPORT_STARTMARKER_WIDTH * m_pParent->getController().getZoomValue(),100);
+ boost::rational<sal_Int64> aStartWidth(REPORT_STARTMARKER_WIDTH * m_pParent->getController().getZoomValue(),100);
long nWidth = long(_nWidth - boost::rational_cast<double>(aStartWidth));
m_aHScroll.SetRangeMax( nWidth );
m_aVScroll.SetRangeMax( m_aTotalPixelSize.Height() );
@@ -163,7 +163,7 @@ Size OScrollWindowHelper::ResizeScrollBars()
const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MAP_APPFONT );
// resize scrollbars and set their ranges
{
- boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100);
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100);
const sal_Int32 nNewWidth = aOutPixSz.Width() - aOffset.X() - boost::rational_cast<long>(aStartWidth);
lcl_setScrollBar(nNewWidth,Point( boost::rational_cast<long>(aStartWidth) + aOffset.X(), aOutPixSz.Height() ),Size( nNewWidth, nScrSize ),m_aHScroll);
}
@@ -382,7 +382,7 @@ sal_uInt32 OScrollWindowHelper::getMarkedObjectCount() const
return m_aReportWindow.getMarkedObjectCount();
}
-void OScrollWindowHelper::zoom(const boost::rational<long>& _aZoom)
+void OScrollWindowHelper::zoom(const boost::rational<sal_Int64>& _aZoom)
{
m_aReportWindow.zoom(_aZoom);
Resize();
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 1d82b716cd5e..7c07993dad73 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -220,7 +220,7 @@ void OSectionWindow::Resize()
Window::Resize();
Size aOutputSize = GetOutputSizePixel();
- boost::rational<long> aEndWidth(long(REPORT_ENDMARKER_WIDTH));
+ boost::rational<sal_Int64> aEndWidth(long(REPORT_ENDMARKER_WIDTH));
aEndWidth *= GetMapMode().GetScaleX();
const Point aThumbPos = m_pParent->getView()->getThumbPos();
@@ -236,7 +236,7 @@ void OSectionWindow::Resize()
{
const bool bShowEndMarker = m_pParent->getView()->GetTotalWidth() <= (aThumbPos.X() + aOutputSize.Width() );
- boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= GetMapMode().GetScaleX();
// set start marker
@@ -299,7 +299,7 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
return 0L;
}
-void OSectionWindow::zoom(const boost::rational<long>& _aZoom)
+void OSectionWindow::zoom(const boost::rational<sal_Int64>& _aZoom)
{
setZoomFactor(_aZoom,*this);
m_aStartMarker.zoom(_aZoom);
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index bc7fc19a6efd..75b30f7e619f 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -89,7 +89,7 @@ OStartMarker::~OStartMarker()
sal_Int32 OStartMarker::getMinHeight() const
{
- boost::rational<long> aExtraWidth(long(2*REPORT_EXTRA_SPACE));
+ boost::rational<sal_Int64> aExtraWidth(long(2*REPORT_EXTRA_SPACE));
aExtraWidth *= GetMapMode().GetScaleX();
return LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() + boost::rational_cast<long>(aExtraWidth);
}
@@ -221,7 +221,7 @@ void OStartMarker::Resize()
aImageSize.Width() = long(aImageSize.Width() * boost::rational_cast<double>(rMapMode.GetScaleX()));
aImageSize.Height() = long(aImageSize.Height() * boost::rational_cast<double>(rMapMode.GetScaleY()));
- boost::rational<long> aExtraWidth(long(REPORT_EXTRA_SPACE));
+ boost::rational<sal_Int64> aExtraWidth(long(REPORT_EXTRA_SPACE));
aExtraWidth *= rMapMode.GetScaleX();
Point aPos(aImageSize.Width() + boost::rational_cast<long>((aExtraWidth + aExtraWidth)), boost::rational_cast<long>(aExtraWidth));
@@ -281,7 +281,7 @@ void OStartMarker::setCollapsed(bool _bCollapsed)
changeImage();
}
-void OStartMarker::zoom(const boost::rational<long>& _aZoom)
+void OStartMarker::zoom(const boost::rational<sal_Int64>& _aZoom)
{
setZoomFactor(_aZoom,*this);
m_aVRuler.SetZoom(_aZoom);
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 8c0e49f4eb86..8f0dd2a76b4f 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -263,7 +263,7 @@ void OViewsWindow::Paint( const Rectangle& rRect )
Window::Paint( rRect );
Size aOut = GetOutputSizePixel();
- boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= GetMapMode().GetScaleX();
aOut.Width() -= boost::rational_cast<long>(aStartWidth);
@@ -1685,11 +1685,11 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>&
}
}
-void OViewsWindow::zoom(const boost::rational<long>& _aZoom)
+void OViewsWindow::zoom(const boost::rational<sal_Int64>& _aZoom)
{
const MapMode& aMapMode = GetMapMode();
- boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
if ( _aZoom < aMapMode.GetScaleX() )
aStartWidth *= aMapMode.GetScaleX();
else
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 33b12ae54a00..b8274f5e81a0 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -78,7 +78,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
OScrollWindowHelper* pScrollWindow = pReportWindow->getScrollWindow();
Size aOut = pReportWindow->GetOutputSizePixel();
- boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
+ boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= m_pParent->GetMapMode().GetScaleX();
aOut.Width() -= boost::rational_cast<long>(aStartWidth);