diff options
| author | truckman <truckman@FreeBSD.org> | 2015-05-09 00:04:20 +0800 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 2015-05-09 00:04:20 +0800 |
| commit | 0b975e47936402c240a7395fceb8d0068b93c2fb (patch) | |
| tree | 82c7ebe0fb3ba92a0a304ea84d837664f78455c0 /editors | |
| parent | cef6e626ae46f8cfbebdee7a02c4a4df84ff7f21 (diff) | |
| download | freebsd-ports-gnome-0b975e47936402c240a7395fceb8d0068b93c2fb.tar.gz freebsd-ports-gnome-0b975e47936402c240a7395fceb8d0068b93c2fb.tar.zst freebsd-ports-gnome-0b975e47936402c240a7395fceb8d0068b93c2fb.zip | |
Resurrect the part of patch-i114430 that was not accepted upstream.
Submitted by: pfg
Approved by: mat (mentor, implicit)
MFH: 2015Q2
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-devel/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-i114430 | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 2495aa780401..3b6986e54456 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -#PORTREVISION= 1 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= editors java MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ diff --git a/editors/openoffice-devel/files/patch-i114430 b/editors/openoffice-devel/files/patch-i114430 new file mode 100644 index 000000000000..01d8a2734019 --- /dev/null +++ b/editors/openoffice-devel/files/patch-i114430 @@ -0,0 +1,31 @@ +Index: sc/source/core/tool/interpr5.cxx +=================================================================== +--- sc/source/core/tool/interpr5.cxx (revision 1678278) ++++ sc/source/core/tool/interpr5.cxx (working copy) +@@ -1611,7 +1611,7 @@ + if (bFlag) + { for ( SCSIZE i = 0; i < nCount; i++ ) + if (pMat->IsValue(i)) +- pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i); ++ pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i); + else + pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); + } +@@ -1618,7 +1618,7 @@ + else + { for ( SCSIZE i = 0; i < nCount; i++ ) + if (pMat->IsValue(i)) +- pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i); ++ pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i); + else + pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); + } +@@ -1628,7 +1628,7 @@ + PushIllegalArgument(); + } + else +- PushDouble(pow(fVal1,fVal2)); ++ PushDouble(::rtl::math::powr(fVal1,fVal2)); + } + + void ScInterpreter::ScSumProduct() |