You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2015/09/27 17:26:48 UTC
svn commit: r1705547 - in /openoffice/branches/AOO410: ./
ext_libraries/apr-util/prj/d.lst main/
main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
Author: pfg
Date: Sun Sep 27 15:26:48 2015
New Revision: 1705547
URL: http://svn.apache.org/viewvc?rev=1705547&view=rev
Log:
MFT r1705542, r1705543
Fix build with external webdav.
Submitted by: Don Lewis
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 15:26:48 2015
@@ -2,5 +2,5 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1694132,1694701,1702894,1702898,1702986,1702988
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
/openoffice/trunk/main:1705369
Modified: openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst?rev=1705547&r1=1705546&r2=1705547&view=diff
==============================================================================
--- openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst (original)
+++ openoffice/branches/AOO410/ext_libraries/apr-util/prj/d.lst Sun Sep 27 15:26:48 2015
@@ -10,6 +10,7 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
linklib: libaprutil-1.so.*.*
+linklib: libaprutil-1.so.*
# Mac
..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 15:26:48 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,1702898,170298
6,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,1702898,170298
6,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542
Modified: openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx?rev=1705547&r1=1705546&r2=1705547&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx (original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx Sun Sep 27 15:26:48 2015
@@ -27,9 +27,9 @@
#include "DAVProperties.hxx"
#include "webdavresponseparser.hxx"
-#include <serf/serf.h>
+#include <serf.h>
#include <rtl/ustrbuf.hxx>
-#include <apr/apr_strings.h>
+#include <apr_strings.h>
namespace http_dav_ucp
{
Modified: openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx?rev=1705547&r1=1705546&r2=1705547&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx (original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx Sun Sep 27 15:26:48 2015
@@ -27,9 +27,9 @@
#include "DAVProperties.hxx"
#include "webdavresponseparser.hxx"
-#include <serf/serf.h>
+#include <serf.h>
#include <rtl/ustrbuf.hxx>
-#include <apr/apr_strings.h>
+#include <apr_strings.h>
namespace http_dav_ucp
{
Modified: openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx?rev=1705547&r1=1705546&r2=1705547&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx (original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx Sun Sep 27 15:26:48 2015
@@ -27,9 +27,9 @@
#include "DAVProperties.hxx"
#include "webdavresponseparser.hxx"
-#include <serf/serf.h>
+#include <serf.h>
#include <rtl/ustrbuf.hxx>
-#include <apr/apr_strings.h>
+#include <apr_strings.h>
namespace http_dav_ucp
{