date:20150829

svn commit: r1698441 - in /openoffice/trunk/main/basebmp/test: basictest.cxx bmpmasktest.cxx bmptest.cxx cliptest.cxx export.map filltest.cxx linetest.cxx main.cxx makefile.mk masktest.cxx polytest.cx

2015-08-29 Thread damjan

Author: damjan
Date: Sat Aug 29 07:37:28 2015
New Revision: 1698441

URL: http://svn.apache.org/r1698441
Log:
#i125003# migrate main/basebmp from cppunit to Google Test.


Added:
openoffice/trunk/main/basebmp/test/main.cxx
Removed:
openoffice/trunk/main/basebmp/test/export.map
Modified:
openoffice/trunk/main/basebmp/test/basictest.cxx
openoffice/trunk/main/basebmp/test/bmpmasktest.cxx
openoffice/trunk/main/basebmp/test/bmptest.cxx
openoffice/trunk/main/basebmp/test/cliptest.cxx
openoffice/trunk/main/basebmp/test/filltest.cxx
openoffice/trunk/main/basebmp/test/linetest.cxx
openoffice/trunk/main/basebmp/test/makefile.mk
openoffice/trunk/main/basebmp/test/masktest.cxx
openoffice/trunk/main/basebmp/test/polytest.cxx

Modified: openoffice/trunk/main/basebmp/test/basictest.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/test/basictest.cxx?rev=1698441&r1=1698440&r2=1698441&view=diff
==
--- openoffice/trunk/main/basebmp/test/basictest.cxx (original)
+++ openoffice/trunk/main/basebmp/test/basictest.cxx Sat Aug 29 07:37:28 2015
@@ -24,10 +24,7 @@
 // autogenerated file with codegen.pl
 
 #include "preextstl.h"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include "gtest/gtest.h"
 #include "postextstl.h"
 
 #include 
@@ -51,248 +48,195 @@ namespace
   debugDump( mpDevice32bpp, output );
 */
 
-class BasicTest : public CppUnit::TestFixture
+class BasicTest : public ::testing::Test
 {
 public:
-void colorTest()
+};
+
+TEST_F(BasicTest, colorTest)
+{
+Color aTestColor;
+
+aTestColor = Color(0xDEADBEEF);
+ASSERT_TRUE( aTestColor.toInt32() == 0xDEADBEEF ) << "unary constructor";
+
+aTestColor = Color( 0x10, 0x20, 0xFF );
+ASSERT_TRUE( aTestColor.toInt32() == 0x001020FF ) << "ternary constructor";
+
+aTestColor.setRed( 0x0F );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00F20FF ) << "setRed()";
+
+aTestColor.setGreen( 0x0F );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00F0FFF ) << "setGreen()";
+
+aTestColor.setBlue( 0x10 );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00F0F10 ) << "setBlue()";
+
+aTestColor.setGrey( 0x13 );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00131313 ) << "setGrey()";
+
+aTestColor = Color( 0x10, 0x20, 0xFF );
+ASSERT_TRUE( aTestColor.getRed() == 0x10 ) << "getRed()";
+ASSERT_TRUE( aTestColor.getGreen() == 0x20 ) << "getGreen()";
+ASSERT_TRUE( aTestColor.getBlue() == 0xFF ) << "getBlue()";
+}
+
+TEST_F(BasicTest, testConstruction)
+{
+const basegfx::B2ISize aSize(101,101);
+basegfx::B2ISize   aSize2(aSize);
+BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
+   true,
+   Format::ONE_BIT_MSB_PAL 
));
+ASSERT_TRUE( pDevice->getSize() == aSize2 ) << "right size";
+ASSERT_TRUE( pDevice->isTopDown() == true ) << "Top down format";
+ASSERT_TRUE( pDevice->getScanlineFormat() == Format::ONE_BIT_MSB_PAL ) << 
"Scanline format";
+ASSERT_TRUE( pDevice->getScanlineStride() == (aSize2.getY() + 7)/8 ) << 
"Scanline len";
+ASSERT_TRUE( pDevice->getPalette() ) << "Palette existence";
+ASSERT_TRUE( (*pDevice->getPalette())[0] == Color(0) ) << "Palette entry 0 
is black";
+ASSERT_TRUE( (*pDevice->getPalette())[1] == Color(0x) ) << 
"Palette entry 1 is white";
+}
+
+TEST_F(BasicTest, testPixelFuncs)
+{
+// 1bpp
+const basegfx::B2ISize aSize(64,64);
+BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
+   true,
+   Format::ONE_BIT_MSB_PAL 
));
+
+const basegfx::B2IPoint aPt(3,3);
+const Color aCol(0x);
+pDevice->setPixel( aPt, aCol, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt) == aCol) << "get/setPixel roundtrip #1";
+
+const basegfx::B2IPoint aPt2(0,0);
+const Color aCol2(0x);
+pDevice->setPixel( aPt2, aCol2, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt2) == aCol2) << "get/setPixel roundtrip 
#2";
+
+const basegfx::B2IPoint aPt3(aSize.getX()-1,aSize.getY()-1);
+const Color aCol3(0x);
+pDevice->setPixel( aPt3, aCol3, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt3) == aCol3) << "get/setPixel roundtrip 
#3";
+
+pDevice->setPixel( aPt3, aCol2, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt3) == aCol2) << "get/setPixel roundtrip 
#3.5";
+
+const basegfx::B2IPoint aPt4(-10,-10);
+pDevice->setPixel( aPt4, aCol3, DrawMode_PAINT );
+const basegfx::B2IPoint aPt5(10,10);
+pDevice->setPixel( aPt5, aCol3, DrawMode_PAINT );
+
+sal_Int32 nPixel(countPixel(pDevice, aCol2));
+const basegfx::B2IPoint aPt6

svn commit: r1698448 - in /openoffice/trunk/main: basebmp/test/makefile.mk basegfx/test/makefile.mk codemaker/test/cppumaker/makefile.mk

2015-08-29 Thread damjan

Author: damjan
Date: Sat Aug 29 09:04:40 2015
New Revision: 1698448

URL: http://svn.apache.org/r1698448
Log:
$(SLOFILES) is unnecessary for applications, and other
makefiles simplifications for recently ported tests.


Modified:
openoffice/trunk/main/basebmp/test/makefile.mk
openoffice/trunk/main/basegfx/test/makefile.mk
openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk

Modified: openoffice/trunk/main/basebmp/test/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/test/makefile.mk?rev=1698448&r1=1698447&r2=1698448&view=diff
==
--- openoffice/trunk/main/basebmp/test/makefile.mk (original)
+++ openoffice/trunk/main/basebmp/test/makefile.mk Sat Aug 29 09:04:40 2015
@@ -108,9 +108,6 @@ APP1TEST  = enabled
 #APP2DEF=  $(MISC)$/$(TARGET).def
 #.ENDIF
 
-#--- All object files 
---
-# do this here, so we get right dependencies
-SLOFILES=$(APP1OBJS)
 
 # --- Targets --
 

Modified: openoffice/trunk/main/basegfx/test/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/test/makefile.mk?rev=1698448&r1=1698447&r2=1698448&view=diff
==
--- openoffice/trunk/main/basegfx/test/makefile.mk (original)
+++ openoffice/trunk/main/basegfx/test/makefile.mk Sat Aug 29 09:04:40 2015
@@ -61,17 +61,11 @@ APP1STDLIBS= \
$(CPPULIB)   \
$(GTESTLIB)
 
-APP1IMPLIB= i$(APP1TARGET)
 APP1RPATH = NONE
-DEF1NAME=$(APP1TARGET)
 APP1TEST = enabled
 
 # END --
 
-#--- All object files 
---
-# do this here, so we get right dependencies
-SLOFILES=$(APP1OBJS)
-
 # --- Targets --
 
 .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"

Modified: openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk?rev=1698448&r1=1698447&r2=1698448&view=diff
==
--- openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk (original)
+++ openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk Sat Aug 29 
09:04:40 2015
@@ -40,13 +40,8 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 APP1TARGET = $(TARGET)
 APP1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
 APP1STDLIBS = $(CPPULIB) $(GTESTLIB) $(SALLIB) $(TESTSHL2LIB)
-APP1VERSIONMAP = version.map
-APP1IMPLIB = i$(APP1TARGET)
-DEF1NAME = $(APP1TARGET)
 APP1TEST = enabled
 
-SLOFILES = $(APP1OBJS)
-
 .INCLUDE: target.mk
 
 $(APP1OBJS): $(MISC)$/$(TARGET).cppumaker.flag

buildbot success in ASF Buildbot on openoffice-linux64-rat

2015-08-29 Thread 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/53

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: r1700037 - /openoffice/trunk/main/solenv/inc/_tg_app.mk

2015-08-29 Thread damjan

Author: damjan
Date: Sat Aug 29 14:23:20 2015
New Revision: 1700037

URL: http://svn.apache.org/r1700037
Log:
#i125003# add Google Test APPnTARGET_run targets for n=2..10, which commit 
1599163
must have missed out ("Up to 9 run unit test targets are supported" says the 
Wiki,
even though only 1 exists in main/solenv/inc/_tg_app.mk).


Modified:
openoffice/trunk/main/solenv/inc/_tg_app.mk

Modified: openoffice/trunk/main/solenv/inc/_tg_app.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/_tg_app.mk?rev=1700037&r1=1700036&r2=1700037&view=diff
==
--- openoffice/trunk/main/solenv/inc/_tg_app.mk (original)
+++ openoffice/trunk/main/solenv/inc/_tg_app.mk Sat Aug 29 14:23:20 2015
@@ -287,6 +287,7 @@ $(APP1TARGET)_run: $(APP1TARGETN)
 
 .ENDIF
 
+
 # Instruction for linking
 # unroll begin
 
@@ -546,6 +547,14 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
 
 .ENDIF # "$(APP2TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP2TEST)" == "enabled" &&  "$(APP2TARGET)" != ""
+
+$(APP2TARGET)_run: $(APP2TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP2TARGETN) 
--gtest_output="xml:$(BIN)/$(APP2TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -806,6 +815,14 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
 
 .ENDIF # "$(APP3TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP3TEST)" == "enabled" &&  "$(APP3TARGET)" != ""
+
+$(APP3TARGET)_run: $(APP3TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP3TARGETN) 
--gtest_output="xml:$(BIN)/$(APP3TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -1066,6 +1083,14 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
 
 .ENDIF # "$(APP4TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP4TEST)" == "enabled" &&  "$(APP4TARGET)" != ""
+
+$(APP4TARGET)_run: $(APP4TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP4TARGETN) 
--gtest_output="xml:$(BIN)/$(APP4TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -1326,6 +1351,14 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
 
 .ENDIF # "$(APP5TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP5TEST)" == "enabled" &&  "$(APP5TARGET)" != ""
+
+$(APP5TARGET)_run: $(APP5TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP5TARGETN) 
--gtest_output="xml:$(BIN)/$(APP5TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -1586,6 +1619,14 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
 
 .ENDIF # "$(APP6TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP6TEST)" == "enabled" &&  "$(APP6TARGET)" != ""
+
+$(APP6TARGET)_run: $(APP6TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP6TARGETN) 
--gtest_output="xml:$(BIN)/$(APP6TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -1846,6 +1887,14 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
 
 .ENDIF # "$(APP7TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP7TEST)" == "enabled" &&  "$(APP7TARGET)" != ""
+
+$(APP7TARGET)_run: $(APP7TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP7TARGETN) 
--gtest_output="xml:$(BIN)/$(APP7TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -2106,6 +2155,14 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
 
 .ENDIF # "$(APP8TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP8TEST)" == "enabled" &&  "$(APP8TARGET)" != ""
+
+$(APP8TARGET)_run: $(APP8TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP8TARGETN) 
--gtest_output="xml:$(BIN)/$(APP8TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -2366,6 +2423,14 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
 
 .ENDIF # "$(APP9TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP9TEST)" == "enabled" &&  "$(APP9TARGET)" != ""
+
+$(APP9TARGET)_run: $(APP9TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP9TARGETN) 
--gtest_output="xml:$(BIN)/$(APP9TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking
 # unroll begin
@@ -2626,5 +2691,13 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
 
 .ENDIF # "$(APP10TARGETN)"!=""
 
+# New rule for automatic run targets of unit test targets
+.IF "$(APP10TEST)" == "enabled" &&  "$(APP10TARGET)" != ""
+
+$(APP10TARGET)_run: $(APP10TARGETN)
+   $(COMMAND_ECHO) $(AUGMENT_LIBRARY_PATH_LOCAL) $(APP10TARGETN) 
--gtest_output="xml:$(BIN)/$(APP10TARGET)_result.xml"
+
+.ENDIF
+
 
 # Instruction for linking

svn commit: r1700039 - in /openoffice/trunk/main/binaryurp/qa: main.cxx makefile.mk test-cache.cxx test-unmarshal.cxx

2015-08-29 Thread damjan

Author: damjan
Date: Sat Aug 29 14:29:12 2015
New Revision: 1700039

URL: http://svn.apache.org/r1700039
Log:
#i125003# migrate main/binaryurp from cppunit to Google Test.


Added:
openoffice/trunk/main/binaryurp/qa/main.cxx
Modified:
openoffice/trunk/main/binaryurp/qa/makefile.mk
openoffice/trunk/main/binaryurp/qa/test-cache.cxx
openoffice/trunk/main/binaryurp/qa/test-unmarshal.cxx

Added: openoffice/trunk/main/binaryurp/qa/main.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/qa/main.cxx?rev=1700039&view=auto
==
--- openoffice/trunk/main/binaryurp/qa/main.cxx (added)
+++ openoffice/trunk/main/binaryurp/qa/main.cxx Sat Aug 29 14:29:12 2015
@@ -0,0 +1,28 @@
+/**
+ * 
+ * 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.
+ * 
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}

Modified: openoffice/trunk/main/binaryurp/qa/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/qa/makefile.mk?rev=1700039&r1=1700038&r2=1700039&view=diff
==
--- openoffice/trunk/main/binaryurp/qa/makefile.mk (original)
+++ openoffice/trunk/main/binaryurp/qa/makefile.mk Sat Aug 29 14:29:12 2015
@@ -29,39 +29,21 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
 
 @all:
-.IF "$(GUI)" == "OS2"
-   @echo "Skipping, cppunit broken."
-.ELIF "$(WITH_CPPUNIT)" != "YES"
-   @echo "cppunit disabled. nothing do do."
-.END
+   @echo unit tests are disabled. Nothing to do.
 
 .ELSE
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-DLLPRE =
+APP1OBJS = $(SLO)/test-cache.obj $(SLO)/main.obj
+APP1RPATH = NONE
+APP1STDLIBS = $(GTESTLIB) $(SALLIB)
+APP1TARGET = test-cache
+APP1TEST = enabled
 
-.IF "$(GUI)" != "OS2"
-SLOFILES = $(SLO)/test-cache.obj $(SLO)/test-unmarshal.obj
-.ENDIF
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/test-cache.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-.IF "$(GUI)" != "OS2"
-SHL1TARGET = test-cache
-.ELSE
-SHL1TARGET = test-c
-.ENDIF
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SHL2IMPLIB = i$(SHL2TARGET)
-SHL2OBJS = \
+APP2OBJS = \
 $(SLO)/test-unmarshal.obj \
 $(SLO)/binaryany.obj \
 $(SLO)/bridge.obj \
@@ -69,29 +51,27 @@ SHL2OBJS = \
 $(SLO)/currentcontext.obj \
 $(SLO)/incomingrequest.obj \
 $(SLO)/lessoperators.obj \
+$(SLO)/main.obj \
 $(SLO)/marshal.obj \
 $(SLO)/outgoingrequests.obj \
 $(SLO)/proxy.obj \
 $(SLO)/reader.obj \
 $(SLO)/unmarshal.obj \
 $(SLO)/writer.obj
-SHL2RPATH = NONE
-SHL2STDLIBS = \
+APP2RPATH = NONE
+APP2STDLIBS = \
 $(CPPUHELPERLIB) \
 $(CPPULIB) \
-$(CPPUNITLIB) \
+$(GTESTLIB) \
 $(SALHELPERLIB) \
 $(SALLIB)
 .IF "$(GUI)" != "OS2"
-SHL2TARGET = test-unmarshal
+APP2TARGET = test-unmarshal
 .ELSE
-SHL2TARGET = test-u
+APP2TARGET = test-u
 .ENDIF
-SHL2VERSIONMAP = version.map
-DEF2NAME = $(SHL2TARGET)
-
-.ENDIF # "$(GUI)" == "OS2"
+APP2TEST = enabled
 
 .INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
 
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"

Modified: openoffice/trunk/main/binaryurp/qa/test-cache.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/qa/test-cache.cxx?rev=1700039&r1=1700038&r2=1700039&view=diff
==
--- openoffice/trunk/main/binaryurp/qa/test-cache.cxx (original)
+++ openoffice/trunk/main/binaryurp/qa/test-cache.cxx Sat Aug 29 14:29:12 2015
@@ -23,26 +23,18 @@
 
 #include "sal/config.h"
 
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include "gtest/gtest.h"
 
 #include "../source/cache.hxx"
 
 namespace {
 
-class Test: public CppUnit::TestFixture {
-private:
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TES

svn commit: r1700066 - in /openoffice/trunk/main/cppuhelper: prj/build.lst qa/ifcontainer/cppu_ifcontainer.cxx qa/ifcontainer/export.map qa/ifcontainer/main.cxx qa/ifcontainer/makefile.mk

2015-08-29 Thread damjan

Author: damjan
Date: Sat Aug 29 18:39:35 2015
New Revision: 1700066

URL: http://svn.apache.org/r1700066
Log:
#i125003# migrate main/cppuhelper/qa/ifcontainer from cppunit to Google Test
and run it on every build.


Added:
openoffice/trunk/main/cppuhelper/qa/ifcontainer/main.cxx
Removed:
openoffice/trunk/main/cppuhelper/qa/ifcontainer/export.map
Modified:
openoffice/trunk/main/cppuhelper/prj/build.lst
openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
openoffice/trunk/main/cppuhelper/qa/ifcontainer/makefile.mk

Modified: openoffice/trunk/main/cppuhelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/prj/build.lst?rev=1700066&r1=1700065&r2=1700066&view=diff
==
--- openoffice/trunk/main/cppuhelper/prj/build.lst (original)
+++ openoffice/trunk/main/cppuhelper/prj/build.lst Sat Aug 29 18:39:35 2015
@@ -3,4 +3,5 @@ ch  cppuhelper  
usr1-   all ch_mkout
 ch cppuhelper\inc  nmake   
-   all ch_include NULL
 ch cppuhelper\source   nmake   
-   all ch_source ch_unotypes ch_include NULL
 ch cppuhelper\unotypes nmake   
-   all ch_unotypes NULL
+ch cppuhelper\qa\ifcontainer   nmake   
-   all ch_qa_ifcontainer ch_source ch_include ch_unotypes NULL
 ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source 
NULL

Modified: openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx?rev=1700066&r1=1700065&r2=1700066&view=diff
==
--- openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx 
(original)
+++ openoffice/trunk/main/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx Sat 
Aug 29 18:39:35 2015
@@ -21,13 +21,12 @@
 
 
 
-#include 
-
 #include "com/sun/star/lang/XEventListener.hpp"
 #include "cppuhelper/interfacecontainer.hxx"
 #include "cppuhelper/queryinterface.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/propshlp.hxx"
+#include "gtest/gtest.h"
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -57,79 +56,12 @@ public:
 
 namespace cppu_ifcontainer
 {
-class IfTest : public CppUnit::TestFixture
+class IfTest : public ::testing::Test
 {
+protected:
 osl::Mutex m_aGuard;
 static const int nTests = 10;
 public:
-void testCreateDispose()
-{
-ContainerStats aStats;
-cppu::OInterfaceContainerHelper *pContainer;
-
-pContainer = new cppu::OInterfaceContainerHelper(m_aGuard);
-
-CPPUNIT_ASSERT_MESSAGE("Empty container not empty",
-   pContainer->getLength() == 0);
-
-int i;
-for (i = 0; i < nTests; i++)
-{
-Reference xRef = new 
ContainerListener(&aStats);
-int nNewLen = pContainer->addInterface(xRef);
-
-CPPUNIT_ASSERT_MESSAGE("addition length mismatch",
-   nNewLen == i + 1);
-CPPUNIT_ASSERT_MESSAGE("addition length mismatch",
-   pContainer->getLength() == i + 1);
-}
-CPPUNIT_ASSERT_MESSAGE("alive count mismatch",
-   aStats.m_nAlive == nTests);
-
-EventObject aObj;
-pContainer->disposeAndClear(aObj);
-
-CPPUNIT_ASSERT_MESSAGE("dispose count mismatch",
-   aStats.m_nDisposed == nTests);
-CPPUNIT_ASSERT_MESSAGE("leaked container left alive",
-   aStats.m_nAlive == 0);
-
-delete pContainer;
-}
-
-void testEnumerate()
-{
-int i;
-ContainerStats aStats;
-cppu::OInterfaceContainerHelper *pContainer;
-pContainer = new cppu::OInterfaceContainerHelper(m_aGuard);
-
-std::vector< Reference< XEventListener > > aListeners;
-for (i = 0; i < nTests; i++)
-{
-Reference xRef = new 
ContainerListener(&aStats);
-int nNewLen = pContainer->addInterface(xRef);
-aListeners.push_back(xRef);
-}
-Sequence< Reference< XInterface > > aElements;
-aElements = pContainer->getElements();
-
-CPPUNIT_ASSERT_MESSAGE("query contents",
-   (int)aElements.getLength() == nTests);
-if ((int)aElements.getLength() == nTests)
-{
-

svn commit: r1700070 - in /openoffice/trunk/main/cppuhelper: prj/build.lst qa/unourl/cppu_unourl.cxx qa/unourl/export.map qa/unourl/makefile.mk

2015-08-29 Thread damjan

Author: damjan
Date: Sat Aug 29 19:08:31 2015
New Revision: 1700070

URL: http://svn.apache.org/r1700070
Log:
#i125003# migrate main/cppuhelper/qa/unourl from cppunit to Google Test
and run it on every build.


Removed:
openoffice/trunk/main/cppuhelper/qa/unourl/export.map
Modified:
openoffice/trunk/main/cppuhelper/prj/build.lst
openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx
openoffice/trunk/main/cppuhelper/qa/unourl/makefile.mk

Modified: openoffice/trunk/main/cppuhelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/prj/build.lst?rev=1700070&r1=1700069&r2=1700070&view=diff
==
--- openoffice/trunk/main/cppuhelper/prj/build.lst (original)
+++ openoffice/trunk/main/cppuhelper/prj/build.lst Sat Aug 29 19:08:31 2015
@@ -4,4 +4,5 @@ ch  cppuhelper\inc  
nmake   -   all ch_i
 ch cppuhelper\source   nmake   
-   all ch_source ch_unotypes ch_include NULL
 ch cppuhelper\unotypes nmake   
-   all ch_unotypes NULL
 ch cppuhelper\qa\ifcontainer   nmake   
-   all ch_qa_ifcontainer ch_source ch_include ch_unotypes NULL
+ch cppuhelper\qa\unourlnmake   
-   all ch_qa_unourl ch_source ch_include ch_unotypes NULL
 ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source 
NULL

Modified: openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx?rev=1700070&r1=1700069&r2=1700070&view=diff
==
--- openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx (original)
+++ openoffice/trunk/main/cppuhelper/qa/unourl/cppu_unourl.cxx Sat Aug 29 
19:08:31 2015
@@ -21,8 +21,6 @@
 
 
 
-#include 
-
 #include "cppuhelper/unourl.hxx"
 #include "rtl/malformeduriexception.hxx"
 #include "rtl/strbuf.hxx"
@@ -30,448 +28,421 @@
 #include "rtl/textenc.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include "gtest/gtest.h"
 
 namespace cppu_unourl
 {
-class UrlTest : public CppUnit::TestFixture
+class UrlTest : public ::testing::Test
 {
 public:
-void testDescriptorParsing()
+};
+
+TEST_F(UrlTest, testDescriptorParsing)
+{
+struct Test
+{
+char const * pInput;
+bool bValid;
+};
+static Test const aTests[]
+= { { "", false },
+{ "abc", true },
+{ "Abc", true },
+{ "aBC", true },
+{ "ABC", true },
+{ "1abc", true },
+{ "123", true },
+{ "abc-1", false },
+{ "ab%63", false },
+{ "abc,", false },
+{ "abc,def=", true },
+{ "abc,Def=", true },
+{ "abc,DEF=", true },
+{ "abc,1def=", true },
+{ "abc,123=", true },
+{ "abc,def-1=", false },
+{ "abc,def", false },
+{ "abc,def=xxx,def=xxx", false },
+{ "abc,def=xxx,ghi=xxx", true },
+{ "abc,,def=xxx", false },
+{ "abc,def=xxx,,ghi=xxx", false },
+{ "abc,def=xxx,ghi=xxx,", false },
+{ "abc,def=%", true },
+{ "abc,def=%1", true },
+{ "abc,def=%00", true },
+{ "abc,def=%22", true },
+{ "abc,def=\"", true },
+{ "abc,def=%ed%a0%80", true } };
+for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
 {
-struct Test
+bool bValid = false;
+try
+{
+cppu::UnoUrlDescriptor 
aDescriptor(rtl::OUString::createFromAscii(
+   aTests[i].pInput));
+bValid = true;
+}
+catch (rtl::MalformedUriException &)
+{}
+
+if (aTests[i].bValid)
+{
+ASSERT_TRUE(bValid) << "Valid uri parsed as invalid";
+}
+else
 {
-char const * pInput;
-bool bValid;
-};
-static Test const aTests[]
-= { { "", false },
-{ "abc", true },
-{ "Abc", true },
-{ "aBC", true },
-{ "ABC", true },
-{ "1abc", true },
-{ "123", true },
-{ "abc-1", false },
-{ "ab%63", false },
-{ "abc,", false },
-{ "abc,def=",

svn commit: r1700072 - in /openoffice/trunk/main/cppuhelper/qa/weak: main.cxx makefile.mk test_weak.cxx

2015-08-29 Thread damjan

Author: damjan
Date: Sat Aug 29 19:25:11 2015
New Revision: 1700072

URL: http://svn.apache.org/r1700072
Log:
#i125003# migrate main/cppuhelper/qa/ifcontainer from cppunit to Google Test,
but don't run it on every build as an assertion outside the test fails during 
the test.


Added:
openoffice/trunk/main/cppuhelper/qa/weak/main.cxx
Modified:
openoffice/trunk/main/cppuhelper/qa/weak/makefile.mk
openoffice/trunk/main/cppuhelper/qa/weak/test_weak.cxx

Added: openoffice/trunk/main/cppuhelper/qa/weak/main.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/weak/main.cxx?rev=1700072&view=auto
==
--- openoffice/trunk/main/cppuhelper/qa/weak/main.cxx (added)
+++ openoffice/trunk/main/cppuhelper/qa/weak/main.cxx Sat Aug 29 19:25:11 2015
@@ -0,0 +1,28 @@
+/**
+ * 
+ * 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.
+ * 
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}

Modified: openoffice/trunk/main/cppuhelper/qa/weak/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/weak/makefile.mk?rev=1700072&r1=1700071&r2=1700072&view=diff
==
--- openoffice/trunk/main/cppuhelper/qa/weak/makefile.mk (original)
+++ openoffice/trunk/main/cppuhelper/qa/weak/makefile.mk Sat Aug 29 19:25:11 
2015
@@ -29,21 +29,19 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_weak.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) 
$(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+   @echo unit tests are disabled. Nothing to do.
+ 
+.ELSE
+
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_weak.obj \
+   $(SLO)$/main.obj
+APP1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(GTESTLIB) $(SALLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
 
 .INCLUDE: target.mk
 
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-$(TESTSHL2) $(SHL1TARGETN)
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"

Modified: openoffice/trunk/main/cppuhelper/qa/weak/test_weak.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/qa/weak/test_weak.cxx?rev=1700072&r1=1700071&r2=1700072&view=diff
==
--- openoffice/trunk/main/cppuhelper/qa/weak/test_weak.cxx (original)
+++ openoffice/trunk/main/cppuhelper/qa/weak/test_weak.cxx Sat Aug 29 19:25:11 
2015
@@ -34,9 +34,9 @@
 #include "com/sun/star/uno/XWeak.hpp"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/weak.hxx"
-#include "testshl/simpleheader.hxx"
 #include "rtl/ref.hxx"
 #include "sal/types.h"
+#include "gtest/gtest.h"
 
 namespace {
 
@@ -74,16 +74,11 @@ protected:
 }
 };
 
-class Test: public ::CppUnit::TestFixture {
+class Test: public ::testing::Test {
 public:
-void testReferenceDispose();
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testReferenceDispose);
-CPPUNIT_TEST_SUITE_END();
 };
 
-void Test::testReferenceDispose() {
+TEST_F(Test, testReferenceDispose) {
 css::uno::Reference< css::uno::XWeak > w(new ::cppu::OWeakObject);
 css::uno::Reference< css::uno::XAdapter > a(w->queryAdapter());
 ::rtl::Reference< Reference > r1(new RuntimeExceptionReference);
@@ -93,13 +88,10 @@ void Test::testReferenceDispose() {
 a->addReference(r2.get());
 a->addReference(r3.get());
 w.clear();
-CPPUNIT_ASSERT(r1->isDisposed());
-CPPUNIT_ASSERT(r2->isDisposed());
-CPPUNIT_ASSERT(r3->isDisposed());
+ASSERT_TRUE(r1->isDisposed());
+ASSERT_TRUE(r2->isDisposed());
+ASSERT_TRUE(r3->isDisposed());
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
-
 }
 
-NOADDITIONAL;

svn commit: r1700074 - in /openoffice/pmc/Policies: ./ Policies.txt Trademark-Infringement-Allegations-2015-08.txt

2015-08-29 Thread orcmid

Author: orcmid
Date: Sat Aug 29 21:08:49 2015
New Revision: 1700074

URL: http://svn.apache.org/r1700074
Log:
Add AOO PMC Policies folder and initiate development of a draft Trademark 
Infringement Allegations policy.

Added:
openoffice/pmc/Policies/
openoffice/pmc/Policies/Policies.txt   (with props)
openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt   
(with props)

Added: openoffice/pmc/Policies/Policies.txt
URL: 
http://svn.apache.org/viewvc/openoffice/pmc/Policies/Policies.txt?rev=1700074&view=auto
==
--- openoffice/pmc/Policies/Policies.txt (added)
+++ openoffice/pmc/Policies/Policies.txt [UTF-8] Sat Aug 29 21:08:49 2015
@@ -0,0 +1,25 @@
+Policies.txt UTF-8 2015-08-29
+
+   AOO PMC POLICIES
+   
+
+   APACHE OPEN OFFICE PROJECT MANAGEMENT COMMITTEE
+
+  
+
+
+
+TODO:
+  * Explain what this folder is, for the benefit of any Chair
+who finds it useful to continue, and for PMC members that
+review and contribute here.
+
+  * Bring in the Trademar-Infringement-Allegation.txt file
+and include it in a manifest of current Policies here.
+
+
+
+
+
+   *** end of Policies.txt ***

Propchange: openoffice/pmc/Policies/Policies.txt
--
svn:eol-style = native

Propchange: openoffice/pmc/Policies/Policies.txt
--
svn:mime-type = text/plain;charset=UTF-8

Added: openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt
URL: 
http://svn.apache.org/viewvc/openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt?rev=1700074&view=auto
==
--- openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt 
(added)
+++ openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt 
[UTF-8] Sat Aug 29 21:08:49 2015
@@ -0,0 +1,79 @@
+Trademark-Infringement-Allegations-2015-08.txtUTF-82015-08-29
+
+ POLICY: HANDLING TRADEMARK-INFRINGEMENT ALLEGATIONS
+ ===
+
+   APACHE OPEN OFFICE PROJECT MANAGEMENT COMMITTEE
+
+ ***
+ DRAFT 00   
+    2015-08-29T20:58Z   
+ ***
+
+
+
+From the Chair,
+
+[for file in the public PMC folder following PMC review and acceptance of any
+modifications]
+
+August 29, 2015
+
+I want to make it perfectly clear, in explicit terms, the principles and
+procedures for dealing with allegations/suspicions of the Apache OpenOffice
+trademark infringement (or "abuse") are.
+
+  1. Third parties with concerns about use of ASF marks are encouraged to
+ communicate their concerns and any clear-cut facts to private@ oo.o (and of
+ course trademark@ a.o).  Any follow-up will occur privately to establish the
+ necessary details.
+
+  2. Members of the PMC who see a trademark issue are expected to follow the
+ same procedure, bringing the facts of the matter to private discussions,
+ analysis and determination of disposition.
+
+  3. Public statements from PMC members alleging infringing acts and expected
+ remedies are unwelcome.  There can be unfortunate consequences.  It is my
+ understanding that the Foundation cannot protect a PMC member who is so
+ exposed to repercussions from elsewhere.  In any case it reflects badly on
+ the Apache Software Foundation, the Apache OpenOffice project, who we say we
+ are and what can be counted on by the public.
+
+  4. When a trademark issue comes to the attention of the PMC from any source,
+ the PMC is expected to calmly and deliberately gather specific concrete and
+ visible details of the supposed current-and-ongoing infringing activity.  In
+ so doing, it will also be important to differentiate between matters of
+ trademark and matters of license handling by a downstream recipient or
+ distributor of code obtained from an Apache Project.
+
+  5. The PMC shall obtain the counsel of the Apache Vice President, Brand
+ Management, on the extent to which there is a trademark issue.
+
+  6. To the extent that other concerns and details must be severed from matters
+ of trademark, the PMC will remove them for separate consideration.  Only
+ elements of concern with respect to trademarks are continued under this
+ procedure

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

2015-08-29 Thread 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/49

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: r1700078 - /openoffice/trunk/main/odk/pack/gendocu/makefile.mk

2015-08-29 Thread pescetti

Author: pescetti
Date: Sat Aug 29 22:02:48 2015
New Revision: 1700078

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

Modified:
openoffice/trunk/main/odk/pack/gendocu/makefile.mk

Modified: openoffice/trunk/main/odk/pack/gendocu/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/gendocu/makefile.mk?rev=1700078&r1=1700077&r2=1700078&view=diff
==
--- openoffice/trunk/main/odk/pack/gendocu/makefile.mk (original)
+++ openoffice/trunk/main/odk/pack/gendocu/makefile.mk Sat Aug 29 22:02:48 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: r1700079 - in /openoffice/pmc/Policies: Policies.txt Trademark-Infringement-Allegations-2015-08.txt

2015-08-29 Thread orcmid

Author: orcmid
Date: Sat Aug 29 22:09:51 2015
New Revision: 1700079

URL: http://svn.apache.org/r1700079
Log:
Update the policy on handling trademark-infringement allegations with an useful 
link, quick-summary headings, and editorial cleanups.

Modified:
openoffice/pmc/Policies/Policies.txt
openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt

Modified: openoffice/pmc/Policies/Policies.txt
URL: 
http://svn.apache.org/viewvc/openoffice/pmc/Policies/Policies.txt?rev=1700079&r1=1700078&r2=1700079&view=diff
==
--- openoffice/pmc/Policies/Policies.txt [UTF-8] (original)
+++ openoffice/pmc/Policies/Policies.txt [UTF-8] Sat Aug 29 22:09:51 2015
@@ -8,18 +8,23 @@ Policies.txt UTF
   
 
+MANIFEST
 
+Policies.txt
+   This folder explanation and manifest
 
-TODO:
-  * Explain what this folder is, for the benefit of any Chair
-who finds it useful to continue, and for PMC members that
-review and contribute here.
-
-  * Bring in the Trademar-Infringement-Allegation.txt file
-and include it in a manifest of current Policies here.
-
-
+Trademark-Infringement-Allegations-2015-08.txt
+   Policy on handling Trademark-Infringement Allegations
 
+  TODO:
+* Explain what this folder is, for the benefit of any Chair
+  who finds it useful to continue, and for PMC members that
+  review and contribute here.
+
+* Reflect that it is the responsibility of the Chair to set policies
+  and procedures that may be required from time-to-time with respect
+  to the operation and duties of the PMC.  This does not extend to
+  technical determinations about the software and its development.
 
 
*** end of Policies.txt ***

Modified: openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt
URL: 
http://svn.apache.org/viewvc/openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt?rev=1700079&r1=1700078&r2=1700079&view=diff
==
--- openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt 
[UTF-8] (original)
+++ openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt 
[UTF-8] Sat Aug 29 22:09:51 2015
@@ -6,74 +6,85 @@ Trademark-Infringement-Allegations-2015-
APACHE OPEN OFFICE PROJECT MANAGEMENT COMMITTEE
 
  ***
- DRAFT 00   
-    2015-08-29T20:58Z   
+ DRAFT 01   
+    2015-08-29T22:00Z   
  ***
 
 
 
-From the Chair,
-
-[for file in the public PMC folder following PMC review and acceptance of any
-modifications]
 
-August 29, 2015
+This document provides an explicit policy on the principles
+and procedures for dealing with allegations/suspicion of any
+infringement of the Apache OpenOffice and related trademarks.
 
-I want to make it perfectly clear, in explicit terms, the principles and
-procedures for dealing with allegations/suspicions of the Apache OpenOffice
-trademark infringement (or "abuse") are.
 
-  1. Third parties with concerns about use of ASF marks are encouraged to
+   1. THIRD-PARTY ALLEGATIONS COME PRIVATELY TO THE PMC OR BRAND MANAGEMENT
+ Third parties with concerns about use of ASF marks are encouraged to
  communicate their concerns and any clear-cut facts to private@ oo.o (and of
  course trademark@ a.o).  Any follow-up will occur privately to establish the
  necessary details.
+   The procedure at  explains
+ how third parties can submit reports on perceived trademark violations.  That
+ page also describes how use of Apache OpenOffice marks is requested.
 
-  2. Members of the PMC who see a trademark issue are expected to follow the
+   2. PMC MEMBERS BRING ISSUES TO THE PMC IN THE SAME MANNER
+ Members of the PMC who see a trademark issue are expected to follow the
  same procedure, bringing the facts of the matter to private discussions,
  analysis and determination of disposition.
 
-  3. Public statements from PMC members alleging infringing acts and expected
+   3. NO PUBLIC STATEMENTS OR DISCUSSIONS OF ALLEGED INFRINGEMENTS
+ Public statements from PMC members alleging infringing acts and expected
  remedies are unwelcome.  There can be unfortunate consequences.  It is my
  understanding that the Foundation cannot protect a PMC member who is so
  exposed to repercussions from elsewhere.  In any case it reflects

svn commit: r1700080 - in /openoffice/pmc/Policies: Policies.txt Trademark-Infringement-Allegations-2015-08.txt

2015-08-29 Thread orcmid

Author: orcmid
Date: Sat Aug 29 22:22:26 2015
New Revision: 1700080

URL: http://svn.apache.org/r1700080
Log:
Change https: to http: to avoid mistaken repository check-attempts from 
non-committers (if that is still how it works).

Modified:
openoffice/pmc/Policies/Policies.txt
openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt

Modified: openoffice/pmc/Policies/Policies.txt
URL: 
http://svn.apache.org/viewvc/openoffice/pmc/Policies/Policies.txt?rev=1700080&r1=1700079&r2=1700080&view=diff
==
--- openoffice/pmc/Policies/Policies.txt [UTF-8] (original)
+++ openoffice/pmc/Policies/Policies.txt [UTF-8] Sat Aug 29 22:22:26 2015
@@ -5,8 +5,8 @@ Policies.txt UTF
 
APACHE OPEN OFFICE PROJECT MANAGEMENT COMMITTEE
 
-  
+  
 
 MANIFEST
 

Modified: openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt
URL: 
http://svn.apache.org/viewvc/openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt?rev=1700080&r1=1700079&r2=1700080&view=diff
==
--- openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt 
[UTF-8] (original)
+++ openoffice/pmc/Policies/Trademark-Infringement-Allegations-2015-08.txt 
[UTF-8] Sat Aug 29 22:22:26 2015
@@ -6,11 +6,11 @@ Trademark-Infringement-Allegations-2015-
APACHE OPEN OFFICE PROJECT MANAGEMENT COMMITTEE
 
  ***
- DRAFT 01   
+ DRAFT 02   
     2015-08-29T22:00Z   
  ***
 
-

svn commit: r1700085 - in /openoffice/trunk/main/slideshow: prj/build.lst test/demoshow.cxx test/main.cxx test/makefile.mk test/slidetest.cxx test/testshape.cxx test/testview.cxx test/views.cxx

2015-08-29 Thread damjan

Author: damjan
Date: Sun Aug 30 02:16:21 2015
New Revision: 1700085

URL: http://svn.apache.org/r1700085
Log:
#i125003# migrate main/slideshow from cppunit to Google Test
and run it on every build.


Added:
openoffice/trunk/main/slideshow/test/main.cxx
Modified:
openoffice/trunk/main/slideshow/prj/build.lst
openoffice/trunk/main/slideshow/test/demoshow.cxx
openoffice/trunk/main/slideshow/test/makefile.mk
openoffice/trunk/main/slideshow/test/slidetest.cxx
openoffice/trunk/main/slideshow/test/testshape.cxx
openoffice/trunk/main/slideshow/test/testview.cxx
openoffice/trunk/main/slideshow/test/views.cxx

Modified: openoffice/trunk/main/slideshow/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/prj/build.lst?rev=1700085&r1=1700084&r2=1700085&view=diff
==
--- openoffice/trunk/main/slideshow/prj/build.lst (original)
+++ openoffice/trunk/main/slideshow/prj/build.lst Sun Aug 30 02:16:21 2015
@@ -9,3 +9,4 @@ pe  slideshow\source\engine\transitions
 pe slideshow\source\engine\animationnodes  nmake   -   all 
pe_animationnodes pe_inc NULL
 pe slideshow\source\engine\activities  nmake   -   all 
pe_activities pe_inc NULL
 pe slideshow\util  nmake   
-   all pe_util pe_shapes pe_slide pe_activities pe_animationnodes 
pe_transitions pe_engine NULL
+pe slideshow\test  nmake   
-   all pe_test pe_shapes pe_slide pe_activities pe_animationnodes 
pe_transitions pe_engine pe_inc NULL

Modified: openoffice/trunk/main/slideshow/test/demoshow.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/demoshow.cxx?rev=1700085&r1=1700084&r2=1700085&view=diff
==
--- openoffice/trunk/main/slideshow/test/demoshow.cxx (original)
+++ openoffice/trunk/main/slideshow/test/demoshow.cxx Sun Aug 30 02:16:21 2015
@@ -48,7 +48,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -111,6 +111,17 @@ public:
  aEvent );
 }
 
+virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea(  ) throw 
(::com::sun::star::uno::RuntimeException)
+{
+// FIXME:
+::com::sun::star::awt::Rectangle r;
+r.X = 0;
+r.Y = 0;
+r.Width = 0;
+r.Height = 0;
+return r;
+}
+
 private:
 virtual ~View() {}
 
@@ -452,6 +463,7 @@ void DemoWindow::init()
 {
 uno::Reference< drawing::XDrawPage > xSlide( new DummySlide );
 mxShow->displaySlide( xSlide,
+  NULL,
   uno::Reference< animations::XAnimationNode 
>(), 
   uno::Sequence< beans::PropertyValue >() );
 mxShow->setProperty( beans::PropertyValue( 

Added: openoffice/trunk/main/slideshow/test/main.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/main.cxx?rev=1700085&view=auto
==
--- openoffice/trunk/main/slideshow/test/main.cxx (added)
+++ openoffice/trunk/main/slideshow/test/main.cxx Sun Aug 30 02:16:21 2015
@@ -0,0 +1,28 @@
+/**
+ * 
+ * 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.
+ * 
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}

Modified: openoffice/trunk/main/slideshow/test/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/makefile.mk?rev=1700085&r1=1700084&r2=1700085&view=diff
==
--- openoffice/trunk/main/slideshow/test/makefile.mk (original)
+++ openoffice/trunk/main/slideshow/test/makefile.mk Sun Aug 30 02:16:21 2015
@@ -26,7 +26,6 @@ PRJ=..
 PRJNAME=slideshow
 P

buildbot failure in ASF Buildbot on openoffice-linux32-nightly

2015-08-29 Thread 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/69

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 aoo-win7

2015-08-29 Thread 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/67

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

2015-08-29 Thread 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/52

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 configure bootstrap

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on openoffice-linux64-nightly

2015-08-29 Thread 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/64

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

svn commit: r1698441 - in /openoffice/trunk/main/basebmp/test: basictest.cxx bmpmasktest.cxx bmptest.cxx cliptest.cxx export.map filltest.cxx linetest.cxx main.cxx makefile.mk masktest.cxx polytest.cx

svn commit: r1698448 - in /openoffice/trunk/main: basebmp/test/makefile.mk basegfx/test/makefile.mk codemaker/test/cppumaker/makefile.mk

buildbot success in ASF Buildbot on openoffice-linux64-rat

svn commit: r1700037 - /openoffice/trunk/main/solenv/inc/_tg_app.mk

svn commit: r1700039 - in /openoffice/trunk/main/binaryurp/qa: main.cxx makefile.mk test-cache.cxx test-unmarshal.cxx

svn commit: r1700066 - in /openoffice/trunk/main/cppuhelper: prj/build.lst qa/ifcontainer/cppu_ifcontainer.cxx qa/ifcontainer/export.map qa/ifcontainer/main.cxx qa/ifcontainer/makefile.mk

svn commit: r1700070 - in /openoffice/trunk/main/cppuhelper: prj/build.lst qa/unourl/cppu_unourl.cxx qa/unourl/export.map qa/unourl/makefile.mk

svn commit: r1700072 - in /openoffice/trunk/main/cppuhelper/qa/weak: main.cxx makefile.mk test_weak.cxx

svn commit: r1700074 - in /openoffice/pmc/Policies: ./ Policies.txt Trademark-Infringement-Allegations-2015-08.txt

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

svn commit: r1700078 - /openoffice/trunk/main/odk/pack/gendocu/makefile.mk

svn commit: r1700079 - in /openoffice/pmc/Policies: Policies.txt Trademark-Infringement-Allegations-2015-08.txt

svn commit: r1700080 - in /openoffice/pmc/Policies: Policies.txt Trademark-Infringement-Allegations-2015-08.txt

svn commit: r1700085 - in /openoffice/trunk/main/slideshow: prj/build.lst test/demoshow.cxx test/main.cxx test/makefile.mk test/slidetest.cxx test/testshape.cxx test/testview.cxx test/views.cxx

buildbot failure in ASF Buildbot on openoffice-linux32-nightly

buildbot failure in ASF Buildbot on aoo-win7

buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

buildbot failure in ASF Buildbot on openoffice-linux64-nightly

18 matches

Site Navigation

Mail list logo

Footer information