From c9b72802f74d76a1ce2523fe66848678846218b5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 6 Oct 2010 12:15:48 +0100 Subject: #i113503# cppunit stl wrapper headers --- sfx2/qa/cppunit/makefile.mk | 7 +++++++ sfx2/qa/cppunit/test_metadatable.cxx | 2 ++ 2 files changed, 9 insertions(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index 2794c2ae92bb..dce0b86a0619 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/qa/cppunit/makefile.mk @@ -35,6 +35,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 903be6920327..6a0be13a9c53 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -27,10 +27,12 @@ #include "precompiled_sfx2.hxx" +#include "preextstl.h" #include #include #include #include +#include "postextstl.h" #include -- cgit From 8694d2bc19ea6b531e85ac8135de34dc99956bca Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 12 Oct 2010 15:53:47 +0200 Subject: Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth --- sfx2/qa/cppunit/test_metadatable.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 6a0be13a9c53..f8e6913b9a2d 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -280,3 +281,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(MetadatableTest); CPPUNIT_PLUGIN_IMPLEMENT(); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From a791a8e604be9fad5794ff565b4509614de43bc3 Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Sun, 21 Nov 2010 00:16:43 +0100 Subject: TL_CONSTASCII_USTRINGPARAM in libs core 32 --- sfx2/qa/cppunit/test_metadatable.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index f8e6913b9a2d..2dcfb08d1a25 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -116,12 +116,12 @@ void MetadatableTest::test() MockMetadatable m4(*pReg); MockMetadatable m5(*pReg); ::rtl::OUString empty; - ::rtl::OUString content( ::rtl::OUString::createFromAscii("content.xml") ); - ::rtl::OUString styles ( ::rtl::OUString::createFromAscii("styles.xml") ); - ::rtl::OUString sid1( ::rtl::OUString::createFromAscii("id1") ); - ::rtl::OUString sid2( ::rtl::OUString::createFromAscii("id2") ); - ::rtl::OUString sid3( ::rtl::OUString::createFromAscii("id3") ); - ::rtl::OUString sid4( ::rtl::OUString::createFromAscii("id4") ); + ::rtl::OUString content( RTL_CONSTASCII_USTRINGPARAM("content.xml") ); + ::rtl::OUString styles( RTL_CONSTASCII_USTRINGPARAM("styles.xml") ); + ::rtl::OUString sid1( RTL_CONSTASCII_USTRINGPARAM("id1") ); + ::rtl::OUString sid2( RTL_CONSTASCII_USTRINGPARAM("id2") ); + ::rtl::OUString sid3( RTL_CONSTASCII_USTRINGPARAM("id3") ); + ::rtl::OUString sid4( RTL_CONSTASCII_USTRINGPARAM("id4") ); beans::StringPair id1(content, sid1); beans::StringPair id2(content, sid2); beans::StringPair id3(content, sid3); -- cgit From 8d86780a27849aa4a12d7dc8748f246e1f5965d8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 28 Nov 2010 21:34:05 +0000 Subject: tidy this a bit --- sfx2/qa/cppunit/makefile.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index dce0b86a0619..56195fdbf4b1 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/qa/cppunit/makefile.mk @@ -48,8 +48,7 @@ DLLPRE = # no leading "lib" on .so files # --- Libs --------------------------------------------------------- SHL1OBJS= \ - $(SLO)/test_metadatable.obj \ - + $(SLO)/test_metadatable.obj SHL1STDLIBS= \ $(CPPUNITLIB) \ @@ -57,21 +56,18 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(VCLLIB) \ - $(SFXLIB) \ - + $(SFXLIB) SHL1TARGET= test_metadatable SHL1RPATH = NONE SHL1IMPLIB= i$(SHL1TARGET) -# SHL1DEF= $(MISC)/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -# DEF1EXPORTFILE= export.exp SHL1VERSIONMAP= version.map # --- All object files --------------------------------------------- SLOFILES= \ - $(SHL1OBJS) \ + $(SHL1OBJS) # --- Targets ------------------------------------------------------ -- cgit From 9d4fdd4f187ae3082ba5077fbdf33e48aaae3821 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Feb 2011 17:55:57 +0100 Subject: Clean up makefiles --- sfx2/qa/complex/docinfo/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index 8c3525541062..0c350f1a9618 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -31,8 +31,8 @@ PRJNAME = sfx2 PACKAGE = complex$/docinfo # --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +.INCLUDE: settings.mk #----- compile .java files ----------------------------------------- -- cgit From c824a1f69c093f38b82ead0f413c75b492a1f994 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 10:50:38 +0100 Subject: Removing the ext_std masterpiece --- sfx2/qa/cppunit/test_metadatable.cxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 2dcfb08d1a25..9afb68f4d081 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -28,12 +28,10 @@ #include "precompiled_sfx2.hxx" -#include "preextstl.h" #include #include #include #include -#include "postextstl.h" #include -- cgit From 553aed7b518599742189ffce50cd947dbf39a2e7 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 16:20:18 +0100 Subject: Trying to remove the stlport mention from the code --- sfx2/qa/cppunit/makefile.mk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index 56195fdbf4b1..10e0eaa3d979 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/qa/cppunit/makefile.mk @@ -35,13 +35,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files -- cgit From 40fe03745fc75609350cf8115134eb07f04eefa7 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 28 Mar 2011 12:38:06 +0200 Subject: Remove commented code in libs-core/sfx2 --- sfx2/qa/complex/sfx2/DocumentMetadataAccess.java | 35 ------------------------ sfx2/qa/complex/sfx2/tools/WriterHelper.java | 2 -- 2 files changed, 37 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java index d145b9028473..8f7071048fc3 100755 --- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java +++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java @@ -127,10 +127,6 @@ public class DocumentMetadataAccess XRepositorySupplier xRS; XDocumentMetadataAccess xDMA; -// public String[] getTestMethodNames () -// { -// return new String[] { "check", "checkRDFa" }; -// } /** * The test parameters */ @@ -522,11 +518,6 @@ public class DocumentMetadataAccess PropertyValue file = new PropertyValue(); file.Name = "URL"; file.Value = tempDir + "TESTDMA.odt"; - /* - PropertyValue baseURL = new PropertyValue(); - baseURL.Name = "DocumentBaseURL"; - baseURL.Value = tempDir + "TMP.odt"; - */ PropertyValue mimetype = new PropertyValue(); mimetype.Name = "MediaType"; mimetype.Value = "application/vnd.oasis.opendocument.text"; @@ -960,39 +951,14 @@ public class DocumentMetadataAccess return blank != null; } -/* - static class Statement implements XStatement - { - XResource m_Subject; - XResource m_Predicate; - XNode m_Object; - XURI m_Graph; - - Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, - XURI i_Graph) - { - m_Subject = i_Subject; - m_Predicate = i_Predicate; - m_Object = i_Object; - m_Graph = i_Graph; - } - - public XResource getSubject() { return m_Subject; } - public XResource getPredicate() { return m_Predicate; } - public XNode getObject() { return m_Object; } - public XURI getGraph() { return m_Graph; } - } -*/ static Statement[] toSeq(XEnumeration i_Enum) throws Exception { java.util.Collection c = new java.util.Vector(); while (i_Enum.hasMoreElements()) { Statement s = (Statement) i_Enum.nextElement(); -//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); c.add(s); } -// return (Statement[]) c.toArray(); // java sucks Object[] arr = c.toArray(); Statement[] ret = new Statement[arr.length]; @@ -1009,7 +975,6 @@ public class DocumentMetadataAccess XNode[] s = (XNode[]) i_Enum.nextElement(); c.add(s); } -// return (XNode[][]) c.toArray(); Object[] arr = c.toArray(); XNode[][] ret = new XNode[arr.length][]; for (int i = 0; i < arr.length; ++i) { diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java index 4767028572bb..b604bd010d65 100755 --- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java +++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java @@ -194,8 +194,6 @@ public class WriterHelper { xRoot = AccessibilityTools.getAccessibleObject(xWindow); - //at.printAccessibleTree(new PrintWriter(System.out),xRoot); - XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); try { -- cgit From e60d365c86b164a4a6940a39377b0b580c9e918d Mon Sep 17 00:00:00 2001 From: Francisco Saito Date: Tue, 29 Mar 2011 21:38:39 +0100 Subject: drop bogus executable flag from [ch]xx/bas/asm files --- sfx2/qa/cppunit/test_metadatable.cxx | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 sfx2/qa/cppunit/test_metadatable.cxx (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx old mode 100755 new mode 100644 -- cgit From 545a54482562c20a5cc1fd978e6f40ac5e9182e5 Mon Sep 17 00:00:00 2001 From: Francisco Saito Date: Tue, 29 Mar 2011 21:43:58 +0100 Subject: drop bogus executable flag from odf files --- sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt | Bin sfx2/qa/complex/sfx2/testdocuments/TEST.odt | Bin sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt | Bin 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt mode change 100755 => 100644 sfx2/qa/complex/sfx2/testdocuments/TEST.odt mode change 100755 => 100644 sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt b/sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt old mode 100755 new mode 100644 diff --git a/sfx2/qa/complex/sfx2/testdocuments/TEST.odt b/sfx2/qa/complex/sfx2/testdocuments/TEST.odt old mode 100755 new mode 100644 diff --git a/sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt old mode 100755 new mode 100644 -- cgit From bca6c6d26764a919ad1df36e4f636963f9b9324a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sun, 22 May 2011 16:23:24 +0200 Subject: fdo#35663: be more explicit on asserts --- sfx2/qa/complex/sfx2/UndoManager.java | 1 + 1 file changed, 1 insertion(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index f37530aba726..c64cd7022e25 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -781,6 +781,7 @@ public class UndoManager m_currentTestCase.doSingleModification(); assertEquals( "when the Undo manager is locked, no implicit additions should happen", 0, m_undoListener.getUndoActionsAdded() ); + assertTrue( "Undo manager gets unlocked as a side effect of performing a simple operation", i_undoManager.isLocked() ); i_undoManager.unlock(); assertEquals( "unlock is not expected to add collected actions - they should be discarded", 0, m_undoListener.getUndoActionsAdded() ); -- cgit