[Libreoffice-commits] .: 3 commits - basegfx/inc basegfx/source sfx2/source solenv/gbuild test/Library_test.mk test/Makefile test/Module_test.mk test/Package_inc.mk test/Package_unittest.mk test/prj test/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 17 03:33:56 PST 2012
basegfx/inc/basegfx/range/b2dpolyrange.hxx | 3
basegfx/source/range/b2dpolyrange.cxx | 16 -
basegfx/source/tools/b2dclipstate.cxx | 20 -
sfx2/source/control/dispatch.cxx | 2
solenv/gbuild/TargetLocations.mk | 9
test/Library_test.mk | 74 +++++
test/Makefile | 40 ++
test/Module_test.mk | 36 ++
test/Package_inc.mk | 33 ++
test/Package_unittest.mk | 55 +++
test/prj/build.lst | 2
test/prj/d.lst | 399 -----------------------------
test/prj/makefile.mk | 1
test/source/makefile.mk | 67 ----
14 files changed, 246 insertions(+), 511 deletions(-)
New commits:
commit a9c29c59be1672fb7e595b5592f882c575cd118a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 17 11:32:24 2012 +0000
gbuildify test
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 59ad239..b49f890 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -33,12 +33,13 @@ gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
gb_Extension_get_outdir_target = $(OUTDIR)/bin/$(1).oxt
gb_PackagePart_get_destinations = \
- $(OUTDIR)/xml \
- $(OUTDIR)/pck \
- $(OUTDIR)/inc \
- $(OUTDIR)/idl \
$(OUTDIR)/bin \
+ $(OUTDIR)/idl \
+ $(OUTDIR)/inc \
$(OUTDIR)/lib \
+ $(OUTDIR)/pck \
+ $(OUTDIR)/unittest \
+ $(OUTDIR)/xml \
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
diff --git a/test/Library_test.mk b/test/Library_test.mk
new file mode 100644
index 0000000..967af9c
--- /dev/null
+++ b/test/Library_test.mk
@@ -0,0 +1,74 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,test))
+
+$(eval $(call gb_Library_add_package_headers,test,test_inc))
+
+$(eval $(call gb_Library_set_include,test,\
+ -I$(SRCDIR)/tools/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,test,\
+ -DOOO_DLLIMPLEMENTATION_TEST \
+))
+
+$(eval $(call gb_Library_add_api,test,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,test,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ sal \
+ tl \
+ utl \
+ ucbhelper \
+ unotest \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUIBASE),unx)
+$(call gb_Library_get_target,test) : \
+ $(call gb_Library_get_target,desktop_detector) \
+ $(call gb_Library_get_target,vclplug_svp) \
+
+endif
+
+$(eval $(call gb_Library_use_external,test,cppunit))
+
+$(eval $(call gb_Library_add_exception_objects,test,\
+ test/source/bootstrapfixture \
+ test/source/unoapi_test \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..7bbbe6c
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/test/Module_test.mk b/test/Module_test.mk
new file mode 100644
index 0000000..86c7c00
--- /dev/null
+++ b/test/Module_test.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,test))
+
+$(eval $(call gb_Module_add_targets,test,\
+ Library_test \
+ Package_inc \
+ Package_unittest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
new file mode 100644
index 0000000..13b70cf
--- /dev/null
+++ b/test/Package_inc.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,test_inc,$(SRCDIR)/test/inc))
+$(eval $(call gb_Package_add_file,test_inc,inc/test/bootstrapfixture.hxx,test/bootstrapfixture.hxx))
+$(eval $(call gb_Package_add_file,test_inc,inc/test/testdllapi.hxx,test/testdllapi.hxx))
+$(eval $(call gb_Package_add_file,test_inc,inc/test/unoapi_test.hxx,test/unoapi_test.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
new file mode 100644
index 0000000..3b8637f
--- /dev/null
+++ b/test/Package_unittest.mk
@@ -0,0 +1,55 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template))
+
+$(eval $(call gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/basic/dialog.xlc,user/basic/dialog.xlc))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/basic/script.xlc,user/basic/script.xlc))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/en-US.dic,user/wordbook/en-US.dic))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/technical.dic,user/wordbook/technical.dic))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/en-GB.dic,user/wordbook/en-GB.dic))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/gallery/empty_directory,user/gallery/empty_directory))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/dtd/empty_directory,user/dtd/empty_directory))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/psprint/pspfontcache,user/psprint/pspfontcache))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/psprint/fontmetric/empty_directory,user/psprint/fontmetric/empty_directory))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/psprint/driver/empty_directory,user/psprint/driver/empty_directory))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/template.bau,user/autotext/en-US/template.bau))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/standard.bau,user/autotext/en-US/standard.bau))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/crdbus50.bau,user/autotext/en-US/crdbus50.bau))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,user/config/psetup.xpm))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/javasettingsunopkginstall.xml,user/config/javasettingsunopkginstall.xml))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/modules/empty_directory,user/config/soffice.cfg/modules/empty_directory))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetupl.xpm,user/config/psetupl.xpm))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/autocorr/empty_directory,user/autocorr/empty_directory))
+$(eval $(call gb_Package_add_file,test_unittest,unittest/user/template/empty_directory,user/template/empty_directory))
+
+# vim: set noet sw=4 ts=4:
diff --git a/test/prj/build.lst b/test/prj/build.lst
index a06591b..24e7435 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,2 +1,2 @@
te test : unotest vcl i18npool NULL
-te test\source nmake - all source_cpp NULL
+te test\prj nmake - all te_prj NULL
diff --git a/test/prj/d.lst b/test/prj/d.lst
index 92ced03..e69de29 100644
--- a/test/prj/d.lst
+++ b/test/prj/d.lst
@@ -1,399 +0,0 @@
-mkdir: %_DEST%\inc\test
-..\%__SRC%\bin\test.dll %_DEST%\bin\test.dll
-..\%__SRC%\lib\itest.lib %_DEST%\lib\itest.lib
-..\%__SRC%\lib\libtest.dylib %_DEST%\lib\libtest.dylib
-..\%__SRC%\lib\libtest.so %_DEST%\lib\libtest.so
-..\%__SRC%\lib\libtest.dll.a %_DEST%\lib\libtest.dll.a
-..\inc\test\testdllapi.hxx %_DEST%\inc\test\testdllapi.hxx
-..\inc\test\bootstrapfixture.hxx %_DEST%\inc\test\bootstrapfixture.hxx
-..\inc\test\unoapi_test.hxx %_DEST%\inc\test\unoapi_test.hxx
-mkdir: %_DEST%\unittest
-mkdir: %_DEST%\unittest\registry
-mkdir: %_DEST%\unittest\user\
-mkdir: %_DEST%\unittest\user\autocorr
-mkdir: %_DEST%\unittest\user\autotext
-mkdir: %_DEST%\unittest\user\autotext\en-US
-mkdir: %_DEST%\unittest\user\basic
-mkdir: %_DEST%\unittest\user\basic\Depot
-mkdir: %_DEST%\unittest\user\basic\Euro
-mkdir: %_DEST%\unittest\user\basic\FormWizard
-mkdir: %_DEST%\unittest\user\basic\Gimmicks
-mkdir: %_DEST%\unittest\user\basic\ImportWizard
-mkdir: %_DEST%\unittest\user\basic\Schedule
-mkdir: %_DEST%\unittest\user\basic\ScriptBindingLibrary
-mkdir: %_DEST%\unittest\user\basic\Template
-mkdir: %_DEST%\unittest\user\basic\Tools
-mkdir: %_DEST%\unittest\user\basic\Tutorials
-mkdir: %_DEST%\unittest\user\config
-mkdir: %_DEST%\unittest\user\config\linked
-mkdir: %_DEST%\unittest\user\config\soffice.cfg
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\layout
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images\Bitmaps
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\menubar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\statusbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\toolbar
-mkdir: %_DEST%\unittest\user\config\soffice.cfg\simpress
-mkdir: %_DEST%\unittest\user\config\symbol
-mkdir: %_DEST%\unittest\user\config\webcast
-mkdir: %_DEST%\unittest\user\config\wizard
-mkdir: %_DEST%\unittest\user\config\wizard\form
-mkdir: %_DEST%\unittest\user\config\wizard\form\styles
-mkdir: %_DEST%\unittest\user\config\wizard\web
-mkdir: %_DEST%\unittest\user\config\wizard\web\buttons
-mkdir: %_DEST%\unittest\user\config\wizard\web\images
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\diagonal
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_bottom
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_left
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_right
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_top
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\simple
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\table_2
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\table_3
-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\zigzag
-mkdir: %_DEST%\unittest\user\config\wizard\web\styles
-mkdir: %_DEST%\unittest\user\dtd
-mkdir: %_DEST%\unittest\user\dtd\math
-mkdir: %_DEST%\unittest\user\dtd\math\1_01
-mkdir: %_DEST%\unittest\user\dtd\officedocument
-mkdir: %_DEST%\unittest\user\dtd\officedocument\1_0
-mkdir: %_DEST%\unittest\user\fonts
-mkdir: %_DEST%\unittest\user\fonts\truetype
-mkdir: %_DEST%\unittest\user\gallery
-mkdir: %_DEST%\unittest\user\gallery\bullets
-mkdir: %_DEST%\unittest\user\gallery\htmlexpo
-mkdir: %_DEST%\unittest\user\gallery\rulers
-mkdir: %_DEST%\unittest\user\gallery\sounds
-mkdir: %_DEST%\unittest\user\gallery\www-back
-mkdir: %_DEST%\unittest\user\gallery\www-graf
-mkdir: %_DEST%\unittest\user\psprint
-mkdir: %_DEST%\unittest\user\psprint\driver
-mkdir: %_DEST%\unittest\user\psprint\fontmetric
-mkdir: %_DEST%\unittest\user\template
-mkdir: %_DEST%\unittest\user\template\common
-mkdir: %_DEST%\unittest\user\template\common\layout
-mkdir: %_DEST%\unittest\user\template\en-US
-mkdir: %_DEST%\unittest\user\template\en-US\internal
-mkdir: %_DEST%\unittest\user\template\en-US\presnt
-mkdir: %_DEST%\unittest\user\template\en-US\wizard
-mkdir: %_DEST%\unittest\user\template\en-US\wizard\agenda
-mkdir: %_DEST%\unittest\user\template\en-US\wizard\fax
-mkdir: %_DEST%\unittest\user\template\en-US\wizard\report
-mkdir: %_DEST%\unittest\user\template\en-US\wizard\styles
-mkdir: %_DEST%\unittest\user\template\wizard
-mkdir: %_DEST%\unittest\user\template\wizard\bitmap
-mkdir: %_DEST%\unittest\user\template\wizard\letter
-mkdir: %_DEST%\unittest\user\template\wizard\letter\bg
-mkdir: %_DEST%\unittest\user\template\wizard\letter\cs
-mkdir: %_DEST%\unittest\user\template\wizard\letter\da
-mkdir: %_DEST%\unittest\user\template\wizard\letter\de
-mkdir: %_DEST%\unittest\user\template\wizard\letter\en-GB
-mkdir: %_DEST%\unittest\user\template\wizard\letter\en-US
-mkdir: %_DEST%\unittest\user\template\wizard\letter\es
-mkdir: %_DEST%\unittest\user\template\wizard\letter\eu
-mkdir: %_DEST%\unittest\user\template\wizard\letter\fr
-mkdir: %_DEST%\unittest\user\template\wizard\letter\hu
-mkdir: %_DEST%\unittest\user\template\wizard\letter\it
-mkdir: %_DEST%\unittest\user\template\wizard\letter\ja
-mkdir: %_DEST%\unittest\user\template\wizard\letter\km
-mkdir: %_DEST%\unittest\user\template\wizard\letter\ko
-mkdir: %_DEST%\unittest\user\template\wizard\letter\nl
-mkdir: %_DEST%\unittest\user\template\wizard\letter\pl
-mkdir: %_DEST%\unittest\user\template\wizard\letter\pt-BR
-mkdir: %_DEST%\unittest\user\template\wizard\letter\pt
-mkdir: %_DEST%\unittest\user\template\wizard\letter\ru
-mkdir: %_DEST%\unittest\user\template\wizard\letter\sk
-mkdir: %_DEST%\unittest\user\template\wizard\letter\sl
-mkdir: %_DEST%\unittest\user\template\wizard\letter\sv
-mkdir: %_DEST%\unittest\user\template\wizard\letter\tr
-mkdir: %_DEST%\unittest\user\template\wizard\letter\vi
-mkdir: %_DEST%\unittest\user\template\wizard\letter\zh-CN
-mkdir: %_DEST%\unittest\user\template\wizard\letter\zh-TW
-mkdir: %_DEST%\unittest\user\wordbook
-mkdir: %_DEST%\unittest\user\xslt
-mkdir: %_DEST%\unittest\user\xslt\common
-mkdir: %_DEST%\unittest\user\xslt\docbook
-mkdir: %_DEST%\unittest\user\xslt\export
-mkdir: %_DEST%\unittest\user\xslt\export\common
-mkdir: %_DEST%\unittest\user\xslt\export\common\styles
-mkdir: %_DEST%\unittest\user\xslt\export\common\table
-mkdir: %_DEST%\unittest\user\xslt\export\spreadsheetml
-mkdir: %_DEST%\unittest\user\xslt\export\uof
-mkdir: %_DEST%\unittest\user\xslt\export\wordml
-mkdir: %_DEST%\unittest\user\xslt\export\xhtml
-mkdir: %_DEST%\unittest\user\xslt\import
-mkdir: %_DEST%\unittest\user\xslt\import\common
-mkdir: %_DEST%\unittest\user\xslt\import\spreadsheetml
-mkdir: %_DEST%\unittest\user\xslt\import\uof
-mkdir: %_DEST%\unittest\user\xslt\import\wordml
-..\user-template\registry\modifications.xcd %_DEST%\unittest\registry\modifications.xcd
-..\user-template\user\* %_DEST%\unittest\user\*
-..\user-template\user\autocorr\* %_DEST%\unittest\user\autocorr\*
-..\user-template\user\autotext\* %_DEST%\unittest\user\autotext\*
-..\user-template\user\autotext\en-US\* %_DEST%\unittest\user\autotext\en-US\*
-..\user-template\user\basic\* %_DEST%\unittest\user\basic\*
-..\user-template\user\basic\Depot\* %_DEST%\unittest\user\basic\Depot\*
-..\user-template\user\basic\Euro\* %_DEST%\unittest\user\basic\Euro\*
-..\user-template\user\basic\FormWizard\* %_DEST%\unittest\user\basic\FormWizard\*
-..\user-template\user\basic\Gimmicks\* %_DEST%\unittest\user\basic\Gimmicks\*
-..\user-template\user\basic\ImportWizard\* %_DEST%\unittest\user\basic\ImportWizard\*
-..\user-template\user\basic\Schedule\* %_DEST%\unittest\user\basic\Schedule\*
-..\user-template\user\basic\ScriptBindingLibrary\* %_DEST%\unittest\user\basic\ScriptBindingLibrary\*
-..\user-template\user\basic\Template\* %_DEST%\unittest\user\basic\Template\*
-..\user-template\user\basic\Tools\* %_DEST%\unittest\user\basic\Tools\*
-..\user-template\user\basic\Tutorials\* %_DEST%\unittest\user\basic\Tutorials\*
-..\user-template\user\config\* %_DEST%\unittest\user\config\*
-..\user-template\user\config\linked\* %_DEST%\unittest\user\config\linked\*
-..\user-template\user\config\soffice.cfg\* %_DEST%\unittest\user\config\soffice.cfg\*
-..\user-template\user\config\soffice.cfg\modules\* %_DEST%\unittest\user\config\soffice.cfg\modules\*
-..\user-template\user\config\soffice.cfg\modules\BasicIDE\* %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\*
-..\user-template\user\config\soffice.cfg\modules\BasicIDE\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\menubar\*
-..\user-template\user\config\soffice.cfg\modules\BasicIDE\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\BasicIDE\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\StartModule\* %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\*
-..\user-template\user\config\soffice.cfg\modules\StartModule\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\menubar\*
-..\user-template\user\config\soffice.cfg\modules\StartModule\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\StartModule\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\dbapp\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\*
-..\user-template\user\config\soffice.cfg\modules\dbapp\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\menubar\*
-..\user-template\user\config\soffice.cfg\modules\dbapp\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\dbapp\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\dbbrowser\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\*
-..\user-template\user\config\soffice.cfg\modules\dbbrowser\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\menubar\*
-..\user-template\user\config\soffice.cfg\modules\dbbrowser\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\dbquery\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\*
-..\user-template\user\config\soffice.cfg\modules\dbquery\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\menubar\*
-..\user-template\user\config\soffice.cfg\modules\dbquery\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\dbrelation\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\*
-..\user-template\user\config\soffice.cfg\modules\dbrelation\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\menubar\*
-..\user-template\user\config\soffice.cfg\modules\dbrelation\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\dbreport\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\*
-..\user-template\user\config\soffice.cfg\modules\dbreport\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\menubar\*
-..\user-template\user\config\soffice.cfg\modules\dbreport\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\dbreport\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\dbtable\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\*
-..\user-template\user\config\soffice.cfg\modules\dbtable\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\menubar\*
-..\user-template\user\config\soffice.cfg\modules\dbtable\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\dbtdata\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\*
-..\user-template\user\config\soffice.cfg\modules\dbtdata\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\menubar\*
-..\user-template\user\config\soffice.cfg\modules\dbtdata\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\sbibliography\* %_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography\*
-..\user-template\user\config\soffice.cfg\modules\sbibliography\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography\menubar\*
-..\user-template\user\config\soffice.cfg\modules\scalc\* %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\*
-..\user-template\user\config\soffice.cfg\modules\scalc\layout\* %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\layout\*
-..\user-template\user\config\soffice.cfg\modules\scalc\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\menubar\*
-..\user-template\user\config\soffice.cfg\modules\scalc\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\scalc\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\scalc\images\* %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images\*
-..\user-template\user\config\soffice.cfg\modules\scalc\images\Bitmaps\* %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images\Bitmaps\*
-..\user-template\user\config\soffice.cfg\modules\schart\* %_DEST%\unittest\user\config\soffice.cfg\modules\schart\*
-..\user-template\user\config\soffice.cfg\modules\schart\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\schart\menubar\*
-..\user-template\user\config\soffice.cfg\modules\schart\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\schart\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\schart\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\schart\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\sdraw\* %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\*
-..\user-template\user\config\soffice.cfg\modules\sdraw\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\menubar\*
-..\user-template\user\config\soffice.cfg\modules\sdraw\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\sdraw\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\sglobal\* %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\*
-..\user-template\user\config\soffice.cfg\modules\sglobal\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\menubar\*
-..\user-template\user\config\soffice.cfg\modules\sglobal\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\sglobal\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\simpress\* %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\*
-..\user-template\user\config\soffice.cfg\modules\simpress\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\menubar\*
-..\user-template\user\config\soffice.cfg\modules\simpress\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\simpress\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\smath\* %_DEST%\unittest\user\config\soffice.cfg\modules\smath\*
-..\user-template\user\config\soffice.cfg\modules\smath\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\smath\menubar\*
-..\user-template\user\config\soffice.cfg\modules\smath\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\smath\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\smath\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\smath\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\sweb\* %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\*
-..\user-template\user\config\soffice.cfg\modules\sweb\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\menubar\*
-..\user-template\user\config\soffice.cfg\modules\sweb\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\sweb\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\swform\* %_DEST%\unittest\user\config\soffice.cfg\modules\swform\*
-..\user-template\user\config\soffice.cfg\modules\swform\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swform\menubar\*
-..\user-template\user\config\soffice.cfg\modules\swform\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swform\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\swform\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swform\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\swreport\* %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\*
-..\user-template\user\config\soffice.cfg\modules\swreport\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\menubar\*
-..\user-template\user\config\soffice.cfg\modules\swreport\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\swreport\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\swriter\* %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\*
-..\user-template\user\config\soffice.cfg\modules\swriter\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\menubar\*
-..\user-template\user\config\soffice.cfg\modules\swriter\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\swriter\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\toolbar\*
-..\user-template\user\config\soffice.cfg\modules\swxform\* %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\*
-..\user-template\user\config\soffice.cfg\modules\swxform\menubar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\menubar\*
-..\user-template\user\config\soffice.cfg\modules\swxform\statusbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\statusbar\*
-..\user-template\user\config\soffice.cfg\modules\swxform\toolbar\* %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\toolbar\*
-..\user-template\user\config\soffice.cfg\simpress\* %_DEST%\unittest\user\config\soffice.cfg\simpress\*
-..\user-template\user\config\symbol\* %_DEST%\unittest\user\config\symbol\*
-..\user-template\user\config\webcast\* %_DEST%\unittest\user\config\webcast\*
-..\user-template\user\config\wizard\* %_DEST%\unittest\user\config\wizard\*
-..\user-template\user\config\wizard\form\* %_DEST%\unittest\user\config\wizard\form\*
-..\user-template\user\config\wizard\form\styles\* %_DEST%\unittest\user\config\wizard\form\styles\*
-..\user-template\user\config\wizard\web\* %_DEST%\unittest\user\config\wizard\web\*
-..\user-template\user\config\wizard\web\buttons\* %_DEST%\unittest\user\config\wizard\web\buttons\*
-..\user-template\user\config\wizard\web\images\* %_DEST%\unittest\user\config\wizard\web\images\*
-..\user-template\user\config\wizard\web\layouts\* %_DEST%\unittest\user\config\wizard\web\layouts\*
-..\user-template\user\config\wizard\web\layouts\diagonal\* %_DEST%\unittest\user\config\wizard\web\layouts\diagonal\*
-..\user-template\user\config\wizard\web\layouts\frame_bottom\* %_DEST%\unittest\user\config\wizard\web\layouts\frame_bottom\*
-..\user-template\user\config\wizard\web\layouts\frame_left\* %_DEST%\unittest\user\config\wizard\web\layouts\frame_left\*
-..\user-template\user\config\wizard\web\layouts\frame_right\* %_DEST%\unittest\user\config\wizard\web\layouts\frame_right\*
-..\user-template\user\config\wizard\web\layouts\frame_top\* %_DEST%\unittest\user\config\wizard\web\layouts\frame_top\*
-..\user-template\user\config\wizard\web\layouts\simple\* %_DEST%\unittest\user\config\wizard\web\layouts\simple\*
-..\user-template\user\config\wizard\web\layouts\table_2\* %_DEST%\unittest\user\config\wizard\web\layouts\table_2\*
-..\user-template\user\config\wizard\web\layouts\table_3\* %_DEST%\unittest\user\config\wizard\web\layouts\table_3\*
-..\user-template\user\config\wizard\web\layouts\zigzag\* %_DEST%\unittest\user\config\wizard\web\layouts\zigzag\*
-..\user-template\user\config\wizard\web\styles\* %_DEST%\unittest\user\config\wizard\web\styles\*
-..\user-template\user\dtd\* %_DEST%\unittest\user\dtd\*
-..\user-template\user\dtd\math\* %_DEST%\unittest\user\dtd\math\*
-..\user-template\user\dtd\math\1_01\* %_DEST%\unittest\user\dtd\math\1_01\*
-..\user-template\user\dtd\officedocument\* %_DEST%\unittest\user\dtd\officedocument\*
-..\user-template\user\dtd\officedocument\1_0\* %_DEST%\unittest\user\dtd\officedocument\1_0\*
-..\user-template\user\fonts\* %_DEST%\unittest\user\fonts\*
-..\user-template\user\fonts\truetype\* %_DEST%\unittest\user\fonts\truetype\*
-..\user-template\user\gallery\* %_DEST%\unittest\user\gallery\*
-..\user-template\user\gallery\bullets\* %_DEST%\unittest\user\gallery\bullets\*
-..\user-template\user\gallery\htmlexpo\* %_DEST%\unittest\user\gallery\htmlexpo\*
-..\user-template\user\gallery\rulers\* %_DEST%\unittest\user\gallery\rulers\*
-..\user-template\user\gallery\sounds\* %_DEST%\unittest\user\gallery\sounds\*
-..\user-template\user\gallery\www-back\* %_DEST%\unittest\user\gallery\www-back\*
-..\user-template\user\gallery\www-graf\* %_DEST%\unittest\user\gallery\www-graf\*
-..\user-template\user\psprint\* %_DEST%\unittest\user\psprint\*
-..\user-template\user\psprint\driver\* %_DEST%\unittest\user\psprint\driver\*
-..\user-template\user\psprint\fontmetric\* %_DEST%\unittest\user\psprint\fontmetric\*
-..\user-template\user\template\* %_DEST%\unittest\user\template\*
-..\user-template\user\template\common\* %_DEST%\unittest\user\template\common\*
-..\user-template\user\template\common\layout\* %_DEST%\unittest\user\template\common\layout\*
-..\user-template\user\template\en-US\* %_DEST%\unittest\user\template\en-US\*
-..\user-template\user\template\en-US\internal\* %_DEST%\unittest\user\template\en-US\internal\*
-..\user-template\user\template\en-US\presnt\* %_DEST%\unittest\user\template\en-US\presnt\*
-..\user-template\user\template\en-US\wizard\* %_DEST%\unittest\user\template\en-US\wizard\*
-..\user-template\user\template\en-US\wizard\agenda\* %_DEST%\unittest\user\template\en-US\wizard\agenda\*
-..\user-template\user\template\en-US\wizard\fax\* %_DEST%\unittest\user\template\en-US\wizard\fax\*
-..\user-template\user\template\en-US\wizard\report\* %_DEST%\unittest\user\template\en-US\wizard\report\*
-..\user-template\user\template\en-US\wizard\styles\* %_DEST%\unittest\user\template\en-US\wizard\styles\*
-..\user-template\user\template\wizard\* %_DEST%\unittest\user\template\wizard\*
-..\user-template\user\template\wizard\bitmap\* %_DEST%\unittest\user\template\wizard\bitmap\*
-..\user-template\user\template\wizard\letter\* %_DEST%\unittest\user\template\wizard\letter\*
-..\user-template\user\template\wizard\letter\bg\* %_DEST%\unittest\user\template\wizard\letter\bg\*
-..\user-template\user\template\wizard\letter\cs\* %_DEST%\unittest\user\template\wizard\letter\cs\*
-..\user-template\user\template\wizard\letter\da\* %_DEST%\unittest\user\template\wizard\letter\da\*
-..\user-template\user\template\wizard\letter\de\* %_DEST%\unittest\user\template\wizard\letter\de\*
-..\user-template\user\template\wizard\letter\en-GB\* %_DEST%\unittest\user\template\wizard\letter\en-GB\*
-..\user-template\user\template\wizard\letter\en-US\* %_DEST%\unittest\user\template\wizard\letter\en-US\*
-..\user-template\user\template\wizard\letter\es\* %_DEST%\unittest\user\template\wizard\letter\es\*
-..\user-template\user\template\wizard\letter\eu\* %_DEST%\unittest\user\template\wizard\letter\eu\*
-..\user-template\user\template\wizard\letter\fr\* %_DEST%\unittest\user\template\wizard\letter\fr\*
-..\user-template\user\template\wizard\letter\hu\* %_DEST%\unittest\user\template\wizard\letter\hu\*
-..\user-template\user\template\wizard\letter\it\* %_DEST%\unittest\user\template\wizard\letter\it\*
-..\user-template\user\template\wizard\letter\ja\* %_DEST%\unittest\user\template\wizard\letter\ja\*
-..\user-template\user\template\wizard\letter\km\* %_DEST%\unittest\user\template\wizard\letter\km\*
-..\user-template\user\template\wizard\letter\ko\* %_DEST%\unittest\user\template\wizard\letter\ko\*
-..\user-template\user\template\wizard\letter\nl\* %_DEST%\unittest\user\template\wizard\letter\nl\*
-..\user-template\user\template\wizard\letter\pl\* %_DEST%\unittest\user\template\wizard\letter\pl\*
-..\user-template\user\template\wizard\letter\pt-BR\* %_DEST%\unittest\user\template\wizard\letter\pt-BR\*
-..\user-template\user\template\wizard\letter\pt\* %_DEST%\unittest\user\template\wizard\letter\pt\*
-..\user-template\user\template\wizard\letter\ru\* %_DEST%\unittest\user\template\wizard\letter\ru\*
-..\user-template\user\template\wizard\letter\sk\* %_DEST%\unittest\user\template\wizard\letter\sk\*
-..\user-template\user\template\wizard\letter\sl\* %_DEST%\unittest\user\template\wizard\letter\sl\*
-..\user-template\user\template\wizard\letter\sv\* %_DEST%\unittest\user\template\wizard\letter\sv\*
-..\user-template\user\template\wizard\letter\tr\* %_DEST%\unittest\user\template\wizard\letter\tr\*
-..\user-template\user\template\wizard\letter\vi\* %_DEST%\unittest\user\template\wizard\letter\vi\*
-..\user-template\user\template\wizard\letter\zh-CN\* %_DEST%\unittest\user\template\wizard\letter\zh-CN\*
-..\user-template\user\template\wizard\letter\zh-TW\* %_DEST%\unittest\user\template\wizard\letter\zh-TW\*
-..\user-template\user\wordbook\* %_DEST%\unittest\user\wordbook\*
-..\user-template\user\xslt\* %_DEST%\unittest\user\xslt\*
-..\user-template\user\xslt\common\* %_DEST%\unittest\user\xslt\common\*
-..\user-template\user\xslt\docbook\* %_DEST%\unittest\user\xslt\docbook\*
-..\user-template\user\xslt\export\* %_DEST%\unittest\user\xslt\export\*
-..\user-template\user\xslt\export\common\* %_DEST%\unittest\user\xslt\export\common\*
-..\user-template\user\xslt\export\common\styles\* %_DEST%\unittest\user\xslt\export\common\styles\*
-..\user-template\user\xslt\export\common\table\* %_DEST%\unittest\user\xslt\export\common\table\*
-..\user-template\user\xslt\export\spreadsheetml\* %_DEST%\unittest\user\xslt\export\spreadsheetml\*
-..\user-template\user\xslt\export\uof\* %_DEST%\unittest\user\xslt\export\uof\*
-..\user-template\user\xslt\export\wordml\* %_DEST%\unittest\user\xslt\export\wordml\*
-..\user-template\user\xslt\export\xhtml\* %_DEST%\unittest\user\xslt\export\xhtml\*
-..\user-template\user\xslt\import\* %_DEST%\unittest\user\xslt\import\*
-..\user-template\user\xslt\import\common\* %_DEST%\unittest\user\xslt\import\common\*
-..\user-template\user\xslt\import\spreadsheetml\* %_DEST%\unittest\user\xslt\import\spreadsheetml\*
-..\user-template\user\xslt\import\uof\* %_DEST%\unittest\user\xslt\import\uof\*
-..\user-template\user\xslt\import\wordml\* %_DEST%\unittest\user\xslt\import\wordml\*
-..\user-template\user\data\* %_DEST%\unittest\user\data\*
diff --git a/test/prj/makefile.mk b/test/prj/makefile.mk
new file mode 100755
index 0000000..0997622
--- /dev/null
+++ b/test/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/test/source/makefile.mk b/test/source/makefile.mk
deleted file mode 100644
index 43f32a6..0000000
--- a/test/source/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = test
-TARGET = cpp
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-# --- Files --------------------------------------------------------
-CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SLOFILES = \
- $(SLO)/bootstrapfixture.obj \
- $(SLO)/unoapi_test.obj
-
-.IF "$(CROSS_COMPILING)" == "YES"
-SHL1IMPLIB = $(SHL1TARGET)
-.ELSE
-SHL1IMPLIB = i$(SHL1TARGET)
-.ENDIF
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = NONE
-SHL1STDLIBS = \
- $(UNOTESTLIB) \
- $(VCLLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(CPPULIB) \
- $(CPPUNITLIB) \
- $(SALLIB) \
- $(I18NISOLANGLIB)
-SHL1TARGET = test
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
commit b14bd565c8e860ead9f666d72c5f25001464f317
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 17 09:06:36 2012 +0000
drop no-opt cast
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index c1d41e0..7b26105 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -575,7 +575,7 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& rShell, sal_Bool bDee
for(std::deque<SfxToDo_Impl>::reverse_iterator i = pImp->aToDoStack.rbegin(); i != pImp->aToDoStack.rend(); ++i)
{
if(i->bPush)
- aStack.Push(static_cast<SfxShell*>(i->pCluster));
+ aStack.Push(i->pCluster);
else
{
SfxShell* pPopped(NULL);
commit bcc25a6d8ab411fe62f935cbb302eb1924274ae8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 17 09:00:04 2012 +0000
callcatcher: remove recently unused code
diff --git a/basegfx/inc/basegfx/range/b2dpolyrange.hxx b/basegfx/inc/basegfx/range/b2dpolyrange.hxx
index 6cb95a4..2050853 100644
--- a/basegfx/inc/basegfx/range/b2dpolyrange.hxx
+++ b/basegfx/inc/basegfx/range/b2dpolyrange.hxx
@@ -81,9 +81,6 @@ namespace basegfx
// insert/append a single range
void appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount = 1);
- // insert/append multiple ranges
- void appendPolyRange(const B2DPolyRange&);
-
void clear();
/** Test whether given range overlaps one or more of the
diff --git a/basegfx/source/range/b2dpolyrange.cxx b/basegfx/source/range/b2dpolyrange.cxx
index 6046f48..0cd3abd 100644
--- a/basegfx/source/range/b2dpolyrange.cxx
+++ b/basegfx/source/range/b2dpolyrange.cxx
@@ -90,17 +90,6 @@ namespace basegfx
maBounds.expand(rRange);
}
- void appendPolyRange(const ImplB2DPolyRange& rPolyRange)
- {
- maRanges.insert(maRanges.end(),
- rPolyRange.maRanges.begin(),
- rPolyRange.maRanges.end());
- maOrient.insert(maOrient.end(),
- rPolyRange.maOrient.begin(),
- rPolyRange.maOrient.end());
- updateBounds();
- }
-
void clear()
{
std::vector<B2DRange> aTmpRanges;
@@ -181,11 +170,6 @@ namespace basegfx
mpImpl->appendElement(rRange, eOrient, nCount );
}
- void B2DPolyRange::appendPolyRange(const B2DPolyRange& rRange)
- {
- mpImpl->appendPolyRange(*rRange.mpImpl);
- }
-
void B2DPolyRange::clear()
{
mpImpl->clear();
diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx
index 963dd39..9a46e2f 100644
--- a/basegfx/source/tools/b2dclipstate.cxx
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -132,26 +132,6 @@ namespace tools
maPendingPolygons.append(aPoly);
}
- void addClipState(const ImplB2DClipState& rOther, Operation eOp)
- {
- if( rOther.mePendingOps == mePendingOps
- && !rOther.maClipPoly.count()
- && !rOther.maPendingPolygons.count() )
- {
- maPendingRanges.appendPolyRange( rOther.maPendingRanges );
- }
- else
- {
- commitPendingRanges();
- commitPendingPolygons();
- rOther.commitPendingRanges();
- rOther.commitPendingPolygons();
-
- maPendingPolygons = rOther.maClipPoly;
- mePendingOps = eOp;
- }
- }
-
void unionRange(const B2DRange& rRange)
{
if( isCleared() )
More information about the Libreoffice-commits
mailing list