[Libreoffice-commits] .: 2 commits - svl/qa

[Caolán McNamara]

 svl/qa/unit/export.map  |    7 -------
 svl/qa/unit/makefile.mk |   22 +++++++++++-----------
 svl/qa/unit/svl.cxx     |   23 -----------------------
 3 files changed, 11 insertions(+), 41 deletions(-)

New commits:
commit 163693e3bc1884284bb9809506eecf6df3962631
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 24 20:36:25 2011 +0000

    Get this to work under windows.
    
    The test code itself isn't compiled with SVL_DLLIMPLEMENTATION
    so either it gets compiled with SVL_DLLIMPLEMENTATION and links
    to the .lib or it gets compiled without it and links to the .dll
    and sticks to the exported methods. In this case we can currently
    take the latter methinks.

diff --git a/svl/qa/unit/makefile.mk b/svl/qa/unit/makefile.mk
index e039c41..ab59123 100644
--- a/svl/qa/unit/makefile.mk
+++ b/svl/qa/unit/makefile.mk
@@ -39,19 +39,19 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS) -I../../inc
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/svl.obj
 SHL1STDLIBS= \
-    $(UNOTOOLSLIB)          \
-    $(TOOLSLIB)             \
-    $(I18NISOLANGLIB)   \
-    $(UCBHELPERLIB)         \
-    $(COMPHELPERLIB)        \
-    $(CPPUHELPERLIB)        \
-    $(CPPULIB)                      \
-    $(SOTLIB)     \
-    $(SALLIB) \
+    $(UNOTOOLSLIB)    \
+    $(SVLLIB)         \
+    $(TOOLSLIB)       \
+    $(I18NISOLANGLIB) \
+    $(UCBHELPERLIB)   \
+    $(COMPHELPERLIB)  \
+    $(CPPUHELPERLIB)  \
+    $(CPPULIB)        \
+    $(SOTLIB)         \
+    $(SALLIB)         \
     $(CPPUNITLIB)
 
 SHL1IMPLIB = i$(SHL1TARGET)
-SHL1LIBS=$(SLB)$/svl.lib
 DEF1NAME = $(SHL1TARGET)
 SHL1VERSIONMAP=version.map
 
@@ -88,7 +88,7 @@ test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/t
     @echo - start unit test \#1 on library $(SHL1TARGETN)
     @echo In the environment: STAR_RESOURCEPATH=$$STAR_RESOURCEPATH
     @echo ----------------------------------------------------------
-    $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
+    $(CPPUNITTESTER) $(SHL1TARGETN) \
         -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
         -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
         -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 4647959..a56c90f 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -26,18 +26,6 @@
  * instead of those above.
  */
 
-// TODO ...
-//    officecfg: can we move this into our skeleton ?
-//          Solve the Setup.xcu problem pleasantly [ custom version ? ]
-//    deliver.pl
-//          don't call regcomp if we don't have it.
-//              In an ideal world
-//              a) scp2 goes away and logic moved into the deliver d.lst
-//              b) install set gets built incrementally as the build progresses
-//              c) the new .xml component registration stuff then removes
-//                 the need for manually calling regcomp and knowing what
-//                 services we need, and in what .so they are implemented
-
 #include "precompiled_svl.hxx"
 
 #ifdef WNT
@@ -58,7 +46,6 @@
 
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/oslfile2streamwrap.hxx>
 
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/sheet/GeneralFunction.hpp>
@@ -69,22 +56,12 @@
 #include "svl/zforlist.hxx"
 #include "svl/zformat.hxx"
 
-#include <iostream>
-
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
-using ::std::cout;
-using ::std::endl;
 
 namespace {
 
-::std::ostream& operator<< (::std::ostream& os, const OUString& str)
-{
-    return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr();
-}
-
-
 class Test : public CppUnit::TestFixture {
 public:
     Test();
commit 94d22dc2bff29d5a36e72b2f1e95f4002cddbe5b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 24 17:38:16 2011 +0000

    remove unused export.map

diff --git a/svl/qa/unit/export.map b/svl/qa/unit/export.map
deleted file mode 100644
index 4ca70fa..0000000
--- a/svl/qa/unit/export.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3.0 {
-    global:
-        registerAllTestFunction;
-
-    local:
-        *;
-};