buildbot success in ASF Buildbot on openoffice-linux64-rat

[buildbot]

The Buildbot has detected a passing build on builder openoffice-linux64-rat 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-linux64-rat/builds/79

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: tethys_ubuntu

Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered 
this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot exception in ASF Buildbot on aoo-win7

[buildbot]

The Buildbot has detected a build exception on builder aoo-win7 while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/aoo-win7/builds/92

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-win7

Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this 
build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

BUILD FAILED: exception svn info build.pl --all upload logs

Sincerely,
 -The Buildbot

svn commit: r1705072 - in /openoffice/trunk/main: ./ formula/ formula/inc/ formula/prj/ formula/source/core/api/ formula/source/core/resource/ formula/source/ui/dlg/ formula/source/ui/resource/ formul

[damjan]

Author: damjan
Date: Thu Sep 24 14:37:53 2015
New Revision: 1705072

URL: http://svn.apache.org/viewvc?rev=1705072=rev
Log:
Migrate main/formula from dmake to gbuild.


Added:
openoffice/trunk/main/formula/AllLangResTarget_for.mk
openoffice/trunk/main/formula/AllLangResTarget_forui.mk
openoffice/trunk/main/formula/Library_for.mk
openoffice/trunk/main/formula/Library_forui.mk
openoffice/trunk/main/formula/Makefile   (with props)
openoffice/trunk/main/formula/Module_formula.mk
openoffice/trunk/main/formula/Package_inc.mk
openoffice/trunk/main/formula/prj/makefile.mk
Removed:
openoffice/trunk/main/formula/inc/makefile.mk
openoffice/trunk/main/formula/source/core/api/makefile.mk
openoffice/trunk/main/formula/source/core/resource/makefile.mk
openoffice/trunk/main/formula/source/ui/dlg/makefile.mk
openoffice/trunk/main/formula/source/ui/resource/makefile.mk
openoffice/trunk/main/formula/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/formula/prj/build.lst
openoffice/trunk/main/formula/prj/d.lst
openoffice/trunk/main/formula/source/ui/resource/ModuleHelper.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk

Modified: openoffice/trunk/main/Module_ooo.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1705072=1705071=1705072=diff
==
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Thu Sep 24 14:37:53 2015
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,o
unoxml \
xmloff \
 vbahelper \
+   formula \
 ))
 
 # vim: set noet ts=4 sw=4:

Modified: openoffice/trunk/main/Repository.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1705072=1705071=1705072=diff
==
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Thu Sep 24 14:37:53 2015
@@ -50,6 +50,8 @@ $(eval $(call gb_Helper_register_librari
drawinglayer \
svgio \
editeng \
+   for \
+   forui \
fwe \
fwi \
fwk \

Added: openoffice/trunk/main/formula/AllLangResTarget_for.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/AllLangResTarget_for.mk?rev=1705072=auto
==
--- openoffice/trunk/main/formula/AllLangResTarget_for.mk (added)
+++ openoffice/trunk/main/formula/AllLangResTarget_for.mk Thu Sep 24 14:37:53 
2015
@@ -0,0 +1,45 @@
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,for))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,for,formula))
+
+$(eval $(call gb_AllLangResTarget_add_srs,for,\
+   for/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,for/res))
+
+$(eval $(call gb_SrsTarget_set_include,for/res,\
+   $$(INCLUDE) \
+   -I$(OUTDIR)/inc \
+   -I$(WORKDIR)/inc/formula \
+   -I$(SRCDIR)/formula/source/core/inc \
+   -I$(SRCDIR)/formula/source/core/api \
+   -I$(SRCDIR)/formula/source/core/resource \
+))
+
+$(eval $(call gb_SrsTarget_add_files,for/res,\
+   formula/source/core/resource/core_resource.src \
+))

Added: openoffice/trunk/main/formula/AllLangResTarget_forui.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/formula/AllLangResTarget_forui.mk?rev=1705072=auto
==
--- openoffice/trunk/main/formula/AllLangResTarget_forui.mk (added)
+++ openoffice/trunk/main/formula/AllLangResTarget_forui.mk Thu Sep 24 14:37:53 
2015
@@ -0,0 +1,48 @@
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work 

svn commit: r1705196 - in /openoffice/trunk/main: sal/inc/osl/file.h sal/inc/osl/file.hxx sal/osl/w32/file_error.c ucb/source/ucp/file/filglob.cxx

[pescetti]

Author: pescetti
Date: Thu Sep 24 23:25:09 2015
New Revision: 1705196

URL: http://svn.apache.org/viewvc?rev=1705196=rev
Log:
#i125194# Fix WebDAV file locking.
Patch by: Giuseppe Castagno 

Modified:
openoffice/trunk/main/sal/inc/osl/file.h
openoffice/trunk/main/sal/inc/osl/file.hxx
openoffice/trunk/main/sal/osl/w32/file_error.c
openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx

Modified: openoffice/trunk/main/sal/inc/osl/file.h
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/osl/file.h?rev=1705196=1705195=1705196=diff
==
--- openoffice/trunk/main/sal/inc/osl/file.h (original)
+++ openoffice/trunk/main/sal/inc/osl/file.h Thu Sep 24 23:25:09 2015
@@ -132,6 +132,7 @@ typedef enum {
osl_File_E_USERS,
osl_File_E_OVERFLOW,
osl_File_E_NOTREADY,
+osl_File_E_LOCKED,
osl_File_E_invalidError,/* unmapped error: always last 
entry in enum! */
 osl_File_E_TIMEDOUT,
osl_File_E_NETWORK,

Modified: openoffice/trunk/main/sal/inc/osl/file.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/osl/file.hxx?rev=1705196=1705195=1705196=diff
==
--- openoffice/trunk/main/sal/inc/osl/file.hxx (original)
+++ openoffice/trunk/main/sal/inc/osl/file.hxx Thu Sep 24 23:25:09 2015
@@ -99,6 +99,7 @@ public:
E_USERS= osl_File_E_USERS,
E_OVERFLOW = osl_File_E_OVERFLOW,
E_NOTREADY = osl_File_E_NOTREADY,
+E_LOCKED   = osl_File_E_LOCKED,
E_invalidError = osl_File_E_invalidError,   /* unmapped 
error: always last entry in enum! */
 E_TIMEDOUT = osl_File_E_TIMEDOUT,
E_NETWORK  = osl_File_E_NETWORK

Modified: openoffice/trunk/main/sal/osl/w32/file_error.c
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/w32/file_error.c?rev=1705196=1705195=1705196=diff
==
--- openoffice/trunk/main/sal/osl/w32/file_error.c (original)
+++ openoffice/trunk/main/sal/osl/w32/file_error.c Thu Sep 24 23:25:09 2015
@@ -87,7 +87,9 @@ static const struct osl_file_error_entry
   {  ERROR_NESTING_NOT_ALLOWED,osl_File_E_AGAIN},  /* 215 */
   {  ERROR_DIRECTORY,  osl_File_E_NOENT},  /* 267 */
   {  ERROR_NOT_ENOUGH_QUOTA,   osl_File_E_NOMEM},  /* 1816 */
-  {  ERROR_UNEXP_NET_ERR,  osl_File_E_NETWORK  }   /* 59 */
+  {  ERROR_UNEXP_NET_ERR,  osl_File_E_NETWORK  },   /* 59 */
+  {  ERROR_FILE_CHECKED_OUT,   osl_File_E_LOCKED   },   /* 220 The file is 
locked or checked out by another user. */
+  {  ERROR_INVALID_NAME,   osl_File_E_NOENT}   /*  123 One or more 
of the names composing the file path has a wrong syntax. */
 };
 
 /* The following two constants must be the minimum and maximum

Modified: openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx?rev=1705196=1705195=1705196=diff
==
--- openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx (original)
+++ openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx Thu Sep 24 23:25:09 
2015
@@ -368,6 +368,10 @@ namespace fileaccess {
 ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
 break;
 
+case FileBase::E_LOCKED:  // file is locked by another user
+ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
+break;
+
 case FileBase::E_FAULT: // Bad address
 case FileBase::E_LOOP: // Too many symbolic links encountered
 case FileBase::E_NOSPC:// No space left on device

svn commit: r1705198 - in /openoffice/branches/AOO410/main: ./ sal/inc/osl/file.h sal/inc/osl/file.hxx sal/osl/w32/file_error.c ucb/source/ucp/file/filglob.cxx

[pescetti]

Author: pescetti
Date: Thu Sep 24 23:28:31 2015
New Revision: 1705198

URL: http://svn.apache.org/viewvc?rev=1705198=rev
Log:
#i125194# Fix WebDAV file locking.
Patch by: Giuseppe Castagno 

Modified:
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/sal/inc/osl/file.h
openoffice/branches/AOO410/main/sal/inc/osl/file.hxx
openoffice/branches/AOO410/main/sal/osl/w32/file_error.c
openoffice/branches/AOO410/main/ucb/source/ucp/file/filglob.cxx

Propchange: openoffice/branches/AOO410/main/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 23:28:31 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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700078,1700135,1702894,1702898,1702986,1702988,1705193
+/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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700078,1700135,1702894,1702898,1702986,1702988,1705193,1705196

Modified: openoffice/branches/AOO410/main/sal/inc/osl/file.h
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sal/inc/osl/file.h?rev=1705198=1705197=1705198=diff
==
--- openoffice/branches/AOO410/main/sal/inc/osl/file.h (original)
+++ openoffice/branches/AOO410/main/sal/inc/osl/file.h Thu Sep 24 23:28:31 2015
@@ -132,6 +132,7 @@ typedef enum {
osl_File_E_USERS,
osl_File_E_OVERFLOW,
osl_File_E_NOTREADY,
+osl_File_E_LOCKED,
osl_File_E_invalidError,/* unmapped error: always last 
entry in enum! */
 osl_File_E_TIMEDOUT,
osl_File_E_NETWORK,

Modified: openoffice/branches/AOO410/main/sal/inc/osl/file.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sal/inc/osl/file.hxx?rev=1705198=1705197=1705198=diff
==
--- openoffice/branches/AOO410/main/sal/inc/osl/file.hxx (original)
+++ openoffice/branches/AOO410/main/sal/inc/osl/file.hxx Thu Sep 24 23:28:31 
2015
@@ -99,6 +99,7 @@ public:
E_USERS= osl_File_E_USERS,
E_OVERFLOW = osl_File_E_OVERFLOW,
E_NOTREADY = osl_File_E_NOTREADY,
+E_LOCKED   = osl_File_E_LOCKED,
E_invalidError = osl_File_E_invalidError,   /* unmapped 
error: always last entry in enum! */
 E_TIMEDOUT = osl_File_E_TIMEDOUT,
E_NETWORK  = osl_File_E_NETWORK

Modified: openoffice/branches/AOO410/main/sal/osl/w32/file_error.c
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sal/osl/w32/file_error.c?rev=1705198=1705197=1705198=diff
==
--- openoffice/branches/AOO410/main/sal/osl/w32/file_error.c (original)
+++ openoffice/branches/AOO410/main/sal/osl/w32/file_error.c Thu Sep 24 
23:28:31 2015
@@ -87,7 +87,9 @@ static const struct osl_file_error_entry
   {  

buildbot success in ASF Buildbot on openoffice-linux64-rat-aoo410

[buildbot]

The Buildbot has detected a passing build on builder 
openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are 
available at:
http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/75

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: tethys_ubuntu

Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' 
triggered this build
Build Source Stamp: [branch openoffice/branches/AOO410] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r1705169 - /openoffice/branches/AOO410/main/external_deps.lst

[pescetti]

Author: pescetti
Date: Thu Sep 24 21:54:41 2015
New Revision: 1705169

URL: http://svn.apache.org/viewvc?rev=1705169=rev
Log:
#i126541# Update location for OOO_EXTRAS

Modified:
openoffice/branches/AOO410/main/external_deps.lst

Modified: openoffice/branches/AOO410/main/external_deps.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/external_deps.lst?rev=1705169=1705168=1705169=diff
==
--- openoffice/branches/AOO410/main/external_deps.lst (original)
+++ openoffice/branches/AOO410/main/external_deps.lst Thu Sep 24 21:54:41 2015
@@ -25,7 +25,9 @@
 # fallback server is used.
 
 # The primary fallback site.
-OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
+# OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
+
+OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
 
 # Must not fallback to svn
 # 
SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/

svn commit: r1705170 - /openoffice/branches/AOO410/main/external_deps.lst

[pescetti]

Author: pescetti
Date: Thu Sep 24 21:55:59 2015
New Revision: 1705170

URL: http://svn.apache.org/viewvc?rev=1705170=rev
Log:
#i126541# Add primary location for CoinMP (new OOO_EXTRAS already has a copy)

Modified:
openoffice/branches/AOO410/main/external_deps.lst

Modified: openoffice/branches/AOO410/main/external_deps.lst
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/external_deps.lst?rev=1705170=1705169=1705170=diff
==
--- openoffice/branches/AOO410/main/external_deps.lst (original)
+++ openoffice/branches/AOO410/main/external_deps.lst Thu Sep 24 21:55:59 2015
@@ -256,7 +256,8 @@ if (RAT_JAR_HOME==BUILD)
 if (ENABLE_CATEGORY_B==YES && SYSTEM_COINMP!=YES)
 MD5 = 2b5f1ca58d6ef30f18f1415b65bed81c
 name = CoinMP-1.6.0.tgz
-URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL1 = http://www.coin-or.org/download/source/CoinMP/$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATB_FONTS == YES)
 MD5 = 35efabc239af896dfb79be7ebdd6e6b9

svn commit: r1705179 - in /openoffice/branches/AOO410: ./ main/ main/connectivity/source/drivers/dbase/makefile.mk main/solenv/inc/tg_compv.mk

[pfg]

Author: pfg
Date: Thu Sep 24 22:25:54 2015
New Revision: 1705179

URL: http://svn.apache.org/viewvc?rev=1705179=rev
Log:
i126553 - (Back)Port FreeBSD build enhancements

MFT r1694701
Workaround for clang 3.4 issue

Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)

openoffice/branches/AOO410/main/connectivity/source/drivers/dbase/makefile.mk
openoffice/branches/AOO410/main/solenv/inc/tg_compv.mk

Propchange: openoffice/branches/AOO410/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 22:25:54 2015
@@ -2,4 +2,4 @@
 /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,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

Propchange: openoffice/branches/AOO410/main/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 22:25:54 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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1700135,1702894,1702898,1702986,1702988
+/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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700135,1702894,1702898,1702986,1702988

Modified: 

svn commit: r1705192 - in /openoffice/branches/AOO410/main/vcl/source/gdi: ./ pdfwriter_impl.cxx

[kschenk]

Author: kschenk
Date: Thu Sep 24 23:01:27 2015
New Revision: 1705192

URL: http://svn.apache.org/viewvc?rev=1705192=rev
Log:
#i63015# Merged from trunk r 1631975


Modified:
openoffice/branches/AOO410/main/vcl/source/gdi/   (props changed)
openoffice/branches/AOO410/main/vcl/source/gdi/pdfwriter_impl.cxx

Propchange: openoffice/branches/AOO410/main/vcl/source/gdi/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 24 23:01:27 2015
@@ -0,0 +1,5 @@
+/openoffice/branches/AOO400/main/vcl/source/gdi:1503684
+/openoffice/branches/ia2/main/vcl/source/gdi:1417739-1541842
+/openoffice/branches/ooxml-osba/main/vcl/source/gdi:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
+/openoffice/branches/rejuvenate01/main/vcl/source/gdi:1480411,1534063,1534098,1536312,1549902,1560617
+/openoffice/trunk/main/vcl/source/gdi: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,1631975,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700135,1702894,1702898,1702986,1702988

Modified: openoffice/branches/AOO410/main/vcl/source/gdi/pdfwriter_impl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/source/gdi/pdfwriter_impl.cxx?rev=1705192=1705191=1705192=diff
==
--- openoffice/branches/AOO410/main/vcl/source/gdi/pdfwriter_impl.cxx (original)
+++ openoffice/branches/AOO410/main/vcl/source/gdi/pdfwriter_impl.cxx Thu Sep 
24 23:01:27 2015
@@ -3693,7 +3693,7 @@ std::map< sal_Int32, sal_Int32 > PDFWrit
 "IsSymbolFont() )
 aLine.append( "/Encoding/WinAnsiEncoding\n" );
 if( nToUnicodeStream )
 {

svn commit: r1705171 - /openoffice/branches/AOO410/main/odk/pack/gendocu/makefile.mk

[pescetti]

Author: pescetti
Date: Thu Sep 24 21:58:30 2015
New Revision: 1705171

URL: http://svn.apache.org/viewvc?rev=1705171=rev
Log:
#i126258# Fix build on systems using a recent version of GNU Patch.
Patch by: Alexander Pyhalov 

Modified:
openoffice/branches/AOO410/main/odk/pack/gendocu/makefile.mk

Modified: openoffice/branches/AOO410/main/odk/pack/gendocu/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/odk/pack/gendocu/makefile.mk?rev=1705171=1705170=1705171=diff
==
--- openoffice/branches/AOO410/main/odk/pack/gendocu/makefile.mk (original)
+++ openoffice/branches/AOO410/main/odk/pack/gendocu/makefile.mk Thu Sep 24 
21:58:30 2015
@@ -112,7 +112,7 @@ $(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(
-$(MKDIRHIER) $(@:d)
$(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
 .IF "$(OS)" != "MACOSX"
-   patch $(JAVA_DOCU_INDEX_FILE) idl_ref_javadoc.patch
+cd $(shell dirname $(JAVA_DOCU_INDEX_FILE)) && patch $(shell basename 
$(JAVA_DOCU_INDEX_FILE)) $(PWD)/idl_ref_javadoc.patch
 .ENDIF
 .ENDIF
 

svn commit: r1705172 - in /openoffice/branches/AOO410: ./ main/ main/solenv/inc/tg_compv.mk

[pfg]

Author: pfg
Date: Thu Sep 24 22:00:48 2015
New Revision: 1705172

URL: http://svn.apache.org/viewvc?rev=1705172=rev
Log:
MFT r1573547
#i124351# avoid "clang: no input file" build error messages

which were caused by the build system getting the compiler version

Originally by hdu@ but it's required by a FreeBSD change.
Pointed out by: Don Lewis

Modified:
openoffice/branches/AOO410/   (props changed)
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/solenv/inc/tg_compv.mk

Propchange: openoffice/branches/AOO410/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 22:00:48 2015
@@ -2,4 +2,4 @@
 /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,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,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,1702894,1702898,1702986,1702988

Propchange: openoffice/branches/AOO410/main/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 22:00: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,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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1700135,1702894,1702898,1702986,1702988
+/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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1700135,1702894,1702898,1702986,1702988

svn commit: r1705195 - in /openoffice/branches/AOO410/main: ./ vcl/source/gdi/ vcl/source/gdi/jobset.cxx

[pescetti]

Author: pescetti
Date: Thu Sep 24 23:15:02 2015
New Revision: 1705195

URL: http://svn.apache.org/viewvc?rev=1705195=rev
Log:
#i126560# Fix print job counter reset.
Patch by: Damjan Jovanovic 

Modified:
openoffice/branches/AOO410/main/   (props changed)
openoffice/branches/AOO410/main/vcl/source/gdi/   (props changed)
openoffice/branches/AOO410/main/vcl/source/gdi/jobset.cxx

Propchange: openoffice/branches/AOO410/main/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 23:15:02 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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700135,1702894,1702898,1702986,1702988
+/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,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700078,1700135,1702894,1702898,1702986,1702988,1705193

Propchange: openoffice/branches/AOO410/main/vcl/source/gdi/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 23:15:02 2015
@@ -2,4 +2,4 @@
 /openoffice/branches/ia2/main/vcl/source/gdi:1417739-1541842
 
/openoffice/branches/ooxml-osba/main/vcl/source/gdi:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 
/openoffice/branches/rejuvenate01/main/vcl/source/gdi:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/vcl/source/gdi: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,1631975,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700135,1702894,1702898,1702986,1702988

svn commit: r1705199 [3/3] - in /openoffice/trunk/main: comphelper/inc/comphelper/ comphelper/source/misc/ framework/source/loadenv/ offapi/com/sun/star/ucb/ sfx2/inc/sfx2/ sfx2/source/dialog/ sfx2/so

[pescetti]

Modified: openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx?rev=1705199=1705198=1705199=diff
==
--- openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx (original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx Thu Sep 24 
23:49:58 2015
@@ -83,6 +83,7 @@ class Content : public ::ucbhelper::Cont
 rtl::OUString m_aEscapedTitle;
 ResourceType  m_eResourceType;
 ContentProvider*  m_pProvider; // No need for a ref, base class holds 
object
+// True if the DEV resource is a 'unmapped URL' as it is named in RFC4918
 bool  m_bTransient;
 bool  m_bCollection;
 bool  m_bDidGetOrHead;
@@ -137,20 +138,20 @@ private:
  const std::auto_ptr< DAVResourceAccess > & rResAccess )
 throw ( ::com::sun::star::uno::Exception );
 
-// Command "open"
+/// Command "open"
 com::sun::star::uno::Any open(
 const com::sun::star::ucb::OpenCommandArgument2 & rArg,
 const com::sun::star::uno::Reference<
 com::sun::star::ucb::XCommandEnvironment > & xEnv )
 throw( ::com::sun::star::uno::Exception );
 
-// Command "post"
+/// Command "post"
 void post( const com::sun::star::ucb::PostCommandArgument2 & rArg,
const com::sun::star::uno::Reference<
 com::sun::star::ucb::XCommandEnvironment > & xEnv )
 throw( ::com::sun::star::uno::Exception );
 
-// Command "insert"
+/// Command "insert"
 void insert( const ::com::sun::star::uno::Reference<
  ::com::sun::star::io::XInputStream > & xInputStream,
  sal_Bool bReplaceExisting,
@@ -158,22 +159,22 @@ private:
  com::sun::star::ucb::XCommandEnvironment >& Environment )
 throw( ::com::sun::star::uno::Exception );
 
-// Command "transfer"
+/// Command "transfer"
 void transfer( const ::com::sun::star::ucb::TransferInfo & rArgs,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment >& Environment 
)
 throw( ::com::sun::star::uno::Exception );
 
-// Command "delete"
+/// Command "delete"
 void destroy( sal_Bool bDeletePhysical )
 throw( ::com::sun::star::uno::Exception );
 
-// Command "lock"
+/// Command "lock"
 void lock( const com::sun::star::uno::Reference<
   com::sun::star::ucb::XCommandEnvironment >& Environment )
 throw( ::com::sun::star::uno::Exception );
 
-// Command "unlock"
+/// Command "unlock"
 void unlock( const com::sun::star::uno::Reference<
   com::sun::star::ucb::XCommandEnvironment >& Environment )
 throw( ::com::sun::star::uno::Exception );
@@ -193,7 +194,7 @@ private:
 const com::sun::star::uno::Reference<
 com::sun::star::ucb::XCommandEnvironment >& Environment );
 
-// XPropertyContainer replacement
+/// XPropertyContainer replacement
 void addProperty( const com::sun::star::ucb::PropertyCommandArgument 
,
   const com::sun::star::uno::Reference<
   com::sun::star::ucb::XCommandEnvironment >& Environment )
@@ -226,13 +227,13 @@ public:
 throw ( ::com::sun::star::ucb::ContentCreationException );
 virtual ~Content();
 
-// XInterface
+/// XInterface
 XINTERFACE_DECL()
 
-// XTypeProvider
+/// XTypeProvider
 XTYPEPROVIDER_DECL()
 
-// XServiceInfo
+/// XServiceInfo
 virtual ::rtl::OUString SAL_CALL
 getImplementationName()
 throw( ::com::sun::star::uno::RuntimeException );
@@ -241,12 +242,12 @@ public:
 getSupportedServiceNames()
 throw( ::com::sun::star::uno::RuntimeException );
 
-// XContent
+/// XContent
 virtual rtl::OUString SAL_CALL
 getContentType()
 throw( com::sun::star::uno::RuntimeException );
 
-// XCommandProcessor
+/// XCommandProcessor
 virtual com::sun::star::uno::Any SAL_CALL
 execute( const com::sun::star::ucb::Command& aCommand,
  sal_Int32 CommandId,
@@ -259,7 +260,7 @@ public:
 abort( sal_Int32 CommandId )
 throw( com::sun::star::uno::RuntimeException );
 
-// XPropertyContainer
+/// XPropertyContainer
 virtual void SAL_CALL
 addProperty( const rtl::OUString& Name,
  sal_Int16 Attributes,
@@ -295,7 +296,7 @@ public:
 
 DAVResourceAccess & getResourceAccess() { return *m_xResAccess; }
 
-// Called from resultset data supplier.
+/** Called from resultset data supplier. */
 static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
 getPropertyValues( const ::com::sun::star::uno::Reference<
  

svn commit: r1705200 - /openoffice/branches/AOO410/main/sfx2/source/doc/docfile.cxx

[pescetti]

Author: pescetti
Date: Thu Sep 24 23:50:09 2015
New Revision: 1705200

URL: http://svn.apache.org/viewvc?rev=1705200=rev
Log:
#i126305# Fix typo that prevents merging from trunk.

Modified:
openoffice/branches/AOO410/main/sfx2/source/doc/docfile.cxx

Modified: openoffice/branches/AOO410/main/sfx2/source/doc/docfile.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sfx2/source/doc/docfile.cxx?rev=1705200=1705199=1705200=diff
==
--- openoffice/branches/AOO410/main/sfx2/source/doc/docfile.cxx (original)
+++ openoffice/branches/AOO410/main/sfx2/source/doc/docfile.cxx Thu Sep 24 
23:50:09 2015
@@ -2533,7 +2533,7 @@ void SfxMedium::UseInteractionHandler( s
 ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >
 SfxMedium::GetInteractionHandler()
 {
-// if interaction isnt allowed explicitly ... return empty reference!
+// if interaction isn't allowed explicitly ... return empty reference!
 if ( !pImp->bUseInteractionHandler )
 return ::com::sun::star::uno::Reference< 
::com::sun::star::task::XInteractionHandler >();
 

svn commit: r1705199 [1/3] - in /openoffice/trunk/main: comphelper/inc/comphelper/ comphelper/source/misc/ framework/source/loadenv/ offapi/com/sun/star/ucb/ sfx2/inc/sfx2/ sfx2/source/dialog/ sfx2/so

[pescetti]

Author: pescetti
Date: Thu Sep 24 23:49:58 2015
New Revision: 1705199

URL: http://svn.apache.org/viewvc?rev=1705199=rev
Log:
#i126305# Add support for WebDAV locking.
Patch by: Giuseppe Castagno 

Modified:
openoffice/trunk/main/comphelper/inc/comphelper/mediadescriptor.hxx

openoffice/trunk/main/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
openoffice/trunk/main/comphelper/source/misc/mediadescriptor.cxx
openoffice/trunk/main/comphelper/source/misc/stillreadwriteinteraction.cxx
openoffice/trunk/main/framework/source/loadenv/loadenv.cxx

openoffice/trunk/main/offapi/com/sun/star/ucb/InteractiveLockingException.idl

openoffice/trunk/main/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
openoffice/trunk/main/offapi/com/sun/star/ucb/makefile.mk
openoffice/trunk/main/sfx2/inc/sfx2/docfile.hxx
openoffice/trunk/main/sfx2/source/dialog/filedlghelper.cxx
openoffice/trunk/main/sfx2/source/doc/docfile.cxx
openoffice/trunk/main/sfx2/source/view/viewfrm.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/DAVException.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/DAVTypes.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockStore.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfLockStore.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfSession.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/SerfTypes.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/makefile.mk
openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.hxx
openoffice/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.cxx
openoffice/trunk/main/ucb/source/ucp/webdav/webdavresponseparser.hxx
openoffice/trunk/main/ucbhelper/inc/ucbhelper/content.hxx
openoffice/trunk/main/ucbhelper/source/client/content.cxx

Modified: openoffice/trunk/main/comphelper/inc/comphelper/mediadescriptor.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/inc/comphelper/mediadescriptor.hxx?rev=1705199=1705198=1705199=diff
==
--- openoffice/trunk/main/comphelper/inc/comphelper/mediadescriptor.hxx 
(original)
+++ openoffice/trunk/main/comphelper/inc/comphelper/mediadescriptor.hxx Thu Sep 
24 23:49:58 2015
@@ -85,6 +85,7 @@ class COMPHELPER_DLLPUBLIC MediaDescript
 static const ::rtl::OUString& PROP_HIDDEN();
 static const ::rtl::OUString& PROP_INPUTSTREAM();
 static const ::rtl::OUString& PROP_INTERACTIONHANDLER();
+static const ::rtl::OUString& PROP_AUTHENTICATIONHANDLER();
 static const ::rtl::OUString& PROP_JUMPMARK();
 static const ::rtl::OUString& PROP_MACROEXECUTIONMODE();
 static const ::rtl::OUString& PROP_MEDIATYPE();

Modified: 
openoffice/trunk/main/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/inc/comphelper/stillreadwriteinteraction.hxx?rev=1705199=1705198=1705199=diff
==
--- 
openoffice/trunk/main/comphelper/inc/comphelper/stillreadwriteinteraction.hxx 
(original)
+++ 
openoffice/trunk/main/comphelper/inc/comphelper/stillreadwriteinteraction.hxx 
Thu Sep 24 23:49:58 2015
@@ -44,18 

buildbot failure in ASF Buildbot on openoffice-linux32-nightly

[buildbot]

The Buildbot has detected a failed build on builder openoffice-linux32-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-linux32-nightly/builds/95

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm2_ubuntu_32bit

Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' 
triggered this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

BUILD FAILED: failed build --all

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on openoffice-linux64-nightly

[buildbot]

The Buildbot has detected a failed build on builder openoffice-linux64-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-linux64-nightly/builds/90

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: tethys_ubuntu

Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' 
triggered this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

BUILD FAILED: failed build --all

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on aoo-win7

[buildbot]

The Buildbot has detected a failed build on builder aoo-win7 while building ASF 
Buildbot. Full details are available at:
http://ci.apache.org/builders/aoo-win7/builds/93

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-win7

Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this 
build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

BUILD FAILED: failed svn info build.pl --all

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

[buildbot]

The Buildbot has detected a failed build on builder openoffice-fbsd-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/81

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-fbsd2_64bit

Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered 
this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

BUILD FAILED: failed build --all

Sincerely,
 -The Buildbot

svn commit: r1705201 [2/3] - in /openoffice/branches/AOO410/main: ./ comphelper/inc/comphelper/ comphelper/source/misc/ framework/source/loadenv/ offapi/com/sun/star/ucb/ sfx2/inc/sfx2/ sfx2/source/di

[pescetti]

Modified: 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx?rev=1705201=1705200=1705201=diff
==
--- 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 
(original)
+++ 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 
Thu Sep 24 23:52:34 2015
@@ -34,9 +34,11 @@ namespace http_dav_ucp
 SerfPutReqProcImpl::SerfPutReqProcImpl( const char* inPath,
 const DAVRequestHeaders& 
inRequestHeaders,
 const char* inData,
+const char* inLockToken,
 apr_size_t inDataLen )
 : SerfRequestProcessorImpl( inPath, inRequestHeaders )
 , mpData( inData )
+, mpLockToken( inLockToken)
 , mnDataLen( inDataLen )
 {
 }
@@ -57,7 +59,7 @@ serf_bucket_t * SerfPutReqProcImpl::crea
 }
 
 // create serf request
-serf_bucket_t *req_bkt = serf_request_bucket_request_create( 
inSerfRequest, 
+serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest,
  "PUT",
  getPathStr(),
  body_bkt,
@@ -68,11 +70,16 @@ serf_bucket_t * SerfPutReqProcImpl::crea
 serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt );
 // general header fields provided by caller
 setRequestHeaders( hdrs_bkt );
+if(mpLockToken)
+{
+// request specific header field
+serf_bucket_headers_set( hdrs_bkt, "if", mpLockToken );
+}
 
 return req_bkt;
 }
 
-void SerfPutReqProcImpl::processChunkOfResponseData( const char* /*data*/, 
+void SerfPutReqProcImpl::processChunkOfResponseData( const char* /*data*/,
  apr_size_t /*len*/ )
 {
 // nothing to do;

Modified: 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx?rev=1705201=1705200=1705201=diff
==
--- 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx 
(original)
+++ 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx 
Thu Sep 24 23:52:34 2015
@@ -33,6 +33,7 @@ public:
 SerfPutReqProcImpl( const char* inPath,
 const DAVRequestHeaders& inRequestHeaders,
 const char* inData,
+const char* inLockToken,
 apr_size_t inDataLen );
 
 
@@ -50,6 +51,7 @@ protected:
 
 private:
 const char* mpData;
+const char* mpLockToken;
 apr_size_t mnDataLen;
 
 };

Modified: 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx?rev=1705201=1705200=1705201=diff
==
--- 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx 
(original)
+++ 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx 
Thu Sep 24 23:52:34 2015
@@ -30,6 +30,9 @@
 
 #include 
 
+//to examine returned http code
+#include "DAVException.hxx"
+
 namespace http_dav_ucp
 {
 
@@ -111,11 +114,19 @@ bool SerfRequestProcessor::processPropFi
 
 // PROPPATCH
 bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue 
> & inProperties,
+ const com::sun::star::ucb::Lock  
inLock,
  apr_status_t& outSerfStatus )
 {
+char * inLockToken = static_cast(0);
+if(inLock.LockTokens.getLength() > 0)
+{
+inLockToken = apr_psprintf( mrSerfSession.getAprPool(), "(<%s>)",
+   rtl::OUStringToOString(inLock.LockTokens[0], 
RTL_TEXTENCODING_UTF8 ).getStr() );
+}
 mpProcImpl = createPropPatchReqProcImpl( mPathStr,
  
mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
- inProperties );
+ inProperties,
+ inLockToken );
 outSerfStatus = runProcessor();
 
 return outSerfStatus == APR_SUCCESS;
@@ -194,11 +205,19 @@ bool SerfRequestProcessor::processHead(
 // PUT
 bool SerfRequestProcessor::processPut( const char* inData,

svn commit: r1705201 [3/3] - in /openoffice/branches/AOO410/main: ./ comphelper/inc/comphelper/ comphelper/source/misc/ framework/source/loadenv/ offapi/com/sun/star/ucb/ sfx2/inc/sfx2/ sfx2/source/di

[pescetti]

Modified: 
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx?rev=1705201=1705200=1705201=diff
==
--- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx 
(original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx Thu 
Sep 24 23:52:34 2015
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -84,6 +85,7 @@
 #include "ContentProperties.hxx"
 #include "SerfUri.hxx"
 #include "UCBDeadPropertyValue.hxx"
+#include 
 
 using namespace com::sun::star;
 using namespace http_dav_ucp;
@@ -728,23 +730,19 @@ uno::Any SAL_CALL Content::execute(
 post( aArg, Environment );
 }
 else if ( aCommand.Name.equalsAsciiL(
-  RTL_CONSTASCII_STRINGPARAM( "lock" ) ) &&
-  supportsExclusiveWriteLock( Environment ) )
+  RTL_CONSTASCII_STRINGPARAM( "lock" ) ) )
 {
 //
 // lock
 //
-
 lock( Environment );
 }
 else if ( aCommand.Name.equalsAsciiL(
-  RTL_CONSTASCII_STRINGPARAM( "unlock" ) ) &&
-  supportsExclusiveWriteLock( Environment ) )
+  RTL_CONSTASCII_STRINGPARAM( "unlock" ) ) )
 {
 //
 // unlock
 //
-
 unlock( Environment );
 }
 else if ( aCommand.Name.equalsAsciiL(
@@ -1454,7 +1452,8 @@ uno::Reference< sdbc::XRow > Content::ge
 
 if ( !bHasAll )
 {
-// Only DAV resources support PROPFIND
+// Only DAV resources support PROPFIND,
+// check already done above in the outer 'if' head
 std::vector< rtl::OUString > aPropNames;
 
 uno::Sequence< beans::Property > aProperties(
@@ -1475,17 +1474,16 @@ uno::Reference< sdbc::XRow > Content::ge
 
 while ( it != end )
 {
-if ( *it == rName )
+if ( *it == rName ) {
+//the failed property in cache is the same as 
the requested one
+//add to the requested properties list
+aProperties[ nProps ] = rProperties[ n ];
+nProps++;
 break;
+}
 
 ++it;
 }
-
-if ( it == end )
-{
-aProperties[ nProps ] = rProperties[ n ];
-nProps++;
-}
 }
 
 aProperties.realloc( nProps );
@@ -3013,6 +3011,23 @@ void Content::lock(
 const uno::Reference< ucb::XCommandEnvironment >& Environment )
 throw( uno::Exception )
 {
+// i126305 TODO: add a check to see if this is really a DAV resource ?
+// currently if the lock is not supported
+// we got an error from the server that should be checked by the client 
(framework)
+rtl::OUString aURL;
+if ( m_bTransient )
+{
+aURL = getParentURL();
+if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) )
+aURL += rtl::OUString::createFromAscii( "/" );
+
+aURL += m_aEscapedTitle;
+}
+else
+{
+aURL = m_xIdentifier->getContentIdentifier();
+}
+
 try
 {
 std::auto_ptr< DAVResourceAccess > xResAccess;
@@ -3021,16 +3036,33 @@ void Content::lock(
 xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) );
 }
 
+// TODO i126305 to discuss:
+// the owner string is the string that will be returned when the lock 
will be
+// interrogated, via lockdiscovery.
+// It should tell a user who is holding the document lock.
+// The string currently set as owner is the one most useful now, 
telling what application locked the resource.
+// May be it would be better put here something better ?
+// Some string be added to office config? Or name of the user there? 
Or a document property user selectable?
+// in case of adding it in config, the lock command should be added a 
string for the owner, and this
+// will be in turn filled in by the framework (e.g. the ucb client).
+// Of course in case of a configuration item, the string should be 
checked against internationalization
+// and how to manage it in webdav protocol, this was not checked 

svn commit: r1705201 [1/3] - in /openoffice/branches/AOO410/main: ./ comphelper/inc/comphelper/ comphelper/source/misc/ framework/source/loadenv/ offapi/com/sun/star/ucb/ sfx2/inc/sfx2/ sfx2/source/di

[pescetti]

Author: pescetti
Date: Thu Sep 24 23:52:34 2015
New Revision: 1705201

URL: http://svn.apache.org/viewvc?rev=1705201=rev
Log:
#i126305# Add support for WebDAV locking.
Patch by: Giuseppe Castagno 

Modified:
openoffice/branches/AOO410/main/   (props changed)

openoffice/branches/AOO410/main/comphelper/inc/comphelper/mediadescriptor.hxx

openoffice/branches/AOO410/main/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
openoffice/branches/AOO410/main/comphelper/source/misc/mediadescriptor.cxx

openoffice/branches/AOO410/main/comphelper/source/misc/stillreadwriteinteraction.cxx
openoffice/branches/AOO410/main/framework/source/loadenv/loadenv.cxx

openoffice/branches/AOO410/main/offapi/com/sun/star/ucb/InteractiveLockingException.idl

openoffice/branches/AOO410/main/offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl
openoffice/branches/AOO410/main/offapi/com/sun/star/ucb/makefile.mk
openoffice/branches/AOO410/main/sfx2/inc/sfx2/docfile.hxx
openoffice/branches/AOO410/main/sfx2/source/dialog/filedlghelper.cxx
openoffice/branches/AOO410/main/sfx2/source/doc/docfile.cxx
openoffice/branches/AOO410/main/sfx2/source/view/viewfrm.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/DAVException.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/DAVResourceAccess.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/DAVTypes.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCallbacks.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockStore.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfLockStore.hxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfSession.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfSession.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/SerfTypes.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/makefile.mk
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.hxx
openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavprovider.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavresponseparser.cxx

openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavresponseparser.hxx
openoffice/branches/AOO410/main/ucbhelper/inc/ucbhelper/content.hxx
openoffice/branches/AOO410/main/ucbhelper/source/client/content.cxx

Propchange: openoffice/branches/AOO410/main/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 23:52:34 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

svn commit: r1705193 - /openoffice/trunk/main/vcl/source/gdi/jobset.cxx

[pescetti]

Author: pescetti
Date: Thu Sep 24 23:11:49 2015
New Revision: 1705193

URL: http://svn.apache.org/viewvc?rev=1705193=rev
Log:
#i126560# Fix print job counter reset.
Patch by: Damjan Jovanovic 

Modified:
openoffice/trunk/main/vcl/source/gdi/jobset.cxx

Modified: openoffice/trunk/main/vcl/source/gdi/jobset.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/jobset.cxx?rev=1705193=1705192=1705193=diff
==
--- openoffice/trunk/main/vcl/source/gdi/jobset.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/jobset.cxx Thu Sep 24 23:11:49 2015
@@ -301,10 +301,10 @@ SvStream& operator>>( SvStream& rIStream
 
sal_uInt16 nLen = 0;
rIStream >> nLen;
-   if ( !nLen )
-   return rIStream;
 
sal_uInt16 nSystem = 0;
+   if ( nLen < sizeof( nLen ) + sizeof( nSystem) )
+   return rIStream;
rIStream >> nSystem;
 
char* pTempBuf = new char[nLen];

svn commit: r1705199 [2/3] - in /openoffice/trunk/main: comphelper/inc/comphelper/ comphelper/source/misc/ framework/source/loadenv/ offapi/com/sun/star/ucb/ sfx2/inc/sfx2/ sfx2/source/dialog/ sfx2/so

[pescetti]

Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx?rev=1705199=1705198=1705199=diff
==
--- openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx 
(original)
+++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx Thu 
Sep 24 23:49:58 2015
@@ -30,6 +30,9 @@
 
 #include 
 
+//to examine returned http code
+#include "DAVException.hxx"
+
 namespace http_dav_ucp
 {
 
@@ -111,11 +114,19 @@ bool SerfRequestProcessor::processPropFi
 
 // PROPPATCH
 bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue 
> & inProperties,
+ const com::sun::star::ucb::Lock  
inLock,
  apr_status_t& outSerfStatus )
 {
+char * inLockToken = static_cast(0);
+if(inLock.LockTokens.getLength() > 0)
+{
+inLockToken = apr_psprintf( mrSerfSession.getAprPool(), "(<%s>)",
+   rtl::OUStringToOString(inLock.LockTokens[0], 
RTL_TEXTENCODING_UTF8 ).getStr() );
+}
 mpProcImpl = createPropPatchReqProcImpl( mPathStr,
  
mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
- inProperties );
+ inProperties,
+ inLockToken );
 outSerfStatus = runProcessor();
 
 return outSerfStatus == APR_SUCCESS;
@@ -194,11 +205,19 @@ bool SerfRequestProcessor::processHead(
 // PUT
 bool SerfRequestProcessor::processPut( const char* inData,
apr_size_t inDataLen,
+   const com::sun::star::ucb::Lock inLock,
apr_status_t& outSerfStatus )
 {
+char * inLockToken = static_cast(0);
+if(inLock.LockTokens.getLength() > 0)
+{
+inLockToken = apr_psprintf( mrSerfSession.getAprPool(), "(<%s>)",
+   rtl::OUStringToOString(inLock.LockTokens[0], 
RTL_TEXTENCODING_UTF8 ).getStr() );
+}
 mpProcImpl = createPutReqProcImpl( mPathStr,

mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
inData,
+   inLockToken,
inDataLen );
 outSerfStatus = runProcessor();
 
@@ -210,6 +229,7 @@ bool SerfRequestProcessor::processPost(
 apr_size_t inDataLen,
 const rtl::OUString & inContentType,
 const rtl::OUString & inReferer,
+const com::sun::star::ucb::Lock inLock,
 const com::sun::star::uno::Reference< 
SerfInputStream >& xioInStrm,
 apr_status_t& outSerfStatus )
 {
@@ -217,10 +237,17 @@ bool SerfRequestProcessor::processPost(
 rtl::OUStringToOString( inContentType, 
RTL_TEXTENCODING_UTF8 ).getStr() );
 mReferer = apr_pstrdup( mrSerfSession.getAprPool(), 
 rtl::OUStringToOString( inReferer, 
RTL_TEXTENCODING_UTF8 ).getStr() );
+char * inLockToken = static_cast(0);
+if(inLock.LockTokens.getLength() > 0)
+{
+inLockToken = apr_psprintf( mrSerfSession.getAprPool(), "(<%s>)",
+   rtl::OUStringToOString(inLock.LockTokens[0], 
RTL_TEXTENCODING_UTF8 ).getStr() );
+}
 mpProcImpl = createPostReqProcImpl( mPathStr,
 
mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
 inData,
 inDataLen,
+inLockToken,
 mContentType,
 mReferer,
 xioInStrm );
@@ -234,6 +261,7 @@ bool SerfRequestProcessor::processPost(
 apr_size_t inDataLen,
 const rtl::OUString & inContentType,
 const rtl::OUString & inReferer,
+const com::sun::star::ucb::Lock inLock,
 const com::sun::star::uno::Reference< 
com::sun::star::io::XOutputStream >& xioOutStrm,
 apr_status_t& outSerfStatus )
 {
@@ -241,10 +269,17 @@ bool SerfRequestProcessor::processPost(
 rtl::OUStringToOString( inContentType,