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

5 files changed, 12 insertions, 12 deletions

diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx
index 83cf3609824b..ff745bf48024 100644
--- a/svx/inc/sdr/properties/itemsettools.hxx
+++ b/svx/inc/sdr/properties/itemsettools.hxx
@@ -56,7 +56,7 @@ namespace sdr
 {
     namespace properties
     {
-        void ScaleItemSet(SfxItemSet& rSet, const boost::rational<sal_Int64>& rScale);
+        void ScaleItemSet(SfxItemSet& rSet, const boost::rational<long>& rScale);
     } // end of namespace properties
 } // end of namespace sdr
 
diff --git a/svx/inc/svdoopengl.hxx b/svx/inc/svdoopengl.hxx
index cec7296528a1..30fd2c86abb5 100644
--- a/svx/inc/svdoopengl.hxx
+++ b/svx/inc/svdoopengl.hxx
@@ -32,7 +32,7 @@ public:
 
     OpenGLContext* getOpenGLContext() { return mpContext;}
 
-    virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
+    virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
 
     void setRenderer(IOpenGLRenderer* pRenderer);
     IOpenGLRenderer* getRenderer();
diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx
index 14fed0a598c9..b262b02362bd 100644
--- a/svx/inc/sxmsitm.hxx
+++ b/svx/inc/sxmsitm.hxx
@@ -27,8 +27,8 @@
 // Instead, we multiply them with each other.
 class SdrMeasureScaleItem: public SdrScaleItem {
 public:
-    SdrMeasureScaleItem()                   : SdrScaleItem(SDRATTR_MEASURESCALE,boost::rational<sal_Int64>(1,1)) {}
-    SdrMeasureScaleItem(const boost::rational<sal_Int64>& rFr): SdrScaleItem(SDRATTR_MEASURESCALE,rFr) {}
+    SdrMeasureScaleItem()                   : SdrScaleItem(SDRATTR_MEASURESCALE,boost::rational<long>(1,1)) {}
+    SdrMeasureScaleItem(const boost::rational<long>& rFr): SdrScaleItem(SDRATTR_MEASURESCALE,rFr) {}
     SdrMeasureScaleItem(SvStream& rIn)      : SdrScaleItem(SDRATTR_MEASURESCALE,rIn) {}
 };
 
diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx
index 7c25de07f116..0f9a216fc359 100644
--- a/svx/inc/sxreaitm.hxx
+++ b/svx/inc/sxreaitm.hxx
@@ -25,15 +25,15 @@
 
 class SdrResizeXAllItem: public SdrFractionItem {
 public:
-    SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,boost::rational<sal_Int64>(1,1)) {}
-    SdrResizeXAllItem(const boost::rational<sal_Int64>& rFact): SdrFractionItem(SDRATTR_RESIZEXALL,rFact) {}
+    SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,boost::rational<long>(1,1)) {}
+    SdrResizeXAllItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEXALL,rFact) {}
     SdrResizeXAllItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXALL,rIn)    {}
 };
 
 class SdrResizeYAllItem: public SdrFractionItem {
 public:
-    SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,boost::rational<sal_Int64>(1,1)) {}
-    SdrResizeYAllItem(const boost::rational<sal_Int64>& rFact): SdrFractionItem(SDRATTR_RESIZEYALL,rFact) {}
+    SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,boost::rational<long>(1,1)) {}
+    SdrResizeYAllItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEYALL,rFact) {}
     SdrResizeYAllItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEYALL,rIn)    {}
 };
 
diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx
index f10167332e34..fe935cf3b5c2 100644
--- a/svx/inc/sxreoitm.hxx
+++ b/svx/inc/sxreoitm.hxx
@@ -25,15 +25,15 @@
 
 class SdrResizeXOneItem: public SdrFractionItem {
 public:
-    SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,boost::rational<sal_Int64>(1,1)) {}
-    SdrResizeXOneItem(const boost::rational<sal_Int64>& rFact): SdrFractionItem(SDRATTR_RESIZEXONE,rFact) {}
+    SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,boost::rational<long>(1,1)) {}
+    SdrResizeXOneItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEXONE,rFact) {}
     SdrResizeXOneItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXONE,rIn)    {}
 };
 
 class SdrResizeYOneItem: public SdrFractionItem {
 public:
-    SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,boost::rational<sal_Int64>(1,1)) {}
-    SdrResizeYOneItem(const boost::rational<sal_Int64>& rFact): SdrFractionItem(SDRATTR_RESIZEYONE,rFact) {}
+    SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,boost::rational<long>(1,1)) {}
+    SdrResizeYOneItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEYONE,rFact) {}
     SdrResizeYOneItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEYONE,rIn)    {}
 };