From owner-svn-ports-all@FreeBSD.ORG Fri May 8 20:08:30 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE3C23EE; Fri, 8 May 2015 20:08:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0CFC1A8E; Fri, 8 May 2015 20:08:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t48K8Tet074386; Fri, 8 May 2015 20:08:29 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t48K8Tlr074384; Fri, 8 May 2015 20:08:29 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201505082008.t48K8Tlr074384@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Fri, 8 May 2015 20:08:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385820 - in branches/2015Q2/editors/openoffice-devel: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2015 20:08:30 -0000 Author: truckman Date: Fri May 8 20:08:28 2015 New Revision: 385820 URL: https://svnweb.freebsd.org/changeset/ports/385820 Log: MFH: r385793 Resurrect the part of patch-i114430 that was not accepted upstream. Submitted by: pfg Approved by: ports-secteam (erwin) Added: branches/2015Q2/editors/openoffice-devel/files/patch-i114430 - copied unchanged from r385793, head/editors/openoffice-devel/files/patch-i114430 Modified: branches/2015Q2/editors/openoffice-devel/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/editors/openoffice-devel/Makefile ============================================================================== --- branches/2015Q2/editors/openoffice-devel/Makefile Fri May 8 20:07:18 2015 (r385819) +++ branches/2015Q2/editors/openoffice-devel/Makefile Fri May 8 20:08:28 2015 (r385820) @@ -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/ \ Copied: branches/2015Q2/editors/openoffice-devel/files/patch-i114430 (from r385793, head/editors/openoffice-devel/files/patch-i114430) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/editors/openoffice-devel/files/patch-i114430 Fri May 8 20:08:28 2015 (r385820, copy of r385793, head/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()