diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:41:47 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:39 +0200 |
commit | 31af61ea091cc895b893c849f2130aa35792b7db (patch) | |
tree | 6c7b63c5b538034bd5d356c5a8667b7e95d59b9c /svx/inc | |
parent | e92c0d6f9b7a6251e00dc55219a203a7e53c96e2 (diff) |
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
Diffstat (limited to 'svx/inc')
-rw-r--r-- | svx/inc/pch/precompiled_svxcore.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sdr/properties/itemsettools.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svdoopengl.hxx | 2 | ||||
-rw-r--r-- | svx/inc/sxmsitm.hxx | 4 | ||||
-rw-r--r-- | svx/inc/sxreaitm.hxx | 8 | ||||
-rw-r--r-- | svx/inc/sxreoitm.hxx | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 7b90cbe617ec..9bb07229cfbd 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -737,7 +737,7 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/fldunit.hxx> -#include <tools/rational.hxx> +#include <tools/fract.hxx> #include <tools/gen.hxx> #include <tools/globname.hxx> #include <tools/helpers.hxx> diff --git a/svx/inc/sdr/properties/itemsettools.hxx b/svx/inc/sdr/properties/itemsettools.hxx index ef365727b087..d930e176b24b 100644 --- a/svx/inc/sdr/properties/itemsettools.hxx +++ b/svx/inc/sdr/properties/itemsettools.hxx @@ -28,7 +28,7 @@ class SdrObject; class SfxItemSet; class Rectangle; -namespace boost { template<class T> class rational; } +class Fraction; // class to remember broadcast start positions @@ -57,7 +57,7 @@ namespace sdr { namespace properties { - void ScaleItemSet(SfxItemSet& rSet, const boost::rational<long>& rScale); + void ScaleItemSet(SfxItemSet& rSet, const Fraction& rScale); } // end of namespace properties } // end of namespace sdr diff --git a/svx/inc/svdoopengl.hxx b/svx/inc/svdoopengl.hxx index 30fd2c86abb5..e30baeacfd0a 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<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; void setRenderer(IOpenGLRenderer* pRenderer); IOpenGLRenderer* getRenderer(); diff --git a/svx/inc/sxmsitm.hxx b/svx/inc/sxmsitm.hxx index b262b02362bd..8843e4b37c40 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<long>(1,1)) {} - SdrMeasureScaleItem(const boost::rational<long>& rFr): SdrScaleItem(SDRATTR_MEASURESCALE,rFr) {} + SdrMeasureScaleItem() : SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {} + SdrMeasureScaleItem(const Fraction& 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 0f9a216fc359..46a063ef739a 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<long>(1,1)) {} - SdrResizeXAllItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEXALL,rFact) {} + SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} + SdrResizeXAllItem(const Fraction& rFact): SdrFractionItem(SDRATTR_RESIZEXALL,rFact) {} SdrResizeXAllItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXALL,rIn) {} }; class SdrResizeYAllItem: public SdrFractionItem { public: - SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,boost::rational<long>(1,1)) {} - SdrResizeYAllItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEYALL,rFact) {} + SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} + SdrResizeYAllItem(const Fraction& 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 fe935cf3b5c2..4bb14b982325 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<long>(1,1)) {} - SdrResizeXOneItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEXONE,rFact) {} + SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} + SdrResizeXOneItem(const Fraction& rFact): SdrFractionItem(SDRATTR_RESIZEXONE,rFact) {} SdrResizeXOneItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEXONE,rIn) {} }; class SdrResizeYOneItem: public SdrFractionItem { public: - SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,boost::rational<long>(1,1)) {} - SdrResizeYOneItem(const boost::rational<long>& rFact): SdrFractionItem(SDRATTR_RESIZEYONE,rFact) {} + SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} + SdrResizeYOneItem(const Fraction& rFact): SdrFractionItem(SDRATTR_RESIZEYONE,rFact) {} SdrResizeYOneItem(SvStream& rIn): SdrFractionItem(SDRATTR_RESIZEYONE,rIn) {} }; |