summaryrefslogtreecommitdiff
path: root/svx/source/sdr
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-10-23 17:22:06 +0200
committerJan Holesovsky <kendy@collabora.com>2014-10-23 18:34:34 +0200
commit858c2a2977d5e4671959724ecd2a453837dadddf (patch)
treea61e303e6e27cef015c50b38b23fc574ce64fcef /svx/source/sdr
parentff502f409fd73249a6a94c579d19905144aa5ba8 (diff)
Fraction: Revert "fdo#84854 it seems long is not enough on 32 bit"
This reverts commit 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e. Conflicts: svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdibrow.cxx sw/source/filter/ww1/w1filter.cxx Change-Id: I80abc7abdeddc267eaabc9f8ab49611bb3f8ae83
Diffstat (limited to 'svx/source/sdr')
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx2
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx2
-rw-r--r--svx/source/sdr/properties/properties.cxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index da63c0c48edb..a87b44850ca0 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -279,7 +279,7 @@ namespace sdr { namespace contact {
::basegfx::B2DVector aZoom( 1, 1 );
if ( pWindow )
{
- const boost::rational<sal_Int64>& rZoom( pWindow->GetZoom() );
+ const boost::rational<long>& rZoom( pWindow->GetZoom() );
aZoom.setX( boost::rational_cast<double>(rZoom) );
aZoom.setY( boost::rational_cast<double>(rZoom) );
}
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index bd5a824cf2a1..0c61dc1b5814 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -318,7 +318,7 @@ namespace sdr
MapUnit aOldUnit(pOldModel->GetScaleUnit());
MapUnit aNewUnit(pNewModel->GetScaleUnit());
bool bScaleUnitChanged(aNewUnit != aOldUnit);
- boost::rational<sal_Int64> aMetricFactor;
+ boost::rational<long> aMetricFactor;
if(bScaleUnitChanged)
{
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index c59906ac1aee..08ff3d349397 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -211,7 +211,7 @@ namespace sdr
{
}
- void DefaultProperties::Scale(const boost::rational<sal_Int64>& rScale)
+ void DefaultProperties::Scale(const boost::rational<long>& rScale)
{
if(mpItemSet)
{
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index 99a60c795b8c..a15f9f8a4d68 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -93,7 +93,7 @@ namespace sdr
{
namespace properties
{
- void ScaleItemSet(SfxItemSet& rSet, const boost::rational<sal_Int64>& rScale)
+ void ScaleItemSet(SfxItemSet& rSet, const boost::rational<long>& rScale)
{
sal_Int32 nMul(rScale.numerator());
sal_Int32 nDiv(rScale.denominator());
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index aecc64691bed..01490d03051b 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -74,7 +74,7 @@ namespace sdr
ClearObjectItem(nWhich);
}
- void BaseProperties::Scale(const boost::rational<sal_Int64>& /*rScale*/)
+ void BaseProperties::Scale(const boost::rational<long>& /*rScale*/)
{
// default implementation does nothing; overload where
// an ItemSet is implemented.