buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
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/94 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
buildbot success in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a passing build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/107 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 succeeded! Sincerely, -The Buildbot
svn commit: r1707101 - in /openoffice/trunk/main/sal: cppunittester/ inc/cppunittester/ inc/sal/cppunit.h prj/build.lst prj/d.lst qa/rtl/logfile/rtl_logfile.cxx qa/rtl/random/makefile.add
Author: damjan Date: Tue Oct 6 17:47:36 2015 New Revision: 1707101 URL: http://svn.apache.org/viewvc?rev=1707101=rev Log: #i125003# eliminate cppunittester, include files, and all cppunit usage in ported tests from from main/sal. Removed: openoffice/trunk/main/sal/cppunittester/ openoffice/trunk/main/sal/inc/cppunittester/ openoffice/trunk/main/sal/inc/sal/cppunit.h openoffice/trunk/main/sal/qa/rtl/random/makefile.add Modified: openoffice/trunk/main/sal/prj/build.lst openoffice/trunk/main/sal/prj/d.lst openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx Modified: openoffice/trunk/main/sal/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/build.lst?rev=1707101=1707100=1707101=diff == --- openoffice/trunk/main/sal/prj/build.lst (original) +++ openoffice/trunk/main/sal/prj/build.lst Tue Oct 6 17:47:36 2015 @@ -18,11 +18,10 @@ sa sal\qa\sal nmake - all sa_qa_sal sa_u sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_util sa_cpprt.u NULL sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_util sa_cpprt.u NULL -sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL -sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL -sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL -sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL -sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util NULL -sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_cppunittester sa_util NULL -sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_cppunittester sa_util NULL -sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL +sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_util NULL +sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_util NULL +sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_util NULL +sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_util NULL +sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_util NULL +sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_util NULL +sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_util NULL Modified: openoffice/trunk/main/sal/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/d.lst?rev=1707101=1707100=1707101=diff == --- openoffice/trunk/main/sal/prj/d.lst (original) +++ openoffice/trunk/main/sal/prj/d.lst Tue Oct 6 17:47:36 2015 @@ -1,11 +1,9 @@ -mkdir: %_DEST%\inc%_EXT%\cppunittester mkdir: %_DEST%\inc%_EXT%\sal mkdir: %_DEST%\inc%_EXT%\osl mkdir: %_DEST%\inc%_EXT%\rtl mkdir: %_DEST%\inc%_EXT%\systools mkdir: %_DEST%\inc%_EXT%\systools\win32 -..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc%_EXT%\protectorfactory.hxx ..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc%_EXT%\rtlbootstrap.mk ..\inc\sal\*.h %_DEST%\inc%_EXT%\sal\*.h ..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc%_EXT%\sal\typesizes.h @@ -35,6 +33,3 @@ symlink: %_DEST%\lib%_EXT%\libuno_sal.dy ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h - -..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunittester -..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunittester.exe Modified: openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx?rev=1707101=1707100=1707101=diff == --- openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx (original) +++ openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx Tue Oct 6 17:47:36 2015 @@ -160,7 +160,7 @@ namespace rtl_logfile nError1 = osl::File::remove( suFilePath ); printError( nError1 ); -CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( ::osl::FileBase::E_None == nError1 ) || ( nError1 == ::osl::FileBase::E_NOENT ) ); +ASSERT_TRUE( ( ::osl::FileBase::E_None == nError1 ) || ( nError1 == ::osl::FileBase::E_NOENT ) ) << "In deleteTestFile Function: remove "; */ }
svn commit: r1707103 - /openoffice/trunk/main/postprocess/rebase/coffbase.txt
Author: damjan Date: Tue Oct 6 17:51:44 2015 New Revision: 1707103 URL: http://svn.apache.org/viewvc?rev=1707103=rev Log: #i125003# no more cppunit Modified: openoffice/trunk/main/postprocess/rebase/coffbase.txt Modified: openoffice/trunk/main/postprocess/rebase/coffbase.txt URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/rebase/coffbase.txt?rev=1707103=1707102=1707103=diff == --- openoffice/trunk/main/postprocess/rebase/coffbase.txt (original) +++ openoffice/trunk/main/postprocess/rebase/coffbase.txt Tue Oct 6 17:51:44 2015 @@ -320,7 +320,6 @@ migrationoo2.uno.dll 0x5b08 inprocserv.dll 0x5b06 0x0001 lngmi.dll0x5af5 0x0010 adomi.dll0x5aea 0x0008 -cppunit_dll.dll 0x5ad6 0x0004 drawinglayermi.dll 0x5ac0 0x0010 editengmi.dll0x5aa8 0x0017 formi.dll0x5aa3 0x0002
svn commit: r1707106 - /openoffice/trunk/main/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
Author: damjan Date: Tue Oct 6 17:55:27 2015 New Revision: 1707106 URL: http://svn.apache.org/viewvc?rev=1707106=rev Log: #i125003# fix a cppunit comment Modified: openoffice/trunk/main/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx Modified: openoffice/trunk/main/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx?rev=1707106=1707105=1707106=diff == --- openoffice/trunk/main/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx (original) +++ openoffice/trunk/main/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx Tue Oct 6 17:55:27 2015 @@ -2823,7 +2823,7 @@ sal_Bool test_append( const char** resAr delete arrOUS[3]; delete arrOUS[4]; } -// For some bizarre reason, only odd numbered tests were set up to run with cppunit +// For some bizarre reason, only odd numbered tests were set up to run }; TEST_F(append_006_Int32, append_001)
svn commit: r1707107 - /openoffice/trunk/main/solenv/gbuild/templates/GoogleTest.mk
Author: damjan Date: Tue Oct 6 17:58:55 2015 New Revision: 1707107 URL: http://svn.apache.org/viewvc?rev=1707107=rev Log: #i125003# add sample GoogleTest.mk to main/solenv/gbuild/templates Added: openoffice/trunk/main/solenv/gbuild/templates/GoogleTest.mk Added: openoffice/trunk/main/solenv/gbuild/templates/GoogleTest.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/templates/GoogleTest.mk?rev=1707107=auto == --- openoffice/trunk/main/solenv/gbuild/templates/GoogleTest.mk (added) +++ openoffice/trunk/main/solenv/gbuild/templates/GoogleTest.mk Tue Oct 6 17:58:55 2015 @@ -0,0 +1,36 @@ +#** +# +# 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_GoogleTest_GoogleTest,MODULE_NAME)) + +$(eval $(call gb_GoogleTest_add_exception_objects,MODULE_NAME, \ +)) + +$(eval $(call gb_GoogleTest_add_linked_libs,MODULE_NAME, \ +$(gb_STDLIBS) \ +)) + +$(eval $(call gb_GoogleTest_set_include,MODULE_NAME,\ + $$(INCLUDE) \ +)) + +# vim: set noet sw=4 ts=4:
svn commit: r1707108 - /openoffice/trunk/main/solenv/gbuild/templates/CppunitTest.mk
Author: damjan Date: Tue Oct 6 17:59:46 2015 New Revision: 1707108 URL: http://svn.apache.org/viewvc?rev=1707108=rev Log: #i125003# delete the obsolete CppunitTest.mk Removed: openoffice/trunk/main/solenv/gbuild/templates/CppunitTest.mk
svn commit: r1707099 - in /openoffice/trunk/main/sal/workben: makefile.mk t_osl_getVolInfo.cxx t_osl_joinProcess.cxx
Author: damjan Date: Tue Oct 6 17:45:40 2015 New Revision: 1707099 URL: http://svn.apache.org/viewvc?rev=1707099=rev Log: #i125003# migrate main/sal/workben from cppunit to Google Test. Modified: openoffice/trunk/main/sal/workben/makefile.mk openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx openoffice/trunk/main/sal/workben/t_osl_joinProcess.cxx Modified: openoffice/trunk/main/sal/workben/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/workben/makefile.mk?rev=1707099=1707098=1707099=diff == --- openoffice/trunk/main/sal/workben/makefile.mk (original) +++ openoffice/trunk/main/sal/workben/makefile.mk Tue Oct 6 17:45:40 2015 @@ -70,12 +70,12 @@ SHL1TARGET=togvi .IF "$(GUI)" == "WNT" APP1STDLIBS=$(KERNEL32LIB) SHL1STDLIBS=$(LB)$/isal.lib -SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib +SHL1STDLIBS+=$(SOLARLIBDIR)$/gtest.lib .ENDIF .IF "$(GUI)" == "UNX" SHL1STDLIBS=$(LB)$/libsal.so -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a +SHL1STDLIBS+=$(SOLARLIBDIR)$/libgtest$(DLLPOSTFIX).a .ENDIF SHL1IMPLIB=i$(SHL1TARGET) @@ -99,12 +99,12 @@ SHL1TARGET=tojp .IF "$(GUI)" == "WNT" APP1STDLIBS=$(KERNEL32LIB) SHL1STDLIBS=$(LB)$/isal.lib -SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib +SHL1STDLIBS+=$(SOLARLIBDIR)$/gtest.lib .ENDIF .IF "$(GUI)" == "UNX" SHL1STDLIBS=$(LB)$/libsal.so -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a +SHL1STDLIBS+=$(SOLARLIBDIR)$/libgtest$(DLLPOSTFIX).a .ENDIF SHL1IMPLIB=i$(SHL1TARGET) Modified: openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx?rev=1707099=1707098=1707099=diff == --- openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx (original) +++ openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx Tue Oct 6 17:45:40 2015 @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include +#include "gtest/gtest.h" #include #include @@ -67,62 +67,55 @@ void test_getVolumeInformation(const rtl osl_VolumeInfo_Mask_FileSystemName | osl_VolumeInfo_Mask_DeviceHandle); -CPPUNIT_ASSERT_MESSAGE -( -"osl_getVolumeInformation failed", -err == osl_File_E_None -); +ASSERT_TRUE( err == osl_File_E_None ) << "osl_getVolumeInformation failed"; } //-- // //-- -class TestClass_osl_getVolumeInformation : public CppUnit::TestFixture +class TestClass_osl_getVolumeInformation : public ::testing::Test { public: - -/*- -Start a process and join with this -process specify a timeout so that -osl_joinProcessWithTimeout returns -osl_Process_E_TimedOut - -*/ - -void test_osl_getVolumeInformation() -{ -rtl::OUString path = rtl::OUString::createFromAscii(TEST_PATH_1); -rtl::OUString path_url; -osl_getFileURLFromSystemPath(path.pData, _url.pData); -test_getVolumeInformation(path_url); - -path = rtl::OUString::createFromAscii(TEST_PATH_2); -osl_getFileURLFromSystemPath(path.pData, _url.pData); -test_getVolumeInformation(path_url); - -path = rtl::OUString::createFromAscii(TEST_PATH_3); -osl_getFileURLFromSystemPath(path.pData, _url.pData); -test_getVolumeInformation(path_url); - -path = rtl::OUString::createFromAscii(TEST_PATH_4); -osl_getFileURLFromSystemPath(path.pData, _url.pData); -test_getVolumeInformation(path_url); - -path = rtl::OUString::createFromAscii(TEST_PATH_5); -osl_getFileURLFromSystemPath(path.pData, _url.pData); -test_getVolumeInformation(path_url); - -path = rtl::OUString::createFromAscii(TEST_PATH_6); -osl_getFileURLFromSystemPath(path.pData, _url.pData); -test_getVolumeInformation(path_url); -} - -CPPUNIT_TEST_SUITE( TestClass_osl_getVolumeInformation ); -CPPUNIT_TEST( test_osl_getVolumeInformation ); -CPPUNIT_TEST_SUITE_END( ); }; + +/*- +Start a process and join with this +process specify a timeout so that +osl_joinProcessWithTimeout returns +osl_Process_E_TimedOut +
buildbot failure in ASF Buildbot on openoffice-linux64-rat-aoo410
The Buildbot has detected a failed 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/87 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 FAILED: failed Sincerely, -The Buildbot
svn commit: r967999 - /websites/production/openoffice/content/
Author: kschenk Date: Tue Oct 6 21:14:13 2015 New Revision: 967999 Log: Publishing svnmucc operation to openoffice site by kschenk Added: websites/production/openoffice/content/ - copied from r967998, websites/staging/openoffice/trunk/content/
svn commit: r967998 - in /websites/staging/openoffice/trunk/content: ./ orientation/intro-qa.html
Author: buildbot Date: Tue Oct 6 21:13:15 2015 New Revision: 967998 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/orientation/intro-qa.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Oct 6 21:13:15 2015 @@ -1 +1 @@ -1701473 +1707144 Modified: websites/staging/openoffice/trunk/content/orientation/intro-qa.html == --- websites/staging/openoffice/trunk/content/orientation/intro-qa.html (original) +++ websites/staging/openoffice/trunk/content/orientation/intro-qa.html Tue Oct 6 21:13:15 2015 @@ -49,7 +49,18 @@ -General + +/* The following code is added by mdx_elementid.py + It was originally lifted from http://subversion.apache.org/style/site.css */ +/* + * Hide class="elementid-permalink", except when an enclosing heading + * has the :hover property. + */ +.headerlink, .elementid-permalink { + visibility: hidden; +} +h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible } +General About Downloads @@ -58,7 +69,7 @@ Press http://www.openoffice.org/;>OpenOffice.org website -Community +Community Get Involved Orientation @@ -71,7 +82,7 @@ People Community FAQs -Development +Development Source Code Bug Tracking @@ -82,12 +93,12 @@ Contributing Code Developer FAQs -Project Management PMC +Project Management PMC http://blogs.apache.org/OOo/;>Project Blog PMC FAQs -The Apache Software Foundation +The Apache Software Foundation http://www.apache.org/;>Website http://www.openoffice.org/donations.html;>Donations @@ -98,14 +109,25 @@ Introduction to QA -Introductions + +/* The following code is added by mdx_elementid.py + It was originally lifted from http://subversion.apache.org/style/site.css */ +/* + * Hide class="elementid-permalink", except when an enclosing heading + * has the :hover property. + */ +.headerlink, .elementid-permalink { + visibility: hidden; +} +h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible } +Introductions In this orientation module you will learn how Quality Assurance is done in our community. You will also learn about basic tasks that are easiest to do for new QA Volunteers. To complete this module, read through the material on this page, including the linked references. There will also be some start-up tasks for you to perform, such as signing up for an account in our defect tracking database. Your first task is to subscribe to our QA mailing list and to introduce yourself to the other QA volunteers. You can subscribe by sending an email to mailto:qa-subscr...@openoffice.apache.org;>qa-subscr...@openoffice.apache.org. -Then you can introduce yourself by mailto:q...@openoffice.apache.org?subject=New%20QA%20Volunteer;>sending an email to the list. +Then you can introduce yourself by mailto:q...@openoffice.apache.org?subject=New QA Volunteer">sending an email to the list. We'd love to hear who you are, where you are from, what your background is, etc. Also as you work through the items on this page, if you have questions or problems, please feel free to ask for help by sending a note to this same list. @@ -113,7 +135,7 @@ this same list. as well. They have useful background information on The Apache Way, mailing list etiquette, decision making in the project, etc. A quick review is a good idea, especially if you are new to working in Apache-style open source projects. Now with the introductions out of the way, let's get started with the QA! -The Purpose of QA +The Purpose of QA Our goal is to maintain and improve the quality of Apache OpenOffice. We primarily accomplish this by finding defects (bugs) in the product before it is released to the general public. The defects are found by a combination of manual and automated tests that we perform on pre-release builds of OpenOffice. We also review and try to reproduce @@ -125,7 +147,7 @@ report, prioritize them, and verify the Although professional QA practitioners are welcome in this project, we are also happy to welcome those with no prior experience, or those who are learning about QA, perhaps as a possible career. Aside from the satisfaction of improving the Apache OpenOffice product, you can learn or practice new
svn commit: r1707144 - /openoffice/site/trunk/content/orientation/intro-qa.mdtext
Author: kschenk Date: Tue Oct 6 21:13:10 2015 New Revision: 1707144 URL: http://svn.apache.org/viewvc?rev=1707144=rev Log: Changed information for how to obtain SNAPSHOT build. Modified: openoffice/site/trunk/content/orientation/intro-qa.mdtext Modified: openoffice/site/trunk/content/orientation/intro-qa.mdtext URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/orientation/intro-qa.mdtext?rev=1707144=1707143=1707144=diff == --- openoffice/site/trunk/content/orientation/intro-qa.mdtext (original) +++ openoffice/site/trunk/content/orientation/intro-qa.mdtext Tue Oct 6 21:13:10 2015 @@ -144,8 +144,8 @@ Once you have your test environment set - [AOO nightly build](http://ci.apache.org/projects/openoffice/index.html) are built each night and are our "rawest" builds, with many possibilities for finding new bugs. - - [Snapshot builds](https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds), are made -generally every few weeks, are built in multiple languages and platforms. + - [Snapshot builds](http://ci.apache.org/projects/openoffice/index.html), (tagged with the word "Snapshot") are made +weekly against a code branch that is being considered for a release candidate. ##Bug Handling
svn commit: r1707170 - /openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx
Author: pescetti Date: Tue Oct 6 23:58:35 2015 New Revision: 1707170 URL: http://svn.apache.org/viewvc?rev=1707170=rev Log: #i126305# Fix access to standard websites (e.g., no WebDAV). Patch by: Giuseppe Castagno Modified: openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx Modified: openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx?rev=1707170=1707169=1707170=diff == --- openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx (original) +++ openoffice/trunk/main/ucb/source/ucp/webdav/webdavcontent.cxx Tue Oct 6 23:58:35 2015 @@ -3091,17 +3091,15 @@ void Content::lock( aOwner )); } break; +case SC_FORBIDDEN: +case SC_NOT_IMPLEMENTED: case SC_METHOD_NOT_ALLOWED: // this it's not always received, but the RFC4918 (which supersed RFC2518) // tells about this in: // http://tools.ietf.org/html/rfc4918#appendix-D.1 // throw exception, will be interpreted by the lock requester (framework) // it is actually a info, not an error -throw ucb::InteractiveLockingLockNotAvailableException( e.getData(), - static_cast< cppu::OWeakObject * >( this ), - task::InteractionClassification_INFO, -aURL, - e.getExtendedError() ); +return; break; //i126305 TODO //see http://tools.ietf.org/html/rfc4918#section-9.10.6 @@ -3579,12 +3577,18 @@ const Content::ResourceType & Content::g catch ( DAVException const & e ) { rResAccess->resetUri(); - -if ( e.getStatus() == SC_METHOD_NOT_ALLOWED ) +switch( e.getStatus() ) { +// returned errors are part of base http 1.1 RFCs: +case SC_FORBIDDEN: // https://tools.ietf.org/html/rfc7231#section-6.5.3 +case SC_NOT_IMPLEMENTED:// http://tools.ietf.org/html/rfc7231#section-6.6.2 +case SC_METHOD_NOT_ALLOWED: // http://tools.ietf.org/html/rfc7231#section-6.5.5 // Status SC_METHOD_NOT_ALLOWED is a safe indicator that the // resource is NON_DAV eResourceType = NON_DAV; +break; +default: +; } // cancel command execution is case that no user authentication data has been provided. if ( e.getError() == DAVException::DAV_HTTP_NOAUTH )
svn commit: r1707171 - in /openoffice/branches/AOO410/main: ./ sal/inc/osl/file.h
Author: pescetti Date: Wed Oct 7 00:02:40 2015 New Revision: 1707171 URL: http://svn.apache.org/viewvc?rev=1707171=rev Log: #i125194# #i126305# Move new enum to last position. Patch by: Giuseppe Castagno. Modified: openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/sal/inc/osl/file.h Propchange: openoffice/branches/AOO410/main/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 7 00:02:40 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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542 +/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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167 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=1707171=1707170=1707171=diff == --- openoffice/branches/AOO410/main/sal/inc/osl/file.h (original) +++ openoffice/branches/AOO410/main/sal/inc/osl/file.h Wed Oct 7 00:02:40 2015 @@ -132,11 +132,11 @@ 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, - osl_File_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM + osl_File_E_FORCE_EQUAL_SIZE, +osl_File_E_LOCKED = SAL_MAX_ENUM } oslFileError; typedefvoid *oslDirectory;
svn commit: r1707172 - in /openoffice/branches/AOO410/main: ./ sc/ sc/source/ui/docshell/docsh4.cxx sw/ sw/source/core/doc/docnew.cxx
Author: pescetti Date: Wed Oct 7 00:04:27 2015 New Revision: 1707172 URL: http://svn.apache.org/viewvc?rev=1707172=rev Log: #i126572# Use correct priority when updating links. Modified: openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/sc/ (props changed) openoffice/branches/AOO410/main/sc/source/ui/docshell/docsh4.cxx openoffice/branches/AOO410/main/sw/ (props changed) openoffice/branches/AOO410/main/sw/source/core/doc/docnew.cxx Propchange: openoffice/branches/AOO410/main/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 7 00:04:27 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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167 +/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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167,1707169 Propchange: openoffice/branches/AOO410/main/sc/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 7 00:04:27 2015 @@ -2,4 +2,4 @@ /openoffice/branches/ia2/main/sc:1417739-1541842 /openoffice/branches/ooxml-osba/main/sc:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 /openoffice/branches/rejuvenate01/main/sc:1480411,1534063,1534098,1536312,1549902,1560617 -/openoffice/trunk/main/sc:1571617,1571902,1594864,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988 +/openoffice/trunk/main/sc:1571617,1571902,1594864,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988,1707169 Modified: openoffice/branches/AOO410/main/sc/source/ui/docshell/docsh4.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sc/source/ui/docshell/docsh4.cxx?rev=1707172=1707171=1707172=diff == --- openoffice/branches/AOO410/main/sc/source/ui/docshell/docsh4.cxx (original) +++ openoffice/branches/AOO410/main/sc/source/ui/docshell/docsh4.cxx Wed Oct 7 00:04:27 2015 @@ -67,6 +67,7 @@ using namespace ::com::sun::star; #include #include #include +#include #include #include "docuno.hxx" @@ -452,12 +453,15 @@ void ScDocShell::Execute( SfxRequest& rR if (nCanUpdate == com::sun::star::document::UpdateDocMode::NO_UPDATE) nSet = LM_NEVER; -else if (nCanUpdate == com::sun::star::document::UpdateDocMode::QUIET_UPDATE && -nSet == LM_ON_DEMAND) -nSet = LM_NEVER; else if (nCanUpdate == com::sun::star::document::UpdateDocMode::FULL_UPDATE) nSet =
svn commit: r1707173 - in /openoffice/branches/AOO410/main: ./ ucb/source/ucp/webdav/webdavcontent.cxx
Author: pescetti Date: Wed Oct 7 00:05:49 2015 New Revision: 1707173 URL: http://svn.apache.org/viewvc?rev=1707173=rev Log: #i126305# Fix access to standard websites (e.g., no WebDAV). Patch by: Giuseppe Castagno Modified: openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx Propchange: openoffice/branches/AOO410/main/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 7 00:05:49 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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167,1707169 +/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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167,1707169-1707170 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=1707173=1707172=1707173=diff == --- openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx (original) +++ openoffice/branches/AOO410/main/ucb/source/ucp/webdav/webdavcontent.cxx Wed Oct 7 00:05:49 2015 @@ -3091,17 +3091,15 @@ void Content::lock( aOwner )); } break; +case SC_FORBIDDEN: +case SC_NOT_IMPLEMENTED: case SC_METHOD_NOT_ALLOWED: // this it's not always received, but the RFC4918 (which supersed RFC2518) // tells about this in: // http://tools.ietf.org/html/rfc4918#appendix-D.1 // throw exception, will be interpreted by the lock requester (framework) // it is actually a info, not an error -throw ucb::InteractiveLockingLockNotAvailableException( e.getData(), - static_cast< cppu::OWeakObject * >( this ), - task::InteractionClassification_INFO, -aURL, - e.getExtendedError() ); +return; break; //i126305 TODO //see http://tools.ietf.org/html/rfc4918#section-9.10.6 @@ -3579,12 +3577,18 @@ const Content::ResourceType & Content::g catch ( DAVException const & e ) { rResAccess->resetUri(); - -if ( e.getStatus() == SC_METHOD_NOT_ALLOWED ) +switch( e.getStatus() ) { +// returned errors are part of base http
svn commit: r1707175 - /openoffice/trunk/main/cui/source/dialogs/about.cxx
Author: pescetti Date: Wed Oct 7 00:55:44 2015 New Revision: 1707175 URL: http://svn.apache.org/viewvc?rev=1707175=rev Log: #i126567# Update copyright year. Modified: openoffice/trunk/main/cui/source/dialogs/about.cxx Modified: openoffice/trunk/main/cui/source/dialogs/about.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/about.cxx?rev=1707175=1707174=1707175=diff == --- openoffice/trunk/main/cui/source/dialogs/about.cxx (original) +++ openoffice/trunk/main/cui/source/dialogs/about.cxx Wed Oct 7 00:55:44 2015 @@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParen sbcopyright.appendAscii("Copyright "); sbcopyright.append((sal_Unicode)0x00a9); sbcopyright.appendAscii(" "); -rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2014") ); +rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2015") ); if (vendor.EqualsAscii("Apache Software Foundation")) { sbcopyright.append(sYear); sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
svn commit: r1707176 - in /openoffice/branches/AOO410/main: ./ cui/source/dialogs/about.cxx
Author: pescetti Date: Wed Oct 7 00:57:45 2015 New Revision: 1707176 URL: http://svn.apache.org/viewvc?rev=1707176=rev Log: #i126567# Update copyright year. Modified: openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/cui/source/dialogs/about.cxx Propchange: openoffice/branches/AOO410/main/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 7 00:57:45 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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167,1707169-1707170 +/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,1585171,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,170289 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1707167,1707169-1707170,1707175 Modified: openoffice/branches/AOO410/main/cui/source/dialogs/about.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/cui/source/dialogs/about.cxx?rev=1707176=1707175=1707176=diff == --- openoffice/branches/AOO410/main/cui/source/dialogs/about.cxx (original) +++ openoffice/branches/AOO410/main/cui/source/dialogs/about.cxx Wed Oct 7 00:57:45 2015 @@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParen sbcopyright.appendAscii("Copyright "); sbcopyright.append((sal_Unicode)0x00a9); sbcopyright.appendAscii(" "); -rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2014") ); +rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2015") ); if (vendor.EqualsAscii("Apache Software Foundation")) { sbcopyright.append(sYear); sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
svn commit: r1707167 - /openoffice/trunk/main/sal/inc/osl/file.h
Author: pescetti Date: Tue Oct 6 23:33:03 2015 New Revision: 1707167 URL: http://svn.apache.org/viewvc?rev=1707167=rev Log: #i125194# #i126305# Move new enum to last position. Patch by: Giuseppe Castagno. Modified: openoffice/trunk/main/sal/inc/osl/file.h Modified: openoffice/trunk/main/sal/inc/osl/file.h URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/osl/file.h?rev=1707167=1707166=1707167=diff == --- openoffice/trunk/main/sal/inc/osl/file.h (original) +++ openoffice/trunk/main/sal/inc/osl/file.h Tue Oct 6 23:33:03 2015 @@ -132,11 +132,11 @@ 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, - osl_File_E_FORCE_EQUAL_SIZE = SAL_MAX_ENUM + osl_File_E_FORCE_EQUAL_SIZE, +osl_File_E_LOCKED = SAL_MAX_ENUM } oslFileError; typedefvoid *oslDirectory;
svn commit: r1707169 - in /openoffice/trunk/main: sc/source/ui/docshell/docsh4.cxx sw/source/core/doc/docnew.cxx
Author: pescetti Date: Tue Oct 6 23:51:45 2015 New Revision: 1707169 URL: http://svn.apache.org/viewvc?rev=1707169=rev Log: #i126572# Use correct priority when updating links. Modified: openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx openoffice/trunk/main/sw/source/core/doc/docnew.cxx Modified: openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx?rev=1707169=1707168=1707169=diff == --- openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx (original) +++ openoffice/trunk/main/sc/source/ui/docshell/docsh4.cxx Tue Oct 6 23:51:45 2015 @@ -67,6 +67,7 @@ using namespace ::com::sun::star; #include #include #include +#include #include #include "docuno.hxx" @@ -452,12 +453,15 @@ void ScDocShell::Execute( SfxRequest& rR if (nCanUpdate == com::sun::star::document::UpdateDocMode::NO_UPDATE) nSet = LM_NEVER; -else if (nCanUpdate == com::sun::star::document::UpdateDocMode::QUIET_UPDATE && -nSet == LM_ON_DEMAND) -nSet = LM_NEVER; else if (nCanUpdate == com::sun::star::document::UpdateDocMode::FULL_UPDATE) nSet = LM_ALWAYS; +if (nSet == LM_ALWAYS && !(SvtSecurityOptions().GetMacroSecurityLevel() == 0)) +nSet = LM_ON_DEMAND; +if (nCanUpdate == com::sun::star::document::UpdateDocMode::QUIET_UPDATE && + nSet == LM_ON_DEMAND) + nSet = LM_NEVER; + if(nSet==LM_ON_DEMAND) { QueryBox aBox( GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), Modified: openoffice/trunk/main/sw/source/core/doc/docnew.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/docnew.cxx?rev=1707169=1707168=1707169=diff == --- openoffice/trunk/main/sw/source/core/doc/docnew.cxx (original) +++ openoffice/trunk/main/sw/source/core/doc/docnew.cxx Tue Oct 6 23:51:45 2015 @@ -118,6 +118,7 @@ #include #include // MetaFieldManager +#include // #include @@ -1017,6 +1018,13 @@ void SwDoc::UpdateLinks( sal_Bool bUI ) case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = sal_False; break; case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = sal_True; break; } +if (nLinkMode == AUTOMATIC && !bAskUpdate) +{ +if (!(SvtSecurityOptions().GetMacroSecurityLevel() == 0)) +{ +bAskUpdate = true; +} +} if( bUpdate && (bUI || !bAskUpdate) ) { SfxMedium* pMedium = GetDocShell()->GetMedium();
buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
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/93 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
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/102 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 succeeded! Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-rat
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/91 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
svn commit: r1707097 - /openoffice/trunk/main/sal/qa/inc/valueequal.hxx
Author: damjan Date: Tue Oct 6 17:43:41 2015 New Revision: 1707097 URL: http://svn.apache.org/viewvc?rev=1707097=rev Log: #i125003# Commit leftover changes from some unit test. Modified: openoffice/trunk/main/sal/qa/inc/valueequal.hxx Modified: openoffice/trunk/main/sal/qa/inc/valueequal.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/inc/valueequal.hxx?rev=1707097=1707096=1707097=diff == --- openoffice/trunk/main/sal/qa/inc/valueequal.hxx (original) +++ openoffice/trunk/main/sal/qa/inc/valueequal.hxx Tue Oct 6 17:43:41 2015 @@ -63,8 +63,8 @@ bool is_equal(T x, T y, sal_Int16 _nPrec if (_nPrec != PREC_long_double) { -t_print(T_VERBOSE, "double equal: %.20f\n", x); -t_print(T_VERBOSE, " %.20f\n", y); +//t_print(T_VERBOSE, "double equal: %.20f\n", x); +//t_print(T_VERBOSE, " %.20f\n", y); } //here nPrecOfN is the number after dot sal_Int32 nBeforeDot = sal_Int32( log10(x) ); @@ -76,20 +76,24 @@ bool is_equal(T x, T y, sal_Int16 _nPrec sal_Int32 nPrecOfN = -nPRECISION + nBeforeDot; if (_nPrec != PREC_long_double) -t_print(T_VERBOSE, "nPrecOfN is %d\n", nPrecOfN); +{ +//t_print(T_VERBOSE, "nPrecOfN is %d\n", nPrecOfN); +} long double nPrec = pow(0.1, -nPrecOfN); if (_nPrec != PREC_long_double) -t_print(T_VERBOSE, "prec: %.20f\n", nPrec); +{ +//t_print(T_VERBOSE, "prec: %.20f\n", nPrec); +} long double nDelta = fabs( x - y ) ; if (_nPrec != PREC_long_double) { -t_print(T_VERBOSE, " delta: %.20f\n", nDelta); -t_print(T_VERBOSE, " nPrec: %.20f\n", nPrec); -t_print(T_VERBOSE, "delta must be less or equal to prec!\n\n"); +//t_print(T_VERBOSE, " delta: %.20f\n", nDelta); +//t_print(T_VERBOSE, " nPrec: %.20f\n", nPrec); +//t_print(T_VERBOSE, "delta must be less or equal to prec!\n\n"); } if (nDelta > nPrec)