diff options
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/column.hxx | 6 | ||||
-rw-r--r-- | sc/inc/document.hxx | 8 | ||||
-rw-r--r-- | sc/inc/editutil.hxx | 8 | ||||
-rw-r--r-- | sc/inc/patattr.hxx | 6 | ||||
-rw-r--r-- | sc/inc/pch/precompiled_sc.hxx | 2 | ||||
-rw-r--r-- | sc/inc/rowheightcontext.hxx | 12 | ||||
-rw-r--r-- | sc/inc/table.hxx | 6 |
7 files changed, 24 insertions, 24 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 9398d2471581..6c33f74bed8d 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -69,7 +69,7 @@ class RefMovedHint; } -class Fraction; +namespace boost { template<typename T> class rational; } class OutputDevice; class SfxItemPoolCache; class SvtListener; @@ -456,12 +456,12 @@ public: long GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& 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 Fraction& rZoomX, const Fraction& 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 063c9f6d9a9f..93f33bdc3cf3 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/fract.hxx> +#include <tools/rational.hxx> #include <tools/gen.hxx> #include <svl/zforlist.hxx> @@ -1453,7 +1453,7 @@ public: void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& rZoomY ); + const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY ); bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const; @@ -1521,7 +1521,7 @@ public: sal_uInt16 GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& rZoomY, + const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, bool bFormula, const ScMarkData* pMarkData = NULL, const ScColWidthParam* pParam = NULL ); @@ -1534,7 +1534,7 @@ public: long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& 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 142650fa9fa1..d3f7b3be986d 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/fract.hxx> +#include <tools/rational.hxx> class OutputDevice; class ScDocument; @@ -44,8 +44,8 @@ class ScEditUtil OutputDevice* pDev; // MapMode has to be set double nPPTX; double nPPTY; - Fraction aZoomX; - Fraction 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 Fraction& rX, const Fraction& 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 90516ccf0c37..67b07f5eaf01 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -28,7 +28,7 @@ namespace vcl { class Font; } class OutputDevice; -class Fraction; +namespace boost { template<class T> class rational; } 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 Fraction* 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 Fraction* 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/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 5e4dada012d9..a78426ac22d9 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/fract.hxx> +#include <tools/rational.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 a33455444438..0db012c4a263 100644 --- a/sc/inc/rowheightcontext.hxx +++ b/sc/inc/rowheightcontext.hxx @@ -12,7 +12,7 @@ #include "scdllapi.h" -#include <tools/fract.hxx> +#include <tools/rational.hxx> class OutputDevice; @@ -22,8 +22,8 @@ class SC_DLLPUBLIC RowHeightContext { double mfPPTX; double mfPPTY; - Fraction maZoomX; - Fraction maZoomY; + boost::rational<long> maZoomX; + boost::rational<long> maZoomY; OutputDevice* mpOutDev; sal_uInt16 mnExtraHeight; @@ -31,15 +31,15 @@ class SC_DLLPUBLIC RowHeightContext public: RowHeightContext( - double fPPTX, double fPPTY, const Fraction& rZoomX, const Fraction& 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 Fraction& getZoomX() const { return maZoomX;} - const Fraction& 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 30df498c71d0..c59dc473aeb6 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -637,7 +637,7 @@ public: void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& rZoomY ); + const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY ); bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const; @@ -672,7 +672,7 @@ public: sal_uInt16 GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev, double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& rZoomY, + const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, bool bFormula, const ScMarkData* pMarkData, const ScColWidthParam* pParam ); bool SetOptimalHeight( @@ -686,7 +686,7 @@ public: long GetNeededSize( SCCOL nCol, SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& 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 ); |