Fraction: Revert "fdo#81356: convert Fraction to boost::rational<long> - wip"

This reverts commit 47a2d7642d249d70b5da0c330a73f3a0032e4bba.

Conflicts:

cui/source/tabpages/transfrm.cxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx
tools/source/generic/rational.cxx

Change-Id: I4849916f5f277a4afef0e279b0135c76b36b9d15

7 files changed, 24 insertions, 24 deletions

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7386409c4cd2..ec05b1357769 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -69,7 +69,7 @@ class RefMovedHint;
 
 }
 
-namespace boost { template<typename T> class rational; }
+class Fraction;
 class OutputDevice;
 class SfxItemPoolCache;
 class SvtListener;
@@ -455,12 +455,12 @@ public:
 
     long GetNeededSize(
         SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY,
-        const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
+        const Fraction& rZoomX, const Fraction& rZoomY,
         bool bWidth, const ScNeededSizeOptions& rOptions, const ScPatternAttr** pPatternChange ) const;
 
     sal_uInt16 GetOptimalColWidth(
         OutputDevice* pDev, double nPPTX, double nPPTY,
-        const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
+        const Fraction& rZoomX, const Fraction& 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 b81a3b61b886..cfc9c410ef0f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -37,7 +37,7 @@
 #include "compressedarray.hxx"
 #include "calcmacros.hxx"
 #include "calcconfig.hxx"
-#include <tools/rational.hxx>
+#include <tools/fract.hxx>
 #include <tools/gen.hxx>
 #include <svl/zforlist.hxx>
 
@@ -1451,7 +1451,7 @@ public:
     void            StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
                                         OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
-                                        const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY );
+                                        const Fraction& rZoomX, const Fraction& 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<long>& rZoomX, const boost::rational<long>& rZoomY,
+                                        const Fraction& rZoomX, const Fraction& 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<long>& rZoomX, const boost::rational<long>& rZoomY,
+                                    const Fraction& rZoomX, const Fraction& 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 d3f7b3be986d..142650fa9fa1 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -27,7 +27,7 @@
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/gen.hxx>
-#include <tools/rational.hxx>
+#include <tools/fract.hxx>
 
 class OutputDevice;
 class ScDocument;
@@ -44,8 +44,8 @@ class ScEditUtil
     OutputDevice*   pDev;           // MapMode has to be set
     double          nPPTX;
     double          nPPTY;
-    boost::rational<long>        aZoomX;
-    boost::rational<long>        aZoomY;
+    Fraction        aZoomX;
+    Fraction        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<long>& rX, const boost::rational<long>& rY ) :
+                            const Fraction& rX, const Fraction& 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 67b07f5eaf01..90516ccf0c37 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -28,7 +28,7 @@
 
 namespace vcl { class Font; }
 class OutputDevice;
-namespace boost { template<class T> class rational; }
+class Fraction;
 class ScStyleSheet;
 class SvNumberFormatter;
 class ScDocument;
@@ -83,14 +83,14 @@ public:
     static void             GetFont( vcl::Font& rFont, const SfxItemSet& rItemSet,
                                         ScAutoFontColorMode eAutoMode,
                                         OutputDevice* pOutDev = NULL,
-                                        const boost::rational<long>* pScale = NULL,
+                                        const Fraction* 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<long>* pScale = NULL,
+                                        const Fraction* pScale = NULL,
                                         const SfxItemSet* pCondSet = NULL,
                                         sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL,
                                         const Color* pTextConfigColor = NULL ) const;
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index a78426ac22d9..5e4dada012d9 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -876,7 +876,7 @@
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/rational.hxx>
+#include <tools/fract.hxx>
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
 #include <tools/mempool.hxx>
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index 95f617e3b811..a077bd0d3361 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -12,7 +12,7 @@
 
 #include "scdllapi.h"
 
-#include <tools/rational.hxx>
+#include <tools/fract.hxx>
 
 #include <vector>
 
@@ -26,8 +26,8 @@ class SC_DLLPUBLIC RowHeightContext
 
     double mfPPTX;
     double mfPPTY;
-    boost::rational<long> maZoomX;
-    boost::rational<long> maZoomY;
+    Fraction maZoomX;
+    Fraction maZoomY;
     OutputDevice* mpOutDev;
 
     sal_uInt16 mnExtraHeight;
@@ -35,15 +35,15 @@ class SC_DLLPUBLIC RowHeightContext
 
 public:
     RowHeightContext(
-        double fPPTX, double fPPTY, const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
+        double fPPTX, double fPPTY, const Fraction& rZoomX, const Fraction& rZoomY,
         OutputDevice* pOutDev );
 
     ~RowHeightContext();
 
     double getPPTX() const { return mfPPTX;}
     double getPPTY() const { return mfPPTY;}
-    const boost::rational<long>& getZoomX() const { return maZoomX;}
-    const boost::rational<long>& getZoomY() const { return maZoomY;}
+    const Fraction& getZoomX() const { return maZoomX;}
+    const Fraction& getZoomY() const { return maZoomY;}
 
     OutputDevice* getOutputDevice() { return mpOutDev;}
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 76be7fb15543..b65f829e39ac 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<long>& rZoomX, const boost::rational<long>& rZoomY );
+                                    const Fraction& rZoomX, const Fraction& 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<long>& rZoomX, const boost::rational<long>& rZoomY,
+                                    const Fraction& rZoomX, const Fraction& 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<long>& rZoomX, const boost::rational<long>& rZoomY,
+                                    const Fraction& rZoomX, const Fraction& rZoomY,
                                     bool bWidth, bool bTotalSize );
     void        SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth );
     void        SetColWidthOnly( SCCOL nCol, sal_uInt16 nNewWidth );