diff options
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/column.hxx | 4 | ||||
-rw-r--r-- | sc/inc/document.hxx | 6 | ||||
-rw-r--r-- | sc/inc/editutil.hxx | 6 | ||||
-rw-r--r-- | sc/inc/patattr.hxx | 4 | ||||
-rw-r--r-- | sc/inc/rowheightcontext.hxx | 10 | ||||
-rw-r--r-- | sc/inc/table.hxx | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 50204b310c99..560729b0887d 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -456,12 +456,12 @@ public: long GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, + const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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 boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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 93f33bdc3cf3..9a796748cf6c 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1453,7 +1453,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 boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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 boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, + const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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 boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, + const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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..9e564319fc2c 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<long> aZoomX; - boost::rational<long> aZoomY; + boost::rational<sal_Int64> aZoomX; + boost::rational<sal_Int64> 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 boost::rational<sal_Int64>& rX, const boost::rational<sal_Int64>& 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 66bdc7e50edb..0f72e0308aa7 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<long>* pScale = NULL, + const boost::rational<sal_Int64>* 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 boost::rational<sal_Int64>* 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 0db012c4a263..816c53d0c88a 100644 --- a/sc/inc/rowheightcontext.hxx +++ b/sc/inc/rowheightcontext.hxx @@ -22,8 +22,8 @@ class SC_DLLPUBLIC RowHeightContext { double mfPPTX; double mfPPTY; - boost::rational<long> maZoomX; - boost::rational<long> maZoomY; + boost::rational<sal_Int64> maZoomX; + boost::rational<sal_Int64> maZoomY; OutputDevice* mpOutDev; sal_uInt16 mnExtraHeight; @@ -31,15 +31,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 boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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 boost::rational<sal_Int64>& getZoomX() const { return maZoomX;} + const boost::rational<sal_Int64>& getZoomY() const { return maZoomY;} OutputDevice* getOutputDevice() { return mpOutDev;} diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index c59dc473aeb6..3b33c65007e7 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 boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY ); + const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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 boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, + const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& 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 boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, + const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY, bool bWidth, bool bTotalSize ); void SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth ); void SetColWidthOnly( SCCOL nCol, sal_uInt16 nNewWidth ); |