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

6 files changed, 18 insertions, 18 deletions

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f21ab076d515..70482322c617 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -455,12 +455,12 @@ public:
 
     long GetNeededSize(
         SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY,
-        const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
+        const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
         bool bWidth, const ScNeededSizeOptions& rOptions, const ScPatternAttr** pPatternChange ) const;
 
     sal_uInt16 GetOptimalColWidth(
         OutputDevice* pDev, double nPPTX, double nPPTY,
-        const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
+        const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
         bool bFormula, sal_uInt16 nOldWidth, const ScMarkData* pMarkData, const ScColWidthParam* pParam) const;
 
     void GetOptimalHeight(
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8064e2c9ffb0..b81a3b61b886 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1451,7 +1451,7 @@ public:
     void            StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
                                         OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
-                                        const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY );
+                                        const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY );
 
     bool            IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
 
@@ -1519,7 +1519,7 @@ public:
 
     sal_uInt16          GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
-                                        const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
+                                        const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
                                         bool bFormula,
                                         const ScMarkData* pMarkData = NULL,
                                         const ScColWidthParam* pParam = NULL );
@@ -1532,7 +1532,7 @@ public:
     long            GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
-                                    const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
+                                    const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
                                     bool bWidth, bool bTotalSize = false );
 
     SC_DLLPUBLIC void           ShowCol(SCCOL nCol, SCTAB nTab, bool bShow);
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 9e564319fc2c..d3f7b3be986d 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -44,8 +44,8 @@ class ScEditUtil
     OutputDevice*   pDev;           // MapMode has to be set
     double          nPPTX;
     double          nPPTY;
-    boost::rational<sal_Int64>        aZoomX;
-    boost::rational<sal_Int64>        aZoomY;
+    boost::rational<long>        aZoomX;
+    boost::rational<long>        aZoomY;
 
     static const char pCalcDelimiters[];
 
@@ -82,7 +82,7 @@ public:
                 ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
                             const Point& rScrPosPixel,
                             OutputDevice* pDevice, double nScaleX, double nScaleY,
-                            const boost::rational<sal_Int64>& rX, const boost::rational<sal_Int64>& rY ) :
+                            const boost::rational<long>& rX, const boost::rational<long>& rY ) :
                     pDoc(pDocument),nCol(nX),nRow(nY),nTab(nZ),
                     aScrPos(rScrPosPixel),pDev(pDevice),
                     nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 0f72e0308aa7..66bdc7e50edb 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -84,14 +84,14 @@ public:
     static void             GetFont( vcl::Font& rFont, const SfxItemSet& rItemSet,
                                         ScAutoFontColorMode eAutoMode,
                                         OutputDevice* pOutDev = NULL,
-                                        const boost::rational<sal_Int64>* pScale = NULL,
+                                        const boost::rational<long>* pScale = NULL,
                                         const SfxItemSet* pCondSet = NULL,
                                         sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL,
                                         const Color* pTextConfigColor = NULL );
     /** Fills a font object from the own item set. */
     void                    GetFont( vcl::Font& rFont, ScAutoFontColorMode eAutoMode,
                                         OutputDevice* pOutDev = NULL,
-                                        const boost::rational<sal_Int64>* pScale = NULL,
+                                        const boost::rational<long>* pScale = NULL,
                                         const SfxItemSet* pCondSet = NULL,
                                         sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL,
                                         const Color* pTextConfigColor = NULL ) const;
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index e105758714b9..95f617e3b811 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -26,8 +26,8 @@ class SC_DLLPUBLIC RowHeightContext
 
     double mfPPTX;
     double mfPPTY;
-    boost::rational<sal_Int64> maZoomX;
-    boost::rational<sal_Int64> maZoomY;
+    boost::rational<long> maZoomX;
+    boost::rational<long> maZoomY;
     OutputDevice* mpOutDev;
 
     sal_uInt16 mnExtraHeight;
@@ -35,15 +35,15 @@ class SC_DLLPUBLIC RowHeightContext
 
 public:
     RowHeightContext(
-        double fPPTX, double fPPTY, const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
+        double fPPTX, double fPPTY, const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
         OutputDevice* pOutDev );
 
     ~RowHeightContext();
 
     double getPPTX() const { return mfPPTX;}
     double getPPTY() const { return mfPPTY;}
-    const boost::rational<sal_Int64>& getZoomX() const { return maZoomX;}
-    const boost::rational<sal_Int64>& getZoomY() const { return maZoomY;}
+    const boost::rational<long>& getZoomX() const { return maZoomX;}
+    const boost::rational<long>& getZoomY() const { return maZoomY;}
 
     OutputDevice* getOutputDevice() { return mpOutDev;}
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index bec3bec3f679..76be7fb15543 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -636,7 +636,7 @@ public:
     void        StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
-                                    const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY );
+                                    const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY );
 
     bool        IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
 
@@ -671,7 +671,7 @@ public:
 
     sal_uInt16      GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
-                                    const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
+                                    const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
                                     bool bFormula, const ScMarkData* pMarkData,
                                     const ScColWidthParam* pParam );
     bool SetOptimalHeight(
@@ -685,7 +685,7 @@ public:
     long        GetNeededSize( SCCOL nCol, SCROW nRow,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
-                                    const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
+                                    const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
                                     bool bWidth, bool bTotalSize );
     void        SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth );
     void        SetColWidthOnly( SCCOL nCol, sal_uInt16 nNewWidth );