resyncing to master

103 files changed, 10074 insertions, 5504 deletions

diff --git a/Makefile.in b/Makefile.in
index cfbea5e11755..ded85bfd1a90 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,6 +31,7 @@ cross-build-toolset:
 	  external \
 	  cppunit \
 	  xml2cmp \
+	  lucene \
 	  sal \
 	  cosv \
 	  udm \
@@ -40,6 +41,7 @@ cross-build-toolset:
 	  registry \
 	  idlc \
 	  icu \
+	  codemaker \
 	  udkapi \
 	  expat \
 	  libxml2 \
@@ -47,8 +49,6 @@ cross-build-toolset:
 	  libxslt \
 	  offapi \
 	  oovbaapi \
-	  codemaker \
-	  offuh \
 	  cppu \
 	  cppuhelper \
 	  rdbmaker \
@@ -60,9 +60,10 @@ cross-build-toolset:
 	  jvmaccess \
 	  bridges \
 	  ucbhelper \
-	  GBUILD:comphelper \
+	  comphelper \
 	  jvmfwk \
 	  regexp \
+	  berkeleydb \
 	  sax \
 	  stoc \
 	  i18npool \
@@ -71,17 +72,22 @@ cross-build-toolset:
 	  dictionaries \
 	  o3tl \
 	  basegfx \
-	  GBUILD:tools \
+	  tools \
+	  idl \
+	  l10ntools \
 	  rsc \
-	  setup_native; do \
-	    case $$D in \
-	    GBUILD:*) \
-	      (cd $${D#*:} && make -r -j@BUILD_MAX_JOBS@) \
-	      ;; \
-	    *) \
+	  setup_native \
+	  icc \
+	  unoil \
+	  javaunohelper \
+	  unotools \
+	  xmlhelp \
+	  shell; do \
+	    if grep -q gb_Module_add_targets $$D/Module_$$D.mk 2>/dev/null; then \
+	      (cd $$D && make -sr -j@BUILD_MAX_JOBS@) \
+	    else \
 	      (cd $$D && build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@ && deliver.pl) \
-	      ;; \
-	    esac; \
+	    fi; \
 	done
 endif
 
@@ -105,7 +111,7 @@ dev-install:
 		echo open install/LibreOffice.app; \
 	else \
 		echo "cd @abs_builddir@/install/program" && \
-		echo ". ooenv" && \
+		echo ". ./ooenv" && \
 		echo "./soffice.bin"; \
 	fi
 
@@ -120,10 +126,12 @@ clean:
 	. ./*Env.Set.sh && \
 	rm -rf */$$INPATH && \
 	rm -rf solver/*/$$INPATH && \
-	rm -rf install && \
-	$$GNUMAKE -C dmake clean && \
-	rm -f solenv/*/bin/dmake* && \
-	$$GNUMAKE -f GNUmakefile.mk -sr clean
+	rm -rf install
+ifeq (@BUILD_DMAKE@,YES)
+	. ./*Env.Set.sh && \
+	(if [ -f dmake/Makefile ] ; then $$GNUMAKE -C dmake clean; fi) && \
+	rm -f solenv/*/bin/dmake*
+endif
 ifeq (@CROSS_COMPILING@,YES)
 	. ./*Env.Set.sh && \
 	rm -rf */$$INPATH_FOR_BUILD && \
@@ -138,12 +146,12 @@ ifeq (@DO_FETCH_TARBALLS@,YES)
 	@. ./*Env.Set.sh && \
 	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
 else
-        @echo "Automatic fetching of external tarballs is disabled."
+	@echo "Automatic fetching of external tarballs is disabled."
 endif
 
 fetch: src.downloaded
 
-Makefile: configure.in set_soenv.in Makefile.in
+Makefile: configure.in ooo.lst.in set_soenv.in Makefile.in
 	./autogen.sh
 
 check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch
@@ -164,3 +172,24 @@ tags:
 docs:
 	@. ./*Env.Set.sh && \
 		mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
+
+findunusedcode:
+# experimental callcatcher target
+# http://www.skynet.ie/~caolan/Packages/callcatcher.html
+	@which callcatcher > /dev/null 2>&1 || \
+	 (echo "callcatcher not installed" && false)
+	@. ./*Env.Set.sh && \
+	   source <(sed -e s,$$INPATH,callcatcher,g ./*Env.Set.sh) && \
+	   . ./solenv/bin/callcatchEnv.Set.sh && \
+	   cd instsetoo_native && \
+	   build.pl $(GBUILD_OPT) --all
+	@. ./*Env.Set.sh && \
+	   source <(sed -e s,$$INPATH,callcatcher,g ./*Env.Set.sh) && \
+	   callanalyse \
+	       $$WORKDIR/LinkTarget/*/* \
+	       */$$OUTPATH/bin/* \
+	       */$$OUTPATH/lib/* > unusedcode.all
+#because non-c++ symbols could be dlsymed lets make a list of class level
+#unused methods which don't require much effort to determine if they need
+#to be just removed, or put behind appropiate platform or debug level ifdefs
+	@grep ::.*\( unusedcode.all | grep -v cppu::bootstrap > unusedcode.easy
diff --git a/README.cross b/README.cross
index 0f21f9144d04..095a419bb43b 100644
--- a/README.cross
+++ b/README.cross
@@ -72,10 +72,12 @@ Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler.  The
 it isn't already, and I have not attempted to check that it keeps
 working. Ditto for native MinGW; if one compiles natively on Windows,
 why not use Microsoft's compiler, as OOo/LO has been build for Windows
-all the time using that and it works fine. In my opinion, it makes
-sense to use MinGW only for cross-compilation. (Because of obvious
-benefits like speed improvement, easier automation in systems like the
-openSUSE Build Servce, etc.)
+all the time using that and it works fine.
+
+In my opinion, the only case where it makes sense to use MinGW is for
+cross-compilation. There is just too much crack on Windows anyway, and
+it is a semi-miracle (well, make that the result of years of work)
+that the MSVC build under Cygwin works as nicely as it does.
 
 MinGW is available as cross-build toolchains pre-packaged in more or
 less official packages for many Linux distros including Debian, Fedora
@@ -83,9 +85,9 @@ and openSUSE. Personally I use the mingw32 packages in the openSUSE
 Build Service, running on openSUSE.
 
 It is somewhat unclear how well thought-out the conditionals and code
-for MinGW inside the LibreOffice code actually is. The little I have
-seen of it seems a bit randomish, with copy-pasting haveing been
-preferred to factoring out differences.
+for MinGW inside the OOo-originated code in LibreOffice actually
+is. The little I have seen of it seems a bit randomish, with
+copy-pasting having been preferred to factoring out differences.
 
 The autogen.lastrun I use for my MinGW cross-compilation experimentation is:
 
@@ -96,7 +98,9 @@ CXX_FOR_BUILD=ccache g++
 --build=x86_64-unknown-linux-gnu
 --host=i686-w64-mingw32
 --with-distro=LibreOfficeWin32
+--disable-binfilter
 --disable-build-mozilla
+--disable-directx
 --disable-ext-nlpsolver
 --disable-ext-pdfimport
 --disable-ext-presenter-console
@@ -114,12 +118,15 @@ CXX_FOR_BUILD=ccache g++
 --with-max-jobs=1
 --with-system-altlinuxhyph
 --with-system-boost
+--with-system-cairo
+--with-system-cppunit
 --with-system-curl
 --with-system-db
 --with-system-expat
 --with-system-gettext
 --with-system-hunspell
 --with-system-icu
+--with-system-libpng
 --with-system-libwpd
 --with-system-libwpg
 --with-system-libwps
@@ -130,7 +137,6 @@ CXX_FOR_BUILD=ccache g++
 --with-system-neon
 --with-system-openssl
 --with-system-redland
---with-system-zlib
 --with-vendor=no
 
 
@@ -165,7 +171,7 @@ thought yet.
 The Apple tool-chain for iOS cross-building is available only for
 MacOSX, so that is where I have been doing it.
 
-Here is my autogen.lastrun for iOS:
+Here is my autogen.lastrun for iOS (device):
 CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
 CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
 CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
@@ -175,6 +181,18 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
 --with-num-cpus=1
 --with-max-jobs=1
 
+And here for the iOS simulator:
+CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--with-distro=LibreOfficeiOS
+--with-external-tar=/Volumes/ooo/git/master/src
+--with-num-cpus=1
+--with-max-jobs=1
+--disable-librsvg
+--enable-debug
+
 
 Android
 -------
@@ -193,20 +211,23 @@ available for Linux, MacOSX and Windows. (Trying to cross-compile from
 Windows will probably drive you insane.)
 
 Here is my autogen.lastrun for Android:
-SYSBASE=/home/tml/android-ndk-r5b/platforms/android-9/arch-arm
-CC=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
-AR=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
-NM=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
-OBJDUMP=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
-RANLIB=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
-STRIP=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
+SYSBASE=/home/tml/android-ndk-r5c/platforms/android-9/arch-arm
+CC=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm
+CXX=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
+AR=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
+NM=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
+OBJDUMP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
+RANLIB=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
+STRIP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
 CC_FOR_BUILD=ccache gcc
 CXX_FOR_BUILD=ccache g++
 --build=x86_64-unknown-linux-gnu
 --disable-zenity
 --with-distro=LibreOfficeAndroid
 --with-external-tar=/mnt/hemulen/ooo/git/master/src
+--disable-python
+--with-num-cpus=1
+--with-max-jobs=1
 
 
 PowerPC Mac OS X
diff --git a/Repository.mk b/Repository.mk
index bf8df09a2e85..a296b46877ec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     rpt \
     rptui \
     rptxml \
+    rtftok \
     sax \
     sb \
     sc \
@@ -139,6 +140,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	test \
+    cairo \
     cppunit \
     fileacc \
     icui18n \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bf75deea0365..b6c710800f1c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -30,7 +30,8 @@
 
 # Make has no support for 'or' clauses in conditionals,
 # we use a filter expression instead.
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD IOS ANDROID, $(OS)))
+ifneq (,$(filter LINUX-GCC MACOSX-GCC WNT-GCC DRAGONFLY-GCC OPENBSD-GCC FREEBSD-GCC NETBSD-GCC IOS-GCC ANDROID-GCC, $(OS)-$(COM)))
+# Could we in fact just check for $(COM) == "GCC" here?
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
@@ -46,21 +47,9 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 endif
 
-ifeq ($(OS),MACOSX)
-gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-endif # ifeq ($(OS),MACOSX)
-
 ifeq ($(OS),WNT)
 
-ifneq ($(USE_MINGW),)
-gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+ifeq ($(COM),GCC)
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
@@ -72,6 +61,7 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT)
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 
 
@@ -79,25 +69,27 @@ gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dl
 # these are libraries built by OOo, but only a few of them
 # all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
 # we link against their dlls in gcc format directly
-gb_Library_NOILIBFILENAMES:=\
-	icuuc \
-	uwinapi \
 
-gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+# Libraries not provided by mingw(-w64), available only in the Windows
+# SDK. So if these actually are liked with somewhere, we can't
+# cross-compile that module then using MinGW. That needs to be fixed
+# then, and we need to use these libraries through run-time lookup of
+# APIs. Or something.
+gb_Library_SDKLIBFILENAMES:=\
+    unicows \
 
 # some Windows platform libraries are missing in mingw library set
 # we have to use them from the PSDK by linking against their ilibs
 gb_Library_ILIBFILENAMES:=\
+
 	unicows \
 	uuid \
 	winmm \
 
-gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib)
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFILENAMES))
@@ -106,6 +98,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 else #ifneq ($(USE_MINGW),)
 
+gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
@@ -150,5 +143,20 @@ endif # ifneq ($(USE_MINGW),)
 
 endif # ifeq ($(OS),WNT)
 
+# Some external libraries get built as static libraries for Android
+# because we haven't bothered fixing their configury to recognize that
+# shared libraries can be built for the platform.
+ifeq ($(OS),ANDROID)
+gb_Library_FILENAMES := $(patsubst cppunit:%.so,cppunit:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:%.so,xml2:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst rdf:%.so,rdf:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xslt:%.so,xslt:%.a,$(gb_Library_FILENAMES))
+
+endif
+
+
+ifeq ($(SYSTEM_CAIRO),YES)
+gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 19426173c9ea..37c0df5c23e5 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -40,6 +40,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     framework \
     hwpfilter \
     lotuswordpro \
+    offapi \
+    oovbaapi \
     oox \
     padmin \
     sc \
@@ -53,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     sw \
     toolkit \
     tools \
+    udkapi \
     unotools \
     unoxml \
     xmloff \
diff --git a/autogen.sh b/autogen.sh
index 4d5037062c36..30b1ae409d71 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,6 +11,8 @@ sub clean()
     print "cleaned the build tree\n";
 }
 
+my $aclocal;
+
 # check we have various vital tools
 sub sanity_checks($)
 {
@@ -20,7 +22,7 @@ sub sanity_checks($)
       (
        'pkg-config' => "pkg-config is required to be installed",
        'autoconf'   => "autoconf is required",
-       'aclocal'    => "aclocal is required",
+       $aclocal     => "$aclocal is required",
       );
 
     for my $elem (@path) {
@@ -105,8 +107,14 @@ for my $arg (@cmdline_args) {
         push @args, $arg;
     }
 }
+for my $arg (@args) {
+    if ($arg =~ /^([A-Z]+)=(.*)/) {
+        $ENV{$1} = $2;
+    }
+}
 
-system ("touch ChangeLog");
+# Alloc $ACLOCAL to specify which aclocal to use
+$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
 
 my $system = `uname -s`;
 chomp $system;
@@ -119,7 +127,7 @@ $aclocal_flags = "-I ./m4/mac" if (($aclocal_flags eq "") && ($system eq 'Darwin
 
 $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
 
-system ("aclocal $aclocal_flags") && die "Failed to run aclocal";
+system ("$aclocal $aclocal_flags") && die "Failed to run aclocal";
 unlink ("configure");
 system ("autoconf") && die "Failed to run autoconf";
 die "failed to generate configure" if (! -x "configure");
diff --git a/configure.in b/configure.in
index 3926aa249e88..1afc0459d64c 100755
--- a/configure.in
+++ b/configure.in
@@ -184,11 +184,6 @@ AC_ARG_ENABLE(cups,
     AS_HELP_STRING([--disable-cups],
         [Disable cups support in the psprint project.]))
 
-AC_ARG_ENABLE(fontconfig,
-    AS_HELP_STRING([--disable-fontconfig],
-        [Disable support for the fontconfig library.]),
-,enable_fontconfig=yes)
-
 AC_ARG_ENABLE(directx,
     AS_HELP_STRING([--disable-directx],
         [Remove DirectX implementation for the new XCanvas interface.
@@ -359,8 +354,8 @@ AC_ARG_ENABLE(kde4,
 AC_ARG_ENABLE(unix-qstart-libpng,
     AS_HELP_STRING([--disable-unix-qstart-libpng],
         [On UNIX systems, we have a faster splash app, that can use libpng to
-	 render its splash, if we can safely link to the system libpng then
-	 enabling this is a good idea (ie. for Linux Distro packaging).]),
+         render its splash, if we can safely link to the system libpng then
+         enabling this is a good idea (ie. for Linux Distro packaging).]),
 ,enable_unix_libpng=yes)
 
 AC_ARG_ENABLE(binfilter,
@@ -447,27 +442,33 @@ AC_ARG_ENABLE(cl-x64,
 
 AC_ARG_ENABLE(extra-gallery,
     AS_HELP_STRING([--enable-extra-gallery],
-	[Add extra gallery content.]),
+        [Add extra gallery content.]),
 ,)
 
 AC_ARG_ENABLE(extra-template,
     AS_HELP_STRING([--enable-extra-template],
-	[Add extra template content.]),
+        [Add extra template content.]),
 ,)
 
 AC_ARG_ENABLE(extra-sample,
     AS_HELP_STRING([--enable-extra-sample],
-	[Add extra sample content.]),
+        [Add extra sample content.]),
 ,)
 
 AC_ARG_ENABLE(extra-font,
     AS_HELP_STRING([--enable-extra-font],
-	[Add extra font content.]),
+        [Add extra font content.]),
 ,)
 
 AC_ARG_ENABLE(lomenubar,
     AS_HELP_STRING([--enable-lomenubar],
-	[Enable global menu support.]),
+        [Enable global menu support.]),
+,)
+
+AC_ARG_ENABLE(online-update,
+    AS_HELP_STRING([--enable-online-update],
+        [Enable the online update service that will check for new versions of
+         LibreOffice. By default, it is on on Windows and Mac, and off on Linux.]),
 ,)
 
 AC_ARG_ENABLE(release-build,
@@ -503,8 +504,8 @@ AC_ARG_WITH(external-tar,
 AC_ARG_WITH(linked-git,
     AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
         [Specify another checkout's clonedir to re-use. This makes use of
-		 git-new-workdir, and saves a lot of diskspace when having multiple
-		 trees side-by-side.]),
+                 git-new-workdir, and saves a lot of diskspace when having multiple
+                 trees side-by-side.]),
     GIT_LINK_SRC=$withval ,
 )
 
@@ -532,13 +533,13 @@ AC_ARG_WITH(vba-package-format,
 
 AC_ARG_WITH(theme,
     AS_HELP_STRING([--with-theme="theme1 theme2..."],
-	[Choose which themes to include. By default those themes with an '*' are included.
+        [Choose which themes to include. By default those themes with an '*' are included.
          Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
 ,)
 
 AC_ARG_WITH(theme,
     AS_HELP_STRING([--with-theme="theme1 theme2..."],
-	[Choose which themes to include. By default those themes with an '*' are included.
+        [Choose which themes to include. By default those themes with an '*' are included.
          Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
 ,)
 
@@ -578,9 +579,9 @@ AC_ARG_WITH(afms,
 
 AC_ARG_WITH(agfa-monotype-fonts,
      AS_HELP_STRING([--with-agfa-monotype-fonts],
-          [Do not include the proprietary Agfa Monotype fonts
-           (even if present) in the LibreOffice installation
-           set.])
+          [This switch should only be enabled for those who have the right
+           to use or distribute the proprietary Agfa Monotype
+           fonts.])
 ,)
 
 AC_ARG_WITH(epm,
@@ -1293,16 +1294,17 @@ dnl ===================================================================
 AC_CANONICAL_SYSTEM
 
 if test "$cross_compiling" = "yes"; then
-  CROSS_COMPILING=YES
+    CROSS_COMPILING=YES
 else
-  CROSS_COMPILING=
+    CROSS_COMPILING=
+    BUILD_TYPE="$BUILD_TYPE NATIVE"
 fi
 AC_SUBST(CROSS_COMPILING)
 
 if test "$build_os" = "cygwin"; then
-  EXEEXT_FOR_BUILD=.exe
+    EXEEXT_FOR_BUILD=.exe
 else
-  EXEEXT_FOR_BUILD=
+    EXEEXT_FOR_BUILD=
 fi
 AC_SUBST(EXEEXT_FOR_BUILD)
 
@@ -1311,8 +1313,8 @@ dnl check for required programs (grep, awk, sed, bash)
 dnl ===================================================================
 cat /dev/null > warn
 
-if test "$EUID" -eq "0"  -a "z`uname -o 2>/dev/null`" = "zCygwin" ; then
-   AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
+if test "z$EUID" = "z0" -a "z`uname -o 2>/dev/null`" = "zCygwin"; then
+    AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
 fi
 
 save_CC=$CC
@@ -1322,27 +1324,27 @@ AC_PROG_EGREP
 AC_PROG_AWK
 AC_PATH_PROG( AWK, $AWK)
 if test -z "$AWK"; then
-   AC_MSG_ERROR([install awk to run this script])
+    AC_MSG_ERROR([install awk to run this script])
 fi
 
 AC_PATH_PROGS(SED, sed )
 if test -z "$SED"; then
-   AC_MSG_ERROR([install sed to run this script])
+    AC_MSG_ERROR([install sed to run this script])
 fi
 
 AC_PATH_PROG(BASH, bash)
 if test -z "$BASH"; then
-   AC_MSG_ERROR([bash not found in \$PATH])
+    AC_MSG_ERROR([bash not found in \$PATH])
 fi
 AC_SUBST(BASH)
 
 AC_MSG_CHECKING([for GNU or BSD tar])
 for a in $GNUTAR gtar gnutar tar; do
-      $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
-      if test $? -eq 0;  then
-           GNUTAR=$a
-           break
-      fi
+    $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
+    if test $? -eq 0;  then
+        GNUTAR=$a
+        break
+    fi
 done
 AC_MSG_RESULT($GNUTAR)
 if test -z "$GNUTAR"; then
@@ -1361,186 +1363,220 @@ test_cups=yes
 test_fontconfig=yes
 
 case "$host_os" in
-    solaris*)
-        test_gtk=yes
-        build_gstreamer=yes
-        test_kde=yes
-        test_freetype=yes
-        test_gstreamer=yes
-        _os=SunOS
-        AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
-        if test -z "$GNUTAR"; then
-            AC_MSG_ERROR([gtar (GNU tar) not found but needed. Install it (Sun Freeware package).])
-        fi
-        AC_SUBST(GNUTAR)
 
-        dnl ===========================================================
-        dnl Check whether we're using Solaris 6,7,8 - SPARC or Intel.
-        dnl ===========================================================
-           AC_MSG_CHECKING([the Solaris operating system release])
-           _os_release=`echo $host_os | $SED -e s/solaris2\.//`
-        if test "$_os_release" -lt "6"; then
-                  AC_MSG_ERROR([use Solaris >= 6 to build LibreOffice])
-           else
-                  AC_MSG_RESULT([ok ($_os_release)])
-           fi
+solaris*)
+    test_gtk=yes
+    build_gstreamer=yes
+    test_kde=yes
+    test_freetype=yes
+    test_gstreamer=yes
+    _os=SunOS
+    AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
+    if test -z "$GNUTAR"; then
+        AC_MSG_ERROR([gtar (GNU tar) not found but needed. Install it (Sun Freeware package).])
+    fi
+    AC_SUBST(GNUTAR)
+
+    dnl ===========================================================
+    dnl Check whether we're using Solaris 6,7,8 - SPARC or Intel.
+    dnl ===========================================================
+    AC_MSG_CHECKING([the Solaris operating system release])
+    _os_release=`echo $host_os | $SED -e s/solaris2\.//`
+    if test "$_os_release" -lt "6"; then
+        AC_MSG_ERROR([use Solaris >= 6 to build LibreOffice])
+    else
+        AC_MSG_RESULT([ok ($_os_release)])
+    fi
 
-           dnl Check whether we're using a SPARC or i386 processor
-           AC_MSG_CHECKING([the processor type])
-           if test "$host_cpu" = "sparc" -o "$host_cpu" = "i386"; then
-                  AC_MSG_RESULT([ok ($host_cpu)])
-           else
-                  AC_MSG_ERROR([only SPARC and i386 processors are supported])
-           fi
-        ;;
-    linux-gnu*|k*bsd*-gnu*)
-        test_gtk=yes
-        build_gstreamer=yes
-        test_kde=yes
-        test_kde4=yes
-        test_freetype=yes
-        test_unix_quickstarter=yes
-        _os=Linux
-        ;;
-    gnu)
-        test_randr=no
-        test_cups=no
-        _os=GNU
-        ;;
-    cygwin*|interix*|mingw32*)
-
-        # When building on Windows normally with MSVC under Cygwin,
-        # configure thinks that the host platform (the platform the
-        # built code will run on) is Cygwin, even if it obviously is
-        # Windows, which in Autoconf terminology is called
-        # "mingw32". (Which is misleading as MinGW is the name of the
-        # tool-chain, not an operating system.)
-
-        # Somewhat confusing, yes. But this configure script doesn't
-        # look at $host etc that much, it mostly uses its own $_os
-        # variable, set here in this case statement.
-
-        # When cross-compiling to Windows from Unix, the host platform
-        # is "mingw32" (because in that case it is the MinGW
-        # tool-chain that is used).
-
-        test_cups=no
-        test_randr=no
-        test_freetype=no
-        test_fontconfig=no
-        _os=WINNT
-        # Confusingly, if the host OS matches "mingw32*", that means
-        # we are using the MinGW compiler, either natively (unlikely)
-        # or cross-compiling. We use WITH_MINGW to indicate
-        # use of MinGW in both cases.
-        case "$host_os" in
-            mingw32*)
-            WITH_MINGW=yes
-            ;;
-        esac
-        ;;
-    darwin*) # Mac OS X or iOS
-        test_gtk=yes
-        test_randr=no
-        test_freetype=no
-        test_fontconfig=no
-        if test "$host_cpu" = "arm"; then
-	    _os=iOS
-            test_gtk=no
-        else
-            _os=Darwin
-        fi
-        enable_systray=no
-        ;;
-    freebsd*)
-        test_gtk=yes
-        build_gstreamer=yes
-        test_kde=yes
-        test_kde4=yes
-        test_freetype=yes
-        AC_MSG_CHECKING([the FreeBSD operating system release])
-        if test -n "$with_os_version"; then
-            OSVERSION="$with_os_version"
-        else
-            OSVERSION=`/sbin/sysctl -n kern.osreldate`
-        fi
-        AC_MSG_RESULT([found OSVERSION=$OSVERSION])
-        AC_MSG_CHECKING([which thread library to use])
-        if test "$OSVERSION" -lt "500016"; then
-            PTHREAD_CFLAGS="-D_THREAD_SAFE"
-            PTHREAD_LIBS="-pthread"
-        elif test "$OSVERSION" -lt "502102"; then
-            PTHREAD_CFLAGS="-D_THREAD_SAFE"
-            PTHREAD_LIBS="-lc_r"
-        else
-            PTHREAD_CFLAGS=""
-            PTHREAD_LIBS="-pthread"
-        fi
-        AC_MSG_RESULT([$PTHREAD_LIBS])
-        _os=FreeBSD
-        ;;
-    *netbsd*)
-        test_gtk=yes
-        build_gstreamer=yes
-        test_kde=no
-        test_kde4=yes
-        test_freetype=yes
-        PTHREAD_LIBS="-pthread -lpthread"
-        _os=NetBSD
-        ;;
-    aix*)
-        test_cups=no
-        test_randr=no
-        test_freetype=yes
-        PTHREAD_LIBS=-pthread
-        _os=AIX
+    dnl Check whether we're using a SPARC or i386 processor
+    AC_MSG_CHECKING([the processor type])
+    if test "$host_cpu" = "sparc" -o "$host_cpu" = "i386"; then
+        AC_MSG_RESULT([ok ($host_cpu)])
+    else
+        AC_MSG_ERROR([only SPARC and i386 processors are supported])
+    fi
+    ;;
+
+linux-gnu*|k*bsd*-gnu*)
+    test_gtk=yes
+    build_gstreamer=yes
+    test_kde=yes
+    test_kde4=yes
+    test_freetype=yes
+    test_unix_quickstarter=yes
+    _os=Linux
+    ;;
+
+gnu)
+    test_randr=no
+    test_cups=no
+    _os=GNU
+     ;;
+
+cygwin*|interix*|mingw32*)
+
+    # When building on Windows normally with MSVC under Cygwin,
+    # configure thinks that the host platform (the platform the
+    # built code will run on) is Cygwin, even if it obviously is
+    # Windows, which in Autoconf terminology is called
+    # "mingw32". (Which is misleading as MinGW is the name of the
+    # tool-chain, not an operating system.)
+
+    # Somewhat confusing, yes. But this configure script doesn't
+    # look at $host etc that much, it mostly uses its own $_os
+    # variable, set here in this case statement.
+
+    # When cross-compiling to Windows from Unix, the host platform
+    # is "mingw32" (because in that case it is the MinGW
+    # tool-chain that is used).
+
+    test_cups=no
+    test_randr=no
+    test_freetype=no
+    test_fontconfig=no
+    _os=WINNT
+    # Confusingly, if the host OS matches "mingw32*", that means
+    # we are using the MinGW compiler, either natively (unlikely)
+    # or cross-compiling. We use WITH_MINGW to indicate
+    # use of MinGW in both cases.
+    case "$host_os" in
+
+    mingw32*)
+        WITH_MINGW=yes
         ;;
-    openbsd*)
-        test_gtk=yes
-        test_kde=yes
-        test_freetype=yes
+    esac
+    ;;
+
+darwin*) # Mac OS X or iOS
+    test_gtk=yes
+    test_randr=no
+    test_freetype=no
+    test_fontconfig=no
+    if test "$host_cpu" = "arm"; then
+        _os=iOS
+        test_gtk=no
+    else
+        _os=Darwin
+    fi
+    enable_systray=no
+;;
+
+freebsd*)
+    test_gtk=yes
+    build_gstreamer=yes
+    test_kde=yes
+    test_kde4=yes
+    test_freetype=yes
+    AC_MSG_CHECKING([the FreeBSD operating system release])
+    if test -n "$with_os_version"; then
+        OSVERSION="$with_os_version"
+    else
+        OSVERSION=`/sbin/sysctl -n kern.osreldate`
+    fi
+    AC_MSG_RESULT([found OSVERSION=$OSVERSION])
+    AC_MSG_CHECKING([which thread library to use])
+    if test "$OSVERSION" -lt "500016"; then
         PTHREAD_CFLAGS="-D_THREAD_SAFE"
         PTHREAD_LIBS="-pthread"
-        _os=OpenBSD
-        ;;
-    dragonfly*)
-        test_gtk=yes
-        build_gstreamer=yes
-        test_kde=yes
-        test_kde4=yes
-        test_freetype=yes
+    elif test "$OSVERSION" -lt "502102"; then
+        PTHREAD_CFLAGS="-D_THREAD_SAFE"
+        PTHREAD_LIBS="-lc_r"
+    else
+        PTHREAD_CFLAGS=""
         PTHREAD_LIBS="-pthread"
-        _os=DragonFly
-        ;;
-    androideabi*)
-        build_gstreamer=no
-	test_cups=no
-        test_fontconfig=no
-        test_freetype=no
-        test_gtk=no
-        test_kde=no
-        test_kde4=no
-        test_randr=no
-        test_unix_quickstarter=no
-        _os=Android
-        ;;
-   *)
-   AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice!])
-   ;;
+    fi
+    AC_MSG_RESULT([$PTHREAD_LIBS])
+    _os=FreeBSD
+    ;;
+
+*netbsd*)
+    test_gtk=yes
+    build_gstreamer=yes
+    test_kde=no
+    test_kde4=yes
+    test_freetype=yes
+    PTHREAD_LIBS="-pthread -lpthread"
+    _os=NetBSD
+    ;;
+
+aix*)
+    test_cups=no
+    test_randr=no
+    test_freetype=yes
+    PTHREAD_LIBS=-pthread
+    _os=AIX
+    ;;
+
+openbsd*)
+    test_gtk=yes
+    test_kde=yes
+    test_freetype=yes
+    PTHREAD_CFLAGS="-D_THREAD_SAFE"
+    PTHREAD_LIBS="-pthread"
+    _os=OpenBSD
+    ;;
+
+dragonfly*)
+    test_gtk=yes
+    build_gstreamer=yes
+    test_kde=yes
+    test_kde4=yes
+    test_freetype=yes
+    PTHREAD_LIBS="-pthread"
+    _os=DragonFly
+    ;;
+
+androideabi*)
+    build_gstreamer=no
+    test_cups=no
+    test_fontconfig=no
+    test_freetype=no
+    test_gtk=no
+    test_kde=no
+    test_kde4=no
+    test_randr=no
+    test_unix_quickstarter=no
+    _os=Android
+    ;;
+
+*)
+    AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice!])
+    ;;
 esac
 
+if test "$_os" = "AIX"; then
+    AC_PATH_PROG(GAWK, gawk)
+    if test -z "$GAWK"; then
+        AC_MSG_ERROR([gawk not found in \$PATH])
+    fi
+fi
+
 AC_SUBST(WITH_MINGW)
 AC_SUBST(OSVERSION)
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LIBS)
 
+dnl It is useful to have a BUILD_TYPE keyword to distinguish "normal"
+dnl desktop OSes from "mobile" ones.
+
+dnl We assume that a non-DESKTOP build type is also a non-NATIVE one.
+dnl In other words, that when building for an OS that is not a
+dnl "desktop" one but a "mobile" one, we are always cross-compiling.
+
+dnl Note the direction of the implication; there is no assumption that
+dnl cross-compiling would imply a non-desktop OS.
+
+if test $_os != iOS -a $_os != Android; then
+    BUILD_TYPE="$BUILD_TYPE DESKTOP"
+fi
+
 if test $build_os = "cygwin"; then
-   dnl ===================================================================
-   dnl If $CC is set to a MinGW compiler, set WITH_MINGW
-   dnl ===================================================================
-   if test "$WITH_MINGW" != "yes" -a -n "$CC" -a "`$CC -dumpmachine 2>/dev/null | $SED -e 's/^.*-//'`" = "mingw32"; then
-      WITH_MINGW="yes"
-   fi
+    dnl ===================================================================
+    dnl If $CC is set to a MinGW compiler, set WITH_MINGW
+    dnl ===================================================================
+    if test "$WITH_MINGW" != "yes" -a -n "$CC" -a "`$CC -dumpmachine 2>/dev/null | $SED -e 's/^.*-//'`" = "mingw32"; then
+        WITH_MINGW="yes"
+    fi
 fi
 
 dnl ===================================================================
@@ -1549,12 +1585,12 @@ dnl and g++ to build guw.exe although MSVC or MinGW is used to
 dnl build LibreOffice.
 dnl ===================================================================
 if test "build_os" = "cygwin" ; then
-   AC_MSG_CHECKING([for Cygwin gcc/g++])
-   if which gcc > /dev/null && which g++ > /dev/null ; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([Cygwin gcc and g++ are needed, please install them.])
-   fi
+    AC_MSG_CHECKING([for Cygwin gcc/g++])
+    if which gcc > /dev/null && which g++ > /dev/null ; then
+        AC_MSG_RESULT([found])
+    else
+        AC_MSG_ERROR([Cygwin gcc and g++ are needed, please install them.])
+    fi
 fi
 
 dnl ===================================================================
@@ -1564,12 +1600,12 @@ dnl ===================================================================
 GCC_HOME_SET="true"
 AC_MSG_CHECKING([gcc home])
 if test -z "$with_gcc_home"; then
-   if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
-      GCC_HOME="/opt/icecream"
-   else
-      GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
-      GCC_HOME_SET="false"
-   fi
+    if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+        GCC_HOME="/opt/icecream"
+    else
+        GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
+        GCC_HOME_SET="false"
+    fi
 else
     GCC_HOME="$with_gcc_home"
 fi
@@ -1577,17 +1613,17 @@ AC_MSG_RESULT($GCC_HOME)
 AC_SUBST(GCC_HOME)
 
 if test "$GCC_HOME_SET" = "true" ; then
-   if test -z "$CC"; then
-      CC="$GCC_HOME/bin/gcc"
-   fi
-   if test -z "$CXX"; then
-      CXX="$GCC_HOME/bin/g++"
-   fi
+    if test -z "$CC"; then
+        CC="$GCC_HOME/bin/gcc"
+    fi
+    if test -z "$CXX"; then
+        CXX="$GCC_HOME/bin/g++"
+    fi
 fi
 
 dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
 if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-   AC_PROG_CC
+    AC_PROG_CC
 fi
 
 COMPATH=`dirname "$CC"`
@@ -1603,52 +1639,45 @@ dnl  Test the gcc version,  3 is OK
 dnl ===================================================================
 if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$GCC" = "yes"; then
     AC_MSG_CHECKING([the GNU C compiler version])
-   _gcc_version=`$CC -dumpversion`
-   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
-   GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
-   if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
-      if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
-         export CC=$GCC_HOME/bin/gcc-4.0
-          dnl  export CC to have it available in set_soenv -> config.guess
-         GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-         if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
-            GCCVER=$GCCVER2
-         fi
-      fi
-      if test "$GCCVER" -ge "040100" ; then
-         AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly])
-      else
-         AC_MSG_RESULT([implicitly using CC=$CC])
-      fi
-   else
-      AC_MSG_RESULT([checked (gcc $_gcc_version)])
-   fi
-   if test "$_os" = "SunOS"; then
-      AC_MSG_CHECKING([gcc linker])
-      if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
-          AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris])
-      fi
-      AC_MSG_RESULT([ok (GNU ld)])
-   fi
+    _gcc_version=`$CC -dumpversion`
+    _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
+    GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+
+    if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
+        if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
+            export CC=$GCC_HOME/bin/gcc-4.0
+            dnl  export CC to have it available in set_soenv -> config.guess
+            GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+            if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
+                GCCVER=$GCCVER2
+            fi
+        fi
+        if test "$GCCVER" -ge "040100" ; then
+            AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly])
+        else
+            AC_MSG_RESULT([implicitly using CC=$CC])
+        fi
+    else
+        AC_MSG_RESULT([checked (gcc $_gcc_version)])
+    fi
 fi
 
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
-   AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
-   bsymbolic_functions_ldflags_save=$LDFLAGS
-   LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
-   AC_LINK_IFELSE([AC_LANG_PROGRAM([
-   #include <stdio.h>
-   ],[
-    printf ("hello world\n");
-   ])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
-   if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
-     AC_MSG_RESULT( found )
-   else
-     AC_MSG_RESULT( not found )
-   fi
-   LDFLAGS=$bsymbolic_functions_ldflags_save
+    AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
+    bsymbolic_functions_ldflags_save=$LDFLAGS
+    LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <stdio.h>
+        ],[
+printf ("hello world\n");
+        ])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
+    if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
+        AC_MSG_RESULT( found )
+    else
+        AC_MSG_RESULT( not found )
+    fi
+    LDFLAGS=$bsymbolic_functions_ldflags_save
 fi
 AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
 
@@ -1659,26 +1688,27 @@ dnl ===================================================================
 
 m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
 if test "$cross_compiling" = "yes"; then
-  AC_MSG_CHECKING([for BUILD platform configuration])
-  echo
-  rm -rf CONF-FOR-BUILD Env.Build.sh
-  mkdir CONF-FOR-BUILD
-  tar cf - \
-	configure \
-	config.guess \
-	oowintool \
-	solenv/inc/minor.mk \
-	solenv/inc/postset.mk \
-	solenv/inc/langlist.mk \
-	set_soenv.in \
-	bootstrap.1 \
-	post_download.in \
-	ooo.lst.in \
-	Makefile.in \
-	bin/repo-list.in | (cd CONF-FOR-BUILD && tar xf -)
-  (
+    AC_MSG_CHECKING([for BUILD platform configuration])
+    echo
+    rm -rf CONF-FOR-BUILD Env.Build.sh
+    mkdir CONF-FOR-BUILD
+    tar cf - \
+        configure \
+        config.guess \
+        oowintool \
+        solenv/inc/minor.mk \
+        solenv/inc/postset.mk \
+        solenv/inc/langlist.mk \
+        set_soenv.in \
+        bootstrap.1 \
+        post_download.in \
+        ooo.lst.in \
+        Makefile.in \
+        bin/repo-list.in | (cd CONF-FOR-BUILD && tar xf -)
+    (
     unset COM GUI GUIBASE OS CPU CPUNAME
     unset CC CXX SYSBASE CFLAGS
+    unset PYTHON_CFLAGS PYTHON_LIBS
     unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
     test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
     test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"
@@ -1689,42 +1719,43 @@ if test "$cross_compiling" = "yes"; then
     test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
     test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION"
     ./configure \
-	--disable-mozilla \
-	--disable-build-mozilla \
+        --disable-mozilla \
+        --disable-build-mozilla \
+        --disable-zenity \
         $sub_conf_opts \
-	2>&1 | sed -e 's/^/    /'
+        2>&1 | sed -e 's/^/    /'
     test -f ./*Env.Set.sh 2>/dev/null || exit
     cp *Env.Set.sh ../Env.Build.sh
     . ./*Env.Set.sh
     for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
              SYSTEM_LIBXSLT; do
-      VV='$'$V
-      VV=`eval "echo $VV"`
-      if test -n "$VV"; then
-	line=${V}_FOR_BUILD='${'${V}_FOR_BUILD:-$VV'}'
-        echo "$line" >>build-config
-      fi
+        VV='$'$V
+        VV=`eval "echo $VV"`
+        if test -n "$VV"; then
+            line=${V}_FOR_BUILD='${'${V}_FOR_BUILD:-$VV'}'
+            echo "$line" >>build-config
+        fi
     done
 
     for V in OUTDIR PATH SOLARINC SOLARLIB WORKDIR; do
-      VV='$'$V
-      VV=`eval "echo $VV"`
-      VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
-      if test -n "$VV"; then
-	line="${V}_FOR_BUILD='$VV'"
-        echo "$line" >>build-config
-      fi
+        VV='$'$V
+        VV=`eval "echo $VV"`
+        VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
+        if test -n "$VV"; then
+            line="${V}_FOR_BUILD='$VV'"
+            echo "$line" >>build-config
+        fi
     done
-  )
-  test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
-  test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
-  perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
-  eval `cat CONF-FOR-BUILD/build-config`
-  AC_MSG_RESULT([checking for BUILD platform configuration... done])
-  rm -rf CONF-FOR-BUILD
+    )
+    test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
+    test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
+    perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
+    eval `cat CONF-FOR-BUILD/build-config`
+    AC_MSG_RESULT([checking for BUILD platform configuration... done])
+    rm -rf CONF-FOR-BUILD
 else
-  CC_FOR_BUILD="$CC"
-  CXX_FOR_BUILD="$CXX"
+    CC_FOR_BUILD="$CC"
+    CXX_FOR_BUILD="$CXX"
 fi
 AC_SUBST(COM_FOR_BUILD)
 AC_SUBST(GUI_FOR_BUILD)
@@ -1747,13 +1778,13 @@ AC_SUBST(SOLARLIB_FOR_BUILD)
 AC_SUBST(WORKDIR_FOR_BUILD)
 
 if test -e solenv/inc/minor.mk; then
-   # Get UPD number from ./solenv/inc/minor.mk
-   UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-   AC_SUBST(UPD)
-   SOURCEVERSION="`grep SOURCEVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-   AC_SUBST(SOURCEVERSION)
+    # Get UPD number from ./solenv/inc/minor.mk
+    UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+    AC_SUBST(UPD)
+    SOURCEVERSION="`grep SOURCEVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+    AC_SUBST(SOURCEVERSION)
 else
-   AC_MSG_ERROR([solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
+    AC_MSG_ERROR([solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
 fi
 
 dnl ===================================================================
@@ -1761,12 +1792,12 @@ dnl Set the ENABLE_CRASHDUMP variable.
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable crashdump feature])
 if test "$enable_crashdump" = "yes"; then
-   ENABLE_CRASHDUMP="TRUE"
-   BUILD_TYPE="$BUILD_TYPE CRASHREP"
-   AC_MSG_RESULT([yes])
+    ENABLE_CRASHDUMP="TRUE"
+    BUILD_TYPE="$BUILD_TYPE CRASHREP"
+    AC_MSG_RESULT([yes])
 else
-   ENABLE_CRASHDUMP=""
-   AC_MSG_RESULT([no])
+    ENABLE_CRASHDUMP=""
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_CRASHDUMP)
 
@@ -1776,64 +1807,71 @@ dnl Windows specific tests and stuff
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
 
-   dnl Include twain scanners
-   BUILD_TYPE="$BUILD_TYPE TWAIN"
-
-   dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
-   AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
-   if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
-      CL_X64=""
-      AC_MSG_RESULT([no])
-   else
-      CL_X64="TRUE"
-      AC_MSG_RESULT([yes])
-   fi
-   AC_SUBST(CL_X64)
-
-   AC_MSG_CHECKING([whether to use DirectX])
-   if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then
-      ENABLE_DIRECTX="TRUE"
-      AC_MSG_RESULT([yes])
-   else
-      ENABLE_DIRECTX=""
-      AC_MSG_RESULT([no])
-   fi
-   AC_SUBST(ENABLE_DIRECTX)
-
-   AC_MSG_CHECKING([whether to use ActiveX])
-   if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
-      DISABLE_ACTIVEX=""
-      AC_MSG_RESULT([yes])
-   else
-      DISABLE_ACTIVEX="TRUE"
-      AC_MSG_RESULT([no])
-   fi
-   AC_SUBST(DISABLE_ACTIVEX)
-
-   AC_MSG_CHECKING([whether to use ATL])
-   if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
-      DISABLE_ATL=""
-      AC_MSG_RESULT([yes])
-   else
-      DISABLE_ATL="TRUE"
-      AC_MSG_RESULT([no])
-   fi
-   AC_SUBST(DISABLE_ATL)
+    dnl Include twain scanners
+    BUILD_TYPE="$BUILD_TYPE TWAIN"
+
+    dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
+    AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
+    if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
+        CL_X64=""
+        AC_MSG_RESULT([no])
+    else
+        CL_X64="TRUE"
+        AC_MSG_RESULT([yes])
+    fi
+    AC_SUBST(CL_X64)
 
+    AC_MSG_CHECKING([whether to use DirectX])
+    if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then
+        ENABLE_DIRECTX="TRUE"
+        AC_MSG_RESULT([yes])
+    else
+        ENABLE_DIRECTX=""
+        AC_MSG_RESULT([no])
+    fi
+    AC_SUBST(ENABLE_DIRECTX)
+
+    AC_MSG_CHECKING([whether to use ActiveX])
+    if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
+        DISABLE_ACTIVEX=""
+        AC_MSG_RESULT([yes])
+    else
+        DISABLE_ACTIVEX="TRUE"
+        AC_MSG_RESULT([no])
+    fi
+    AC_SUBST(DISABLE_ACTIVEX)
+
+    AC_MSG_CHECKING([whether to use ATL])
+    if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE"; then
+        DISABLE_ATL=""
+        AC_MSG_RESULT([yes])
+    elif test "$enable_atl" = ""; then
+        if test "$WITH_MINGW" = "yes"; then
+            DISABLE_ATL="TRUE"
+            AC_MSG_RESULT([no])
+        else
+            DISABLE_ATL=""
+            AC_MSG_RESULT([yes])
+        fi
+    else
+        DISABLE_ATL="TRUE"
+        AC_MSG_RESULT([no])
+    fi
+    AC_SUBST(DISABLE_ATL)
 fi
 
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to turn warnings to errors])
 if test -n "$enable_werror" && test "$enable_werror" != "no"; then
-   ENABLE_WERROR="TRUE"
-   AC_MSG_RESULT([yes])
-   AC_MSG_WARN([Turning warnings to errors has no effect in modules or])
-   AC_MSG_WARN([on platforms where it has been disabled explicitly])
-   echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitly" >> warn
+    ENABLE_WERROR="TRUE"
+    AC_MSG_RESULT([yes])
+    AC_MSG_WARN([Turning warnings to errors has no effect in modules or])
+    AC_MSG_WARN([on platforms where it has been disabled explicitly])
+    echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitly" >> warn
 else
-   ENABLE_WERROR="FALSE"
-   AC_MSG_RESULT([no])
+    ENABLE_WERROR="FALSE"
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_WERROR)
 
@@ -1841,28 +1879,31 @@ dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to do a debug build])
 if test -n "$enable_debug" && test "$enable_debug" != "no"; then
-   ENABLE_DEBUG="TRUE"
-   enable_symbols="yes"
-   AC_MSG_RESULT([yes])
+    ENABLE_DEBUG="TRUE"
+    ENABLE_DEBUG_STL="TRUE"
+    enable_symbols="yes"
+    AC_MSG_RESULT([yes])
 else
-   ENABLE_DEBUG="FALSE"
-   AC_MSG_RESULT([no])
+    ENABLE_DEBUG="FALSE"
+    ENABLE_DEBUG_STL="FALSE"
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(ENABLE_DEBUG_STL)
 
 dnl Set the ENABLE_DBGUTIL variable
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build with additional debug utilities])
 if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
-   PROEXT=""
-   PRODUCT=""
-   PROFULLSWITCH=""
-   AC_MSG_RESULT([yes])
+    PROEXT=""
+    PRODUCT=""
+    PROFULLSWITCH=""
+    AC_MSG_RESULT([yes])
 else
-   PRODUCT="full"
-   PROFULLSWITCH="product=full"
-   PROEXT=".pro"
-   AC_MSG_RESULT([no, full product build])
+    PRODUCT="full"
+    PROFULLSWITCH="product=full"
+    PROEXT=".pro"
+    AC_MSG_RESULT([no, full product build])
 fi
 AC_SUBST(PRODUCT)
 AC_SUBST(PROFULLSWITCH)
@@ -1872,11 +1913,11 @@ dnl whether to include symbols into final build.
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include symbols])
 if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-   ENABLE_SYMBOLS="TRUE"
-   AC_MSG_RESULT([yes])
+    ENABLE_SYMBOLS="TRUE"
+    AC_MSG_RESULT([yes])
 else
-   ENABLE_SYMBOLS=
-   AC_MSG_RESULT([no])
+    ENABLE_SYMBOLS=
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_SYMBOLS)
 
@@ -1884,16 +1925,16 @@ dnl Determine if the solver is to be stripped or not.
 dnl ===================================================================
 AC_MSG_CHECKING([whether to strip the solver or not.])
 if test "z$enable_strip_solver" = "zno"; then
-   DISABLE_STRIP="TRUE"
-   AC_MSG_RESULT([no])
+    DISABLE_STRIP="TRUE"
+    AC_MSG_RESULT([no])
 else
-   if test -n "$ENABLE_SYMBOLS"; then
-      DISABLE_STRIP="TRUE"
-      AC_MSG_RESULT([no])
-   else
-      DISABLE_STRIP=
-      AC_MSG_RESULT([yes])
-   fi
+    if test -n "$ENABLE_SYMBOLS"; then
+        DISABLE_STRIP="TRUE"
+        AC_MSG_RESULT([no])
+    else
+        DISABLE_STRIP=
+        AC_MSG_RESULT([yes])
+    fi
 fi
 AC_SUBST(DISABLE_STRIP)
 
@@ -1901,29 +1942,29 @@ dnl check for cups support
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable native cups support])
 if test "$test_cups" = "yes" -a "z$enable_cups" != "zno"; then
-   ENABLE_CUPS="TRUE"
-   AC_MSG_RESULT([yes])
-   AC_CHECK_LIB(cups, cupsPrintFiles)
-   AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
-   if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a "$ac_cv_header_cups_cups_h" != "yes"; then
+    ENABLE_CUPS="TRUE"
+    AC_MSG_RESULT([yes])
+    AC_CHECK_LIB(cups, cupsPrintFiles)
+    AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
+    if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a "$ac_cv_header_cups_cups_h" != "yes"; then
         AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or cups???-devel.])
-   fi
+    fi
 else
-   ENABLE_CUPS=""
-   AC_MSG_RESULT([no])
+    ENABLE_CUPS=""
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_CUPS)
 
 
 # check for fontconfig support
-AC_MSG_CHECKING([whether to enable fontconfig support])
-if test "z$test_fontconfig" = "zyes" -a "z$enable_fontconfig" != "no"; then
-   ENABLE_FONTCONFIG="TRUE"
-   AC_MSG_RESULT([yes])
-   PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
+AC_MSG_CHECKING([whether we need fontconfig])
+if test "z$test_fontconfig" = "zyes"; then
+    ENABLE_FONTCONFIG="TRUE"
+    AC_MSG_RESULT([yes])
+    PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
 else
-   ENABLE_FONTCONFIG=""
-   AC_MSG_RESULT([no])
+    ENABLE_FONTCONFIG=""
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_FONTCONFIG)
 AC_SUBST(FONTCONFIG_CFLAGS)
@@ -1932,13 +1973,12 @@ AC_SUBST(FONTCONFIG_LIBS)
 dnl whether to find & fetch external tarballs?
 dnl ===================================================================
 if test -z "$TARFILE_LOCATION"; then
-   TARFILE_LOCATION="DEFAULT"
+    TARFILE_LOCATION="DEFAULT"
 fi
 AC_SUBST(TARFILE_LOCATION)
 
-if test "z$enable_fetch_external" != "zno" \
-   && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
-   DO_FETCH_TARBALLS="YES"
+if test "z$enable_fetch_external" != "zno" ; then
+    DO_FETCH_TARBALLS="YES"
 fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
@@ -1951,23 +1991,23 @@ dnl Disable legacy binary file formats filters
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
 if test "$enable_binfilter" = "no"; then
-   WITH_BINFILTER="NO"
-   AC_MSG_RESULT([no])
+    WITH_BINFILTER="NO"
+    AC_MSG_RESULT([no])
 else
-   WITH_BINFILTER="YES"
-   BUILD_TYPE="$BUILD_TYPE BINFILTER"
-   AC_MSG_RESULT([yes])
+    WITH_BINFILTER="YES"
+    BUILD_TYPE="$BUILD_TYPE BINFILTER"
+    AC_MSG_RESULT([yes])
 fi
 AC_SUBST(WITH_BINFILTER)
 
 dnl Enable ugly pieces of code we're better off without
 dnl ===================================================================
 if test "$enable_ugly" = "yes"; then
-  BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
-  SCPDEFS="$SCPDEFS -DWITH_UGLY"
-  ENABLE_UGLY=YES
+    BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
+    SCPDEFS="$SCPDEFS -DWITH_UGLY"
+    ENABLE_UGLY=YES
 else
-  ENABLE_UGLY=NO
+    ENABLE_UGLY=NO
 fi
 AC_SUBST(ENABLE_UGLY)
 
@@ -1976,9 +2016,9 @@ dnl Disable rpath in shared libraries?
 dnl ===================================================================
 AC_MSG_CHECKING([whether to use RPATH in shared libraries])
 if test "$enable_rpath" = "no"; then
-   ENABLE_RPATH="no"
+    ENABLE_RPATH="no"
 else
-   ENABLE_RPATH="yes"
+    ENABLE_RPATH="yes"
 fi
 AC_MSG_RESULT([$ENABLE_RPATH])
 AC_SUBST(ENABLE_RPATH)
@@ -1987,12 +2027,12 @@ dnl Test whether to include MySpell dictionaries
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include MySpell dictionaries])
 if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then
-  AC_MSG_RESULT([yes])
-  WITH_MYSPELL_DICTS=YES
-  BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
+    AC_MSG_RESULT([yes])
+    WITH_MYSPELL_DICTS=YES
+    BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
 else
-  AC_MSG_RESULT([no])
-  WITH_MYSPELL_DICTS=NO
+    AC_MSG_RESULT([no])
+    WITH_MYSPELL_DICTS=NO
 fi
 AC_SUBST(WITH_MYSPELL_DICTS)
 
@@ -2022,8 +2062,8 @@ if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
     fi
     AC_MSG_RESULT([$THES_SYSTEM_DIR])
 else
-        AC_MSG_RESULT([no])
-        SYSTEM_DICTS=NO
+    AC_MSG_RESULT([no])
+    SYSTEM_DICTS=NO
 fi
 AC_SUBST(SYSTEM_DICTS)
 AC_SUBST(DICT_SYSTEM_DIR)
@@ -2035,20 +2075,20 @@ dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable pch feature])
 if test -n "$enable_pch" && test "$enable_pch" != "no"; then
-   if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-       ENABLE_PCH="TRUE"
-       AC_MSG_RESULT([yes])
+    if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
+        ENABLE_PCH="TRUE"
+        AC_MSG_RESULT([yes])
 dnl There is no PCH support in GCC versions prior to this
-   elif test "$GCC" = "yes"; then
-       ENABLE_PCH="TRUE"
-       AC_MSG_RESULT([yes])
-   else
-       ENABLE_PCH=""
-       AC_MSG_WARN([Precompiled header not yet supported for your platform/compiler])
-   fi
-else
-   ENABLE_PCH=""
-   AC_MSG_RESULT([no])
+    elif test "$GCC" = "yes"; then
+        ENABLE_PCH="TRUE"
+        AC_MSG_RESULT([yes])
+    else
+        ENABLE_PCH=""
+        AC_MSG_WARN([Precompiled header not yet supported for your platform/compiler])
+    fi
+else
+    ENABLE_PCH=""
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_PCH)
 
@@ -2057,11 +2097,11 @@ dnl Search all the common names for GNU make
 dnl ===================================================================
 AC_MSG_CHECKING([for GNU make])
 for a in "$MAKE" $GNUMAKE make gmake gnumake; do
-      $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
-      if test $? -eq 0;  then
-           GNUMAKE=$a
-           break
-      fi
+    $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
+    if test $? -eq 0;  then
+        GNUMAKE=$a
+        break
+    fi
 done
 AC_MSG_RESULT($GNUMAKE)
 if test -z "$GNUMAKE"; then
@@ -2074,7 +2114,7 @@ _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 if test "$_make_longver" -ge "038100" ; then
     AC_MSG_RESULT([$GNUMAKE $_make_version])
 else
-   AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
+    AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
 fi
 AC_SUBST(GNUMAKE)
 
@@ -2082,64 +2122,65 @@ dnl ===================================================================
 dnl  Test the Solaris compiler version
 dnl ===================================================================
 if test "$_os" = "SunOS"; then
-   if test "$CC" = "cc"; then
-      AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-      AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
-      dnl cc -V outputs to standard error!!!!
-      _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | $SED -e 's/.* C //'`
-      _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
-      _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
-      if test "$_sunstudio_major" != "5"; then
-         AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
-      else
-         _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
-         if test "$_sunstudio_minor" = "false"; then
+    if test "$CC" = "cc"; then
+        AC_PATH_PROGS(_cc, cc)
+        COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
+        AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
+        dnl cc -V outputs to standard error!!!!
+        _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | $SED -e 's/.* C //'`
+        _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
+        _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
+        if test "$_sunstudio_major" != "5"; then
             AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
-         else
-            dnl compiler will do
-            AC_MSG_RESULT([checked])
-         fi
-      fi
-   fi
+        else
+            _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
+            if test "$_sunstudio_minor" = "false"; then
+                AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
+            else
+                dnl compiler will do
+                AC_MSG_RESULT([checked])
+            fi
+        fi
+    fi
 fi
 
 HAVE_LD_HASH_STYLE=FALSE
 WITH_LINKER_HASH_STYLE=
 AC_MSG_CHECKING( for --hash-style gcc linker support )
 if test "$GCC" = "yes" ; then
-   if test -z "$with_linker_hash_style" -o "$with_linker_hash_style" = "yes" ; then
-      hash_styles="gnu sysv"
-   elif test "$with_linker_hash_style" = "no" ; then
-      hash_styles=
-   else
-      hash_styles="$with_linker_hash_style"
-   fi
-
-   for hash_style in $hash_styles ; do
-      test "$HAVE_LD_HASH_STYLE" = "TRUE" && continue
-      hash_style_ldflags_save=$LDFLAGS
-      LDFLAGS="$LDFLAGS -Wl,--hash-style=$hash_style"
-
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([
-	  #include <stdio.h>
-	],[
-	  printf ("");
-	])],
-	[ if ./conftest$EXEEXT; then
-	    HAVE_LD_HASH_STYLE=TRUE
-	    WITH_LINKER_HASH_STYLE=$hash_style
-          fi],
-	[HAVE_LD_HASH_STYLE=FALSE])
-       LDFLAGS=$hash_style_ldflags_save
-   done
-
-   if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then
-     AC_MSG_RESULT( $WITH_LINKER_HASH_STYLE )
-   else
-     AC_MSG_RESULT( no )
-   fi
-   LDFLAGS=$hash_style_ldflags_save
+    if test -z "$with_linker_hash_style" -o "$with_linker_hash_style" = "yes" ; then
+        hash_styles="gnu sysv"
+    elif test "$with_linker_hash_style" = "no" ; then
+        hash_styles=
+    else
+        hash_styles="$with_linker_hash_style"
+    fi
+
+    for hash_style in $hash_styles ; do
+        test "$HAVE_LD_HASH_STYLE" = "TRUE" && continue
+        hash_style_ldflags_save=$LDFLAGS
+        LDFLAGS="$LDFLAGS -Wl,--hash-style=$hash_style"
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM(
+            [
+#include <stdio.h>
+            ],[
+printf ("");
+            ])],
+            [ if ./conftest$EXEEXT; then
+                  HAVE_LD_HASH_STYLE=TRUE
+                  WITH_LINKER_HASH_STYLE=$hash_style
+              fi],
+            [HAVE_LD_HASH_STYLE=FALSE])
+        LDFLAGS=$hash_style_ldflags_save
+    done
+
+    if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then
+        AC_MSG_RESULT( $WITH_LINKER_HASH_STYLE )
+    else
+        AC_MSG_RESULT( no )
+    fi
+    LDFLAGS=$hash_style_ldflags_save
 else
     AC_MSG_RESULT( no )
 fi
@@ -2150,15 +2191,15 @@ dnl ===================================================================
 dnl Check whether there's a Perl version available.
 dnl ===================================================================
 if test -z "$with_perl_home"; then
-   AC_PATH_PROG(PERL, perl)
+    AC_PATH_PROG(PERL, perl)
 else
-   test "$build_os" = "cygwin" && with_perl_home=`cygpath -u "$with_perl_home"`
-   _perl_path="$with_perl_home/bin/perl"
-   if test -x "$_perl_path"; then
-      PERL=$_perl_path
-   else
-      AC_MSG_ERROR([$_perl_path not found])
-   fi
+    test "$build_os" = "cygwin" && with_perl_home=`cygpath -u "$with_perl_home"`
+    _perl_path="$with_perl_home/bin/perl"
+    if test -x "$_perl_path"; then
+        PERL=$_perl_path
+    else
+        AC_MSG_ERROR([$_perl_path not found])
+    fi
 fi
 
 dnl ===================================================================
@@ -2166,15 +2207,15 @@ dnl Testing for Perl version 5 or greater.
 dnl $] is the Perl version variable, it is returned as an integer
 dnl ===================================================================
 if test "$PERL"; then
-   AC_MSG_CHECKING([the Perl version])
-   ${PERL} -e "exit($]);"
-   _perl_version=$?
-   if test "$_perl_version" -lt 5; then
-      AC_MSG_ERROR([found Perl version "$_perl_version", use version 5 of Perl])
-   fi
-   AC_MSG_RESULT([checked (perl $_perl_version)])
+    AC_MSG_CHECKING([the Perl version])
+    ${PERL} -e "exit($]);"
+    _perl_version=$?
+    if test "$_perl_version" -lt 5; then
+        AC_MSG_ERROR([found Perl version "$_perl_version", use version 5 of Perl])
+    fi
+    AC_MSG_RESULT([checked (perl $_perl_version)])
 else
-   AC_MSG_ERROR([Perl not found, install version 5 of Perl])
+    AC_MSG_ERROR([Perl not found, install version 5 of Perl])
 fi
 AC_SUBST(PERL)
 
@@ -2183,7 +2224,7 @@ dnl Testing for required Perl modules
 dnl ===================================================================
 
 AC_MSG_CHECKING([for required Perl modules])
-if `$PERL -e 'use Archive::Zip;'`; then
+if `$PERL -e 'use Archive::Zip; use Cwd;'`; then
     AC_MSG_RESULT([all modules found])
 else
     AC_MSG_ERROR([Failed to find some modules])
@@ -2284,7 +2325,7 @@ if test "$_os" = "WINNT"; then
             export INCLUDE=`cygpath -d "$COMPATH/Include"`
             dnl  Check which Microsoft C/C++ compiler is found
             AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
-	    # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
+            # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
             CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
                             x = match( \\\$0, /..\\...\\...../ )
                             CCversion = substr( \\\$0, RSTART, RLENGTH)
@@ -2320,52 +2361,52 @@ if test "$_os" = "WINNT"; then
             AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
         fi
 
-	# Check for 64-bit (cross-)compiler to use to build the 64-bit
-	# version of the Explorer extension (and maybe other small
-	# bits, too) needed when installing a 32-bit LibreOffice on a
-	# 64-bit OS. The 64-bit Explorer extension is a feature that
-	# has been present since long in OOo. Don't confuse it with
-	# building LibreOffice itself as 64-bit code, which is
-	# unfished work and highly experimental.
-
-	BUILD_X64=
-	CC_X64_BINARY=
-	LINK_X64_BINARY=
-	LIBMGR_X64_BINARY=
-
-	if test "$CL_X64" = ""; then
-	    AC_MSG_CHECKING([for a x64 compiler])
-
-	    # Prefer native x64 compiler to cross-compiler, in case we are running
-	    # the build on a 64-bit OS.
-	    if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
-		BUILD_X64=TRUE
-		CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
-		CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
-		LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
-		LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
-	    elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
-		BUILD_X64=TRUE
-		CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
-		CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
-		LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
-		LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
-	    fi
-	    if test "$BUILD_X64" = TRUE; then
-		AC_MSG_RESULT([found])
-	    else
-		AC_MSG_RESULT([not found])
-		AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
-	    fi
-	fi
-	AC_SUBST(BUILD_X64)
-
-	# These are passed to the environment through set_soenv.in as usual, and then
-	# used in set_wntx64.mk
-	AC_SUBST(CC_X64_BINARY)
-	AC_SUBST(CXX_X64_BINARY)
-	AC_SUBST(LINK_X64_BINARY)
-	AC_SUBST(LIBMGR_X64_BINARY)
+        # Check for 64-bit (cross-)compiler to use to build the 64-bit
+        # version of the Explorer extension (and maybe other small
+        # bits, too) needed when installing a 32-bit LibreOffice on a
+        # 64-bit OS. The 64-bit Explorer extension is a feature that
+        # has been present since long in OOo. Don't confuse it with
+        # building LibreOffice itself as 64-bit code, which is
+        # unfished work and highly experimental.
+
+        BUILD_X64=
+        CC_X64_BINARY=
+        LINK_X64_BINARY=
+        LIBMGR_X64_BINARY=
+
+        if test "$CL_X64" = ""; then
+            AC_MSG_CHECKING([for a x64 compiler])
+
+            # Prefer native x64 compiler to cross-compiler, in case we are running
+            # the build on a 64-bit OS.
+            if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+                BUILD_X64=TRUE
+                CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+                CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+                LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
+                LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
+            elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
+                BUILD_X64=TRUE
+                CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+                CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+                LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
+                LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
+            fi
+            if test "$BUILD_X64" = TRUE; then
+                AC_MSG_RESULT([found])
+            else
+                AC_MSG_RESULT([not found])
+                AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
+            fi
+        fi
+        AC_SUBST(BUILD_X64)
+
+        # These are passed to the environment through set_soenv.in as usual, and then
+        # used in set_wntx64.mk
+        AC_SUBST(CC_X64_BINARY)
+        AC_SUBST(CXX_X64_BINARY)
+        AC_SUBST(LINK_X64_BINARY)
+        AC_SUBST(LIBMGR_X64_BINARY)
 
     else
         AC_MSG_CHECKING([the compiler is MinGW])
@@ -2396,19 +2437,19 @@ fi
 
 if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
 
-   # If you use CC=/path/to/compiler/foo-gcc or even CC="ccache
-   # /path/to/compiler/foo-gcc" you need to set the AR etc env vars
-   # explicitly. Or put /path/to/compiler in PATH yourself.
+    # If you use CC=/path/to/compiler/foo-gcc or even CC="ccache
+    # /path/to/compiler/foo-gcc" you need to set the AR etc env vars
+    # explicitly. Or put /path/to/compiler in PATH yourself.
 
-   AC_CHECK_TOOL(AR,ar)
-   AC_CHECK_TOOL(NM,nm)
-   AC_CHECK_TOOL(OBJDUMP,objdump)
-   AC_CHECK_TOOL(RANLIB,ranlib)
-   AC_CHECK_TOOL(STRIP,strip)
-   if test "$_os" = "WINNT"; then
-      AC_CHECK_TOOL(DLLTOOL,dlltool)
-      AC_CHECK_TOOL(WINDRES,windres)
-   fi
+    AC_CHECK_TOOL(AR,ar)
+    AC_CHECK_TOOL(NM,nm)
+    AC_CHECK_TOOL(OBJDUMP,objdump)
+    AC_CHECK_TOOL(RANLIB,ranlib)
+    AC_CHECK_TOOL(STRIP,strip)
+    if test "$_os" = "WINNT"; then
+        AC_CHECK_TOOL(DLLTOOL,dlltool)
+        AC_CHECK_TOOL(WINDRES,windres)
+    fi
 fi
 AC_SUBST(AR)
 AC_SUBST(DLLTOOL)
@@ -2424,18 +2465,18 @@ dnl pkg-config checks on Mac OS X
 dnl ===================================================================
 
 if test $_os = Darwin; then
-   AC_MSG_CHECKING([for bogus pkg-config])
-   if test -n "$PKG_CONFIG"; then
-      if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | grep -q Mono.framework; then
-         AC_MSG_RESULT([yes, from Mono])
-      else
-         AC_MSG_RESULT([yes, from unknown origin])
-      fi
-      AC_MSG_WARN([This might have unexpected consequences, please consider hiding $PKG_CONFIG])
-      echo "Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it" >>warn
-   else
-      AC_MSG_RESULT([no])
-   fi
+    AC_MSG_CHECKING([for bogus pkg-config])
+    if test -n "$PKG_CONFIG"; then
+        if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | grep -q Mono.framework; then
+            AC_MSG_RESULT([yes, from Mono])
+        else
+            AC_MSG_RESULT([yes, from unknown origin])
+        fi
+        AC_MSG_WARN([This might have unexpected consequences, please consider hiding $PKG_CONFIG])
+        echo "Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it" >>warn
+    else
+        AC_MSG_RESULT([no])
+    fi
 fi
 
 dnl ===================================================================
@@ -2461,10 +2502,10 @@ if test "$build_os" = "cygwin"; then
         MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
     fi
     if test -z "$MIDL_PATH" ; then
-      vstest=`./oowintool --msvs-productdir`;
-      if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
-          MIDL_PATH="$vstest/Common7/Tools/Bin"
-      fi
+        vstest=`./oowintool --msvs-productdir`;
+        if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
+            MIDL_PATH="$vstest/Common7/Tools/Bin"
+        fi
     fi
     if test -z "$MIDL_PATH" ; then
         winsdktest=`./oowintool --windows-sdk-home`
@@ -2492,7 +2533,7 @@ if test "$build_os" = "cygwin"; then
     else
        csctest=`./oowintool --csc-compilerdir`;
        if test -x "$csctest/csc.exe"; then
-          CSC_PATH="$csctest"
+           CSC_PATH="$csctest"
        fi
     fi
     if test ! -x "$CSC_PATH/csc.exe"; then
@@ -2503,28 +2544,28 @@ if test "$build_os" = "cygwin"; then
     CSC_PATH=`cygpath -u "$CSC_PATH"`
 
     dnl Check mscoree.lib / .NET Framework dir
-        AC_MSG_CHECKING(.NET Framework)
-        if test -n "$with_dotnet_framework_home"; then
+    AC_MSG_CHECKING(.NET Framework)
+    if test -n "$with_dotnet_framework_home"; then
         with_dotnet_framework_home=`cygpath -u "$with_dotnet_framework_home"`
-        fi
-        if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then
-            DOTNET_FRAMEWORK_HOME="$with_dotnet_framework_home"
-        fi
-        if test -z "$DOTNET_FRAMEWORK_HOME" ; then
-          frametest=`./oowintool --dotnetsdk-dir`
-          if test -f "$frametest/lib/mscoree.lib"; then
-             DOTNET_FRAMEWORK_HOME="$frametest"
-          else
-             frametest=`./oowintool --windows-sdk-home`
-             if test -f "$frametest/lib/mscoree.lib"; then
+    fi
+    if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then
+        DOTNET_FRAMEWORK_HOME="$with_dotnet_framework_home"
+    fi
+    if test -z "$DOTNET_FRAMEWORK_HOME" ; then
+        frametest=`./oowintool --dotnetsdk-dir`
+        if test -f "$frametest/lib/mscoree.lib"; then
+            DOTNET_FRAMEWORK_HOME="$frametest"
+        else
+            frametest=`./oowintool --windows-sdk-home`
+            if test -f "$frametest/lib/mscoree.lib"; then
                 DOTNET_FRAMEWORK_HOME="$frametest"
-             fi
-          fi
-        fi
-        if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib"; then
-            AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-dotnet-framework-home])
+            fi
         fi
-        AC_MSG_RESULT(found)
+    fi
+    if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib"; then
+        AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-dotnet-framework-home])
+    fi
+    AC_MSG_RESULT(found)
     # Convert to posix path with 8.3 filename restrictions ( No spaces )
     DOTNET_FRAMEWORK_HOME=`cygpath -d "$DOTNET_FRAMEWORK_HOME"`
     DOTNET_FRAMEWORK_HOME=`cygpath -u "$DOTNET_FRAMEWORK_HOME"`
@@ -2537,47 +2578,47 @@ dnl ===================================================================
 dnl Check if stdc headers are available excluding MSVC.
 dnl ===================================================================
 if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-   AC_HEADER_STDC
+    AC_HEADER_STDC
 fi
 
 if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-   dnl ===================================================================
-   dnl Find pre-processors.
-   dnl ===================================================================
-
-   AC_PROG_CXXCPP
-
-   dnl Check whether there's a C pre-processor.
-   dnl ===================================================================
-   dnl When using SunStudio compiler, there is a bug with the cc
-   dnl preprocessor, so use CC preprocessor as the cc preprocessor
-   dnl See Issuezilla #445.
-   dnl ===================================================================
-   if test "$_os" = "SunOS"; then
-      CPP=$CXXCPP
-   else
-      AC_PROG_CPP
-   fi
-
-   dnl Find integral type sizes and alignments
-
-   AC_CHECK_SIZEOF(long)
-   AC_CHECK_SIZEOF(short)
-   AC_CHECK_SIZEOF(int)
-   AC_CHECK_SIZEOF(long long)
-   AC_CHECK_SIZEOF(double)
-   AC_CHECK_SIZEOF(void*)
-
-   SIZEOF_SHORT=$ac_cv_sizeof_short
-   SIZEOF_INT=$ac_cv_sizeof_int
-   SIZEOF_LONG=$ac_cv_sizeof_long
-   SIZEOF_LONGLONG=$ac_cv_sizeof_long_long
-   SIZEOF_DOUBLE=$ac_cv_sizeof_double
-   SIZEOF_POINTER=$ac_cv_sizeof_voidp
-
-   dnl Allow build without AC_CHECK_ALIGNOF, grrr
-   m4_pattern_allow([AC_CHECK_ALIGNOF])
-   m4_ifdef([AC_CHECK_ALIGNOF],
+    dnl ===================================================================
+    dnl Find pre-processors.
+    dnl ===================================================================
+
+    AC_PROG_CXXCPP
+
+    dnl Check whether there's a C pre-processor.
+    dnl ===================================================================
+    dnl When using SunStudio compiler, there is a bug with the cc
+    dnl preprocessor, so use CC preprocessor as the cc preprocessor
+    dnl See Issuezilla #445.
+    dnl ===================================================================
+    if test "$_os" = "SunOS"; then
+        CPP=$CXXCPP
+    else
+        AC_PROG_CPP
+    fi
+
+    dnl Find integral type sizes and alignments
+
+    AC_CHECK_SIZEOF(long)
+    AC_CHECK_SIZEOF(short)
+    AC_CHECK_SIZEOF(int)
+    AC_CHECK_SIZEOF(long long)
+    AC_CHECK_SIZEOF(double)
+    AC_CHECK_SIZEOF(void*)
+
+    SIZEOF_SHORT=$ac_cv_sizeof_short
+    SIZEOF_INT=$ac_cv_sizeof_int
+    SIZEOF_LONG=$ac_cv_sizeof_long
+    SIZEOF_LONGLONG=$ac_cv_sizeof_long_long
+    SIZEOF_DOUBLE=$ac_cv_sizeof_double
+    SIZEOF_POINTER=$ac_cv_sizeof_voidp
+
+    dnl Allow build without AC_CHECK_ALIGNOF, grrr
+    m4_pattern_allow([AC_CHECK_ALIGNOF])
+    m4_ifdef([AC_CHECK_ALIGNOF],
       ,
       [
          dnl We know that the ALIGNOF_ variables are used only when cross-compiling
@@ -2592,44 +2633,44 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
             ])
       ])
 
-   AC_CHECK_ALIGNOF(short,[#include <stddef.h>])
-   AC_CHECK_ALIGNOF(int,[#include <stddef.h>])
-   AC_CHECK_ALIGNOF(long,[#include <stddef.h>])
-   AC_CHECK_ALIGNOF(double,[#include <stddef.h>])
-
-   ALIGNOF_SHORT=$ac_cv_alignof_short
-   ALIGNOF_INT=$ac_cv_alignof_int
-   ALIGNOF_LONG=$ac_cv_alignof_long
-   ALIGNOF_DOUBLE=$ac_cv_alignof_double
-
-   AC_C_BIGENDIAN
-   WORDS_BIGENDIAN=$ac_cv_c_bigendian
-
-   dnl Check for large file support
-   AC_SYS_LARGEFILE
-   if test -n "$ac_cv_sys_file_offset_bits"; then
-      LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-   fi
-   if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
-      LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
-   fi
-else
-   # Hardcode for MSVC
-   SIZEOF_SHORT=2
-   SIZEOF_INT=4
-   SIZEOF_LONG=4
-   SIZEOF_LONGLONG=8
-   if test "$CL_X64" = ""; then
-     SIZEOF_POINTER=4
-   else
-     SIZEOF_POINTER=8
-   fi
-   ALIGNOF_SHORT=2
-   ALIGNOF_INT=4
-   ALIGNOF_LONG=4
-   ALIGNOF_DOUBLE=8
-   WORDS_BIGENDIAN=no
-   LFS_CFLAGS=''
+    AC_CHECK_ALIGNOF(short,[#include <stddef.h>])
+    AC_CHECK_ALIGNOF(int,[#include <stddef.h>])
+    AC_CHECK_ALIGNOF(long,[#include <stddef.h>])
+    AC_CHECK_ALIGNOF(double,[#include <stddef.h>])
+
+    ALIGNOF_SHORT=$ac_cv_alignof_short
+    ALIGNOF_INT=$ac_cv_alignof_int
+    ALIGNOF_LONG=$ac_cv_alignof_long
+    ALIGNOF_DOUBLE=$ac_cv_alignof_double
+
+    AC_C_BIGENDIAN
+    WORDS_BIGENDIAN=$ac_cv_c_bigendian
+
+    dnl Check for large file support
+    AC_SYS_LARGEFILE
+    if test -n "$ac_cv_sys_file_offset_bits"; then
+        LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+    fi
+    if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
+        LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
+    fi
+else
+    # Hardcode for MSVC
+    SIZEOF_SHORT=2
+    SIZEOF_INT=4
+    SIZEOF_LONG=4
+    SIZEOF_LONGLONG=8
+    if test "$CL_X64" = ""; then
+        SIZEOF_POINTER=4
+    else
+        SIZEOF_POINTER=8
+    fi
+    ALIGNOF_SHORT=2
+    ALIGNOF_INT=4
+    ALIGNOF_LONG=4
+    ALIGNOF_DOUBLE=8
+    WORDS_BIGENDIAN=no
+    LFS_CFLAGS=''
 fi
 AC_SUBST(WORDS_BIGENDIAN)
 AC_SUBST(LFS_CFLAGS)
@@ -2649,23 +2690,23 @@ dnl ===================================================================
 dnl Check if valgrind.h is available
 dnl ===================================================================
 if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no"; then
-   dnl Test $prefix (currently only testing for /usr and /usr/local)
-   dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
-   VALGRIND_CFLAGS=""
-   prev_cppflags=$CPPFLAGS
-   if test -z "$VALGRIND_CFLAGS"; then
-      CPPFLAGS="-I/usr/include/valgrind"
-      AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [unset ac_cv_header_valgrind_h])
-   fi
-   if test -z "$VALGRIND_CFLAGS"; then
-      CPPFLAGS="-I/usr/local/include/valgrind"
-      AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [])
-   fi
-   if test -n "$VALGRIND_CFLAGS"; then
-      CPPFLAGS=$VALGRIND_CFLAGS
-      AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
-   fi
-   CPPFLAGS=$prev_cppflags
+    dnl Test $prefix (currently only testing for /usr and /usr/local)
+    dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
+    VALGRIND_CFLAGS=""
+    prev_cppflags=$CPPFLAGS
+    if test -z "$VALGRIND_CFLAGS"; then
+        CPPFLAGS="-I/usr/include/valgrind"
+        AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [unset ac_cv_header_valgrind_h])
+    fi
+    if test -z "$VALGRIND_CFLAGS"; then
+        CPPFLAGS="-I/usr/local/include/valgrind"
+        AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [])
+    fi
+    if test -n "$VALGRIND_CFLAGS"; then
+        CPPFLAGS=$VALGRIND_CFLAGS
+        AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
+    fi
+    CPPFLAGS=$prev_cppflags
 fi
 AC_SUBST([VALGRIND_CFLAGS])
 
@@ -2673,65 +2714,64 @@ dnl ===================================================================
 dnl Testing for C++ compiler and version...
 dnl ===================================================================
 if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-   if test -n "$CC" -a -z "$CXX"; then
-      CXX="$CC"
-   fi
+    if test -n "$CC" -a -z "$CXX"; then
+        CXX="$CC"
+    fi
 fi
 
 dnl Autoconf 2.53 can do this test for cl.exe, 2.13 can't!
 if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-   AC_PROG_CXX
+    AC_PROG_CXX
 fi
 
 dnl check if we are using a buggy version of g++ (currently 3.4.0, 3.4.1 and trunk)
 if test "$GXX" = "yes"; then
-   AC_MSG_CHECKING([the GNU C++ compiler version])
+    AC_MSG_CHECKING([the GNU C++ compiler version])
 
-   _gpp_version=`$CXX -dumpversion`
-   _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`
+    _gpp_version=`$CXX -dumpversion`
+    _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`
 
-   if test "$_os" = "Darwin" -a "$_gpp_majmin" -ge "401" ; then
-      if test -z "$save_CXX" -a -x "$GCC_HOME/bin/g++-4.0" ; then
-         CXX=$GCC_HOME/bin/g++-4.0
-         _gpp_majmin_2=`"$CXX" -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'`
-         if test "$_gpp_majmin_2" -ge "400" -a "$_gpp_majmin_2" -lt "401" ; then
-            _gpp_majmin=$_gpp_majmin_2
-         fi
-      fi
-      if test "$_gpp_majmin" -ge "401" ; then
-         AC_MSG_ERROR([You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly])
-      else
-         AC_MSG_RESULT([implicitly using CXX=$CXX])
-      fi
-   else
-      AC_MSG_RESULT([checked (g++ $_gpp_version)])
-   fi
-
-   if test "$_gpp_majmin" = "304"; then
-      AC_MSG_CHECKING([whether $CXX has the enum bug])
-AC_TRY_RUN([
-extern "C" void abort (void);
-extern "C" void exit (int status);
-
-enum E { E0, E1, E2, E3, E4, E5 };
-
-void
-test (enum E e)
-{
-  if (e == E2 || e == E3 || e == E1)
-  exit (1);
-}
+    if test "$_os" = "Darwin" -a "$_gpp_majmin" -ge "401" ; then
+        if test -z "$save_CXX" -a -x "$GCC_HOME/bin/g++-4.0" ; then
+            CXX=$GCC_HOME/bin/g++-4.0
+            _gpp_majmin_2=`"$CXX" -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'`
+            if test "$_gpp_majmin_2" -ge "400" -a "$_gpp_majmin_2" -lt "401" ; then
+                _gpp_majmin=$_gpp_majmin_2
+            fi
+        fi
+        if test "$_gpp_majmin" -ge "401" ; then
+            AC_MSG_ERROR([You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly])
+        else
+            AC_MSG_RESULT([implicitly using CXX=$CXX])
+        fi
+    else
+        AC_MSG_RESULT([checked (g++ $_gpp_version)])
+    fi
 
-int
-main (void)
-{
-  test (E4);
-  test (E5);
-  test (E0);
-  return 0;
-}
-],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents LibreOffice from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
-   fi
+    if test "$_gpp_majmin" = "304"; then
+        AC_MSG_CHECKING([whether $CXX has the enum bug])
+        AC_TRY_RUN([
+            extern "C" void abort (void);
+            extern "C" void exit (int status);
+
+            enum E { E0, E1, E2, E3, E4, E5 };
+
+            void test (enum E e)
+            {
+                if (e == E2 || e == E3 || e == E1)
+                    exit (1);
+            }
+
+            int main (void)
+            {
+                test (E4);
+                test (E5);
+                test (E0);
+                return 0;
+            }
+            ],
+            [AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents LibreOffice from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
+    fi
 fi
 
 dnl ===================================================================
@@ -2740,31 +2780,31 @@ dnl ===================================================================
 # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
 # often contains an i386 which is expanded as a macro.
 if test "$GXX" = "yes"; then
-   AC_MSG_CHECKING([for g++ include path])
-   if test -z "$with_gxx_include_path"; then
-      with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-      if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
-          with_gxx_include_path="/usr/include"
-      fi
-      if test "$build_os" = "cygwin" -a "$WITH_MINGW" = "yes"; then
-         with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
-         with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
-      fi
-      if echo $with_gxx_include_path | grep -q linux; then
-         # workaround for Mandriva - issue 100049
-         with_gxx_include_path=`cd $with_gxx_include_path && pwd`
-      fi
-   fi
-   dnl This is the original code...
-   dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-   if test -z "$with_gxx_include_path"; then
-      with_gxx_include_path="NO_GXX_INCLUDE"
-      AC_MSG_RESULT([none])
-   else
-      AC_MSG_RESULT([$with_gxx_include_path])
-   fi
-else
-   with_gxx_include_path="NO_GXX_INCLUDE"
+    AC_MSG_CHECKING([for g++ include path])
+    if test -z "$with_gxx_include_path"; then
+        with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+        if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
+            with_gxx_include_path="/usr/include"
+        fi
+        if test "$build_os" = "cygwin" -a "$WITH_MINGW" = "yes"; then
+            with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
+            with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
+        fi
+        if echo $with_gxx_include_path | grep -q linux; then
+            # workaround for Mandriva - issue 100049
+            with_gxx_include_path=`cd $with_gxx_include_path && pwd`
+        fi
+    fi
+    dnl This is the original code...
+    dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
+    if test -z "$with_gxx_include_path"; then
+        with_gxx_include_path="NO_GXX_INCLUDE"
+        AC_MSG_RESULT([none])
+    else
+        AC_MSG_RESULT([$with_gxx_include_path])
+    fi
+else
+    with_gxx_include_path="NO_GXX_INCLUDE"
 fi
 GXX_INCLUDE_PATH="$with_gxx_include_path"
 AC_SUBST(GXX_INCLUDE_PATH)
@@ -2773,136 +2813,136 @@ dnl ===================================================================
 dnl Set the MinGW include directories
 dnl ===================================================================
 if test "$WITH_MINGW" = "yes"; then
-   AC_MSG_CHECKING([for MinGW runtime include path])
-   cat >conftest.$ac_ext <<_ACEOF
+    AC_MSG_CHECKING([for MinGW runtime include path])
+    cat >conftest.$ac_ext <<_ACEOF
 #include <stddef.h>
 #include <bits/c++config.h>
 _ACEOF
-   _mingw_lib_include_path=`$CXX -E -xc++ conftest.$ac_ext | $SED -n -e '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' -e '/.*1*"\(.*\)\/bits\/c++config.h".*/s//\1/p' | sort -u | xargs echo`
-   rm conftest.$ac_ext
-   if test "$build_os" = "cygwin" -a -n "$_mingw_lib_include_path"; then
-      _temp=""
-      for a in $_mingw_lib_include_path
-         do
+    _mingw_lib_include_path=`$CXX -E -xc++ conftest.$ac_ext | $SED -n -e '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' -e '/.*1*"\(.*\)\/bits\/c++config.h".*/s//\1/p' | sort -u | xargs echo`
+    rm conftest.$ac_ext
+    if test "$build_os" = "cygwin" -a -n "$_mingw_lib_include_path"; then
+        _temp=""
+        for a in $_mingw_lib_include_path
+        do
             a=`cygpath -d "$a"`
             _temp="$_temp "`cygpath -u "$a"`
-         done
-      _mingw_lib_include_path=$_temp
-   fi
-   if test -z "$_mingw_lib_include_path"; then
-      _mingw_lib_include_path="NO_LIB_INCLUDE"
-      AC_MSG_RESULT([no MinGW include path])
-   else
-      AC_MSG_RESULT([$_mingw_lib_include_path])
-   fi
-  MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
-  AC_SUBST(MINGW_LIB_INCLUDE_PATH)
-dnl mingw gcc 4.4.0 needs backward in include path to use hash_set/hash_map
-   AC_MSG_CHECKING([for MinGW C++ backward include path])
-   cat >conftest.$ac_ext <<_ACEOF
+        done
+        _mingw_lib_include_path=$_temp
+    fi
+    if test -z "$_mingw_lib_include_path"; then
+        _mingw_lib_include_path="NO_LIB_INCLUDE"
+        AC_MSG_RESULT([no MinGW include path])
+    else
+        AC_MSG_RESULT([$_mingw_lib_include_path])
+    fi
+    MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
+    AC_SUBST(MINGW_LIB_INCLUDE_PATH)
+    dnl mingw gcc 4.4.0 needs backward in include path to use hash_set/hash_map
+    AC_MSG_CHECKING([for MinGW C++ backward include path])
+    cat >conftest.$ac_ext <<_ACEOF
 #include <hash_set>
 _ACEOF
-   _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo`
-   rm conftest.$ac_ext
-   if test "$build_os" = "cygwin" -a -n "$_mingw_backward_include_path"; then
-      _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
-      _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
-      AC_MSG_RESULT([$_mingw_backward_include_path])
-   else
-      _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
-      AC_MSG_RESULT([no MinGW C++ backward includes])
-   fi
-  MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path"
-  AC_SUBST(MINGW_BACKWARD_INCLUDE_PATH)
-  mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
-  MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
-
-  # How to do this crack when cross-compiling?
-  AC_MSG_CHECKING([whether to use dynamic libgcc])
-  if test "$build_os" = "cygwin" -a -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
-    AC_MSG_CHECKING([dynamic libgcc name])
-    MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | $SED -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | $SED -e 's@_@?@g'`
-    MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
-    if test -n "$MINGW_GCCDLL"; then
-        MINGW_SHARED_GCCLIB=YES
-        AC_MSG_RESULT([use $MINGW_GCCDLL])
+    _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo`
+    rm conftest.$ac_ext
+    if test "$build_os" = "cygwin" -a -n "$_mingw_backward_include_path"; then
+        _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
+        _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
+        AC_MSG_RESULT([$_mingw_backward_include_path])
+    else
+        _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
+        AC_MSG_RESULT([no MinGW C++ backward includes])
+    fi
+    MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path"
+    AC_SUBST(MINGW_BACKWARD_INCLUDE_PATH)
+    mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
+    MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
+
+    # How to do this crack when cross-compiling?
+    AC_MSG_CHECKING([whether to use dynamic libgcc])
+    if test "$build_os" = "cygwin" -a -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
+        AC_MSG_CHECKING([dynamic libgcc name])
+        MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | $SED -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | $SED -e 's@_@?@g'`
+        MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+        if test -n "$MINGW_GCCDLL"; then
+            MINGW_SHARED_GCCLIB=YES
+            AC_MSG_RESULT([use $MINGW_GCCDLL])
+        else
+            AC_MSG_RESULT([no])
+        fi
     else
         AC_MSG_RESULT([no])
     fi
-  else
-    AC_MSG_RESULT([no])
-  fi
-  if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
-      MINGW_GCCLIB_EH=YES
-  fi
+    if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
+        MINGW_GCCLIB_EH=YES
+    fi
 
-  AC_MSG_CHECKING([whether to use dynamic libstdc++])
-  MINGW_SHARED_LIBSTDCPP=
-  if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
-    MINGW_SHARED_LIBSTDCPP=stdc++_s
-  fi
-  if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
-    MINGW_SHARED_LIBSTDCPP=stdc++.dll
-  fi
-  if test "$build_os" = "cygwin" -a -n "$MINGW_SHARED_LIBSTDCPP" ; then
-    AC_MSG_CHECKING([dynamic libstdc++ name])
-    MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
-    if test -n "$MINGW_GXXDLL"; then
-        MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
-        MINGW_SHARED_GXXLIB=YES
-        AC_MSG_RESULT([use $MINGW_GXXDLL])
+    AC_MSG_CHECKING([whether to use dynamic libstdc++])
+    MINGW_SHARED_LIBSTDCPP=
+    if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
+        MINGW_SHARED_LIBSTDCPP=stdc++_s
+    fi
+    if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
+        MINGW_SHARED_LIBSTDCPP=stdc++.dll
+    fi
+    if test "$build_os" = "cygwin" -a -n "$MINGW_SHARED_LIBSTDCPP" ; then
+        AC_MSG_CHECKING([dynamic libstdc++ name])
+        MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
+        MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+        if test -n "$MINGW_GXXDLL"; then
+            MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
+            MINGW_SHARED_GXXLIB=YES
+            AC_MSG_RESULT([use $MINGW_GXXDLL])
+        else
+            MINGW_SHARED_LIBSTDCPP=
+            AC_MSG_RESULT([no])
+        fi
     else
-        MINGW_SHARED_LIBSTDCPP=
         AC_MSG_RESULT([no])
     fi
-  else
-    AC_MSG_RESULT([no])
-  fi
-  test "$build_os" = "cygwin" && MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
-  AC_SUBST(MINGW_CLIB_DIR)
-  AC_SUBST(MINGW_SHARED_GCCLIB)
-  AC_SUBST(MINGW_GCCLIB_EH)
-  AC_SUBST(MINGW_SHARED_GXXLIB)
-  AC_SUBST(MINGW_SHARED_LIBSTDCPP)
-  AC_SUBST(MINGW_GCCDLL)
-  AC_SUBST(MINGW_GXXDLL)
+    test "$build_os" = "cygwin" && MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
+    AC_SUBST(MINGW_CLIB_DIR)
+    AC_SUBST(MINGW_SHARED_GCCLIB)
+    AC_SUBST(MINGW_GCCLIB_EH)
+    AC_SUBST(MINGW_SHARED_GXXLIB)
+    AC_SUBST(MINGW_SHARED_LIBSTDCPP)
+    AC_SUBST(MINGW_GCCDLL)
+    AC_SUBST(MINGW_GXXDLL)
 fi
 
 dnl ===================================================================
 dnl Extra checking for the SunOS compiler
 dnl ===================================================================
 if test "$_os" = "SunOS"; then
-   dnl SunStudio C++ compiler packaged with SunStudio C compiler
-   if test "$CC" = "cc"; then
-   AC_MSG_CHECKING([SunStudio C++ Compiler])
-      if test "$CXX" != "CC"; then
-         AC_MSG_WARN([SunStudio C++ was not found])
-         echo "SunStudio C++ was not found" >> warn
-      else
-         AC_MSG_RESULT([checked])
-      fi
-   fi
+    dnl SunStudio C++ compiler packaged with SunStudio C compiler
+    if test "$CC" = "cc"; then
+    AC_MSG_CHECKING([SunStudio C++ Compiler])
+        if test "$CXX" != "CC"; then
+            AC_MSG_WARN([SunStudio C++ was not found])
+            echo "SunStudio C++ was not found" >> warn
+        else
+            AC_MSG_RESULT([checked])
+        fi
+    fi
 fi
 
 dnl *************************************************************
 dnl Testing for exception handling - dwarf2 or sjlj exceptions...
 dnl *************************************************************
 if test "$WITH_MINGW" = "yes"; then
-  AC_MSG_CHECKING([exception type])
-  AC_LANG_PUSH([C++])
-  AC_TRY_LINK(
-    [#include <iostream>
+    AC_MSG_CHECKING([exception type])
+    AC_LANG_PUSH([C++])
+    AC_TRY_LINK(
+        [#include <iostream>
 
-extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__));
+        extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__));
 
-    ],
-    [_Unwind_SjLj_RaiseException() ],
-    [exceptions_type="sjlj"],
-    [exceptions_type="dwarf2"]
-  )
-  AC_MSG_RESULT($exceptions_type)
-  AC_LANG_POP([C++])
+        ],
+        [_Unwind_SjLj_RaiseException() ],
+        [exceptions_type="sjlj"],
+        [exceptions_type="dwarf2"]
+    )
+    AC_MSG_RESULT($exceptions_type)
+    AC_LANG_POP([C++])
 fi
 
 EXCEPTIONS="$exceptions_type"
@@ -2914,45 +2954,46 @@ dnl ===================================================================
 AC_MSG_CHECKING([Whether building STLPort library makes sense])
 BUILD_STLPORT="no"
 if test "$_os" = "Linux"; then
-  case "$host_cpu" in
+    case "$host_cpu" in
     i?86)
-      case "$host_os" in k*bsd*-gnu*)
-        BUILD_STLPORT="no"
-        ;;
-      *)
-        BUILD_STLPORT="yes"
+        case "$host_os" in
+        k*bsd*-gnu*)
+            BUILD_STLPORT="no"
+            ;;
+        *)
+            BUILD_STLPORT="yes"
+            ;;
+        esac
         ;;
-      esac
-      ;;
     *)
-      BUILD_STLPORT="no"
-      ;;
-  esac
+        BUILD_STLPORT="no"
+        ;;
+    esac
 elif test "$_os" = "SunOS"; then
-   BUILD_STLPORT="yes"
+    BUILD_STLPORT="yes"
 elif test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-   BUILD_STLPORT="yes"
+    BUILD_STLPORT="yes"
 elif test "$_os" = "FreeBSD"; then
-   BUILD_STLPORT="yes"
+    BUILD_STLPORT="yes"
 fi
 if test "$BUILD_STLPORT" = "yes" ; then
-   AC_MSG_RESULT([yes])
+    AC_MSG_RESULT([yes])
 else
-   AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no])
 fi
 
 AC_MSG_CHECKING([Whether STLPort library will be actually built])
 if test "$with_stlport" = "auto" -o "$BUILD_STLPORT" = "no"; then
-   with_stlport=$BUILD_STLPORT
+    with_stlport=$BUILD_STLPORT
 fi
 if test "$with_stlport" = "yes" ; then
-   AC_MSG_RESULT([yes])
-       WITH_STLPORT=YES
-       SCPDEFS="$SCPDEFS -DWITH_STLPORT"
-       BUILD_TYPE="$BUILD_TYPE STLPORT"
+    AC_MSG_RESULT([yes])
+    WITH_STLPORT=YES
+    SCPDEFS="$SCPDEFS -DWITH_STLPORT"
+    BUILD_TYPE="$BUILD_TYPE STLPORT"
 else
-   WITH_STLPORT=NO
-   AC_MSG_RESULT([no])
+    WITH_STLPORT=NO
+    AC_MSG_RESULT([no])
 fi
 
 AC_SUBST(WITH_STLPORT)
@@ -2961,40 +3002,40 @@ dnl ===================================================================
 dnl visibility and c++0x features
 dnl ===================================================================
 if test "$GCC" = "yes"; then
-   AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
-   save_CFLAGS=$CFLAGS
-   CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
-   AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
-   CFLAGS=$save_CFLAGS
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      AC_MSG_RESULT([yes])
-   else
-      AC_MSG_RESULT([no])
-   fi
-
-   AC_MSG_CHECKING([whether $CC supports -std=c++0x without Language Defect 757])
-   save_CXXFLAGS=$CFLAGS
-   CXXFLAGS="$CXXFLAGS -std=c++0x"
-   AC_LANG_PUSH([C++])
-
-   AC_TRY_COMPILE([
+    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+    save_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
+    AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
+    CFLAGS=$save_CFLAGS
+    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+
+    AC_MSG_CHECKING([whether $CC supports -std=c++0x without Language Defect 757])
+    save_CXXFLAGS=$CFLAGS
+    CXXFLAGS="$CXXFLAGS -std=c++0x"
+    AC_LANG_PUSH([C++])
+
+    AC_TRY_COMPILE([
 #include <stddef.h>
 
 template <typename T, size_t S> char (&sal_n_array_size( T(&)[S] ))[S];
 
 namespace
 {
-	struct b
-	{
-		int i;
-		int j;
-	};
+        struct b
+        {
+                int i;
+                int j;
+        };
 }
 ],[
 struct a
 {
-	int i;
-	int j;
+        int i;
+        int j;
 };
 a thinga[]={{0,0}, {1,1}};
 b thingb[]={{0,0}, {1,1}};
@@ -3003,13 +3044,13 @@ size_t j = sizeof(sal_n_array_size(thingb));
 return !(i != 0 && j != 0);
 ], HAVE_CXX0X=TRUE,)
 
-   AC_LANG_POP([C++])
-   CXXFLAGS=$save_CXXFLAGS
-   if test "$HAVE_CXX0X" = "TRUE"; then
-      AC_MSG_RESULT([yes])
-   else
-      AC_MSG_RESULT([no])
-   fi
+    AC_LANG_POP([C++])
+    CXXFLAGS=$save_CXXFLAGS
+    if test "$HAVE_CXX0X" = "TRUE"; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
 fi
 
 AC_SUBST(HAVE_CXX0X)
@@ -3021,40 +3062,40 @@ dnl need to check for ccache version: otherwise prevents
 dnl caching of the results (like "-x objective-c++" for Mac)
 AC_MSG_CHECKING([whether we are able to use --ccache-skip])
 if test "$_os" != "Darwin" ; then
-   AC_MSG_RESULT([only used on Mac currently, skipping])
-else
-   # checking for ccache presence/version
-   AC_MSG_RESULT([probing...])
-   AC_PATH_PROG([CCACHE],[ccache],[not_found])
-   if test "$CCACHE" = "not_found" ; then
-      AC_MSG_NOTICE([not enabling --ccache-skip (ccache not found)])
-   else
-      # check ccache version
-      AC_MSG_CHECKING([whether version of ccache is suitable])
-      CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
-      CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-      if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then
-         AC_MSG_RESULT([yes])
-         AC_MSG_CHECKING([whether ccache is actually used for the build])
-         AC_LANG_PUSH([C++])
-         save_CXXFLAGS=$CXXFLAGS
-         CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
-         dnl an empty program will do, we're checking the compiler flags
-         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
-            [use_ccache=yes], [use_ccache=no])
-         if test $use_ccache = yes ; then
-            AC_MSG_RESULT([yes, will enable --ccache-skip])
-            AC_SUBST([USE_CCACHE], [YES])
-         else
-            AC_MSG_RESULT([no, will not enable --ccache-skip])
-         fi
-         CXXFLAGS=$save_CXXFLAGS
-         AC_LANG_POP([C++])
-      else
-         AC_MSG_RESULT([no])
-         AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. ccache will not be used.])
-      fi
-   fi
+    AC_MSG_RESULT([only used on Mac currently, skipping])
+else
+    # checking for ccache presence/version
+    AC_MSG_RESULT([probing...])
+    AC_PATH_PROG([CCACHE],[ccache],[not_found])
+    if test "$CCACHE" = "not_found" ; then
+        AC_MSG_NOTICE([not enabling --ccache-skip (ccache not found)])
+    else
+        # check ccache version
+        AC_MSG_CHECKING([whether version of ccache is suitable])
+        CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
+        CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+        if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then
+            AC_MSG_RESULT([yes])
+            AC_MSG_CHECKING([whether ccache is actually used for the build])
+            AC_LANG_PUSH([C++])
+            save_CXXFLAGS=$CXXFLAGS
+            CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
+            dnl an empty program will do, we're checking the compiler flags
+            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
+                [use_ccache=yes], [use_ccache=no])
+            if test $use_ccache = yes ; then
+                AC_MSG_RESULT([yes, will enable --ccache-skip])
+                AC_SUBST([USE_CCACHE], [YES])
+            else
+                AC_MSG_RESULT([no, will not enable --ccache-skip])
+            fi
+            CXXFLAGS=$save_CXXFLAGS
+            AC_LANG_POP([C++])
+        else
+            AC_MSG_RESULT([no])
+            AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. ccache will not be used.])
+        fi
+    fi
 fi
 
 dnl ===================================================================
@@ -3063,43 +3104,48 @@ dnl ===================================================================
 HAVE_GCC_VISIBILITY_BROKEN=
 if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) ; then
 
-   AC_LANG_PUSH([C++])
-
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      AC_MSG_CHECKING([if STL headers are visibility safe])
-      AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
-      AC_MSG_RESULT([$stlvisok])
-      if test "$stlvisok" = "no"; then
-         AC_MSG_WARN([Your gcc STL headers are not visibility safe. Disabling visibility])
-         echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn
-         unset HAVE_GCC_VISIBILITY_FEATURE
-      fi
-   fi
-
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      sharedlink_ldflags_save=$LDFLAGS
-      LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
-
-      AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL headers])
-      AC_TRY_LINK([#include <sstream>
+    AC_LANG_PUSH([C++])
+
+    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+        AC_MSG_CHECKING([if STL headers are visibility safe])
+        AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
+        AC_MSG_RESULT([$stlvisok])
+        if test "$stlvisok" = "no"; then
+            AC_MSG_WARN([Your gcc STL headers are not visibility safe. Disabling visibility])
+            echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn
+            unset HAVE_GCC_VISIBILITY_FEATURE
+        fi
+    fi
+
+    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+        sharedlink_ldflags_save=$LDFLAGS
+        LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
+
+        AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL headers])
+        AC_TRY_LINK(
+            [
+#include <sstream>
 using namespace std;
-],[istringstream strm( "test" ); return 0;],
-      $EGREP -q  unresolvable conftest.err;
-      if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi,
-      gccvisok=no)
-      AC_MSG_RESULT([$gccvisok])
-      if test "$gccvisok" = "no"; then
-         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe, disabling that.])
-         echo "Your gcc is not -fvisibility-inlines-hidden safe, disabling that." >> warn
-         HAVE_GCC_VISIBILITY_BROKEN="TRUE"
-      fi
-
-      LDFLAGS=$sharedlink_ldflags_save
-   fi
-
-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-      AC_MSG_CHECKING([if gcc has a visibility bug with class-level attributes (GCC bug 26905)])
-      cat >visibility.cxx <<_ACEOF
+            ],[
+istringstream strm( "test" ); return 0;
+            ],
+            $EGREP -q  unresolvable conftest.err;
+            if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi,
+            gccvisok=no
+        )
+        AC_MSG_RESULT([$gccvisok])
+        if test "$gccvisok" = "no"; then
+            AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe, disabling that.])
+            echo "Your gcc is not -fvisibility-inlines-hidden safe, disabling that." >> warn
+            HAVE_GCC_VISIBILITY_BROKEN="TRUE"
+        fi
+
+        LDFLAGS=$sharedlink_ldflags_save
+    fi
+
+    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+        AC_MSG_CHECKING([if gcc has a visibility bug with class-level attributes (GCC bug 26905)])
+        cat >visibility.cxx <<_ACEOF
 #pragma GCC visibility push(hidden)
 struct __attribute__ ((visibility ("default"))) TestStruct {
   static void Init();
@@ -3108,37 +3154,37 @@ __attribute__ ((visibility ("default"))) void TestFunc() {
   TestStruct::Init();
 }
 _ACEOF
-      if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
-         gccvisbroken=yes
-      else
-         case "$host_cpu" in
+        if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
+            gccvisbroken=yes
+        else
+            case "$host_cpu" in
             i?86|x86_64)
-               if test "$_os" = "Darwin"; then
-                  gccvisbroken=no
-               else
-                  if $EGREP -q '@PLT' visibility.s; then
-                     gccvisbroken=no
-                  else
-                     gccvisbroken=yes
-                  fi
-               fi
-               ;;
+                if test "$_os" = "Darwin"; then
+                    gccvisbroken=no
+                else
+                    if $EGREP -q '@PLT' visibility.s; then
+                        gccvisbroken=no
+                    else
+                        gccvisbroken=yes
+                    fi
+                fi
+                ;;
             *)
-               gccvisbroken=no
-               ;;
-         esac
-      fi
-      rm -f visibility.s
+                gccvisbroken=no
+                ;;
+            esac
+        fi
+        rm -f visibility.s
 
-      AC_MSG_RESULT([$gccvisbroken])
-      if test "$gccvisbroken" = "yes"; then
-         AC_MSG_WARN([Your gcc is not -fvisibility=hidden safe. Disabling visibility])
-         echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn
-         unset HAVE_GCC_VISIBILITY_FEATURE
-      fi
-   fi
+        AC_MSG_RESULT([$gccvisbroken])
+        if test "$gccvisbroken" = "yes"; then
+            AC_MSG_WARN([Your gcc is not -fvisibility=hidden safe. Disabling visibility])
+            echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn
+            unset HAVE_GCC_VISIBILITY_FEATURE
+        fi
+    fi
 
-   AC_LANG_POP([C++])
+    AC_LANG_POP([C++])
 fi
 
 AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
@@ -3163,22 +3209,22 @@ if test "$with_alloc" = "tcmalloc"; then
     ALLOC="TCMALLOC";
 fi
 if test "$with_alloc" = "jemalloc"; then
-  if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
-    AC_MSG_RESULT(jemalloc)
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -pthread"
-    AC_CHECK_LIB(jemalloc, malloc, [],
-        [AC_MSG_ERROR(jemalloc not found or functional. Install the jemalloc allocator.)], [])
-    ALLOC="JEMALLOC";
-    CFLAGS=$save_CFLAGS
-  else
-    AC_MSG_RESULT([system])
-    ALLOC="SYS_ALLOC";
-    AC_CHECK_FUNCS([malloc realloc calloc free])
-  fi
+    if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
+        AC_MSG_RESULT(jemalloc)
+        save_CFLAGS=$CFLAGS
+        CFLAGS="$CFLAGS -pthread"
+        AC_CHECK_LIB(jemalloc, malloc, [],
+            [AC_MSG_ERROR(jemalloc not found or functional. Install the jemalloc allocator.)], [])
+        ALLOC="JEMALLOC";
+        CFLAGS=$save_CFLAGS
+    else
+        AC_MSG_RESULT([system])
+        ALLOC="SYS_ALLOC";
+        AC_CHECK_FUNCS([malloc realloc calloc free])
+    fi
 fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
-   AC_MSG_RESULT([internal])
+    AC_MSG_RESULT([internal])
 fi
 AC_SUBST(ALLOC)
 
@@ -3188,11 +3234,11 @@ dnl ===================================================================
 
 AC_MSG_CHECKING([whether to add custom build version])
 if test "z$with_build_version" != "z"; then
-   BUILD_VER_STRING=$with_build_version
-   AC_MSG_RESULT([yes, $BUILD_VER_STRING])
+    BUILD_VER_STRING=$with_build_version
+    AC_MSG_RESULT([yes, $BUILD_VER_STRING])
 else
-   BUILD_VER_STRING=
-   AC_MSG_RESULT([no])
+    BUILD_VER_STRING=
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(BUILD_VER_STRING)
 
@@ -3201,33 +3247,29 @@ dnl Java support enable
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build with Java support])
 if test "$with_java" != "no"; then
-   AC_MSG_RESULT([yes])
-   SOLAR_JAVA="TRUE"
+    AC_MSG_RESULT([yes])
+    SOLAR_JAVA="TRUE"
 else
-   AC_MSG_RESULT([no])
-   SOLAR_JAVA=""
+    AC_MSG_RESULT([no])
+    SOLAR_JAVA=""
 fi
 
 AC_SUBST(SOLAR_JAVA)
 
-dnl SOLAR_JAVA (yes, silly name, should rename) indicates whether we
-dnl want there to be *run-time* support for Java extensions in the
-dnl built LibreOffice. We might need a different test for whether
-dnl there is Java at *build-time*.
-
-dnl If we don't have access to Java at build-time we can't have
-dnl run-time Java support either. But I think there are some uses of
-dnl Java at build-time even if no run-time Java support is wanted. Or
-dnl is there? This is a bit unclear to me.
+dnl SOLAR_JAVA="YES" (yes, silly name, should rename) indicates whether we
+dnl want there to be *run-time* (and build-time) support for Java extensions in the
+dnl built LibreOffice.
+dnl SOLAR_JAVA="BUILD" indicate build-time only support (no runtime support)
+dnl SOLAR_JAVA="" indicate no java support at all
 
 if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
-   # IBMs JDK needs this...
-   JITC_PROCESSOR_TYPE=6
-   export JITC_PROCESSOR_TYPE
+    # IBMs JDK needs this...
+    JITC_PROCESSOR_TYPE=6
+    export JITC_PROCESSOR_TYPE
 fi
 
 if test $_os = "WINNT"; then
-   WITH_VC_REDIST="TRUE"
+    WITH_VC_REDIST="TRUE"
 fi
 AC_SUBST(WITH_VC_REDIST)
 
@@ -3236,139 +3278,139 @@ dnl Checks for Java
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
 
-   # Windows-specific tests
-   if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
-      if test "$CL_X64" != ""; then
-	 bitness="64-bit"
-	 otherbitness="32-bit"
-      else
-	 bitness="32-bit"
-	 otherbitness="64-bit"
-      fi
-
-      if test -z "$with_jdk_home"; then
-
-	 # Unfortunately apparently no way to find, if needed, the 64-bit
-	 # JDK in the Registry from the 32-bit Perl oowintool
-
-	 _jdk_home=`./oowintool --jdk-home`
-	 if test -f "$_jdk_home/lib/jvm.lib" -a -f "$_jdk_home/bin/java.exe"; then
-	    with_jdk_home="$_jdk_home"
-	    howfound="found by oowintool"
-	 else
-	    AC_MSG_ERROR([No JDK found by oowintool, pass the --with-jdk-home option pointing to a $bitness JDK])
-	 fi
-      else
-	 test "$build_os" = "cygwin" && with_jdk_home=`cygpath -u "$with_jdk_home"`
-	 howfound="you passed"
-      fi
-   fi
-
-   JAVA_HOME=; export JAVA_HOME
-   if test -z "$with_jdk_home"; then
-      AC_PATH_PROG(JAVAINTERPRETER, $with_java)
-   else
-      _java_path="$with_jdk_home/bin/$with_java"
-      dnl Check if there is a Java interpreter at all.
-      if test -x "$_java_path"; then
-         JAVAINTERPRETER=$_java_path
-      else
-         AC_MSG_ERROR([$_java_path not found, pass --with-jdk-home])
-      fi
-   fi
-
-   if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
-      # Check that the JDK found is correct architecture
-      # Why is this necessary, we don't link with any library from the JDK I think,
-
-      shortjdkhome=`cygpath -d "$with_jdk_home"`
-      if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" = "" >/dev/null; then
-	 AC_MSG_WARN([You are building 64-bit binaries but the JDK $howfound is 32-bit])
-	 AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
-      elif test "$CL_X64" = "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" != ""  >/dev/null; then
-	 AC_MSG_WARN([You are building 32-bit binaries but the JDK $howfound is 64-bit])
-	 AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a (32-bit) JDK])
-      fi
-
-      if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then
-          JAVAINTERPRETER="${JAVAINTERPRETER}.exe"
-      fi
-      JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
-      JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
-   elif test "$_os" = "Darwin"; then
-      dnl HACK:  There currently is only a 32 bit version of LibreOffice for Mac OS X,
-      dnl and Tiger Java complains about -d32 while Snow Leopard Java needs it
-      dnl to run in 32 bit mode and be able to load LibreOffice jnilibs:
-      AC_MSG_CHECKING([whether to pass -d32 to Java interpreter])
-      if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
-         AC_MSG_RESULT([yes])
-         JAVAIFLAGS=-d32
-      else
-         AC_MSG_RESULT([no])
-      fi
-   fi
+    # Windows-specific tests
+    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
+        if test "$CL_X64" != ""; then
+            bitness="64-bit"
+            otherbitness="32-bit"
+        else
+            bitness="32-bit"
+            otherbitness="64-bit"
+        fi
+
+        if test -z "$with_jdk_home"; then
+
+            # Unfortunately apparently no way to find, if needed, the 64-bit
+            # JDK in the Registry from the 32-bit Perl oowintool
+
+            _jdk_home=`./oowintool --jdk-home`
+            if test -f "$_jdk_home/lib/jvm.lib" -a -f "$_jdk_home/bin/java.exe"; then
+                with_jdk_home="$_jdk_home"
+                howfound="found by oowintool"
+            else
+                AC_MSG_ERROR([No JDK found by oowintool, pass the --with-jdk-home option pointing to a $bitness JDK])
+            fi
+        else
+            test "$build_os" = "cygwin" && with_jdk_home=`cygpath -u "$with_jdk_home"`
+            howfound="you passed"
+        fi
+    fi
+
+    JAVA_HOME=; export JAVA_HOME
+    if test -z "$with_jdk_home"; then
+        AC_PATH_PROG(JAVAINTERPRETER, $with_java)
+    else
+        _java_path="$with_jdk_home/bin/$with_java"
+        dnl Check if there is a Java interpreter at all.
+        if test -x "$_java_path"; then
+            JAVAINTERPRETER=$_java_path
+        else
+            AC_MSG_ERROR([$_java_path not found, pass --with-jdk-home])
+        fi
+    fi
+
+    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
+        # Check that the JDK found is correct architecture
+        # Why is this necessary, we don't link with any library from the JDK I think,
+
+        shortjdkhome=`cygpath -d "$with_jdk_home"`
+        if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" = "" >/dev/null; then
+            AC_MSG_WARN([You are building 64-bit binaries but the JDK $howfound is 32-bit])
+            AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
+        elif test "$CL_X64" = "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" != ""  >/dev/null; then
+            AC_MSG_WARN([You are building 32-bit binaries but the JDK $howfound is 64-bit])
+            AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a (32-bit) JDK])
+        fi
+
+        if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then
+            JAVAINTERPRETER="${JAVAINTERPRETER}.exe"
+        fi
+        JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
+        JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
+    elif test "$_os" = "Darwin"; then
+        dnl HACK:  There currently is only a 32 bit version of LibreOffice for Mac OS X,
+        dnl and Tiger Java complains about -d32 while Snow Leopard Java needs it
+        dnl to run in 32 bit mode and be able to load LibreOffice jnilibs:
+        AC_MSG_CHECKING([whether to pass -d32 to Java interpreter])
+        if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
+            AC_MSG_RESULT([yes])
+            JAVAIFLAGS=-d32
+        else
+            AC_MSG_RESULT([no])
+        fi
+    fi
 fi
 
 dnl ===================================================================
 dnl Checks for JDK.
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
-   _gij_longver=0
-   AC_MSG_CHECKING([the installed JDK])
-   if test -n "$JAVAINTERPRETER"; then
-      dnl java -version sends output to stderr!
-      if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-         AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-      elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
-        JDK=gcj
-        AC_MSG_RESULT([checked (gcj)])
-        _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
-        _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
-      elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "BEA"` -gt 0; then
-         AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-      elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "IBM"` -gt 0; then
-        JDK=ibm
-
-        dnl IBM JDK specific tests
-        _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-        _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-
-        if test "$_jdk_ver" -lt 10500; then
-             AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
-        fi
+    _gij_longver=0
+    AC_MSG_CHECKING([the installed JDK])
+    if test -n "$JAVAINTERPRETER"; then
+        dnl java -version sends output to stderr!
+        if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
+            AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
+        elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
+            JDK=gcj
+            AC_MSG_RESULT([checked (gcj)])
+            _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
+            _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+
+        elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "BEA"` -gt 0; then
+            AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
+        elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "IBM"` -gt 0; then
+            JDK=ibm
+
+            dnl IBM JDK specific tests
+            _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
+            _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+
+            if test "$_jdk_ver" -lt 10500; then
+                AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
+            fi
 
-        AC_MSG_RESULT([checked (IBM JDK $_jdk)])
+            AC_MSG_RESULT([checked (IBM JDK $_jdk)])
 
-        if test "$with_jdk_home" = ""; then
-             AC_MSG_ERROR([In order to successfully build LibreOffice using the IBM JDK,
+            if test "$with_jdk_home" = ""; then
+                AC_MSG_ERROR([In order to successfully build LibreOffice using the IBM JDK,
 you must use the "--with-jdk-home" configure option explicitly])
-        fi
+            fi
 
-        JAVA_HOME=$with_jdk_home
+           JAVA_HOME=$with_jdk_home
 
-      else
-        JDK=sun
+        else
+            JDK=sun
 
-        dnl Sun JDK specific tests
-        _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-        _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+            dnl Sun JDK specific tests
+            _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
+            _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
-        if test "$_jdk_ver" -lt 10500; then
-             AC_MSG_ERROR([JDK is too old, you need at least 1.5])
-        fi
-        AC_MSG_RESULT([checked (JDK $_jdk)])
-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
-        if test "$_os" = "WINNT"; then
-          JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
+            if test "$_jdk_ver" -lt 10500; then
+                AC_MSG_ERROR([JDK is too old, you need at least 1.5])
+            fi
+            AC_MSG_RESULT([checked (JDK $_jdk)])
+            JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
+            if test "$_os" = "WINNT"; then
+                JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
+            fi
         fi
-      fi
-   else
-      AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
-   fi
+    else
+        AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
+    fi
 else
-   dnl Java disabled
-   JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
+    dnl Java disabled
+    JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
 fi
 
 _java_target_ver="1.5"
@@ -3390,7 +3432,7 @@ if test "$SOLAR_JAVA" != ""; then
         _java_target_ver=`echo "$_jdk_ver" | $AWK '{ maj=substr($0,1,1); min=substr($0,2,2); print int(maj)"."int(min) }'`
         AC_MSG_RESULT([$_java_target_ver])
     else
-            AC_MSG_ERROR([Unable to guess Java bytecode version from Java version!])
+        AC_MSG_ERROR([Unable to guess Java bytecode version from Java version!])
     fi
     fi
 
@@ -3428,14 +3470,14 @@ if test "$SOLAR_JAVA" != ""; then
         fi
     fi
     if test -z "$JAVACOMPILER"; then
-      AC_MSG_ERROR([$javacompiler not found set with_jdk_home])
+        AC_MSG_ERROR([$javacompiler not found set with_jdk_home])
     fi
     if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
-       if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
-          JAVACOMPILER="${JAVACOMPILER}.exe"
-       fi
-       JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
-       JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
+        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
+            JAVACOMPILER="${JAVACOMPILER}.exe"
+        fi
+        JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
+        JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
     fi
 
     if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
@@ -3486,7 +3528,7 @@ if test "$SOLAR_JAVA" != ""; then
         fi
     fi
     if test -z "$JAVADOC"; then
-      AC_MSG_ERROR([$_javadoc_path not found set with_jdk_home])
+        AC_MSG_ERROR([$_javadoc_path not found set with_jdk_home])
     fi
     if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
         if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
@@ -3498,47 +3540,46 @@ if test "$SOLAR_JAVA" != ""; then
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-   # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
-   if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-
-   if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
-       # try to recover first by looking whether we have a alternatives
-       # system as in Debian or newer SuSEs where following /usr/bin/javac
-       # over /etc/alternatives/javac leads to the right bindir where we
-       # just need to strip a bit away to get a valid JAVA_HOME
-       JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
-   elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
-       # maybe only one level of symlink (e.g. on Mac)
-       JAVA_HOME=$(readlink $JAVACOMPILER)
-       if test "$(dirname $JAVA_HOME)" = "."; then
-           # we've got no path to trim back
-           JAVA_HOME=""
-       fi
-   else
-       # else warn
-       AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
-       AC_MSG_WARN([if this is the case, please inform the correct JAVA_HOME with --with-jdk-home])
-       echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
-       echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
-   fi
-   dnl now that we have the path to the real javac, make a JAVA_HOME out of it..
-   if test "$JAVA_HOME" != "/usr"; then
-       if test "$_os" = "Darwin"; then
-           dnl Leopard returns a non-suitable path with readlink - points to "Current" only
-           JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
-           dnl Tiger already returns a JDK path..
-           JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
-       else
-           JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
-       fi
-   fi
-fi
-# as we drop out of this, JAVA_HOME may have been set to the empty string by readlink
+    # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
+    if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
+        if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
+           # try to recover first by looking whether we have a alternatives
+           # system as in Debian or newer SuSEs where following /usr/bin/javac
+           # over /etc/alternatives/javac leads to the right bindir where we
+           # just need to strip a bit away to get a valid JAVA_HOME
+           JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
+        elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
+            # maybe only one level of symlink (e.g. on Mac)
+            JAVA_HOME=$(readlink $JAVACOMPILER)
+            if test "$(dirname $JAVA_HOME)" = "."; then
+                # we've got no path to trim back
+                JAVA_HOME=""
+            fi
+        else
+            # else warn
+            AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
+            AC_MSG_WARN([if this is the case, please inform the correct JAVA_HOME with --with-jdk-home])
+            echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
+            echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
+        fi
+        dnl now that we have the path to the real javac, make a JAVA_HOME out of it..
+        if test "$JAVA_HOME" != "/usr"; then
+            if test "$_os" = "Darwin"; then
+                dnl Leopard returns a non-suitable path with readlink - points to "Current" only
+                JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
+                dnl Tiger already returns a JDK path..
+                JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
+            else
+                JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
+            fi
+        fi
+    fi
+    # as we drop out of this, JAVA_HOME may have been set to the empty string by readlink
 
-dnl now if JAVA_HOME has been set to empty, then call findhome to find it
+    dnl now if JAVA_HOME has been set to empty, then call findhome to find it
     if test -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x"; then
-        cat > findhome.java <<_ACEOF
+        if test "x$with_jdk_home" = "x"; then
+            cat > findhome.java <<_ACEOF
 [import java.io.File;
 
 class findhome
@@ -3551,96 +3592,98 @@ class findhome
     }
 }]
 _ACEOF
-        AC_MSG_CHECKING([if javac works])
-        javac_cmd="$JAVACOMPILER findhome.java 1>&2"
-        AC_TRY_EVAL(javac_cmd)
-        if test $? = 0 && test -f ./findhome.class ; then
-          AC_MSG_RESULT([javac works])
-        else
-          echo "configure: javac test failed" >&5
-          cat findhome.java >&5
-          AC_MSG_ERROR([javac does not work - java projects will not build!])
-        fi
+            AC_MSG_CHECKING([if javac works])
+            javac_cmd="$JAVACOMPILER findhome.java 1>&2"
+            AC_TRY_EVAL(javac_cmd)
+            if test $? = 0 && test -f ./findhome.class ; then
+                AC_MSG_RESULT([javac works])
+            else
+                echo "configure: javac test failed" >&5
+                cat findhome.java >&5
+                AC_MSG_ERROR([javac does not work - java projects will not build!])
+            fi
 
-        AC_MSG_CHECKING([if gij knows its java.home])
-        JAVA_HOME=`$JAVAINTERPRETER findhome`
-        if test $? = 0 && test "$JAVA_HOME" != "" ; then
-          AC_MSG_RESULT([$JAVA_HOME])
+            AC_MSG_CHECKING([if gij knows its java.home])
+            JAVA_HOME=`$JAVAINTERPRETER findhome`
+            if test $? = 0 && test "$JAVA_HOME" != "" ; then
+                AC_MSG_RESULT([$JAVA_HOME])
+            else
+                echo "configure: java test failed" >&5
+                cat findhome.java >&5
+                AC_MSG_ERROR([gij does not know its java.home - use --with-jdk-home])
+            fi
         else
-          echo "configure: java test failed" >&5
-          cat findhome.java >&5
-          AC_MSG_ERROR([gij does not know its java.home - use --with-jdk-home])
+            JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$with_java,,p"`
         fi
-      else
-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$with_java,,p"`
-      fi
     fi
 
     dnl second sanity check JAVA_HOME if possible
     if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
-      # now check if $JAVA_HOME is really valid
-      if test "$_os" = "Darwin"; then
-         if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
+        # now check if $JAVA_HOME is really valid
+        if test "$_os" = "Darwin"; then
+            if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
+                JAVA_HOME_OK="NO"
+            fi
+        elif test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
             JAVA_HOME_OK="NO"
-         fi
-      elif test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
-         JAVA_HOME_OK="NO"
-      fi
-      if test "$JAVA_HOME_OK" = "NO"; then
-         AC_MSG_WARN([JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script])
-         AC_MSG_WARN([attempted to find JAVA_HOME automatically, but apparently it failed])
-         AC_MSG_WARN([in case JAVA_HOME is incorrectly set, some projects with not be built correctly])
-         echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
-         echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
-         echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-      fi
+        fi
+        if test "$JAVA_HOME_OK" = "NO"; then
+            AC_MSG_WARN([JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script])
+            AC_MSG_WARN([attempted to find JAVA_HOME automatically, but apparently it failed])
+            AC_MSG_WARN([in case JAVA_HOME is incorrectly set, some projects with not be built correctly])
+            echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
+            echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
+            echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
+        fi
     fi
     AC_MSG_NOTICE([JAVA_HOME=$JAVA_HOME])
 fi
+
 AWTLIB=
+
 if test "$SOLAR_JAVA" != ""; then
-   AC_MSG_CHECKING([for jawt lib name])
-   if test "$JDK" = "gcj"; then
-      save_CFLAGS=$CFLAGS
-      save_LDFLAGS=$LDFLAGS
-      CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-      LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
-      exec 6>/dev/null # no output
-      AC_CHECK_HEADER(jni.h, [],
+    AC_MSG_CHECKING([for jawt lib name])
+    if test "$JDK" = "gcj"; then
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS -I$JAVA_HOME/include"
+        LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+        exec 6>/dev/null # no output
+        AC_CHECK_HEADER(jni.h, [],
                     [AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
-      AC_CHECK_LIB(gcjawt, JAWT_GetAWT, [ AWTLIB="-lgcjawt -lgcj"] )
-      exec 6>&1 # output on again
-      CFLAGS=$save_CFLAGS
-      LDFLAGS=$save_LDFLAGS
-   fi
-   # IBM SDK 1.5.0-sr5 includes libjawt.so with unresolved symbols.
-   # A workaround is to link also against libpmawt.so
-   if test "$JDK" = "ibm" ; then
-      save_CFLAGS=$CFLAGS
-      save_LDFLAGS=$LDFLAGS
-      save_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-      CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-      LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin"
-      LD_LIBRARY_PATH=$JAVA_HOME/jre/bin:$JAVA_HOME/jre/bin/classic:$JAVA_HOME/jre/bin/xawt:$LD_LIBRARY_PATH
-      export LD_LIBRARY_PATH
-      exec 6>/dev/null # no output
-      AC_CHECK_HEADER(jni.h, [],
+        AC_CHECK_LIB(gcjawt, JAWT_GetAWT, [ AWTLIB="-lgcjawt -lgcj"] )
+        exec 6>&1 # output on again
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+    fi
+    # IBM SDK 1.5.0-sr5 includes libjawt.so with unresolved symbols.
+    # A workaround is to link also against libpmawt.so
+    if test "$JDK" = "ibm" ; then
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        save_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+        CFLAGS="$CFLAGS -I$JAVA_HOME/include"
+        LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin"
+        LD_LIBRARY_PATH=$JAVA_HOME/jre/bin:$JAVA_HOME/jre/bin/classic:$JAVA_HOME/jre/bin/xawt:$LD_LIBRARY_PATH
+        export LD_LIBRARY_PATH
+        exec 6>/dev/null # no output
+        AC_CHECK_HEADER(jni.h, [],
                     [AC_MSG_ERROR([jni.h could not be found.])], [])
-      AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB="-ljawt"] )
-      if test -z "$AWTLIB"; then
-         LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
-         AC_CHECK_LIB(mawt, JAWT_GetAWT, [ AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"])
-      fi
-      exec 6>&1 # output on again
-      CFLAGS=$save_CFLAGS
-      LDFLAGS=$save_LDFLAGS
-      LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH
-   fi
-   if test -z "$AWTLIB"; then
-      AWTLIB=-ljawt
-   fi
-   AC_MSG_RESULT([$AWTLIB])
-   AC_SUBST(AWTLIB)
+        AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB="-ljawt"] )
+        if test -z "$AWTLIB"; then
+            LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
+            AC_CHECK_LIB(mawt, JAWT_GetAWT, [ AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"])
+        fi
+        exec 6>&1 # output on again
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH
+    fi
+    if test -z "$AWTLIB"; then
+        AWTLIB=-ljawt
+    fi
+    AC_MSG_RESULT([$AWTLIB])
+    AC_SUBST(AWTLIB)
 fi
 
 AC_SUBST(JAVA_HOME)
@@ -3677,24 +3720,24 @@ else
     # (the other) not...
     $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
     if test $? -eq 0; then
-       BUILD_DMAKE=NO
-       AC_MSG_RESULT([yes])
-       AC_MSG_CHECKING([the dmake version])
-       DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
-       if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-     AC_MSG_RESULT([OK, >= 4.11])
-       elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
-        test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
-     AC_MSG_RESULT([OK, >= 4.11])
-       else
-     AC_MSG_RESULT([too old. >= 4.11 is needed])
-     echo "A newer dmake will be built on ./bootstrap"
-     BUILD_DMAKE=YES
-       fi
+        BUILD_DMAKE=NO
+        AC_MSG_RESULT([yes])
+        AC_MSG_CHECKING([the dmake version])
+        DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
+        if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
+            AC_MSG_RESULT([OK, >= 4.11])
+        elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
+            test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
+            AC_MSG_RESULT([OK, >= 4.11])
+        else
+            AC_MSG_RESULT([too old. >= 4.11 is needed])
+            echo "A newer dmake will be built on ./bootstrap"
+            BUILD_DMAKE=YES
+        fi
     else
-       AC_MSG_RESULT([no])
-       echo "dmake will be built on ./bootstrap"
-       BUILD_DMAKE=YES
+        AC_MSG_RESULT([no])
+        echo "dmake will be built on ./bootstrap"
+        BUILD_DMAKE=YES
     fi
 fi
 AC_SUBST(BUILD_DMAKE)
@@ -3702,59 +3745,59 @@ AC_SUBST(BUILD_DMAKE)
 AC_MSG_CHECKING([whether to enable EPM for packing])
 BUILD_EPM=NO
 if test "$enable_epm" = "yes"; then
-   AC_MSG_RESULT([yes])
-   dnl ===================================================================
-   dnl Check for epm - not needed for Windows
-   dnl ===================================================================
-   if test "$_os" != "WINNT"; then
-      if test -n "$with_epm"; then
-          EPM=$with_epm
-      else
-         AC_PATH_PROG(EPM, epm, no)
-      fi
-      if test "$EPM" = "no" || test "$EPM" = "internal"; then
-         echo "EPM will be built."
-         BUILD_EPM=YES
-         BUILD_TYPE="$BUILD_TYPE EPM"
-      else
-         # Gentoo has some epm which is something different...
-         AC_MSG_CHECKING([whether the found epm is the right epm])
-         if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
-            AC_MSG_RESULT([yes])
-         else
-            AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm])
-         fi
-         AC_MSG_CHECKING([epm version])
-         EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
-     if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
-           test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
-           AC_MSG_RESULT([OK, >= 3.7])
-           BUILD_EPM=NO
-            if test "$_os" = "Darwin"; then
-               AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
-                  _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
-                  if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
+    AC_MSG_RESULT([yes])
+    dnl ===================================================================
+    dnl Check for epm - not needed for Windows
+    dnl ===================================================================
+    if test "$_os" != "WINNT"; then
+        if test -n "$with_epm"; then
+            EPM=$with_epm
+        else
+            AC_PATH_PROG(EPM, epm, no)
+        fi
+        if test "$EPM" = "no" || test "$EPM" = "internal"; then
+            echo "EPM will be built."
+            BUILD_EPM=YES
+            BUILD_TYPE="$BUILD_TYPE EPM"
+        else
+            # Gentoo has some epm which is something different...
+            AC_MSG_CHECKING([whether the found epm is the right epm])
+            if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
+                AC_MSG_RESULT([yes])
+            else
+                AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm])
+            fi
+            AC_MSG_CHECKING([epm version])
+            EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
+            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
+               test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
+                AC_MSG_RESULT([OK, >= 3.7])
+                BUILD_EPM=NO
+                if test "$_os" = "Darwin"; then
+                    AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
+                    _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
+                    if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
                         AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
-                  elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-                      AC_MSG_RESULT([$_pm, ok])
-                  else # we never should get here, but go safe
-                      AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
-                  fi
-           fi
-     else
-           AC_MSG_RESULT([too old. epm >= 3.7 is required.])
-           echo "EPM will be built."
-           BUILD_EPM=YES
-           BUILD_TYPE="$BUILD_TYPE EPM"
-     fi
-      fi
-   fi
-
-   # test which package format to use
-   AC_MSG_CHECKING([which package format to use])
-
-   # defaults
-   case "$_os" in
+                    elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
+                        AC_MSG_RESULT([$_pm, ok])
+                    else # we never should get here, but go safe
+                        AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
+                    fi
+                fi
+            else
+                AC_MSG_RESULT([too old. epm >= 3.7 is required.])
+                echo "EPM will be built."
+                BUILD_EPM=YES
+                BUILD_TYPE="$BUILD_TYPE EPM"
+            fi
+        fi
+    fi
+
+    # test which package format to use
+    AC_MSG_CHECKING([which package format to use])
+
+    # defaults
+    case "$_os" in
     Darwin)
         PKGFORMAT=dmg
         ;;
@@ -3762,12 +3805,12 @@ if test "$enable_epm" = "yes"; then
         PKGFORMAT=pkg
         ;;
     Linux)
-      # if building on Debian, default should be deb...
-      if test -e /etc/debian_version; then
-         PKGFORMAT=deb
-      else
-         PKGFORMAT=rpm
-      fi
+        # if building on Debian, default should be deb...
+        if test -e /etc/debian_version; then
+            PKGFORMAT=deb
+        else
+            PKGFORMAT=rpm
+        fi
         ;;
     AIX)
         PKGFORMAT=rpm
@@ -3785,14 +3828,14 @@ if test "$enable_epm" = "yes"; then
     # but go sure...
     *)
         AC_MSG_ERROR([unknown system])
-   esac
-   if test -n "$with_package_format"; then
-    for i in $with_package_format; do
-        case "$i" in
+    esac
+    if test -n "$with_package_format"; then
+        for i in $with_package_format; do
+            case "$i" in
             aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
-            ;;
-        *)
-            AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
+                ;;
+            *)
+                AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 depot or swinstall - HP-UX software distribution
@@ -3810,93 +3853,93 @@ dmg - Mac OS X .dmg
 installed - installation tree
 msi - Windows .msi
             ])
-            ;;
-        esac
-    done
-    PKGFORMAT="$with_package_format"
-   fi
-   AC_MSG_RESULT([$PKGFORMAT])
-   if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
-      AC_MSG_CHECKING([for rpm])
-      for a in "$RPM" rpmbuild rpm; do
-         $a --usage >/dev/null 2> /dev/null
-         if test $? -eq 0; then
-            RPM=$a
-            break
-         else
-            $a --version >/dev/null 2> /dev/null
+                ;;
+            esac
+        done
+        PKGFORMAT="$with_package_format"
+    fi
+    AC_MSG_RESULT([$PKGFORMAT])
+    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
+        AC_MSG_CHECKING([for rpm])
+        for a in "$RPM" rpmbuild rpm; do
+            $a --usage >/dev/null 2> /dev/null
             if test $? -eq 0; then
-               RPM=$a
-               break
+                RPM=$a
+                break
+            else
+                $a --version >/dev/null 2> /dev/null
+                if test $? -eq 0; then
+                    RPM=$a
+                    break
+                fi
+            fi
+        done
+        if test -z "$RPM" ; then
+            AC_MSG_ERROR([not found])
+        elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then
+            RPM_PATH=`which $RPM`
+            AC_MSG_RESULT([$RPM_PATH])
+        else
+            AC_MSG_ERROR([cannot build packages. Try installing rpmbuild.])
+        fi
+    fi
+    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
+        AC_PATH_PROG(DPKG, dpkg, no)
+        if test "$DPKG" = "no"; then
+            AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
+        fi
+    fi
+    if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
+        if test "$_os" = "Darwin"; then
+            AC_MSG_CHECKING([for PackageMaker availability])
+            if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
+                AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
+            else
+                AC_MSG_RESULT([ok])
+            fi
+        else
+            AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
+        fi
+    fi
+    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
+       echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
+        if test "$EPM" != "no" && test "$EPM" != "internal"; then
+            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
+                AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs])
+                if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
+                    AC_MSG_RESULT([yes])
+                else
+                    AC_MSG_RESULT([no])
+                    if echo "$PKGFORMAT" | grep -q rpm; then
+                        _pt="rpm"
+                        AC_MSG_WARN([the rpms will need to be installed with --nodeps])
+                        echo "the rpms will need to be installed with --nodeps" >> warn
+                    else
+                        _pt="pkg"
+                    fi
+                    AC_MSG_WARN([the ${_pt}s will not be relocateable])
+                    echo "the ${_pt}s will not be relocateable" >> warn
+                    AC_MSG_WARN([if you want to make sure installation without --nodeps and
+                                 relocation will work, you need to patch your epm with the
+                                 patch in epm/epm-3.7.patch or build with
+                                 --with-epm=internal which will build a suitable epm])
+                fi
             fi
-         fi
-       done
-       if test -z "$RPM" ; then
-          AC_MSG_ERROR([not found])
-       elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then
-          RPM_PATH=`which $RPM`
-          AC_MSG_RESULT([$RPM_PATH])
-       else
-          AC_MSG_ERROR([cannot build packages. Try installing rpmbuild.])
-       fi
-   fi
-   if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
-      AC_PATH_PROG(DPKG, dpkg, no)
-      if test "$DPKG" = "no"; then
-         AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
-      fi
-   fi
-   if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
-      if test "$_os" = "Darwin"; then
-         AC_MSG_CHECKING([for PackageMaker availability])
-         if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
-            AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
-         else
-            AC_MSG_RESULT([ok])
-         fi
-      else
-         AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
-       fi
-   fi
-   if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
-      echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-          if test "$EPM" != "no" && test "$EPM" != "internal"; then
-           if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
-               AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs])
-               if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
-                  AC_MSG_RESULT([yes])
-               else
-                  AC_MSG_RESULT([no])
-                  if echo "$PKGFORMAT" | grep -q rpm; then
-                      _pt="rpm"
-                      AC_MSG_WARN([the rpms will need to be installed with --nodeps])
-                      echo "the rpms will need to be installed with --nodeps" >> warn
-                  else
-                      _pt="pkg"
-                  fi
-                  AC_MSG_WARN([the ${_pt}s will not be relocateable])
-                  echo "the ${_pt}s will not be relocateable" >> warn
-                  AC_MSG_WARN([if you want to make sure installation without --nodeps and
-                  relocation will work, you need to patch your epm with the
-                  patch in epm/epm-3.7.patch or build with
-                  --with-epm=internal which will build a suitable epm])
-               fi
-           fi
         fi
-   fi
-   if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-      AC_PATH_PROG(PKGMK, pkgmk, no)
-      if test "$PKGMK" = "no"; then
-         AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
-      fi
-   fi
-   AC_SUBST(RPM)
-   AC_SUBST(DPKG)
-   AC_SUBST(PKGMK)
+    fi
+    if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
+        AC_PATH_PROG(PKGMK, pkgmk, no)
+        if test "$PKGMK" = "no"; then
+            AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
+        fi
+    fi
+    AC_SUBST(RPM)
+    AC_SUBST(DPKG)
+    AC_SUBST(PKGMK)
 else
-   AC_MSG_RESULT([no])
-   EPM=NO
-   PKGFORMAT=native
+    AC_MSG_RESULT([no])
+    EPM=NO
+    PKGFORMAT=native
 fi
 AC_SUBST(EPM)
 AC_SUBST(BUILD_EPM)
@@ -3922,11 +3965,11 @@ dnl Check for building stax
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the stax])
 if test -f "./stax/download/jsr173_1.0_api.jar"; then
-   BUILD_STAX=NO
-   AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar])
+    BUILD_STAX=NO
+    AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar])
 else
-   BUILD_STAX=YES
-   AC_MSG_RESULT([yes])
+    BUILD_STAX=YES
+    AC_MSG_RESULT([yes])
 fi
 AC_SUBST(BUILD_STAX)
 
@@ -3935,51 +3978,51 @@ dnl Check for building ODK
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the ODK])
 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
-   AC_MSG_RESULT([yes])
+    AC_MSG_RESULT([yes])
 
-   if test "$with_java" != "no"; then
-      AC_MSG_CHECKING([whether to build unowinreg.dll])
-      if test "$_os" = "WINNT" -a "z$enable_build_unowinreg" = "z" ; then
-           # build on Win by default
-           enable_build_unowinreg=yes
-      fi
-      if test "z$enable_build_unowinreg" = "z" -o "$enable_build_unowinreg" = "no"; then
-         AC_MSG_RESULT([no])
-         BUILD_UNOWINREG=NO
-      else
-         AC_MSG_RESULT([yes])
-         BUILD_UNOWINREG=YES
-      fi
-      if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "YES"; then
-         if test -z "$with_mingw_cross_compiler"; then
-            dnl Guess...
-            AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++ i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false)
-         elif test -x "$with_mingw_cross_compiler"; then
-             MINGWCXX="$with_mingw_cross_compiler"
-         else
-            AC_CHECK_TOOL(MINGWCXX, "$with_mingw_cross_compiler", false)
-         fi
+    if test "$with_java" != "no"; then
+        AC_MSG_CHECKING([whether to build unowinreg.dll])
+        if test "$_os" = "WINNT" -a "z$enable_build_unowinreg" = "z" ; then
+            # build on Win by default
+            enable_build_unowinreg=yes
+        fi
+        if test "z$enable_build_unowinreg" = "z" -o "$enable_build_unowinreg" = "no"; then
+            AC_MSG_RESULT([no])
+            BUILD_UNOWINREG=NO
+        else
+            AC_MSG_RESULT([yes])
+            BUILD_UNOWINREG=YES
+        fi
+        if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "YES"; then
+            if test -z "$with_mingw_cross_compiler"; then
+                dnl Guess...
+                AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++ i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false)
+            elif test -x "$with_mingw_cross_compiler"; then
+                 MINGWCXX="$with_mingw_cross_compiler"
+            else
+                AC_CHECK_TOOL(MINGWCXX, "$with_mingw_cross_compiler", false)
+            fi
 
-         if test "$MINGWCXX" = "false"; then
-            AC_MSG_ERROR([MinGW32 C++ cross-compiler not found.])
-         fi
+            if test "$MINGWCXX" = "false"; then
+                AC_MSG_ERROR([MinGW32 C++ cross-compiler not found.])
+            fi
 
-         mingwstrip_test="`echo $MINGWCXX | $SED -e s/g++/strip/`"
-         if test -x "$mingwstrip_test"; then
-            MINGWSTRIP="$mingwstrip_test"
-         else
-            AC_CHECK_TOOL(MINGWSTRIP, "$mingwstrip_test", false)
-         fi
+            mingwstrip_test="`echo $MINGWCXX | $SED -e s/g++/strip/`"
+            if test -x "$mingwstrip_test"; then
+                MINGWSTRIP="$mingwstrip_test"
+            else
+                AC_CHECK_TOOL(MINGWSTRIP, "$mingwstrip_test", false)
+            fi
 
-         if test "$MINGWSTRIP" = "false"; then
-            AC_MSG_ERROR(MinGW32 binutils not found.)
-         fi
-      fi
-   fi
-   BUILD_TYPE="$BUILD_TYPE ODK"
+            if test "$MINGWSTRIP" = "false"; then
+                AC_MSG_ERROR(MinGW32 binutils not found.)
+            fi
+        fi
+    fi
+    BUILD_TYPE="$BUILD_TYPE ODK"
 else
-   AC_MSG_RESULT([no])
-   BUILD_UNOWINREG=NO
+    AC_MSG_RESULT([no])
+    BUILD_UNOWINREG=NO
 fi
 AC_SUBST(BUILD_UNOWINREG)
 AC_SUBST(MINGWCXX)
@@ -3990,12 +4033,12 @@ dnl Check for system stdlibs
 dnl ===================================================================
 AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
 if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
-   test "$with_system_stdlibs" != "no"; then
-   AC_MSG_RESULT([no])
-   SYSTEM_STDLIBS=YES
+    test "$with_system_stdlibs" != "no"; then
+    AC_MSG_RESULT([no])
+    SYSTEM_STDLIBS=YES
 else
-   AC_MSG_RESULT([yes])
-   SYSTEM_STDLIBS=NO
+    AC_MSG_RESULT([yes])
+    SYSTEM_STDLIBS=NO
 fi
 AC_SUBST(SYSTEM_STDLIBS)
 
@@ -4004,7 +4047,7 @@ dnl Check for system zlib
 dnl ===================================================================
 AC_MSG_CHECKING([which zlib to use])
 if test -n "$with_system_zlib" -o -n "$with_system_libs" -o \
-	"$_os" != "WINNT" && \
+        "$_os" != "WINNT" && \
     test "$with_system_zlib" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_ZLIB=YES
@@ -4098,7 +4141,17 @@ dnl ===================================================================
 dnl Check for system cppunit
 dnl ===================================================================
 AC_MSG_CHECKING([which cppunit to use])
-if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
+if test -z "$ENABLE_DEBUG_STL"; then
+    AC_MSG_ERROR([Internal error, debug build check needs to precede cppunit check])
+fi
+if test "$ENABLE_DEBUG_STL" = "TRUE"; then
+    if test "$with_system_cppunit" = "yes"; then
+        AC_MSG_ERROR([--with-system-cppunit conflicts with debug build])
+    fi
+    AC_MSG_RESULT([internal, needed by debug build])
+    SYSTEM_CPPUNIT=NO
+    BUILD_TYPE="$BUILD_TYPE CPPUNIT"
+elif test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
         test "$with_system_cppunit" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_CPPUNIT=YES
@@ -4117,7 +4170,7 @@ dnl ===================================================================
 dnl Check whether freetype is available
 dnl ===================================================================
 if test  "$test_freetype" = "yes"; then
-   AC_MSG_CHECKING([whether freetype is available])
+    AC_MSG_CHECKING([whether freetype is available])
     PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
 fi
 AC_SUBST(FREETYPE_CFLAGS)
@@ -4177,23 +4230,23 @@ fi
 AC_SUBST(USE_FT_EMBOLDEN)
 
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
-   test "$with_system_libxslt" != "no"; then
+       test "$with_system_libxslt" != "no"; then
     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" = "no"; then
-      # somehow AC_MSG_WARN won't work...
-       echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
-       echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-       with_system_libxml=yes
+           test "$with_system_libxml" = "no"; then
+        # somehow AC_MSG_WARN won't work...
+        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
+        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
+        with_system_libxml=yes
     fi
 fi
 if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
-   test "$with_system_libxml" != "no"; then
+       test "$with_system_libxml" != "no"; then
     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" = "no"; then
-      # somehow AC_MSG_WARN won't work...
-       echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
-       echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-       with_system_libxslt=yes
+           test "$with_system_libxslt" = "no"; then
+        # somehow AC_MSG_WARN won't work...
+        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
+        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
+        with_system_libxslt=yes
     fi
 fi
 
@@ -4203,7 +4256,7 @@ fi
 AC_MSG_CHECKING([which libxslt to use])
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
        "$_os" = "Darwin" && \
-   test "$with_system_libxslt" != "no"; then
+       test "$with_system_libxslt" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBXSLT=YES
     if test "$_os" = "Darwin"; then
@@ -4243,7 +4296,7 @@ AC_SUBST(XSLTPROC)
 AC_MSG_CHECKING([which libxml to use])
 if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
             "$_os" = "Darwin" -o $_os = iOS && \
-    test "$with_system_libxml" != "no"; then
+        test "$with_system_libxml" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBXML=YES
     if test "$_os" = "Darwin"; then
@@ -4277,132 +4330,132 @@ AC_MSG_CHECKING([which Python to use])
 
 case "$enable_python" in
 no|disable)
-   enable_python=no
-   AC_MSG_RESULT([none])
-   DISABLE_PYTHON=TRUE
-   ;;
+    enable_python=no
+    AC_MSG_RESULT([none])
+    DISABLE_PYTHON=TRUE
+    ;;
 ""|yes|auto)
-   if test $build_os = cygwin; then
-      dnl When building on Windows we don't attempt to use any installed
-      dnl "system"  Python.
-      dnl
-      dnl (When cross-compiling to Windows from Linux using the mingw32-cross
-      dnl compiler from OBS, use mingw32-python from OBS, and ditto for other
-      dnl MinGW cross-compilation setups.)
-      AC_MSG_RESULT([internal])
-      enable_python=internal
-   elif test $_os = Darwin; then
-      AC_MSG_RESULT([system, MacOSX10.4u.SDK (Python 2.3)])
-      enable_python=system
-      PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
-      PYTHON_LIBS="-framework Python"
-   else
-      AC_MSG_RESULT([checking below])
-      enable_python=auto       
-   fi
-   ;;
+    if test $build_os = cygwin; then
+        dnl When building on Windows we don't attempt to use any installed
+        dnl "system"  Python.
+        dnl
+        dnl (When cross-compiling to Windows from Linux using the mingw32-cross
+        dnl compiler from OBS, use mingw32-python from OBS, and ditto for other
+        dnl MinGW cross-compilation setups.)
+        AC_MSG_RESULT([internal])
+        enable_python=internal
+    elif test $_os = Darwin; then
+        AC_MSG_RESULT([system, MacOSX10.4u.SDK (Python 2.3)])
+        enable_python=system
+        PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
+        PYTHON_LIBS="-framework Python"
+    else
+        AC_MSG_RESULT([checking below])
+        enable_python=auto
+    fi
+    ;;
 internal)
-   AC_MSG_RESULT([internal])
-   ;;
+    AC_MSG_RESULT([internal])
+    ;;
 system)
-   AC_MSG_RESULT([system])
-   ;;
+    AC_MSG_RESULT([system])
+    ;;
 *)
-   AC_MSG_ERROR([Incorrect --enable-python option])
-   ;;
+    AC_MSG_ERROR([Incorrect --enable-python option])
+    ;;
 esac
 
 AC_SUBST(DISABLE_PYTHON)
 
 if test $_os = WINNT -a "$WITH_MINGW" != yes -a $enable_python = system; then
-   AC_MSG_ERROR([Must use internal Python when building with MSVC])
+    AC_MSG_ERROR([Must use internal Python when building with MSVC])
 fi
 
 if test $enable_python != no; then
-   BUILD_TYPE="$BUILD_TYPE PYUNO"
+    BUILD_TYPE="$BUILD_TYPE PYUNO"
 fi
 
 if test "$cross_compiling" != yes; then
-   if test $enable_python = system; then
-      dnl This causes an error if no Python found
-      AM_PATH_PYTHON([2.2])
-   elif test $enable_python = auto; then
-      dnl This allows lack of system Python
-      AM_PATH_PYTHON([2.2],, [:])
-
-      if test "$PYTHON" = :; then
-         enable_python=internal
-      else
-         enable_python=system
-      fi
-   fi
+    if test $enable_python = system; then
+        dnl This causes an error if no Python found
+        AM_PATH_PYTHON([2.2])
+    elif test $enable_python = auto; then
+        dnl This allows lack of system Python
+        AM_PATH_PYTHON([2.2],, [:])
+
+        if test "$PYTHON" = :; then
+            enable_python=internal
+        else
+            enable_python=system
+        fi
+    fi
 fi
 
 if test $enable_python = system; then
-   if test -n "$PYTHON_CFLAGS" -a -n "$PYTHON_LIBS"; then
-      dnl Fallback: Accept these in the environment.
+    if test -n "$PYTHON_CFLAGS" -a -n "$PYTHON_LIBS"; then
+        dnl Fallback: Accept these in the environment.
       :
-   elif test "$cross_compiling" != yes; then
-      python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
-      python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
-      python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
-      python_libdir=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'));"`
-      PYTHON_CFLAGS="-I$python_include"
-      PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
-   elif test "$cross_compiling" = yes; then
-      dnl How to find out the cross-compilation Python installation path?
-      dnl Let's hardocode what we know for different distributions for now...
-
-      for python_sysroot in /usr/i686-w64-mingw32/sys-root/mingw ; do
-         for python_version in 2.6 ; do
-            if test -f ${python_sysroot}/include/python${python_version}/Python.h; then
-               PYTHON_CFLAGS="-I ${python_sysroot}/include/python$python_version"
-               PYTHON_LIBS="-L ${python_sysroot}lib -lpython$python_version $python_libs"
-               break
-            fi
-         done
-         test -n "$PYTHON_CFLAGS" && break
-      done
-   fi
+    elif test "$cross_compiling" != yes; then
+        python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
+        python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
+        python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
+        python_libdir=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'));"`
+        PYTHON_CFLAGS="-I$python_include"
+        PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
+    elif test "$cross_compiling" = yes; then
+        dnl How to find out the cross-compilation Python installation path?
+        dnl Let's hardocode what we know for different distributions for now...
+
+        for python_sysroot in /usr/i686-w64-mingw32/sys-root/mingw ; do
+            for python_version in 2.6 ; do
+                if test -f ${python_sysroot}/include/python${python_version}/Python.h; then
+                    PYTHON_CFLAGS="-I ${python_sysroot}/include/python$python_version"
+                    PYTHON_LIBS="-L ${python_sysroot}lib -lpython$python_version $python_libs"
+                    break
+                fi
+            done
+            test -n "$PYTHON_CFLAGS" && break
+        done
+    fi
 fi
 
 dnl By now enable_python should be "system", "internal" or "no"
 case $enable_python in
 system)
-   SYSTEM_PYTHON=YES
+    SYSTEM_PYTHON=YES
 
-   dnl Check if the headers really work
-   save_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-   AC_CHECK_HEADER(Python.h, [],
+    dnl Check if the headers really work
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
+    AC_CHECK_HEADER(Python.h, [],
        [AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])],
        [])
-   CPPFLAGS="$save_CPPFLAGS"
+    CPPFLAGS="$save_CPPFLAGS"
 
-   dnl FIXME Check if the Python library can be linked with, too?
-   ;;
+    dnl FIXME Check if the Python library can be linked with, too?
+    ;;
 
 internal)
-   SYSTEM_PYTHON=NO
-   BUILD_TYPE="$BUILD_TYPE PYTHON"
-   # Embedded Python dies without Home set
-   if test "z$HOME" = "z"; then
-      export HOME="";
-   fi
-   # bz2 tarball and bzip2 is not standard
-   if test -z "$BZIP2"; then
-      AC_PATH_PROG( BZIP2, bzip2)
-      if test -z "$BZIP2"; then
-         AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2])
-      fi
-   fi
-   ;;
+    SYSTEM_PYTHON=NO
+    BUILD_TYPE="$BUILD_TYPE PYTHON"
+    # Embedded Python dies without Home set
+    if test "z$HOME" = "z"; then
+        export HOME="";
+    fi
+    # bz2 tarball and bzip2 is not standard
+    if test -z "$BZIP2"; then
+        AC_PATH_PROG( BZIP2, bzip2)
+        if test -z "$BZIP2"; then
+            AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2])
+        fi
+    fi
+    ;;
 no)
-   SYSTEM_PYTHON=NO
-   ;;
+    SYSTEM_PYTHON=NO
+    ;;
 *)
-   AC_MSG_ERROR([Internal configure script error, invalid enable_python value "$enable_python"])
-   ;;
+    AC_MSG_ERROR([Internal configure script error, invalid enable_python value "$enable_python"])
+    ;;
 esac
 
 AC_SUBST(SYSTEM_PYTHON)
@@ -4432,9 +4485,9 @@ if test "$with_system_translate_toolkit" = "yes" ; then
         AC_MSG_ERROR([$PO2OO does not support --skipsource; use translate-toolkit >= 1.9 or use --without-system-translate-toolkit])
     fi
 else
-   AC_MSG_RESULT([internal])
-   SYSTEM_TRANSLATE_TOOLKIT=NO
-   BUILD_TYPE="$BUILD_TYPE TRANSLATE_TOOLKIT"
+    AC_MSG_RESULT([internal])
+    SYSTEM_TRANSLATE_TOOLKIT=NO
+    BUILD_TYPE="$BUILD_TYPE TRANSLATE_TOOLKIT"
 fi
 AC_SUBST(SYSTEM_TRANSLATE_TOOLKIT)
 
@@ -4482,7 +4535,7 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
                 [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
             AC_CHECK_LIB(db$dash$dbver, __db185_open,
                 [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
-         done
+        done
         test -n "$DB_LIB" && break
     done
 
@@ -4512,11 +4565,11 @@ dnl Check for system lucene
 dnl ===================================================================
 AC_MSG_CHECKING([which lucene to use])
 if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
-       test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_LUCENE=YES
-        if test -z $LUCENE_CORE_JAR; then
-          AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar,
+        test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_LUCENE=YES
+    if test -z $LUCENE_CORE_JAR; then
+         AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar,
             [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
             [
               AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
@@ -4528,14 +4581,14 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
                 ]
               )
             ]
-          )
-        else
-          AC_CHECK_FILE($LUCENE_CORE_JAR, [],
+         )
+    else
+        AC_CHECK_FILE($LUCENE_CORE_JAR, [],
                [AC_MSG_ERROR(lucene-core.jar not found.)], [])
-        fi
+    fi
 
-        if test -z $LUCENE_ANALYZERS_JAR; then
-          AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar,
+    if test -z $LUCENE_ANALYZERS_JAR; then
+        AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar,
             [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar ],
             [
               AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar,
@@ -4543,14 +4596,14 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
                 [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)]
               )
             ]
-          )
-        else
-          AC_CHECK_FILE($LUCENE_CORE_JAR, [],
+        )
+    else
+        AC_CHECK_FILE($LUCENE_CORE_JAR, [],
                [ AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
-        fi
-        AC_MSG_CHECKING([whether lucene is version 2.x])
-        export LUCENE_CORE_JAR
-        if $PERL -e 'use Archive::Zip;
+    fi
+    AC_MSG_CHECKING([whether lucene is version 2.x])
+    export LUCENE_CORE_JAR
+    if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'LUCENE_CORE_JAR'}";
             my $zip = Archive::Zip->new( $file );
             my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
@@ -4559,10 +4612,10 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
             } else {
                 exit 1;
             }'; then
-            AC_MSG_RESULT([yes])
-         else
-            AC_MSG_ERROR([no, you need lucene 2])
-         fi
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_ERROR([no, you need lucene 2])
+    fi
 
 else
     AC_MSG_RESULT([internal])
@@ -4575,92 +4628,92 @@ AC_SUBST(LUCENE_ANALYZERS_JAR)
 
 AC_MSG_CHECKING([whether to build the MySQL Connector extension])
 if test -n "$enable_ext_mysql_connector" -a "$enable_ext_mysql_connector" != "no"; then
-  AC_MSG_RESULT([yes])
-  ENABLE_MYSQLC=YES
-  AC_MSG_CHECKING([for mysqlc module])
-  if test -d mysqlc; then
-   AC_MSG_RESULT([OK])
-  else
-   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-  fi
-  BUILD_TYPE="$BUILD_TYPE MYSQLC"
+    AC_MSG_RESULT([yes])
+    ENABLE_MYSQLC=YES
+    AC_MSG_CHECKING([for mysqlc module])
+    if test -d mysqlc; then
+        AC_MSG_RESULT([OK])
+    else
+        AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+    fi
+    BUILD_TYPE="$BUILD_TYPE MYSQLC"
 else
-  AC_MSG_RESULT([no])
-  ENABLE_MYSQLC=NO
+    AC_MSG_RESULT([no])
+    ENABLE_MYSQLC=NO
 fi
 AC_SUBST(ENABLE_MYSQLC)
 
 if test "$ENABLE_MYSQLC" = "YES"; then
 
-SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MYSQLC"
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MYSQLC"
 
-dnl ===================================================================
-dnl Check for system MySQL
-dnl ===================================================================
-AC_MSG_CHECKING([for mysql pre-requisites])
-if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
-       test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
-    AC_MSG_RESULT([external MySQL])
-    SYSTEM_MYSQL=YES
-    AC_PATH_PROG( MYSQLCONFIG, mysql_config)
-    AC_MSG_CHECKING([MySQL version])
-    MYSQL_VERSION=`$MYSQLCONFIG --version`
-    MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
-    if test "$MYSQL_MAJOR" -ge "5"; then
-        AC_MSG_RESULT([OK])
-    else
-        AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
-    fi
-    AC_MSG_CHECKING([for MySQL Client library])
-    MYSQL_INC=`$MYSQLCONFIG --include`
-    MYSQL_LIB=`$MYSQLCONFIG --libs`
-    MYSQL_DEFINES=`$MYSQLCONFIG --cflags | $SED -e s,$MYSQL_INC,,`
-    AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
-else
-    SYSTEM_MYSQL=NO
-    if test -n "$with_libmysql_path"; then
-        AC_MSG_RESULT([external Connector/C (libmysql)])
-        LIBMYSQL=libmysql.so
-        if test "$_os" = "Darwin"; then
-            LIBMYSQL=libmysql.dylib
-        elif test "$_os" = "WINNT"; then
-            LIBMYSQL=libmysql.dll
-        fi
-        AC_MSG_CHECKING([for $LIBMYSQL])
-        if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
-            AC_MSG_RESULT([found.])
-            LIBMYSQL_PATH=$with_libmysql_path
+    dnl ===================================================================
+    dnl Check for system MySQL
+    dnl ===================================================================
+    AC_MSG_CHECKING([for mysql pre-requisites])
+    if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
+           test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
+        AC_MSG_RESULT([external MySQL])
+        SYSTEM_MYSQL=YES
+        AC_PATH_PROG( MYSQLCONFIG, mysql_config)
+        AC_MSG_CHECKING([MySQL version])
+        MYSQL_VERSION=`$MYSQLCONFIG --version`
+        MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
+        if test "$MYSQL_MAJOR" -ge "5"; then
+            AC_MSG_RESULT([OK])
         else
-            AC_MSG_ERROR([not found. Please specify proper path in --with-libmysql-path.])
+            AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
         fi
+        AC_MSG_CHECKING([for MySQL Client library])
+        MYSQL_INC=`$MYSQLCONFIG --include`
+        MYSQL_LIB=`$MYSQLCONFIG --libs`
+        MYSQL_DEFINES=`$MYSQLCONFIG --cflags | $SED -e s,$MYSQL_INC,,`
+        AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
     else
-        AC_MSG_ERROR([not given. Please specify either --with-system-mysql or --with-libmysql-path])
+        SYSTEM_MYSQL=NO
+        if test -n "$with_libmysql_path"; then
+            AC_MSG_RESULT([external Connector/C (libmysql)])
+            LIBMYSQL=libmysql.so
+            if test "$_os" = "Darwin"; then
+                LIBMYSQL=libmysql.dylib
+            elif test "$_os" = "WINNT"; then
+                LIBMYSQL=libmysql.dll
+            fi
+            AC_MSG_CHECKING([for $LIBMYSQL])
+            if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
+                AC_MSG_RESULT([found.])
+                LIBMYSQL_PATH=$with_libmysql_path
+            else
+                AC_MSG_ERROR([not found. Please specify proper path in --with-libmysql-path.])
+            fi
+        else
+            AC_MSG_ERROR([not given. Please specify either --with-system-mysql or --with-libmysql-path])
+        fi
     fi
-fi
-AC_SUBST(SYSTEM_MYSQL)
-AC_SUBST(MYSQL_INC)
-AC_SUBST(MYSQL_LIB)
-AC_SUBST(MYSQL_DEFINES)
-AC_SUBST(LIBMYSQL_PATH)
+    AC_SUBST(SYSTEM_MYSQL)
+    AC_SUBST(MYSQL_INC)
+    AC_SUBST(MYSQL_LIB)
+    AC_SUBST(MYSQL_DEFINES)
+    AC_SUBST(LIBMYSQL_PATH)
 
-AC_LANG_PUSH([C++])
-dnl ===================================================================
-dnl Check for system MySQL C++ Connector
-dnl ===================================================================
-# FIXME!
-# who thought this too-generic cppconn dir was a good idea?
-AC_MSG_CHECKING([MySQL Connector/C++])
-if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
-        test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_MYSQL_CPPCONN=YES
+    AC_LANG_PUSH([C++])
+    dnl ===================================================================
+    dnl Check for system MySQL C++ Connector
+    dnl ===================================================================
+    # FIXME!
+    # who thought this too-generic cppconn dir was a good idea?
+    AC_MSG_CHECKING([MySQL Connector/C++])
+    if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
+            test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_MYSQL_CPPCONN=YES
         AC_LANG_PUSH([C++])
-    AC_CHECK_HEADER(mysql_driver.h, [],
+        AC_CHECK_HEADER(mysql_driver.h, [],
                     [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
-    AC_CHECK_LIB(mysqlcppconn, main, [],
+        AC_CHECK_LIB(mysqlcppconn, main, [],
                     [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
-   AC_MSG_CHECKING([version])
-      AC_TRY_RUN([
+        AC_MSG_CHECKING([version])
+        AC_TRY_RUN([
 #include <mysql_driver.h>
 
 int main(int argc, char **argv) {
@@ -4674,21 +4727,22 @@ int main(int argc, char **argv) {
         return 1;
 }
       ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, we need >= 1.0.6])])
+
         AC_LANG_POP([C++])
 
-else
-    AC_MSG_RESULT([internal])
+    else
+        AC_MSG_RESULT([internal])
         AC_MSG_CHECKING([for mysqlcppconn module])
         if test -d mysqlcppconn; then
-          AC_MSG_RESULT([OK])
+            AC_MSG_RESULT([OK])
         else
-          AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+            AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
         fi
-    BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
-    SYSTEM_MYSQL_CPPCONN=NO
-fi
-AC_LANG_POP([C++])
-AC_SUBST(SYSTEM_MYSQL_CPPCONN)
+        BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
+        SYSTEM_MYSQL_CPPCONN=NO
+    fi
+    AC_LANG_POP([C++])
+    AC_SUBST(SYSTEM_MYSQL_CPPCONN)
 fi
 
 dnl ===================================================================
@@ -4697,16 +4751,16 @@ dnl ===================================================================
 AC_MSG_CHECKING([which hsqldb to use])
 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
        test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_HSQLDB=YES
-        if test -z $HSQLDB_JAR; then
-               HSQLDB_JAR=/usr/share/java/hsqldb.jar
-        fi
-        AC_CHECK_FILE($HSQLDB_JAR, [],
+    AC_MSG_RESULT([external])
+    SYSTEM_HSQLDB=YES
+    if test -z $HSQLDB_JAR; then
+        HSQLDB_JAR=/usr/share/java/hsqldb.jar
+    fi
+    AC_CHECK_FILE($HSQLDB_JAR, [],
                [AC_MSG_ERROR(hsqldb.jar not found.)], [])
-        AC_MSG_CHECKING([whether hsqldb is 1.8.0.x])
-        export HSQLDB_JAR
-        if $PERL -e 'use Archive::Zip;
+    AC_MSG_CHECKING([whether hsqldb is 1.8.0.x])
+    export HSQLDB_JAR
+    if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'HSQLDB_JAR'}";
             my $zip = Archive::Zip->new( $file );
             my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
@@ -4727,10 +4781,10 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
             } else {
                 exit 1;
             }'; then
-            AC_MSG_RESULT([yes])
-         else
-            AC_MSG_ERROR([no, you need hsqldb >= 1.8.0.9 but < 1.8.1])
-         fi
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_ERROR([no, you need hsqldb >= 1.8.0.9 but < 1.8.1])
+    fi
 else
     AC_MSG_RESULT([internal])
     SYSTEM_HSQLDB=NO
@@ -4745,12 +4799,12 @@ dnl ===================================================================
 AC_MSG_CHECKING([which beanshell to use])
 if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
        test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_BSH=YES
-        if test -z $BSH_JAR; then
-               BSH_JAR=/usr/share/java/bsh.jar
-        fi
-        AC_CHECK_FILE($BSH_JAR, [],
+    AC_MSG_RESULT([external])
+    SYSTEM_BSH=YES
+    if test -z $BSH_JAR; then
+        BSH_JAR=/usr/share/java/bsh.jar
+    fi
+    AC_CHECK_FILE($BSH_JAR, [],
                [AC_MSG_ERROR(bsh.jar not found.)], [])
 else
     AC_MSG_RESULT([internal])
@@ -4767,10 +4821,10 @@ dnl ===================================================================
 AC_MSG_CHECKING([which saxon to use])
 if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
        test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_SAXON=YES
-        if test -z $SAXON_JAR; then
-          AC_CHECK_FILE(/usr/share/java/saxon9.jar,
+    AC_MSG_RESULT([external])
+    SYSTEM_SAXON=YES
+    if test -z $SAXON_JAR; then
+        AC_CHECK_FILE(/usr/share/java/saxon9.jar,
             [ SAXON_JAR=/usr/share/java/saxon9.jar ],
             [
               AC_CHECK_FILE(/usr/share/java/saxon.jar,
@@ -4783,24 +4837,24 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
               )
             ]
           )
-        else
-          AC_CHECK_FILE($SAXON_JAR, [],
+    else
+        AC_CHECK_FILE($SAXON_JAR, [],
                [AC_MSG_ERROR(saxon.jar replacement not found.)], [])
-        fi
-        if test -n "$SERIALIZER_JAR"; then
-          AC_CHECK_FILE($SERIALIZER_JAR, [],
+    fi
+    if test -n "$SERIALIZER_JAR"; then
+        AC_CHECK_FILE($SERIALIZER_JAR, [],
                [AC_MSG_ERROR(serializer.jar not found.)], [])
-          AC_SUBST(SERIALIZER_JAR)
-        fi
+        AC_SUBST(SERIALIZER_JAR)
+    fi
 
-dnl Saxon comes in two practically available versions, the out-of-date saxonb which
-dnl supports the Java extensions that LibreOffice uses, and the up-to-date saxon he
-dnl "home edition" version, which is crippled to not support those Java extensions.
-dnl And as an aside the he one also needs to be tweaked to include
-dnl a META-INF/services to broadcast that it supports the jaxp transform factory
+    dnl Saxon comes in two practically available versions, the out-of-date saxonb which
+    dnl supports the Java extensions that LibreOffice uses, and the up-to-date saxon he
+    dnl "home edition" version, which is crippled to not support those Java extensions.
+    dnl And as an aside the he one also needs to be tweaked to include
+    dnl a META-INF/services to broadcast that it supports the jaxp transform factory
 
-        AC_MSG_CHECKING([if saxon works])
-        cat > saxontest.java <<_ACEOF
+    AC_MSG_CHECKING([if saxon works])
+    cat > saxontest.java <<_ACEOF
 [import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.stream.StreamSource;
@@ -4830,7 +4884,8 @@ class saxontest {
 }
 ]
 _ACEOF
-        cat > saxontest.xsl<<_ACEOF
+
+    cat > saxontest.xsl<<_ACEOF
 [<?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:template match="/">
@@ -4839,23 +4894,24 @@ _ACEOF
 </xsl:stylesheet>
 ]
 _ACEOF
-        javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
-        AC_TRY_EVAL(javac_cmd)
-        if test $? = 0 && test -f ./saxontest.class ; then
-            java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
-            AC_TRY_EVAL(java_cmd)
-            if test $? = 0; then
-              AC_MSG_RESULT([yes])
-            else
-              cat saxontest.java >&5
-              AC_MSG_RESULT([no])
-              AC_MSG_ERROR([Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb])
-            fi
+
+    javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
+    AC_TRY_EVAL(javac_cmd)
+    if test $? = 0 && test -f ./saxontest.class ; then
+        java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
+        AC_TRY_EVAL(java_cmd)
+        if test $? = 0; then
+            AC_MSG_RESULT([yes])
         else
-          AC_MSG_RESULT([no])
-          cat saxontest.java >&5
-          AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
+            cat saxontest.java >&5
+            AC_MSG_RESULT([no])
+            AC_MSG_ERROR([Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb])
         fi
+    else
+        AC_MSG_RESULT([no])
+        cat saxontest.java >&5
+        AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
+    fi
 else
     AC_MSG_RESULT([internal])
     SYSTEM_SAXON=NO
@@ -4865,57 +4921,58 @@ AC_SUBST(SYSTEM_SAXON)
 AC_SUBST(SAXON_JAR)
 
 if test -n "$NEED_SAXON"; then
-   BUILD_TYPE="$BUILD_TYPE SAXON"
+    BUILD_TYPE="$BUILD_TYPE SAXON"
 fi
 
 dnl ===================================================================
 dnl Check for system curl
 dnl ===================================================================
 if test "$_os" = "Darwin" -a "$with_system_curl" != "no"; then
-   with_system_curl=yes
+    with_system_curl=yes
 fi
 AC_MSG_CHECKING([which libcurl to use])
 if test -n "$with_system_curl" -o -n "$with_system_libs" && \
     test "$with_system_curl" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_CURL=YES
-
-   curl_version=""
-   if test "$cross_compiling" = "yes"; then
-      dnl At least the OBS mingw32-libcurl-devel package
-      dnl comes with a proper .pc file
-      PKG_CHECK_MODULES(CURL, libcurl,, [:])
-      if test -n "CURL_PKG_ERRORS"; then
-         AC_MSG_RESULT([no])
-      else
-         curl_version=`$PKG_CONFIG --modversion libcurl`
-      fi
-   fi
-   if test -z "$curl_version"; then
-      AC_PATH_PROG(CURLCONFIG, curl-config)
-      if test -z "$CURLCONFIG"; then
-         AC_MSG_ERROR([install the libcurl development package])
-      fi
-      CURL_LIBS=`$CURLCONFIG --libs`
-      CURL_CFLAGS=`$CURLCONFIG --cflags`
-      curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
-   fi
-
-   AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
-   case $curl_version in
-   dnl brackets doubled below because Autoconf uses them as m4 quote characters,
-   dnl so they need to be doubled to end up in the configure script
-   7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
-      AC_MSG_RESULT([yes, you have $curl_version])
-      ;;
-   *)
-      AC_MSG_ERROR([no, you have $curl_version])
-      ;;
-   esac
+    AC_MSG_RESULT([external])
+    SYSTEM_CURL=YES
+
+    curl_version=""
+    if test "$cross_compiling" = "yes"; then
+        dnl At least the OBS mingw32-libcurl-devel package
+        dnl comes with a proper .pc file
+        PKG_CHECK_MODULES(CURL, libcurl,, [:])
+        if test -n "CURL_PKG_ERRORS"; then
+            AC_MSG_RESULT([no])
+        else
+            curl_version=`$PKG_CONFIG --modversion libcurl`
+        fi
+    fi
+    if test -z "$curl_version"; then
+        AC_PATH_PROG(CURLCONFIG, curl-config)
+        if test -z "$CURLCONFIG"; then
+            AC_MSG_ERROR([install the libcurl development package])
+        fi
+        CURL_LIBS=`$CURLCONFIG --libs`
+        CURL_CFLAGS=`$CURLCONFIG --cflags`
+        curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
+    fi
+
+    AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
+
+    case $curl_version in
+    dnl brackets doubled below because Autoconf uses them as m4 quote characters,
+    dnl so they need to be doubled to end up in the configure script
+    7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
+        AC_MSG_RESULT([yes, you have $curl_version])
+        ;;
+    *)
+        AC_MSG_ERROR([no, you have $curl_version])
+        ;;
+    esac
 else
-   AC_MSG_RESULT([internal])
-   SYSTEM_CURL=NO
-   BUILD_TYPE="$BUILD_TYPE CURL"
+    AC_MSG_RESULT([internal])
+    SYSTEM_CURL=NO
+    BUILD_TYPE="$BUILD_TYPE CURL"
 fi
 AC_SUBST(SYSTEM_CURL)
 AC_SUBST(CURL_CFLAGS)
@@ -4926,38 +4983,37 @@ dnl Check for system boost
 dnl ===================================================================
 AC_MSG_CHECKING([which boost to use])
 if test -n "$with_system_boost" -o -n "$with_system_headers" && \
-    test "$with_system_boost" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_BOOST=YES
-   AC_LANG_PUSH([C++])
-   AC_CHECK_HEADER(boost/shared_ptr.hpp, [],
+        test "$with_system_boost" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_BOOST=YES
+    AC_LANG_PUSH([C++])
+    AC_CHECK_HEADER(boost/shared_ptr.hpp, [],
        [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
-   AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
+    AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
        [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
-   AC_CHECK_HEADER(boost/function.hpp, [],
+    AC_CHECK_HEADER(boost/function.hpp, [],
        [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
-   AC_CHECK_HEADER([boost/unordered_map.hpp], [HAVE_BOOST_UNORDERED_MAP=TRUE],
+    AC_CHECK_HEADER([boost/unordered_map.hpp], [HAVE_BOOST_UNORDERED_MAP=TRUE],
                    [AC_MSG_WARN([boost/unordered_map.hpp not found])], [])
 
-   save_CXXFLAGS=$CXXFLAGS
-   CXXFLAGS="$CXXFLAGS -fno-exceptions"
-   AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions])
-   AC_TRY_COMPILE([#include <boost/function.hpp>
-], [],
-   ac_cv_cxx_boost_no_exceptions_broken=no, ac_cv_cxx_boost_no_exceptions_broken=yes)
-
-   if test "$ac_cv_cxx_boost_no_exceptions_broken" = "yes"; then
-    AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
-   else
-      AC_MSG_RESULT([yes])
-   fi
-   CXXFLAGS=$save_CXXFLAGS
-   AC_LANG_POP([C++])
-else
-   AC_MSG_RESULT([internal])
-   BUILD_TYPE="$BUILD_TYPE BOOST"
-   SYSTEM_BOOST=NO
-   HAVE_BOOST_UNORDERED_MAP=TRUE
+    save_CXXFLAGS=$CXXFLAGS
+    CXXFLAGS="$CXXFLAGS -fno-exceptions"
+    AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions])
+    AC_TRY_COMPILE([#include <boost/function.hpp>
+], [], ac_cv_cxx_boost_no_exceptions_broken=no, ac_cv_cxx_boost_no_exceptions_broken=yes)
+
+    if test "$ac_cv_cxx_boost_no_exceptions_broken" = "yes"; then
+        AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
+    else
+        AC_MSG_RESULT([yes])
+    fi
+    CXXFLAGS=$save_CXXFLAGS
+    AC_LANG_POP([C++])
+else
+    AC_MSG_RESULT([internal])
+    BUILD_TYPE="$BUILD_TYPE BOOST"
+    SYSTEM_BOOST=NO
+    HAVE_BOOST_UNORDERED_MAP=TRUE
 fi
 AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
 AC_SUBST(SYSTEM_BOOST)
@@ -4967,7 +5023,7 @@ dnl Check for system mdds
 dnl ===================================================================
 AC_MSG_CHECKING([which mdds to use])
 if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
-    test "$with_system_mdds" != "no"; then
+        test "$with_system_mdds" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_MDDS=YES
 
@@ -5006,9 +5062,9 @@ if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
 ], ac_cv_cxx_mdds_flat_segment_tree_correct=yes, ac_cv_cxx_mdds_flat_segment_tree_correct=no)
 
     if test "$ac_cv_cxx_mdds_flat_segment_tree_correct" = "yes"; then
-      AC_MSG_RESULT([yes])
+        AC_MSG_RESULT([yes])
     else
-      AC_MSG_ERROR([no, install mdds >= 0.5.0])
+        AC_MSG_ERROR([no, install mdds >= 0.5.0])
     fi
     CXXFLAGS=$save_CXXFLAGS
     AC_LANG_POP([C++])
@@ -5032,17 +5088,17 @@ dnl Check for system vigra
 dnl ===================================================================
 AC_MSG_CHECKING([which vigra to use])
 if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
-    test "$with_system_vigra" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_VIGRA=YES
-   AC_LANG_PUSH([C++])
-   AC_CHECK_HEADER(vigra/copyimage.hxx, [],
+        test "$with_system_vigra" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_VIGRA=YES
+    AC_LANG_PUSH([C++])
+    AC_CHECK_HEADER(vigra/copyimage.hxx, [],
        [AC_MSG_ERROR(vigra/copyimage.hxx not found. install vigra)], [])
-   AC_LANG_POP([C++])
+    AC_LANG_POP([C++])
 else
-   AC_MSG_RESULT([internal])
-   BUILD_TYPE="$BUILD_TYPE VIGRA"
-   SYSTEM_VIGRA=NO
+    AC_MSG_RESULT([internal])
+    BUILD_TYPE="$BUILD_TYPE VIGRA"
+    SYSTEM_VIGRA=NO
 fi
 AC_SUBST(SYSTEM_VIGRA)
 
@@ -5051,82 +5107,82 @@ dnl Check for system odbc
 dnl ===================================================================
 AC_MSG_CHECKING([which odbc headers to use])
 if test -n "$with_system_odbc" -o -n "$with_system_headers" && \
-    test "$with_system_odbc" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_ODBC_HEADERS=YES
+        test "$with_system_odbc" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_ODBC_HEADERS=YES
 
-   AC_CHECK_HEADER(sqlext.h, [],
+    AC_CHECK_HEADER(sqlext.h, [],
       [AC_MSG_ERROR(odbc not found. install odbc)], [])
 else
-   AC_MSG_RESULT([internal])
-   SYSTEM_ODBC_HEADERS=NO
-   BUILD_TYPE="$BUILD_TYPE UNIXODBC"
+    AC_MSG_RESULT([internal])
+    SYSTEM_ODBC_HEADERS=NO
+    BUILD_TYPE="$BUILD_TYPE UNIXODBC"
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
 AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components])
 if test "$enable_mozilla" = "no"; then
-   AC_MSG_RESULT([no])
-   WITH_MOZILLA=NO
-   ENABLE_NSS_MODULE=NO
+    AC_MSG_RESULT([no])
+    WITH_MOZILLA=NO
+    ENABLE_NSS_MODULE=NO
 else
-   AC_MSG_RESULT([yes])
-   WITH_MOZILLA=YES
+    AC_MSG_RESULT([yes])
+    WITH_MOZILLA=YES
 fi
 AC_SUBST(WITH_MOZILLA)
 
 AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
 if test "$enable_mozilla" = "no"; then
-   AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no])
 elif test "$with_system_mozilla" = "yes"; then
-   AC_MSG_RESULT([no, not possible with system-mozilla])
+    AC_MSG_RESULT([no, not possible with system-mozilla])
 else
-   AC_MSG_RESULT([yes])
+    AC_MSG_RESULT([yes])
 fi
 
 AC_MSG_CHECKING([whether to build XML Security support])
 if test "$enable_mozilla" = "no"; then
-   AC_MSG_RESULT([no, since Mozilla (NSS) disabled but needed])
+    AC_MSG_RESULT([no, since Mozilla (NSS) disabled but needed])
 else
-   AC_MSG_RESULT([yes])
+    AC_MSG_RESULT([yes])
 fi
 
 AC_MSG_CHECKING([whether to build LDAP configuration backend])
 if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then
-   if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then
-      AC_MSG_RESULT([yes])
-      WITH_LDAP=YES
-   else
-      AC_MSG_RESULT([no. Either Mozilla or OpenLDAP needed])
-      WITH_LDAP=NO
-   fi
+    if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then
+        AC_MSG_RESULT([yes])
+        WITH_LDAP=YES
+    else
+        AC_MSG_RESULT([no. Either Mozilla or OpenLDAP needed])
+        WITH_LDAP=NO
+    fi
 else
-   AC_MSG_RESULT([no])
-   WITH_LDAP=NO
+    AC_MSG_RESULT([no])
+    WITH_LDAP=NO
 fi
 
 if test "$WITH_LDAP" = "YES"; then
-   dnl ===================================================================
-   dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK
-   dnl ===================================================================
-   AC_MSG_CHECKING([which LDAP SDK to use])
-   if test -n "$with_openldap" && test "$with_openldap" != "no"; then
-         AC_MSG_RESULT([OpenLDAP])
-       WITH_OPENLDAP=YES
-       AC_CHECK_HEADERS(ldap.h, [],
+    dnl ===================================================================
+    dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK
+    dnl ===================================================================
+    AC_MSG_CHECKING([which LDAP SDK to use])
+    if test -n "$with_openldap" && test "$with_openldap" != "no"; then
+        AC_MSG_RESULT([OpenLDAP])
+        WITH_OPENLDAP=YES
+        AC_CHECK_HEADERS(ldap.h, [],
            [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
-       AC_CHECK_LIB(ldap, ldap_simple_bind_s, [],
+        AC_CHECK_LIB(ldap, ldap_simple_bind_s, [],
            [AC_MSG_ERROR(openldap lib not found or functional)], [])
-       # rumours say that OpenLDAP doesn't have that function. I looked and
-       # it has it. Test for it to be sure
-         AC_CHECK_LIB(ldap, ldap_set_option, [],
+        # rumours say that OpenLDAP doesn't have that function. I looked and
+        # it has it. Test for it to be sure
+        AC_CHECK_LIB(ldap, ldap_set_option, [],
                 [AC_MSG_ERROR(openldap lib not found or functional)], [])
-   else
-       AC_MSG_RESULT([Netscape/Mozilla])
-       # TODO. Actually do a sanity check and check for
-       # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
-       WITH_OPENLDAP=NO
-   fi
+    else
+        AC_MSG_RESULT([Netscape/Mozilla])
+        # TODO. Actually do a sanity check and check for
+        # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
+        WITH_OPENLDAP=NO
+    fi
 fi
 AC_SUBST(WITH_LDAP)
 AC_SUBST(WITH_OPENLDAP)
@@ -5144,17 +5200,17 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
     enable_nss_module=no
     AC_MSG_CHECKING([which Mozilla flavour to use])
     if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
-      MOZ_FLAVOUR=libxul
+        MOZ_FLAVOUR=libxul
     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
-      MOZ_FLAVOUR=xulrunner
+        MOZ_FLAVOUR=xulrunner
     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
-      MOZ_FLAVOUR=seamonkey
+        MOZ_FLAVOUR=seamonkey
     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
-      MOZ_FLAVOUR=firefox
+        MOZ_FLAVOUR=firefox
     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
-      MOZ_FLAVOUR=mozilla
+        MOZ_FLAVOUR=mozilla
     else
-      MOZ_FLAVOUR=libxul
+        MOZ_FLAVOUR=libxul
     fi
     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
     AC_MSG_RESULT($tmp)
@@ -5168,29 +5224,29 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
     fi
 
     if $PKG_CONFIG --exists nspr ; then
-      PKG_CHECK_MODULES( MOZ_NSPR, nspr )
-      NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
-      AC_SUBST(NSPR_LIB)
+        PKG_CHECK_MODULES( MOZ_NSPR, nspr )
+        NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
+        AC_SUBST(NSPR_LIB)
     else
-      PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
+        PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
     fi
 
     if test "$MOZ_FLAVOUR" != "libxul"; then
-      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" )
-      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
-      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+        PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" )
+        MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
+        MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
     fi
 
     if test -z "$HASXPCOM"; then
-      PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
-      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
-      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
-      if ! test -e "$MOZ_LIB/libxul.so"; then
-         MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
-         if test -e "$MOZ_LIB/sdk/lib/libxul.so"; then
-            MOZ_LIB="$MOZ_LIB/sdk/lib"
-         fi
-      fi
+        PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
+        MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
+        MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
+        if ! test -e "$MOZ_LIB/libxul.so"; then
+            MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
+            if test -e "$MOZ_LIB/sdk/lib/libxul.so"; then
+                MOZ_LIB="$MOZ_LIB/sdk/lib"
+            fi
+        fi
     fi
 
     save_CPPFLAGS="$CPPFLAGS"
@@ -5208,15 +5264,15 @@ Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5))], [])
 
     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-      AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
-      if test -d "$MOZ_INC/ldap"; then
-         AC_MSG_RESULT([yes])
-         MOZ_LDAP_CFLAGS="-I$MOZ_INC"
-      else
-        AC_MSG_ERROR([no.
+        AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
+        if test -d "$MOZ_INC/ldap"; then
+            AC_MSG_RESULT([yes])
+            MOZ_LDAP_CFLAGS="-I$MOZ_INC"
+        else
+            AC_MSG_ERROR([no.
 Could not find LDAP header include files in $MOZ_INC/ldap.
 Please recompile $tmp with --enable-ldap or use --with-openldap.])
-      fi
+        fi
     fi
 
     #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
@@ -5235,31 +5291,31 @@ else
     SYSTEM_MOZILLA=NO
     BUILD_TYPE="$BUILD_TYPE MOZ"
 if test -z "$with_mozilla_version"; then
-   MOZILLA_VERSION=
+    MOZILLA_VERSION=
 else
-   AC_MSG_CHECKING([which Mozilla version to build])
-   MOZILLA_VERSION=$with_mozilla_version
-   enable_build_mozilla=1
-   AC_MSG_RESULT([$MOZILLA_VERSION])
+    AC_MSG_CHECKING([which Mozilla version to build])
+    MOZILLA_VERSION=$with_mozilla_version
+    enable_build_mozilla=1
+    AC_MSG_RESULT([$MOZILLA_VERSION])
 fi
 
 AC_SUBST(MOZILLA_VERSION)
 
 AC_MSG_CHECKING([for toolkit Mozilla should use])
 if test -z "$with_mozilla_toolkit"; then
-   if test "$_os" != "WINNT" ; then
-      if test "$_os" = "Darwin" ; then
-         MOZILLA_TOOLKIT=mac
-         AC_MSG_RESULT([mac])
-      else
-         MOZILLA_TOOLKIT=gtk2
-         AC_MSG_RESULT([gtk2])
-      fi
-   fi
+    if test "$_os" != "WINNT" ; then
+        if test "$_os" = "Darwin" ; then
+            MOZILLA_TOOLKIT=mac
+            AC_MSG_RESULT([mac])
+        else
+            MOZILLA_TOOLKIT=gtk2
+            AC_MSG_RESULT([gtk2])
+        fi
+    fi
 else
-   MOZILLA_TOOLKIT=$with_mozilla_toolkit
-   enable_build_mozilla=1
-   AC_MSG_RESULT([$MOZILLA_TOOLKIT])
+    MOZILLA_TOOLKIT=$with_mozilla_toolkit
+    enable_build_mozilla=1
+    AC_MSG_RESULT([$MOZILLA_TOOLKIT])
 fi
 #if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
 #   #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
@@ -5271,135 +5327,135 @@ AC_SUBST(MOZILLA_TOOLKIT)
 
 # default to enabling build mozilla
 if test "$enable_build_mozilla" != "no"; then
-      enable_build_mozilla=yes
+    enable_build_mozilla=yes
 else
-      enable_build_mozilla=
+    enable_build_mozilla=
 fi
 
 AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
 if test -n "$enable_build_mozilla"; then
-   BUILD_MOZAB="TRUE"
-   AC_MSG_RESULT([yes])
+    BUILD_MOZAB="TRUE"
+    AC_MSG_RESULT([yes])
 else
-   BUILD_MOZAB=""
-   AC_MSG_RESULT([no])
+    BUILD_MOZAB=""
+    AC_MSG_RESULT([no])
 fi
 
 AC_MSG_CHECKING([whether to build provided NSS module])
 if test "$enable_nss_module" != "no"; then
-   ENABLE_NSS_MODULE="YES"
-   BUILD_TYPE="$BUILD_TYPE NSS"
-   AC_MSG_RESULT([yes])
-   if test "$build_os" = "cygwin"; then
-      AC_MSG_CHECKING([for Mozilla build tooling])
-      if test -z "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling not found.
+    ENABLE_NSS_MODULE="YES"
+    BUILD_TYPE="$BUILD_TYPE NSS"
+    AC_MSG_RESULT([yes])
+    if test "$build_os" = "cygwin"; then
+        AC_MSG_CHECKING([for Mozilla build tooling])
+        if test -z "$MOZILLABUILD" ; then
+            AC_MSG_ERROR([Mozilla build tooling not found.
 Use the --with-mozilla-build option after installing the tools obtained
 from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
-      else
-         if test \( "$WITH_MINGW" = "yes" \) ; then
-            if test ! -d "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling incomplete!])
-            else
-               AC_MSG_RESULT([ok])
-            fi
-         else
-            if test ! -d "$MOZILLABUILD/moztools" \
-               -o ! -d "$MOZILLABUILD/msys" ; then
-AC_MSG_ERROR([Mozilla build tooling incomplete!])
+        else
+            if test \( "$WITH_MINGW" = "yes" \) ; then
+                if test ! -d "$MOZILLABUILD" ; then
+                    AC_MSG_ERROR([Mozilla build tooling incomplete!])
+                else
+                    AC_MSG_RESULT([ok])
+                fi
             else
-               AC_MSG_RESULT([ok])
+                if test ! -d "$MOZILLABUILD/moztools" \
+                        -o ! -d "$MOZILLABUILD/msys" ; then
+                    AC_MSG_ERROR([Mozilla build tooling incomplete!])
+                else
+                    AC_MSG_RESULT([ok])
+                fi
             fi
-         fi
-      fi
-   fi
+        fi
+    fi
 else
-   ENABLE_NSS_MODULE="NO"
-   AC_MSG_RESULT([no])
+    ENABLE_NSS_MODULE="NO"
+    AC_MSG_RESULT([no])
 fi
 
 
 if test "$BUILD_MOZAB" = "TRUE"; then
-  if test "$_os" = "WINNT"; then
-    if test "$WITH_MINGW" != "yes"; then
-      # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
-      if test "$MSVSVER" != "2005"; then
-        AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio 2005 only.])
-      fi
-    else
-      AC_MSG_WARN([Building SeaMonkey with MinGW is not tested, and likely to break.])
-      echo "Building SeaMonkey with MinGW is not tested, and likely to break." >> warn
+    if test "$_os" = "WINNT"; then
+        if test "$WITH_MINGW" != "yes"; then
+            # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
+            if test "$MSVSVER" != "2005"; then
+                AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio 2005 only.])
+            fi
+        else
+            AC_MSG_WARN([Building SeaMonkey with MinGW is not tested, and likely to break.])
+            echo "Building SeaMonkey with MinGW is not tested, and likely to break." >> warn
+        fi
     fi
-  fi
 
-   if test -z "$MOZILLA_VERSION"; then
-      MOZILLA_VERSION=1.1.14
-   fi
-   MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-   MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
-   AC_MSG_CHECKING([for Mozilla sources])
-   if test -z "$MOZILLA_FETCH_FILE"; then
-      AC_MSG_RESULT([not found])
-      HAVE_MOZILLA_TARBALL=n
-   else
-      AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE])
-      if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
-         if test -z "$DO_FETCH"; then
-            AC_MSG_RESULT([will be fetched])
+    if test -z "$MOZILLA_VERSION"; then
+        MOZILLA_VERSION=1.1.14
+    fi
+    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
+    MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
+    AC_MSG_CHECKING([for Mozilla sources])
+    if test -z "$MOZILLA_FETCH_FILE"; then
+        AC_MSG_RESULT([not found])
+        HAVE_MOZILLA_TARBALL=n
+    else
+        AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE])
+        if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
+            if test -z "$DO_FETCH"; then
+                AC_MSG_RESULT([will be fetched])
+                HAVE_MOZILLA_TARBALL=y
+            else
+                AC_MSG_RESULT([not found])
+                HAVE_MOZILLA_TARBALL=n
+            fi
+        else
+            AC_MSG_RESULT([found])
             HAVE_MOZILLA_TARBALL=y
-         else
-            AC_MSG_RESULT([not found])
-            HAVE_MOZILLA_TARBALL=n
-         fi
-      else
-         AC_MSG_RESULT([found])
-         HAVE_MOZILLA_TARBALL=y
-      fi
-   fi
-   if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-      AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
+        fi
+    fi
+    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
+        AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
 Use "./download" to download.])
-   fi
-   if test "$_os" = "WINNT"; then
-      AC_MSG_CHECKING([for moztools binaries])
-      if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
-        AC_MSG_ERROR([The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
+    fi
+    if test "$_os" = "WINNT"; then
+        AC_MSG_CHECKING([for moztools binaries])
+        if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
+            AC_MSG_ERROR([The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
-      else
-         AC_MSG_RESULT([ok])
-      fi
-   elif test "$_os" = "Darwin"; then
-      if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-         AC_MSG_NOTICE([checking whether Mozilla can be built...])
-         PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build Mozilla]), AC_MSG_ERROR([Prerequisites to build Mozilla not met. Either use the precompiled Mozilla binaries or install the missing packages]))
-      else
-         PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
-         if test -z "$MOZIDL"; then
-            AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build Mozilla with Mac toolkit.])
-         fi
-      fi
-   else
-      # Generic Unix/Linux section
-      if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-         PKG_CHECK_MODULES(MOZLIBREQ, gtk+-2.0, MOZGTK="TRUE", MOZGTK="")
-         if test -z "$MOZGTK"; then
-            AC_MSG_ERROR([GTK2 is needed to build Mozilla.])
-         fi
-         PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.8.0, MOZIDL="TRUE", MOZIDL="")
-         if test -z "$MOZIDL"; then
-            AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build Mozilla.])
-         fi
-      else
-         PKG_CHECK_MODULES(MOZLIBREQ, gtk+ >= 1.2.3, MOZGTK="TRUE", MOZGTK="")
-         if test -z "$MOZGTK"; then
-            AC_MSG_ERROR([GTK+ 1.2 is needed when not using GTK2 to build Mozilla.])
-         fi
-         PKG_CHECK_MODULES(MOZLIBREQ, libidl >= 0.6.3 libidl <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
-         if test -z "$MOZIDL"; then
-            AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build Mozilla.])
-         fi
-      fi
-   fi
+        else
+            AC_MSG_RESULT([ok])
+        fi
+    elif test "$_os" = "Darwin"; then
+        if test "$MOZILLA_TOOLKIT" = "gtk2"; then
+            AC_MSG_NOTICE([checking whether Mozilla can be built...])
+            PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build Mozilla]), AC_MSG_ERROR([Prerequisites to build Mozilla not met. Either use the precompiled Mozilla binaries or install the missing packages]))
+        else
+            PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
+            if test -z "$MOZIDL"; then
+                AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build Mozilla with Mac toolkit.])
+            fi
+        fi
+    else
+        # Generic Unix/Linux section
+        if test "$MOZILLA_TOOLKIT" = "gtk2"; then
+            PKG_CHECK_MODULES(MOZLIBREQ, gtk+-2.0, MOZGTK="TRUE", MOZGTK="")
+            if test -z "$MOZGTK"; then
+                AC_MSG_ERROR([GTK2 is needed to build Mozilla.])
+            fi
+            PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.8.0, MOZIDL="TRUE", MOZIDL="")
+            if test -z "$MOZIDL"; then
+                AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build Mozilla.])
+            fi
+        else
+            PKG_CHECK_MODULES(MOZLIBREQ, gtk+ >= 1.2.3, MOZGTK="TRUE", MOZGTK="")
+            if test -z "$MOZGTK"; then
+                AC_MSG_ERROR([GTK+ 1.2 is needed when not using GTK2 to build Mozilla.])
+            fi
+            PKG_CHECK_MODULES(MOZLIBREQ, libidl >= 0.6.3 libidl <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
+            if test -z "$MOZIDL"; then
+                AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build Mozilla.])
+            fi
+        fi
+    fi
 fi
 
 AC_SUBST(BUILD_MOZAB)
@@ -5421,15 +5477,15 @@ dnl Check for system sane
 dnl ===================================================================
 AC_MSG_CHECKING([which sane header to use])
 if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
-    test "$with_system_sane_header" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_SANE_HEADER=YES
-   AC_CHECK_HEADER(sane/sane.h, [],
+        test "$with_system_sane_header" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_SANE_HEADER=YES
+    AC_CHECK_HEADER(sane/sane.h, [],
       [AC_MSG_ERROR(sane not found. install sane)], [])
 else
-   AC_MSG_RESULT([internal])
-   SYSTEM_SANE_HEADER=NO
-   BUILD_TYPE="$BUILD_TYPE SANE"
+    AC_MSG_RESULT([internal])
+    SYSTEM_SANE_HEADER=NO
+    BUILD_TYPE="$BUILD_TYPE SANE"
 fi
 AC_SUBST(SYSTEM_SANE_HEADER)
 
@@ -5438,38 +5494,38 @@ dnl Check for system icu
 dnl ===================================================================
 AC_MSG_CHECKING([which icu to use])
 if test -n "$with_system_icu" -o -n "$with_system_libs" && \
-    test "$with_system_icu" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_ICU=YES
-   AC_LANG_PUSH([C++])
-   AC_MSG_CHECKING([for unicode/rbbi.h])
-   AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
-   AC_LANG_POP([C++])
-   AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin])
-   if test -z "$SYSTEM_GENBRK"; then
-      AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
-   fi
-   AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
-   if test -z "$SYSTEM_GENCCODE"; then
-      AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
-   fi
-   AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
-   if test -z "$SYSTEM_GENCMN"; then
-      AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
-   fi
-
-   AC_PATH_PROG( ICUCONFIG, icu-config)
-   AC_MSG_CHECKING([ICU version])
-   ICU_VERSION=`$ICUCONFIG --version`
-   ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
-   ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
-   ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
-
-   if test "$ICU_MAJOR" -ge "4"; then
-      AC_MSG_RESULT([OK])
-   else
-      AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
-   fi
+        test "$with_system_icu" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_ICU=YES
+    AC_LANG_PUSH([C++])
+    AC_MSG_CHECKING([for unicode/rbbi.h])
+    AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
+    AC_LANG_POP([C++])
+    AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin])
+    if test -z "$SYSTEM_GENBRK"; then
+        AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk\"])
+    fi
+    AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
+    if test -z "$SYSTEM_GENCCODE"; then
+        AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode\"])
+    fi
+    AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
+    if test -z "$SYSTEM_GENCMN"; then
+        AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn\"])
+    fi
+
+    AC_PATH_PROG( ICUCONFIG, icu-config)
+    AC_MSG_CHECKING([ICU version])
+    ICU_VERSION=`$ICUCONFIG --version`
+    ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
+    ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
+    ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
+
+    if test "$ICU_MAJOR" -ge "4"; then
+        AC_MSG_RESULT([OK])
+    else
+        AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
+    fi
 
 else
     AC_MSG_RESULT([internal])
@@ -5504,7 +5560,7 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -
         BUILD_TYPE="$BUILD_TYPE GRAPHITE"
     fi
 else
-   AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_GRAPHITE)
 AC_SUBST(SYSTEM_GRAPHITE)
@@ -5518,90 +5574,90 @@ dnl Check for Mac OS X native GUI, which may is now required; the X11 build is n
 dnl See if we have the AppKit framework for building with Quartz graphics.
 
 if test  "$_os" = "Darwin"; then
-   if test "x$with_x" = "xyes"; then
-      AC_MSG_ERROR([X11 build is no longer supported on MacOSX, please use the native aqua build])
-   else
-      AC_MSG_CHECKING([for /System/Library/Frameworks/AppKit.framework])
-      if test -d "/System/Library/Frameworks/AppKit.framework/"; then
-         AC_MSG_RESULT([yes])
-         x_includes="no_x_includes"
-         x_libraries="no_x_libraries"
-         dnl disable some things used on other Unix versions but not on the aqua build
-         enable_gtk=no
-         enable_cups=no
-         ENABLE_CUPS=""
-         AC_SUBST(ENABLE_CUPS)
-      else
-         AC_MSG_ERROR([No AppKit.framewrok found])
-      fi
-   fi
+    if test "x$with_x" = "xyes"; then
+        AC_MSG_ERROR([X11 build is no longer supported on MacOSX, please use the native aqua build])
+    else
+        AC_MSG_CHECKING([for /System/Library/Frameworks/AppKit.framework])
+        if test -d "/System/Library/Frameworks/AppKit.framework/"; then
+            AC_MSG_RESULT([yes])
+            x_includes="no_x_includes"
+            x_libraries="no_x_libraries"
+            dnl disable some things used on other Unix versions but not on the aqua build
+            enable_gtk=no
+            enable_cups=no
+            ENABLE_CUPS=""
+            AC_SUBST(ENABLE_CUPS)
+        else
+            AC_MSG_ERROR([No AppKit.framewrok found])
+        fi
+    fi
 fi
 
 if test $_os = iOS -o $_os = Android; then
-   enable_gtk=no
+    enable_gtk=no
 fi
 
 dnl ***************************************
 dnl testing for X libraries and includes...
 dnl ***************************************
 if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
-   dnl Mac OS X using Aqua graphics. Don't check for X11.
-   :
+    dnl Mac OS X using Aqua graphics. Don't check for X11.
+    :
 elif test "$_os" != "WINNT" -a "$_os" != "Android" -a "$_os" != "iOS"; then
-   AC_PATH_X
-   AC_PATH_XTRA
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-   if test "x$x_includes" = "x"; then
-     x_includes="default_x_includes"
-   fi
-   if test "x$x_libraries" = "x"; then
-     x_libraries="default_x_libraries"
-   fi
-   dnl The variables $x_libraries and $x_includes are set.
-   if test -z "$x_libraries"; then
-      AC_MSG_ERROR([No X libraries found]) # Exit
-   fi
-   if test -z "$x_includes"; then
-      AC_MSG_ERROR([No X includes found]) # Exit
-   fi
-   CFLAGS="$CFLAGS $X_CFLAGS"
-   LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
-   AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
-   dnl Check if the XauDisposeAuth symbol is provided by libXau.
-   AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
-else
-   x_includes="no_x_includes"
-   x_libraries="no_x_libraries"
+    AC_PATH_X
+    AC_PATH_XTRA
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+    if test "x$x_includes" = "x"; then
+        x_includes="default_x_includes"
+    fi
+    if test "x$x_libraries" = "x"; then
+        x_libraries="default_x_libraries"
+    fi
+    dnl The variables $x_libraries and $x_includes are set.
+    if test -z "$x_libraries"; then
+        AC_MSG_ERROR([No X libraries found]) # Exit
+    fi
+    if test -z "$x_includes"; then
+        AC_MSG_ERROR([No X includes found]) # Exit
+    fi
+    CFLAGS="$CFLAGS $X_CFLAGS"
+    LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
+    AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
+    dnl Check if the XauDisposeAuth symbol is provided by libXau.
+    AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
+else
+    x_includes="no_x_includes"
+    x_libraries="no_x_libraries"
 fi
 if test -z "$x_includes"; then
-   x_includes="no_x_includes"
+    x_includes="no_x_includes"
 fi
 if test -z "$x_libraries"; then
-   x_libraries="no_x_libraries"
+    x_libraries="no_x_libraries"
 fi
 if test "$x_includes" = "default_x_includes"; then
-   XINC="/usr/include"
+    XINC="/usr/include"
 else
-   XINC="$x_includes"
+    XINC="$x_includes"
 fi
 AC_SUBST(XINC)
 if test "$x_libraries" = "default_x_libraries"; then
-   XLIB=`$PKG_CONFIG --variable=libdir x11`
-   if test "x$XLIB" = x; then
-         XLIB="/usr/lib"
-   fi
+    XLIB=`$PKG_CONFIG --variable=libdir x11`
+    if test "x$XLIB" = x; then
+        XLIB="/usr/lib"
+    fi
 else
-   XLIB="$x_libraries"
+    XLIB="$x_libraries"
 fi
 AC_SUBST(XLIB)
 AC_SUBST(XAU_LIBS)
 
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "Android" -a "$_os" != "iOS"; then
-   dnl ===================================================================
-   dnl Check for Composite.h for Mozilla plugin
-   dnl ===================================================================
-   AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])],
+    dnl ===================================================================
+    dnl Check for Composite.h for Mozilla plugin
+    dnl ===================================================================
+    AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])],
      [#include <X11/Intrinsic.h>])
 fi
 
@@ -5611,27 +5667,27 @@ dnl Check for system Xrender
 dnl ===================================================================
 AC_MSG_CHECKING([whether to link to Xrender])
 if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then
-   AC_MSG_RESULT([yes])
-   XRENDER_LINK=YES
-   with_system_xrender_headers=yes
+    AC_MSG_RESULT([yes])
+    XRENDER_LINK=YES
+    with_system_xrender_headers=yes
 else
-   AC_MSG_RESULT([no, dynamically open it])
-   XRENDER_LINK=NO
+    AC_MSG_RESULT([no, dynamically open it])
+    XRENDER_LINK=NO
 fi
 AC_MSG_CHECKING([which Xrender headers to use])
 if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
-    test "$with_system_xrender_headers" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_XRENDER_HEADERS=YES
-   AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
+        test "$with_system_xrender_headers" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_XRENDER_HEADERS=YES
+    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
       [AC_MSG_ERROR(Xrender not found. install X)], [])
 else
-   AC_MSG_RESULT([internal])
-   SYSTEM_XRENDER_HEADERS=NO
-   BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
+    AC_MSG_RESULT([internal])
+    SYSTEM_XRENDER_HEADERS=NO
+    BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
 fi
 if test "$XRENDER_LINK" = "YES"; then
-   AC_CHECK_LIB(Xrender, XRenderQueryVersion, [],
+    AC_CHECK_LIB(Xrender, XRenderQueryVersion, [],
       [AC_MSG_ERROR(libXrender not found or functional)], [])
 fi
 AC_SUBST(SYSTEM_XRENDER_HEADERS)
@@ -5642,26 +5698,26 @@ dnl Check for XRandr
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable RandR support])
 if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
-   if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
-      XRANDR_DLOPEN="TRUE"
-      AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
-   else
-      AC_MSG_RESULT([yes])
-      XRANDR_DLOPEN="FALSE"
-      PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", ENABLE_RANDR="")
-      if test "$ENABLE_RANDR" != "TRUE"; then
-         AC_CHECK_HEADER(X11/extensions/Xrandr.h, [],
+    if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
+        XRANDR_DLOPEN="TRUE"
+        AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
+    else
+        AC_MSG_RESULT([yes])
+        XRANDR_DLOPEN="FALSE"
+        PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", ENABLE_RANDR="")
+        if test "$ENABLE_RANDR" != "TRUE"; then
+            AC_CHECK_HEADER(X11/extensions/Xrandr.h, [],
                         [AC_MSG_ERROR([X11/extensions/Xrandr.h could not be found. X11 dev missing?])], [])
-         XRANDR_CFLAGS=" "
-         AC_CHECK_LIB(Xrandr, XRRQueryExtension, [],
+            XRANDR_CFLAGS=" "
+            AC_CHECK_LIB(Xrandr, XRRQueryExtension, [],
               [ AC_MSG_ERROR(libXrandr not found or functional) ], [])
-         XRANDR_LIBS="-lXrandr "
-         ENABLE_RANDR="TRUE"
-      fi
-   fi
+            XRANDR_LIBS="-lXrandr "
+            ENABLE_RANDR="TRUE"
+        fi
+    fi
 else
-   ENABLE_RANDR=""
-   AC_MSG_RESULT([no])
+    ENABLE_RANDR=""
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(XRANDR_DLOPEN)
 AC_SUBST(XRANDR_CFLAGS)
@@ -5683,12 +5739,12 @@ dnl Check for system neon
 dnl ===================================================================
 AC_MSG_CHECKING([which neon to use])
 if test -n "$with_system_neon" -o -n "$with_system_libs" && \
-    test "$with_system_neon" != "no"; then
-        AC_MSG_RESULT([external])
-        PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
-        NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-        NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-        SYSTEM_NEON=YES
+        test "$with_system_neon" != "no"; then
+    AC_MSG_RESULT([external])
+    PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
+    NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
+    NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
+    SYSTEM_NEON=YES
 else
     AC_MSG_RESULT([internal])
     SYSTEM_NEON=NO
@@ -5707,7 +5763,7 @@ dnl Check for system openssl
 dnl ===================================================================
 if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
         "$_os" = "DragonFly" && test "$with_system_openssl" != "no"; then
-   with_system_openssl=yes
+    with_system_openssl=yes
 fi
 AC_MSG_CHECKING([which libssl to use])
 if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
@@ -5737,11 +5793,11 @@ dnl Check for system redland
 dnl ===================================================================
 AC_MSG_CHECKING([which redland library to use])
 if test -n "$with_system_redland" -o -n "$with_system_libs" && \
-    test "$with_system_redland" != "no"; then
+        test "$with_system_redland" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_REDLAND=YES
-   dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
-   PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8)
+    dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
+    PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8)
 else
     AC_MSG_RESULT([internal])
     BUILD_TYPE="$BUILD_TYPE REDLAND"
@@ -5756,21 +5812,21 @@ dnl Check for system hunspell
 dnl ===================================================================
 AC_MSG_CHECKING([which libhunspell to use])
 if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
-    test "$with_system_hunspell" != "no"; then
+        test "$with_system_hunspell" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_HUNSPELL=YES
     AC_LANG_PUSH([C++])
     PKG_CHECK_MODULES(HUNSPELL, hunspell, HUNSPELL_PC="TRUE", HUNSPELL_PC="" )
     if test "$HUNSPELL_PC" != "TRUE"; then
-      AC_CHECK_HEADER(hunspell.hxx, [],
-      [
-      AC_CHECK_HEADER(hunspell/hunspell.hxx, [ HUNSPELL_CFLAGS=-I/usr/include/hunspell ],
-           [AC_MSG_ERROR(hunspell headers not found.)], [])
-         ], [])
-      AC_CHECK_LIB(hunspell, main, [],
+        AC_CHECK_HEADER(hunspell.hxx, [],
+            [
+            AC_CHECK_HEADER(hunspell/hunspell.hxx, [ HUNSPELL_CFLAGS=-I/usr/include/hunspell ],
+            [AC_MSG_ERROR(hunspell headers not found.)], [])
+            ], [])
+        AC_CHECK_LIB(hunspell, main, [],
            [ AC_MSG_ERROR(hunspell library not found.) ], [])
-      HUNSPELL_LIBS=-lhunspell
-     fi
+        HUNSPELL_LIBS=-lhunspell
+    fi
     AC_LANG_POP([C++])
 else
     AC_MSG_RESULT([internal])
@@ -5786,7 +5842,7 @@ dnl Checking for altlinuxhyph
 dnl ===================================================================
 AC_MSG_CHECKING([which altlinuxhyph to use])
 if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
-    test "$with_system_altlinuxhyph" != "no"; then
+        test "$with_system_altlinuxhyph" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_HYPH=YES
     AC_CHECK_HEADER(hyphen.h, [],
@@ -5797,11 +5853,11 @@ if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
     AC_CHECK_LIB(hyphen, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhyphen],
         [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
     if test -z "$HYPHEN_LIB"; then
-       AC_CHECK_LIB(hyph, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhyph],
+        AC_CHECK_LIB(hyph, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhyph],
            [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
     fi
     if test -z "$HYPHEN_LIB"; then
-       AC_CHECK_LIB(hnj, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhnj],
+        AC_CHECK_LIB(hnj, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhnj],
            [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
     fi
 else
@@ -5817,7 +5873,7 @@ dnl Checking for mythes
 dnl ===================================================================
 AC_MSG_CHECKING([which mythes to use])
 if test -n "$with_system_mythes" -o -n "$with_system_libs" && \
-   test "$with_system_mythes" != "no"; then
+       test "$with_system_mythes" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_MYTHES=YES
     AC_LANG_PUSH([C++])
@@ -5827,8 +5883,8 @@ if test -n "$with_system_mythes" -o -n "$with_system_libs" && \
             [ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
         AC_CHECK_LIB(mythes-1.2, main, [],
             [ MYTHES_FOUND=no], [])
-     if test "$MYTHES_FOUND" = "no"; then
-            AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes],
+    if test "$MYTHES_FOUND" = "no"; then
+        AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes],
                 [ MYTHES_FOUND=no], [])
     fi
     if test "$MYTHES_FOUND" = "no"; then
@@ -5850,7 +5906,7 @@ dnl Checking for lpsolve
 dnl ===================================================================
 AC_MSG_CHECKING([which lpsolve to use])
 if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
-    test "$with_system_lpsolve" != "no"; then
+        test "$with_system_lpsolve" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LPSOLVE=YES
     AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
@@ -5903,27 +5959,27 @@ dnl ***************************************
 dnl testing libc version for Linux...
 dnl ***************************************
 if test "$_os" = "Linux"; then
-   AC_MSG_CHECKING([whether libc is >= 2.1.1])
-   exec 6>/dev/null # no output
-   AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
-   exec 6>&1 # output on again
-   if test "$HAVE_LIBC"; then
-      AC_MSG_RESULT([yes])
-   else
-      AC_MSG_ERROR([no, upgrade libc])
-   fi
+    AC_MSG_CHECKING([whether libc is >= 2.1.1])
+    exec 6>/dev/null # no output
+    AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
+    exec 6>&1 # output on again
+    if test "$HAVE_LIBC"; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_ERROR([no, upgrade libc])
+    fi
 fi
 
 if test "$_os" != "WINNT"; then
-  AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
-  AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
-  if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
-    SYSTEM_LIBC=YES
-  fi
+    AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
+    AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
+    if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
+        SYSTEM_LIBC=YES
+    fi
 else
-  HAVE_GETOPT=NO
-  HAVE_READDIR_R=NO
-  SYSTEM_LIBC=YES
+    HAVE_GETOPT=NO
+    HAVE_READDIR_R=NO
+    SYSTEM_LIBC=YES
 fi
 AC_SUBST(HAVE_GETOPT)
 AC_SUBST(HAVE_READDIR_R)
@@ -6105,89 +6161,89 @@ dnl Checking for bison and flex
 dnl ***************************************
 AC_PATH_PROG(BISON, bison)
 if test -z "$BISON"; then
-   AC_MSG_ERROR([no bison found in \$PATH, install it])
+    AC_MSG_ERROR([no bison found in \$PATH, install it])
 else
-   AC_MSG_CHECKING([the bison version])
-   _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
+    AC_MSG_CHECKING([the bison version])
+    _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
     _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
     # Accept newer than 1.875 or older(equal) than 1.75
     if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then
-       if test "$_bison_version" = "1.875" ; then
-          AC_MSG_WARN([suspect ($BISON $_bison_version)])
-          echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
-       else
-          AC_MSG_RESULT([checked ($BISON $_bison_version)])
-       fi
+        if test "$_bison_version" = "1.875" ; then
+            AC_MSG_WARN([suspect ($BISON $_bison_version)])
+            echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
+        else
+            AC_MSG_RESULT([checked ($BISON $_bison_version)])
+        fi
     else
-       AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))])
+        AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))])
     fi
 fi
 AC_PATH_PROG(FLEX, flex)
 if test -z "$FLEX"; then
-   AC_MSG_ERROR([no flex found in \$PATH, install it])
+    AC_MSG_ERROR([no flex found in \$PATH, install it])
 fi
 dnl ***************************************
 dnl Checking for patch
 dnl ***************************************
 AC_PATH_PROG(PATCH, patch)
 if test -z "$PATCH"; then
-   AC_MSG_ERROR([\"patch\" not found in \$PATH, install it])
+    AC_MSG_ERROR([\"patch\" not found in \$PATH, install it])
 fi
 
 dnl On Solaris, FreeBSD or MacOS X, check if --with-gnu-patch was used
 if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
-   if test -z "$with_gnu_patch"; then
-      GNUPATCH=$PATCH
-   else
-      if test -x "$with_gnu_patch"; then
-    GNUPATCH=$with_gnu_patch
-      else
-         AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
-      fi
-   fi
+    if test -z "$with_gnu_patch"; then
+        GNUPATCH=$PATCH
+    else
+        if test -x "$with_gnu_patch"; then
+            GNUPATCH=$with_gnu_patch
+        else
+            AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
+        fi
+    fi
 
-   AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-      AC_MSG_RESULT([yes])
-   else
-      AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
-   fi
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
+    fi
 fi
 
 dnl We also need to check for --with-gnu-cp
 
 if test -z "$with_gnu_cp"; then
-   # check the place where the good stuff is hidden on Solaris...
-   if test -x /usr/gnu/bin/cp; then
-      GNUCP=/usr/gnu/bin/cp
-   else
-      AC_PATH_PROGS(GNUCP, gnucp cp)
-   fi
-   if test -z $GNUCP; then
-      AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
-   fi
-else
-   if test -x "$with_gnu_cp"; then
-      GNUCP=$with_gnu_cp
-   else
-      AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
-   fi
+    # check the place where the good stuff is hidden on Solaris...
+    if test -x /usr/gnu/bin/cp; then
+        GNUCP=/usr/gnu/bin/cp
+    else
+        AC_PATH_PROGS(GNUCP, gnucp cp)
+    fi
+    if test -z $GNUCP; then
+        AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
+    fi
+else
+    if test -x "$with_gnu_cp"; then
+        GNUCP=$with_gnu_cp
+    else
+        AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
+    fi
 fi
 
 AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support])
 if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then
-   AC_MSG_RESULT([yes])
+    AC_MSG_RESULT([yes])
 elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
     AC_MSG_RESULT([yes])
 else
     case "$build_os" in
-        darwin*|netbsd*|openbsd*|freebsd*|dragonfly*)
-            GNUCP=''
-            AC_MSG_RESULT([no gnucp found - using the system's cp command])
-            ;;
-        *)
-            AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
-            ;;
+    darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
+        GNUCP=''
+        AC_MSG_RESULT([no gnucp found - using the system's cp command])
+        ;;
+    *)
+        AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
+        ;;
     esac
 fi
 
@@ -6198,35 +6254,35 @@ dnl ***************************************
 dnl testing assembler path
 dnl ***************************************
 if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-  if test "$CL_X64" = ""; then
-    assembler=ml.exe
-    assembler_bin=bin
-  else
-    assembler=ml64.exe
-    assembler_bin=bin/amd64
-  fi
-  if test -n "$with_asm_home"; then
-    with_asm_home=`cygpath -u "$with_asm_home"`
-  fi
-  if test -x "$with_asm_home/$assembler"; then
-     AC_MSG_CHECKING([$assembler assembler path])
-     AC_MSG_RESULT([$with_asm_home/$assembler])
-  else
-    AC_PATH_PROG(ML_EXE, $assembler)
-    if test -z "$ML_EXE"; then
-      AC_MSG_CHECKING([$with_cl_home/$assembler_bin/$assembler])
-      if test -x "$with_cl_home/$assembler_bin/$assembler"; then
-        with_asm_home=$with_cl_home/$assembler_bin
-        AC_MSG_RESULT([found])
-      else
-        AC_MSG_ERROR([Configure did not find $assembler assembler.])
-      fi
+    if test "$CL_X64" = ""; then
+        assembler=ml.exe
+        assembler_bin=bin
     else
-       with_asm_home="ASM_IN_PATH"
+        assembler=ml64.exe
+        assembler_bin=bin/amd64
+    fi
+    if test -n "$with_asm_home"; then
+        with_asm_home=`cygpath -u "$with_asm_home"`
+    fi
+    if test -x "$with_asm_home/$assembler"; then
+        AC_MSG_CHECKING([$assembler assembler path])
+        AC_MSG_RESULT([$with_asm_home/$assembler])
+    else
+        AC_PATH_PROG(ML_EXE, $assembler)
+        if test -z "$ML_EXE"; then
+            AC_MSG_CHECKING([$with_cl_home/$assembler_bin/$assembler])
+            if test -x "$with_cl_home/$assembler_bin/$assembler"; then
+                with_asm_home=$with_cl_home/$assembler_bin
+                AC_MSG_RESULT([found])
+            else
+                AC_MSG_ERROR([Configure did not find $assembler assembler.])
+            fi
+        else
+            with_asm_home="ASM_IN_PATH"
+        fi
     fi
-  fi
 else
-  with_asm_home="NO_ASM_HOME"
+    with_asm_home="NO_ASM_HOME"
 fi
 ASM_HOME="$with_asm_home"
 AC_SUBST(ASM_HOME)
@@ -6237,7 +6293,7 @@ dnl ===================================================================
 AC_PATH_PROG(ZIP, zip)
 test -z "$ZIP" && AC_MSG_ERROR([zip is required])
 AC_PATH_PROG(UNZIP, unzip)
-test -z "$ZIP" && AC_MSG_ERROR([unzip is required])
+test -z "$UNZIP" && AC_MSG_ERROR([unzip is required])
 if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
     AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
 fi
@@ -6259,13 +6315,13 @@ GTK3_CFLAGS=""
 GTK3_LIBS=""
 ENABLE_GTK3=""
 if test "x$enable_gtk3" = "xyes"; then
-   if test "$with_system_cairo" != yes; then
-      echo "System cairo required for gtk3 support, please use --system-cairo"
-   fi
-   PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
-   if test "x$ENABLE_GTK3" = "xTRUE"; then
-      R="gtk3"
-   fi
+    if test "$with_system_cairo" != yes; then
+        echo "System cairo required for gtk3 support, please use --system-cairo"
+    fi
+    PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+    if test "x$ENABLE_GTK3" = "xTRUE"; then
+        R="gtk3"
+    fi
 fi
 AC_SUBST(GTK3_LIBS)
 AC_SUBST(GTK3_CFLAGS)
@@ -6342,38 +6398,38 @@ ENABLE_SYSTRAY_GTK=""
 ENABLE_DBUS=""
 if test  "$test_gtk" = "yes"; then
 
-   if test "$ENABLE_GTK" = "TRUE" ; then
-      PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
-      PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
-      BUILD_TYPE="$BUILD_TYPE GTK"
-
-      if test "x$enable_systray" = "xyes"; then
-         PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
-			    [ ENABLE_SYSTRAY_GTK="TRUE" ],
-			    [ ENABLE_SYSTRAY_GTK="" ])
-      fi
-
-      AC_MSG_CHECKING([whether to enable DBUS support])
-      if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
-          ENABLE_DBUS="TRUE"
-          AC_MSG_RESULT([yes])
-          PKG_CHECK_MODULES( DBUS, dbus-glib-1 >= 0.70 )
-      else
-          AC_MSG_RESULT([no])
-      fi
-
-      AC_MSG_CHECKING([whether to enable GIO support])
-      if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
-          if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
-             AC_MSG_ERROR([please use --enable-gio only together with --disable-gnome-vfs.])
-          fi
-          ENABLE_GIO="TRUE"
-          AC_MSG_RESULT([yes])
-          PKG_CHECK_MODULES( GIO, gio-2.0 )
-      else
-          AC_MSG_RESULT([no])
-      fi
-   fi
+    if test "$ENABLE_GTK" = "TRUE" ; then
+        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
+        PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
+        BUILD_TYPE="$BUILD_TYPE GTK"
+
+        if test "x$enable_systray" = "xyes"; then
+            PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
+                            [ ENABLE_SYSTRAY_GTK="TRUE" ],
+                            [ ENABLE_SYSTRAY_GTK="" ])
+        fi
+
+        AC_MSG_CHECKING([whether to enable DBUS support])
+        if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
+            ENABLE_DBUS="TRUE"
+            AC_MSG_RESULT([yes])
+            PKG_CHECK_MODULES( DBUS, dbus-glib-1 >= 0.70 )
+        else
+            AC_MSG_RESULT([no])
+        fi
+
+        AC_MSG_CHECKING([whether to enable GIO support])
+        if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
+            if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
+                AC_MSG_ERROR([please use --enable-gio only together with --disable-gnome-vfs.])
+            fi
+            ENABLE_GIO="TRUE"
+            AC_MSG_RESULT([yes])
+            PKG_CHECK_MODULES( GIO, gio-2.0 )
+        else
+            AC_MSG_RESULT([no])
+        fi
+    fi
 fi
 AC_SUBST(ENABLE_GIO)
 AC_SUBST(ENABLE_DBUS)
@@ -6389,71 +6445,20 @@ AC_SUBST(LIBPNG_CFLAGS)
 
 AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
 if test "x$enable_unix_libpng" = "xyes"; then
-   AC_MSG_RESULT([yes])
-else
-   AC_MSG_RESULT([no])
-   ENABLE_QUICKSTART_LIBPNG=""
-fi
-AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
-
-dnl ===================================================================
-dnl Test whether to build cairo or rely on the system version
-dnl ===================================================================
-
-dnl ENABLE_CAIRO will be set to empty later when necessary
-ENABLE_CAIRO="TRUE"
-
-BUILD_PIXMAN=""
-SYSTEM_CAIRO=""
-
-AC_MSG_CHECKING([whether to use the system cairo])
-
-if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_system_cairo" != no \); then
-    SYSTEM_CAIRO=YES
     AC_MSG_RESULT([yes])
-
-    PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
-
-    if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-        AC_MSG_ERROR([Cairo library requires fontconfig.])
-    fi
-
-    if test "$with_system_xrender_headers" = "yes"; then
-        AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
-        AC_TRY_RUN([
-#include <X11/extensions/Xrender.h>
-
-int main(int argc, char **argv) {
-#ifdef PictStandardA8
-      return 0;
-#else
-      return 1;
-#endif
-}
-        ],
-        [AC_MSG_RESULT([yes])],
-        [AC_MSG_ERROR([no, X headers too old.])]
-        )
-    fi
 else
     AC_MSG_RESULT([no])
-    BUILD_TYPE="$BUILD_TYPE CAIRO"
-    BUILD_PIXMAN=YES
+    ENABLE_QUICKSTART_LIBPNG=""
 fi
+AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
 
-AC_SUBST(ENABLE_CAIRO)
-AC_SUBST(BUILD_PIXMAN)
-AC_SUBST(SYSTEM_CAIRO)
-AC_SUBST(CAIRO_CFLAGS)
-AC_SUBST(CAIRO_LIBS)
+dnl ===================================================================
 
 ENABLE_CAIRO_CANVAS="FALSE"
 if test "$enable_cairo_canvas" = "yes" -a "$ENABLE_CAIRO" = "TRUE" ; then
    ENABLE_CAIRO_CANVAS="TRUE"
 fi
 AC_SUBST(ENABLE_CAIRO_CANVAS)
-
-dnl ===================================================================
 dnl Check whether the GStreamer libraries are available.
 dnl ===================================================================
 
@@ -6464,10 +6469,10 @@ if test  "$build_gstreamer" = "yes"; then
     AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend])
     if test "x$enable_gstreamer" != "xno" ; then
         ENABLE_GSTREAMER="TRUE"
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES( GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10 )
+        AC_MSG_RESULT([yes])
+        PKG_CHECK_MODULES( GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10 )
     else
-         AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
     fi
 fi
 
@@ -6481,48 +6486,47 @@ AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
 ENABLE_OPENGL=
 
 if test "$_os" = "Darwin" ; then
-   # We use frameworks on Mac OS X, no need for detail checks
-   ENABLE_OPENGL=TRUE
-   AC_MSG_RESULT([yes])
+    # We use frameworks on Mac OS X, no need for detail checks
+    ENABLE_OPENGL=TRUE
+    AC_MSG_RESULT([yes])
 else
-   if test "x$enable_opengl" != "xno" ; then
-      if test "$_os" != "WINNT"; then
-         save_LDFLAGS=$LDFLAGS
-         LDFLAGS="$LDFLAGS -lm"
-         AC_MSG_RESULT([yes])
-         AC_CHECK_LIB(GL, main, [],
+    if test "x$enable_opengl" != "xno" ; then
+        if test "$_os" != "WINNT"; then
+            save_LDFLAGS=$LDFLAGS
+            LDFLAGS="$LDFLAGS -lm"
+            AC_MSG_RESULT([yes])
+            AC_CHECK_LIB(GL, main, [],
                       [AC_MSG_ERROR(libGL not installed or functional)], [])
-         AC_CHECK_LIB(GLU, main, [],
+            AC_CHECK_LIB(GLU, main, [],
                       [AC_MSG_ERROR(libGLU not installed or functional)], [])
-         ENABLE_OPENGL=TRUE
-         LDFLAGS=$save_LDFLAGS
-
-         dnl ===================================================================
-         dnl Check for system Mesa
-         dnl ===================================================================
-         AC_MSG_CHECKING([which Mesa headers to use])
-         if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
-            test "$with_system_mesa_headers" != "no"; then
-            AC_MSG_RESULT([external])
-            SYSTEM_MESA_HEADERS=YES
-            AC_LANG_PUSH(C)
-            AC_CHECK_HEADER(GL/glxext.h, [],
-               [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
-            AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
-            AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
-            AC_LANG_POP(C)
-         else
-            AC_MSG_RESULT([internal])
-            SYSTEM_MESA_HEADERS=NO
-            BUILD_TYPE="$BUILD_TYPE MESA"
+            ENABLE_OPENGL=TRUE
+            LDFLAGS=$save_LDFLAGS
+
+            dnl ===================================================================
+            dnl Check for system Mesa
+            dnl ===================================================================
+            AC_MSG_CHECKING([which Mesa headers to use])
+            if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
+                    test "$with_system_mesa_headers" != "no"; then
+                AC_MSG_RESULT([external])
+                SYSTEM_MESA_HEADERS=YES
+                AC_LANG_PUSH(C)
+                AC_CHECK_HEADER(GL/glxext.h, [],
+                   [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+                AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+                AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+                AC_LANG_POP(C)
+            else
+                AC_MSG_RESULT([internal])
+                SYSTEM_MESA_HEADERS=NO
+                BUILD_TYPE="$BUILD_TYPE MESA"
+            fi
+        else
+            AC_MSG_RESULT([not on Windows])
         fi
-
-      else
-        AC_MSG_RESULT([not on Windows])
-      fi
-   else
-      AC_MSG_RESULT([no])
-   fi
+    else
+       AC_MSG_RESULT([no])
+    fi
 fi
 
 AC_SUBST(SYSTEM_MESA_HEADERS)
@@ -6584,8 +6588,8 @@ AC_SUBST(POPPLER_LIBS)
 
 
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-  AC_MSG_CHECKING([for sdext module])
-  BUILD_TYPE="$BUILD_TYPE SDEXT"
+   AC_MSG_CHECKING([for sdext module])
+   BUILD_TYPE="$BUILD_TYPE SDEXT"
 fi
 
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
@@ -6605,202 +6609,202 @@ AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [
 AC_SUBST(ENABLE_MEDIAWIKI)
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
-  AC_MSG_CHECKING([which Servlet API Jar to use])
-  if test -n "$with_system_servlet_api"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_SERVLETAPI=YES
-      if test -z "$SERVLETAPI_JAR"; then
-    SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
-      fi
-      AC_CHECK_FILE($SERVLETAPI_JAR, [],
-             [AC_MSG_ERROR(servlet-api.jar not found.)], [])
-  else
-    AC_MSG_RESULT([internal])
-    SYSTEM_SERVLETAPI=NO
-    BUILD_TYPE="$BUILD_TYPE TOMCAT"
-  fi
+    AC_MSG_CHECKING([which Servlet API Jar to use])
+    if test -n "$with_system_servlet_api"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_SERVLETAPI=YES
+        if test -z "$SERVLETAPI_JAR"; then
+            SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
+        fi
+        AC_CHECK_FILE($SERVLETAPI_JAR, [],
+              [AC_MSG_ERROR(servlet-api.jar not found.)], [])
+    else
+        AC_MSG_RESULT([internal])
+        SYSTEM_SERVLETAPI=NO
+        BUILD_TYPE="$BUILD_TYPE TOMCAT"
+    fi
 fi
 AC_SUBST(SYSTEM_SERVLETAPI)
 AC_SUBST(SERVLETAPI_JAR)
 
 AC_MSG_CHECKING([whether to build the Report Builder extension])
 if test -n "$enable_ext_report_builder" -a "$enable_ext_report_builder" != "no" && test "$with_java" != "no"; then
-  AC_MSG_RESULT([yes])
-  ENABLE_REPORTBUILDER=YES
-  AC_MSG_CHECKING([for reportbuilder module])
-  AC_MSG_CHECKING([which jfreereport libs to use])
-  if test "$with_system_jfreereport" = "yes"; then
-      SYSTEM_JFREEREPORT=YES
-      AC_MSG_RESULT([external])
-      if test -z $SAC_JAR; then
-             SAC_JAR=/usr/share/java/sac.jar
-      fi
-      AC_CHECK_FILE($SAC_JAR, [],
+    AC_MSG_RESULT([yes])
+    ENABLE_REPORTBUILDER=YES
+    AC_MSG_CHECKING([for reportbuilder module])
+    AC_MSG_CHECKING([which jfreereport libs to use])
+    if test "$with_system_jfreereport" = "yes"; then
+        SYSTEM_JFREEREPORT=YES
+        AC_MSG_RESULT([external])
+        if test -z $SAC_JAR; then
+            SAC_JAR=/usr/share/java/sac.jar
+        fi
+        AC_CHECK_FILE($SAC_JAR, [],
              [AC_MSG_ERROR(sac.jar not found.)], [])
 
-      if test -z $LIBXML_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libxml-1.0.0.jar,
-          [ LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/libxml.jar,
-              [ LIBXML_JAR=/usr/share/java/libxml.jar ],
-              [AC_MSG_ERROR(libxml.jar replacement not found.)]
+        if test -z $LIBXML_JAR; then
+            AC_CHECK_FILE(/usr/share/java/libxml-1.0.0.jar,
+                [ LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/libxml.jar,
+                       [ LIBXML_JAR=/usr/share/java/libxml.jar ],
+                       [AC_MSG_ERROR(libxml.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBXML_JAR, [],
-             [AC_MSG_ERROR(libxml.jar not found.)], [])
-      fi
-
-      if test -z $FLUTE_JAR; then
-        AC_CHECK_FILE(/usr/share/java/flute-1.3.0.jar,
-          [ FLUTE_JAR=/usr/share/java/flute-1.3.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/flute.jar,
-              [ FLUTE_JAR=/usr/share/java/flute.jar ],
-              [ AC_MSG_ERROR(flute-1.3.0.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($LIBXML_JAR, [],
+                 [AC_MSG_ERROR(libxml.jar not found.)], [])
+        fi
+
+        if test -z $FLUTE_JAR; then
+            AC_CHECK_FILE(/usr/share/java/flute-1.3.0.jar,
+                [ FLUTE_JAR=/usr/share/java/flute-1.3.0.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/flute.jar,
+                        [ FLUTE_JAR=/usr/share/java/flute.jar ],
+                        [ AC_MSG_ERROR(flute-1.3.0.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($FLUTE_JAR, [],
-             [AC_MSG_ERROR(flute-1.3.0.jar not found.)], [])
-      fi
-
-      if test -z $JFREEREPORT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/flow-engine-0.9.2.jar,
-          [ JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/flow-engine.jar,
-              [ JFREEREPORT_JAR=/usr/share/java/flow-engine.jar ],
-              [AC_MSG_ERROR(jfreereport.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($FLUTE_JAR, [],
+                 [AC_MSG_ERROR(flute-1.3.0.jar not found.)], [])
+        fi
+
+        if test -z $JFREEREPORT_JAR; then
+            AC_CHECK_FILE(/usr/share/java/flow-engine-0.9.2.jar,
+                [ JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/flow-engine.jar,
+                        [ JFREEREPORT_JAR=/usr/share/java/flow-engine.jar ],
+                        [AC_MSG_ERROR(jfreereport.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($JFREEREPORT_JAR, [],
-             [AC_MSG_ERROR(jfreereport.jar not found.)], [])
-      fi
-
-      if test -z $LIBLAYOUT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/liblayout-0.2.9.jar,
-          [ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/liblayout.jar,
-              [ LIBLAYOUT_JAR=/usr/share/java/liblayout.jar ],
-              [AC_MSG_ERROR(liblayout.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($JFREEREPORT_JAR, [],
+                 [AC_MSG_ERROR(jfreereport.jar not found.)], [])
+        fi
+
+        if test -z $LIBLAYOUT_JAR; then
+            AC_CHECK_FILE(/usr/share/java/liblayout-0.2.9.jar,
+                [ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/liblayout.jar,
+                        [ LIBLAYOUT_JAR=/usr/share/java/liblayout.jar ],
+                        [AC_MSG_ERROR(liblayout.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBLAYOUT_JAR, [],
-             [AC_MSG_ERROR(liblayout.jar not found.)], [])
-      fi
-
-      if test -z $LIBLOADER_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libloader-1.0.0.jar,
-          [ LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/libloader.jar,
-              [ LIBLOADER_JAR=/usr/share/java/libloader.jar ],
-              [AC_MSG_ERROR(libloader.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($LIBLAYOUT_JAR, [],
+                 [AC_MSG_ERROR(liblayout.jar not found.)], [])
+        fi
+
+        if test -z $LIBLOADER_JAR; then
+            AC_CHECK_FILE(/usr/share/java/libloader-1.0.0.jar,
+                [ LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/libloader.jar,
+                       [ LIBLOADER_JAR=/usr/share/java/libloader.jar ],
+                       [AC_MSG_ERROR(libloader.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBLOADER_JAR, [],
-             [AC_MSG_ERROR(libloader.jar not found.)], [])
-      fi
-
-      if test -z $LIBFORMULA_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libformula-0.2.0.jar,
-          [ LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/libformula.jar,
-              [ LIBFORMULA_JAR=/usr/share/java/libformula.jar ],
-              [AC_MSG_ERROR(libformula.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($LIBLOADER_JAR, [],
+                [AC_MSG_ERROR(libloader.jar not found.)], [])
+        fi
+
+        if test -z $LIBFORMULA_JAR; then
+            AC_CHECK_FILE(/usr/share/java/libformula-0.2.0.jar,
+                 [ LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar ],
+                 [
+                     AC_CHECK_FILE(/usr/share/java/libformula.jar,
+                         [ LIBFORMULA_JAR=/usr/share/java/libformula.jar ],
+                         [AC_MSG_ERROR(libformula.jar replacement not found.)]
+                     )
+                 ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBFORMULA_JAR, [],
-             [AC_MSG_ERROR(libformula.jar not found.)], [])
-      fi
-
-      if test -z $LIBREPOSITORY_JAR; then
-        AC_CHECK_FILE(/usr/share/java/librepository-1.0.0.jar,
-          [ LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/librepository.jar,
-              [ LIBREPOSITORY_JAR=/usr/share/java/librepository.jar ],
-              [AC_MSG_ERROR(librepository.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($LIBFORMULA_JAR, [],
+                [AC_MSG_ERROR(libformula.jar not found.)], [])
+        fi
+
+        if test -z $LIBREPOSITORY_JAR; then
+            AC_CHECK_FILE(/usr/share/java/librepository-1.0.0.jar,
+                [ LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/librepository.jar,
+                        [ LIBREPOSITORY_JAR=/usr/share/java/librepository.jar ],
+                        [AC_MSG_ERROR(librepository.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBREPOSITORY_JAR, [],
-             [AC_MSG_ERROR(librepository.jar not found.)], [])
-      fi
-
-      if test -z $LIBFONTS_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libfonts-1.0.0.jar,
-          [ LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/libfonts.jar,
-              [ LIBFONTS_JAR=/usr/share/java/libfonts.jar ],
-              [AC_MSG_ERROR(libfonts.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($LIBREPOSITORY_JAR, [],
+                [AC_MSG_ERROR(librepository.jar not found.)], [])
+        fi
+
+        if test -z $LIBFONTS_JAR; then
+            AC_CHECK_FILE(/usr/share/java/libfonts-1.0.0.jar,
+                [ LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/libfonts.jar,
+                        [ LIBFONTS_JAR=/usr/share/java/libfonts.jar ],
+                        [AC_MSG_ERROR(libfonts.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBFONTS_JAR, [],
-             [AC_MSG_ERROR(libfonts.jar not found.)], [])
-      fi
-
-      if test -z $LIBSERIALIZER_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libserializer-1.0.0.jar,
-          [ LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/libserializer.jar,
-              [ LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar ],
-              [AC_MSG_ERROR(libserializer.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($LIBFONTS_JAR, [],
+                [AC_MSG_ERROR(libfonts.jar not found.)], [])
+        fi
+
+        if test -z $LIBSERIALIZER_JAR; then
+            AC_CHECK_FILE(/usr/share/java/libserializer-1.0.0.jar,
+                [ LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/libserializer.jar,
+                        [ LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar ],
+                        [AC_MSG_ERROR(libserializer.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBSERIALIZER_JAR, [],
-             [AC_MSG_ERROR(libserializer.jar not found.)], [])
-      fi
-
-
-      if test -z $LIBBASE_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libbase-1.0.0.jar,
-          [ LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/libbase.jar,
-              [ LIBBASE_JAR=/usr/share/java/libbase.jar ],
-              [AC_MSG_ERROR(libbase.jar replacement not found.)]
+        else
+            AC_CHECK_FILE($LIBSERIALIZER_JAR, [],
+                [AC_MSG_ERROR(libserializer.jar not found.)], [])
+        fi
+
+
+        if test -z $LIBBASE_JAR; then
+            AC_CHECK_FILE(/usr/share/java/libbase-1.0.0.jar,
+                [ LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar ],
+                [
+                    AC_CHECK_FILE(/usr/share/java/libbase.jar,
+                        [ LIBBASE_JAR=/usr/share/java/libbase.jar ],
+                        [AC_MSG_ERROR(libbase.jar replacement not found.)]
+                    )
+                ]
             )
-          ]
-        )
-      else
-        AC_CHECK_FILE($LIBBASE_JAR, [],
-             [AC_MSG_ERROR(libbase.jar not found.)], [])
-      fi
+        else
+            AC_CHECK_FILE($LIBBASE_JAR, [],
+                [AC_MSG_ERROR(libbase.jar not found.)], [])
+        fi
 
-  else
-     AC_MSG_RESULT([internal])
-     AC_MSG_CHECKING([for jfreereport module])
-     SYSTEM_JFREEREPORT=NO
-     BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
-  fi
-  BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
+    else
+        AC_MSG_RESULT([internal])
+        AC_MSG_CHECKING([for jfreereport module])
+        SYSTEM_JFREEREPORT=NO
+        BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
+    fi
+    BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
 else
-  AC_MSG_RESULT([no])
-  ENABLE_REPORTBUILDER=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
-  SYSTEM_JFREEREPORT=NO
+    AC_MSG_RESULT([no])
+    ENABLE_REPORTBUILDER=NO
+    SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
+    SYSTEM_JFREEREPORT=NO
 fi
 AC_SUBST(ENABLE_REPORTBUILDER)
 AC_SUBST(SYSTEM_JFREEREPORT)
@@ -6819,77 +6823,77 @@ AC_SUBST(LIBSERIALIZER_JAR)
 # this has to be here because both the Wiki Publisher and the SRB use
 # commons-logging
 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-  AC_MSG_CHECKING([which Apache commons-* libs to use])
-  if test "$with_system_apache_commons" = "yes"; then
-    SYSTEM_APACHE_COMMONS=YES
-    AC_MSG_RESULT([external])
-    if test "$ENABLE_MEDIAWIKI" = "YES"; then
-      if test -z $COMMONS_CODEC_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar,
-          [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
-              [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
-              [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
-            )
-          ]
-        )
-      else
-        AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
-             [AC_MSG_ERROR(commons-codec.jar not found.)], [])
-      fi
-
-      if test -z $COMMONS_LANG_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar,
-          [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
-              [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
-              [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
-            )
-          ]
-        )
-      else
-        AC_CHECK_FILE($COMMONS_LANG_JAR, [],
-             [AC_MSG_ERROR(commons-lang.jar not found.)], [])
-      fi
-
-      if test -z $COMMONS_HTTPCLIENT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar,
-          [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar,
-              [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
-              [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
-            )
-          ]
-        )
-      else
-        AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-             [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
-      fi
-    fi
-    if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-      if test -z $COMMONS_LOGGING_JAR; then
-        AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
-          [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
-              [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
-              [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
-            )
-          ]
-        )
-      else
-        AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
-             [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-      fi
+    AC_MSG_CHECKING([which Apache commons-* libs to use])
+    if test "$with_system_apache_commons" = "yes"; then
+        SYSTEM_APACHE_COMMONS=YES
+        AC_MSG_RESULT([external])
+        if test "$ENABLE_MEDIAWIKI" = "YES"; then
+            if test -z $COMMONS_CODEC_JAR; then
+                AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar,
+                    [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
+                    [
+                        AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
+                            [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
+                            [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
+                        )
+                    ]
+                )
+            else
+                AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
+                    [AC_MSG_ERROR(commons-codec.jar not found.)], [])
+            fi
+
+            if test -z $COMMONS_LANG_JAR; then
+                AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar,
+                    [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
+                    [
+                        AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
+                            [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
+                            [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
+                            )
+                    ]
+                )
+            else
+                AC_CHECK_FILE($COMMONS_LANG_JAR, [],
+                    [AC_MSG_ERROR(commons-lang.jar not found.)], [])
+            fi
+
+            if test -z $COMMONS_HTTPCLIENT_JAR; then
+                AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar,
+                    [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
+                    [
+                        AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar,
+                            [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
+                            [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
+                        )
+                    ]
+                )
+            else
+                AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+                    [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+            fi
+        fi
+        if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
+            if test -z $COMMONS_LOGGING_JAR; then
+                AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
+                   [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
+                   [
+                        AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
+                            [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
+                            [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
+                        )
+                    ]
+                )
+            else
+                AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+                    [AC_MSG_ERROR(commons-logging.jar not found.)], [])
+            fi
+        fi
+    else
+        AC_MSG_RESULT([internal])
+        SYSTEM_APACHE_COMMONS=NO
+        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
     fi
-  else
-    AC_MSG_RESULT([internal])
-    SYSTEM_APACHE_COMMONS=NO
-    BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
-  fi
 fi
 AC_SUBST(SYSTEM_APACHE_COMMONS)
 AC_SUBST(COMMONS_CODEC_JAR)
@@ -6924,21 +6928,21 @@ AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
 dnl Scripting provider for Python extension?
 dnl We always provide this unless we have disabled Python completely
 if test $enable_python = no; then
-   ENABLE_SCRIPTING_PYTHON=NO
+    ENABLE_SCRIPTING_PYTHON=NO
 else
-   ENABLE_SCRIPTING_PYTHON=YES
+    ENABLE_SCRIPTING_PYTHON=YES
 fi
 AC_SUBST(ENABLE_SCRIPTING_PYTHON)
 
 supports_multilib=
 case "$host_cpu" in
-   x86_64 | powerpc64 | s390x)
-      if test "$SIZEOF_LONG" = "8"; then
-          supports_multilib="yes"
-      fi
-      ;;
-   *)
-      ;;
+x86_64 | powerpc64 | s390x)
+    if test "$SIZEOF_LONG" = "8"; then
+        supports_multilib="yes"
+    fi
+    ;;
+*)
+    ;;
 esac
 
 dnl ===================================================================
@@ -7081,134 +7085,134 @@ KDE_GLIB_CFLAGS=""
 KDE_GLIB_LIBS=""
 KDE_HAVE_GLIB=""
 if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-   qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
-   qt_libdirs="$QT4LIB /usr/lib $x_libraries"
+    qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
+    qt_libdirs="$QT4LIB /usr/lib $x_libraries"
 
-   kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
-   kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
+    kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
+    kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
 
-   if test -n "$supports_multilib" ; then
-      qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-      kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel"
-   fi
+    if test -n "$supports_multilib" ; then
+        qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
+        kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel"
+    fi
 
-   if test -n "$QTDIR" ; then
-      qt_incdirs="$QTDIR/include $qt_incdirs"
-      if test -z "$supports_multilib" ; then
-         qt_libdirs="$QTDIR/lib $qt_libdirs"
-      else
-         qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
-      fi
-   fi
-   if test -n "$QT4DIR" ; then
-      qt_incdirs="$QT4DIR/include $qt_incdirs"
-      if test -z "$supports_multilib" ; then
-         qt_libdirs="$QT4DIR/lib $qt_libdirs"
-      else
-         qt_libdirs="$QT4DIR/lib64 $QT4DIR/lib $qt_libdirs"
-      fi
-   fi
-
-   if test -n "$KDEDIR" ; then
-      kde_incdirs="$KDEDIR/include $kde_incdirs"
-      if test -z "$supports_multilib" ; then
-         kde_libdirs="$KDEDIR/lib $kde_libdirs"
-      else
-         kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
-      fi
-   fi
-   if test -n "$KDE4DIR" ; then
-      kde_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde_incdirs"
-      if test -z "$supports_multilib" ; then
-         kde_libdirs="$KDE4DIR/lib $kde_libdirs"
-      else
-         kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
-      fi
-   fi
-
-   qt_test_include="Qt/qobject.h"
-   qt_test_library="libQtCore.so"
-   kde_test_include="kwindowsystem.h"
-   kde_test_library="libsolid.so"
-
-   AC_MSG_CHECKING([for Qt4 headers])
-   qt_header_dir="no"
-   for inc_dir in $qt_incdirs ; do
-      if test -r "$inc_dir/$qt_test_include" ; then
-         qt_header_dir="$inc_dir"
-         break
-      fi
-   done
-
-   AC_MSG_RESULT([$qt_header_dir])
-   if test "x$qt_header_dir" = "xno" ; then
-      AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
-   fi
-
-   AC_MSG_CHECKING([for Qt4 libraries])
-   qt_lib_dir="no"
-   for lib_dir in $qt_libdirs ; do
-      if test -r "$lib_dir/$qt_test_library" ; then
-         qt_lib_dir="$lib_dir"
-         PKG_CONFIG_PATH="$qt_lib_dir"/pkgconfig:$PKG_CONFIG_PATH
-         break
-      fi
-   done
-
-   AC_MSG_RESULT([$qt_lib_dir])
-
-   if test "x$qt_lib_dir" = "xno" ; then
-      AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
-   fi
-
-   dnl Check for Meta Object Compiler
-
-   AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-   MOC4="$MOCQT4"
-   if test "$MOC4" = "no" ; then
-      AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-      if test "$MOC4" = "no" ; then
-         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+    if test -n "$QTDIR" ; then
+        qt_incdirs="$QTDIR/include $qt_incdirs"
+        if test -z "$supports_multilib" ; then
+            qt_libdirs="$QTDIR/lib $qt_libdirs"
+        else
+            qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
+        fi
+    fi
+    if test -n "$QT4DIR" ; then
+        qt_incdirs="$QT4DIR/include $qt_incdirs"
+        if test -z "$supports_multilib" ; then
+            qt_libdirs="$QT4DIR/lib $qt_libdirs"
+        else
+            qt_libdirs="$QT4DIR/lib64 $QT4DIR/lib $qt_libdirs"
+        fi
+    fi
+
+    if test -n "$KDEDIR" ; then
+        kde_incdirs="$KDEDIR/include $kde_incdirs"
+        if test -z "$supports_multilib" ; then
+            kde_libdirs="$KDEDIR/lib $kde_libdirs"
+        else
+            kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
+        fi
+    fi
+    if test -n "$KDE4DIR" ; then
+        kde_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde_incdirs"
+        if test -z "$supports_multilib" ; then
+            kde_libdirs="$KDE4DIR/lib $kde_libdirs"
+        else
+            kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
+        fi
+    fi
+
+    qt_test_include="Qt/qobject.h"
+    qt_test_library="libQtCore.so"
+    kde_test_include="kwindowsystem.h"
+    kde_test_library="libsolid.so"
+
+    AC_MSG_CHECKING([for Qt4 headers])
+    qt_header_dir="no"
+    for inc_dir in $qt_incdirs ; do
+        if test -r "$inc_dir/$qt_test_include" ; then
+            qt_header_dir="$inc_dir"
+            break
+        fi
+    done
+
+    AC_MSG_RESULT([$qt_header_dir])
+    if test "x$qt_header_dir" = "xno" ; then
+        AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+
+    AC_MSG_CHECKING([for Qt4 libraries])
+    qt_lib_dir="no"
+    for lib_dir in $qt_libdirs ; do
+        if test -r "$lib_dir/$qt_test_library" ; then
+            qt_lib_dir="$lib_dir"
+            PKG_CONFIG_PATH="$qt_lib_dir"/pkgconfig:$PKG_CONFIG_PATH
+            break
+        fi
+    done
+
+    AC_MSG_RESULT([$qt_lib_dir])
+
+    if test "x$qt_lib_dir" = "xno" ; then
+        AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
+    fi
+
+    dnl Check for Meta Object Compiler
+
+    AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+    MOC4="$MOCQT4"
+    if test "$MOC4" = "no" ; then
+        AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+        if test "$MOC4" = "no" ; then
+            AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QT4DIR before running "configure".])
-      fi
-   fi
-
-   dnl Check for KDE4 headers
-   AC_MSG_CHECKING([for KDE4 headers])
-   kde_incdir="no"
-   for kde_check in $kde_incdirs ; do
-      if test -r "$kde_check/$kde_test_include" ; then
-         kde_incdir="$kde_check"
-         break
-      fi
-   done
-   AC_MSG_RESULT([$kde_incdir])
-   if test "x$kde_incdir" = "xno" ; then
-      AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
-   fi
-
-   dnl Check for KDE4 libraries
-   AC_MSG_CHECKING([for KDE4 libraries])
-   kde_libdir="no"
-   for kde_check in $kde_libdirs ; do
-      if test -r "$kde_check/$kde_test_library" ; then
-         kde_libdir="$kde_check"
-         break
-      fi
-   done
-
-   AC_MSG_RESULT([$kde_libdir])
-   if test "x$kde_libdir" = "xno" ; then
-      AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
-   fi
-
-   KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-   KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
-
-   AC_LANG_PUSH([C++])
-   save_CXXFLAGS=$CXXFLAGS
-   CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
-   AC_MSG_CHECKING([whether KDE is >= 4.2])
+        fi
+    fi
+
+    dnl Check for KDE4 headers
+    AC_MSG_CHECKING([for KDE4 headers])
+    kde_incdir="no"
+    for kde_check in $kde_incdirs ; do
+        if test -r "$kde_check/$kde_test_include" ; then
+            kde_incdir="$kde_check"
+            break
+        fi
+    done
+    AC_MSG_RESULT([$kde_incdir])
+    if test "x$kde_incdir" = "xno" ; then
+        AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+
+    dnl Check for KDE4 libraries
+    AC_MSG_CHECKING([for KDE4 libraries])
+    kde_libdir="no"
+    for kde_check in $kde_libdirs ; do
+        if test -r "$kde_check/$kde_test_library" ; then
+            kde_libdir="$kde_check"
+            break
+        fi
+    done
+
+    AC_MSG_RESULT([$kde_libdir])
+    if test "x$kde_libdir" = "xno" ; then
+        AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+    fi
+
+    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
+    KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
+
+    AC_LANG_PUSH([C++])
+    save_CXXFLAGS=$CXXFLAGS
+    CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
+    AC_MSG_CHECKING([whether KDE is >= 4.2])
        AC_TRY_RUN([
 #include <kdeversion.h>
 
@@ -7217,13 +7221,13 @@ int main(int argc, char **argv) {
        else return 1;
 }
        ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old])])
-   CXXFLAGS=$save_CXXFLAGS
-   AC_LANG_POP([C++])
+    CXXFLAGS=$save_CXXFLAGS
+    AC_LANG_POP([C++])
 
    # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled
-   PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
-    [KDE_HAVE_GLIB=1],
-    AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's Glib event loop support]]))
+    PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
+        [KDE_HAVE_GLIB=1],
+        AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's Glib event loop support]]))
 fi
 AC_SUBST(KDE4_CFLAGS)
 AC_SUBST(KDE4_LIBS)
@@ -7238,10 +7242,10 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to enable the lockdown pieces])
 ENABLE_LOCKDOWN=""
 if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then
-  ENABLE_LOCKDOWN=YES
-  AC_MSG_RESULT([yes])
+    ENABLE_LOCKDOWN=YES
+    AC_MSG_RESULT([yes])
 else
-  AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_LOCKDOWN)
 
@@ -7250,12 +7254,12 @@ dnl Test whether to include Evolution 2 support
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable evolution 2 support])
 if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then
-   AC_MSG_RESULT([yes])
-   PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
-   ENABLE_EVOAB2="TRUE"
+    AC_MSG_RESULT([yes])
+    PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
+    ENABLE_EVOAB2="TRUE"
 else
-   ENABLE_EVOAB2=""
-   AC_MSG_RESULT([no])
+    ENABLE_EVOAB2=""
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_EVOAB2)
 AC_SUBST(GOBJECT_CFLAGS)
@@ -7266,11 +7270,11 @@ dnl Test whether to include KDE AB support
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable KDE address book support])
 if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
-   AC_MSG_RESULT([yes])
-   AC_LANG_PUSH([C++])
-   save_CXXFLAGS=$CXXFLAGS
-   CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
-   AC_MSG_CHECKING([whether KDE is between 3.2 and 3.6])
+    AC_MSG_RESULT([yes])
+    AC_LANG_PUSH([C++])
+    save_CXXFLAGS=$CXXFLAGS
+    CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
+    AC_MSG_CHECKING([whether KDE is between 3.2 and 3.6])
        AC_TRY_RUN([
 #include <kdeversion.h>
 
@@ -7279,12 +7283,12 @@ int main(int argc, char **argv) {
        else return 1;
 }
        ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old or too recent, please use another version of KDE or disable KDE address book support])])
-   CXXFLAGS=$save_CXXFLAGS
-   AC_LANG_POP([C++])
-   ENABLE_KAB=TRUE
+    CXXFLAGS=$save_CXXFLAGS
+    AC_LANG_POP([C++])
+    ENABLE_KAB=TRUE
 else
-   AC_MSG_RESULT([no])
-   ENABLE_KAB=
+    AC_MSG_RESULT([no])
+    ENABLE_KAB=
 fi
 AC_SUBST(ENABLE_KAB)
 
@@ -7293,16 +7297,16 @@ dnl Test whether to include MathMLDTD
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include MathMLDTD])
 if test -n "$enable_mathmldtd"; then
-  if test "$enable_mathmldtd" = "no"; then
+    if test "$enable_mathmldtd" = "no"; then
+        AC_MSG_RESULT([no])
+        SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
+    else
+        AC_MSG_RESULT([yes])
+        BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
+    fi
+else
     AC_MSG_RESULT([no])
     SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
-  else
-    AC_MSG_RESULT([yes])
-    BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
-  fi
-else
-  AC_MSG_RESULT([no])
-  SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
 fi
 
 dnl ===================================================================
@@ -7311,16 +7315,16 @@ dnl ===================================================================
 AC_MSG_CHECKING([which themes to include])
 # if none given, use all available themes
 if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
-  enable_theme="default crystal hicontrast oxygen tango"
+    enable_theme="default crystal hicontrast oxygen tango"
 fi
 
-  WITH_THEMES=""
-  for theme in $enable_theme
-  do
+WITH_THEMES=""
+for theme in $enable_theme
+do
     WITH_THEMES="$WITH_THEMES $theme"
     SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
-  done
-  AC_MSG_RESULT([$WITH_THEMES])
+done
+AC_MSG_RESULT([$WITH_THEMES])
 AC_SUBST(WITH_THEMES)
 
 dnl ===================================================================
@@ -7328,12 +7332,12 @@ dnl Test whether to integrate helppacks into the product's installer
 dnl ===================================================================
 AC_MSG_CHECKING([for helppack integration])
 if test "z$with_helppack_integration" = "zno" ; then
-  WITH_HELPPACK_INTEGRATION=NO
-  AC_MSG_RESULT([no integration])
+    WITH_HELPPACK_INTEGRATION=NO
+    AC_MSG_RESULT([no integration])
 else
-  WITH_HELPPACK_INTEGRATION=YES
-  SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION"
-  AC_MSG_RESULT([integration])
+    WITH_HELPPACK_INTEGRATION=YES
+    SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION"
+    AC_MSG_RESULT([integration])
 fi
 AC_SUBST(WITH_HELPPACK_INTEGRATION)
 
@@ -7342,12 +7346,12 @@ dnl Test whether to integrate extensions into the product's installer
 dnl ===================================================================
 AC_MSG_CHECKING([for extensions integration])
 if test "z$with_extension_integration" = "z" -o "z$with_extension_integration" = "zno" ; then
-  WITH_EXTENSION_INTEGRATION=NO
-  AC_MSG_RESULT([no integration])
+    WITH_EXTENSION_INTEGRATION=NO
+    AC_MSG_RESULT([no integration])
 else
-  WITH_EXTENSION_INTEGRATION=YES
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION"
-  AC_MSG_RESULT([integration])
+    WITH_EXTENSION_INTEGRATION=YES
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION"
+    AC_MSG_RESULT([integration])
 fi
 AC_SUBST(WITH_EXTENSION_INTEGRATION)
 
@@ -7377,13 +7381,13 @@ else
     LIGHTPROOF_EN_US_PACK=
     # check whether the langs are requested at all
     for lang in $wanted_lightproof ; do
-    if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
-        LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
-        case $lang in
-        "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
-        "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
-    esac
-    fi
+        if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
+            LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
+            case $lang in
+            "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
+            "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
+            esac
+        fi
     done
     AC_MSG_RESULT([$LIGHTPROOF_LANG])
 fi
@@ -7396,12 +7400,12 @@ dnl Test whether to include Watch Window extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Watch Window extension integration])
 if test "z$enable_ext_watch_window" = "z" -o "z$enable_ext_watch_window" = "zno" ; then
-  AC_MSG_RESULT([no])
-  WATCH_WINDOW_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    WATCH_WINDOW_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
-  WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
+    WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
 fi
 AC_SUBST(WATCH_WINDOW_EXTENSION_PACK)
 
@@ -7410,12 +7414,12 @@ dnl Test whether to include Diagram extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Diagram extension integration])
 if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
-  AC_MSG_RESULT([no])
-  DIAGRAM_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    DIAGRAM_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
-  DIAGRAM_EXTENSION_PACK="41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
+    DIAGRAM_EXTENSION_PACK="41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt"
 fi
 AC_SUBST(DIAGRAM_EXTENSION_PACK)
 
@@ -7424,12 +7428,12 @@ dnl Test whether to include Validator extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Validator extension integration])
 if test "z$enable_ext_validator" = "z" -o "z$enable_ext_validator" = "zno" ; then
-  AC_MSG_RESULT([no])
-  VALIDATOR_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    VALIDATOR_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
-  VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
+    VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
 fi
 AC_SUBST(VALIDATOR_EXTENSION_PACK)
 
@@ -7438,12 +7442,12 @@ dnl Test whether to include Barcode extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Barcode extension integration])
 if test "z$enable_ext_barcode" = "z" -o "z$enable_ext_barcode" = "zno" ; then
-  AC_MSG_RESULT([no])
-  BARCODE_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    BARCODE_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
-  BARCODE_EXTENSION_PACK="7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
+    BARCODE_EXTENSION_PACK="7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt"
 fi
 AC_SUBST(BARCODE_EXTENSION_PACK)
 
@@ -7452,13 +7456,13 @@ dnl Test whether to include ConvertTextToNumber extension
 dnl ===================================================================
 AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
 if test "z$enable_ext_ct2n" = "z" -o "z$enable_ext_ct2n" = "zno" ; then
-  AC_MSG_RESULT([no])
-  CT2N_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    CT2N_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  BUILD_TYPE="$BUILD_TYPE CT2N"
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
-  CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
+    AC_MSG_RESULT([yes])
+    BUILD_TYPE="$BUILD_TYPE CT2N"
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
+    CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
 fi
 AC_SUBST(CT2N_EXTENSION_PACK)
 
@@ -7467,12 +7471,12 @@ dnl Test whether to include Numbertext extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Numbertext extension integration])
 if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; then
-  AC_MSG_RESULT([no])
-  NUMBERTEXT_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    NUMBERTEXT_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
-  NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
+    NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt"
 fi
 AC_SUBST(NUMBERTEXT_EXTENSION_PACK)
 
@@ -7481,12 +7485,12 @@ dnl Test whether to include Hungarian Cross-reference Toolbar extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
 if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
-  AC_MSG_RESULT([no])
-  HUNART_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    HUNART_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
-  HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
+    HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
 fi
 AC_SUBST(HUNART_EXTENSION_PACK)
 
@@ -7495,12 +7499,12 @@ dnl Test whether to include Typography Toolbar extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Typography Toolbar extension integration])
 if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
-  AC_MSG_RESULT([no])
-  TYPO_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    TYPO_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
-  TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
+    TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
 fi
 AC_SUBST(TYPO_EXTENSION_PACK)
 
@@ -7509,12 +7513,12 @@ dnl Test whether to include Google Docs extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Google Docs extension integration])
 if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ; then
-  AC_MSG_RESULT([no])
-  GOOGLE_DOCS_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    GOOGLE_DOCS_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
-  GOOGLE_DOCS_EXTENSION_PACK="dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
+    GOOGLE_DOCS_EXTENSION_PACK="dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt"
 fi
 AC_SUBST(GOOGLE_DOCS_EXTENSION_PACK)
 
@@ -7523,11 +7527,11 @@ dnl Test whether to include NLPSolver extension
 dnl ===================================================================
 AC_MSG_CHECKING([for NLPSolver extension integration])
 if test "z$enable_ext_nlpsolver" = "z" -o "z$enable_ext_nlpsolver" = "zno" ; then
-  AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no])
 else
-  AC_MSG_RESULT([yes])
-  BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
+    AC_MSG_RESULT([yes])
+    BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
 fi
 
 dnl ===================================================================
@@ -7535,11 +7539,11 @@ dnl Test whether to include LanguageTool extension
 dnl ===================================================================
 AC_MSG_CHECKING([for LanguageTool extension integration])
 if test "z$with_languagetool" = "z" -o "z$with_languagetool" = "zno" ; then
-  AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no])
 else
-  AC_MSG_RESULT([yes])
-  BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
+    AC_MSG_RESULT([yes])
+    BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
 fi
 
 dnl ===================================================================
@@ -7547,12 +7551,12 @@ dnl Test whether to include oooblogger extension
 dnl ===================================================================
 AC_MSG_CHECKING([for oooblogger extension integration])
 if test "z$enable_ext_oooblogger" = "z" -o "z$enable_ext_oooblogger" = "zno" ; then
-  AC_MSG_RESULT([no])
-  OOOBLOGGER_EXTENSION_PACK=""
+    AC_MSG_RESULT([no])
+    OOOBLOGGER_EXTENSION_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
-  OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
+    AC_MSG_RESULT([yes])
+    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
+    OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
 fi
 AC_SUBST(OOOBLOGGER_EXTENSION_PACK)
 
@@ -7567,15 +7571,15 @@ else
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK"
     sun_supported_langs="en-US de it fr es hu"
     if test "z$with_sun_templates" = "zyes" ; then
-    wanted_sun_templates="$sun_supported_langs"
+        wanted_sun_templates="$sun_supported_langs"
     else
-    # check whether the langs are supported by Sun
-    wanted_sun_templates=
-    for lang in $with_sun_templates ; do
-        if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
-        wanted_sun_templates="$wanted_sun_templates $lang"
-        fi
-    done
+        # check whether the langs are supported by Sun
+        wanted_sun_templates=
+        for lang in $with_sun_templates ; do
+            if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
+                wanted_sun_templates="$wanted_sun_templates $lang"
+            fi
+        done
     fi
     SUNTEMPLATES_LANG=
     SUNTEMPLATES_DE_PACK=
@@ -7588,14 +7592,14 @@ else
     for lang in $wanted_sun_templates ; do
     if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
         SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-		case $lang in
-			"de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
-			"en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
-			"es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
-			"fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
-			"hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
-			"it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
-		esac
+        case $lang in
+        "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
+        "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
+        "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
+        "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
+        "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
+        "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
+        esac
     fi
     done
     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
@@ -7613,25 +7617,25 @@ dnl Test whether to include fonts
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include third-party fonts])
 if test "$with_fonts" != "no" ; then
-  AC_MSG_RESULT([yes])
-  WITH_FONTS=YES
-  BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
+    AC_MSG_RESULT([yes])
+    WITH_FONTS=YES
+    BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
 else
-  AC_MSG_RESULT([no])
-  WITH_FONTS=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
+    AC_MSG_RESULT([no])
+    WITH_FONTS=NO
+    SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
 fi
 AC_SUBST(WITH_FONTS)
 
 AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
 if test "$with_agfa_monotype_fonts" = "yes" ; then
-  AC_MSG_RESULT([yes])
-  WITH_AGFA_MONOTYPE_FONTS=YES
-  SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
-  BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
+    AC_MSG_RESULT([yes])
+    WITH_AGFA_MONOTYPE_FONTS=YES
+    SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
+    BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
 else
-  AC_MSG_RESULT([no])
-  WITH_AGFA_MONOTYPE_FONTS=NO
+    AC_MSG_RESULT([no])
+    WITH_AGFA_MONOTYPE_FONTS=NO
 fi
 AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
 
@@ -7640,11 +7644,11 @@ dnl Test whether to include ppds
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include PPDs])
 if test "$with_ppds" != "no"; then
-  AC_MSG_RESULT([yes])
+    AC_MSG_RESULT([yes])
 else
-  AC_MSG_RESULT([no])
-  WITHOUT_PPDS=YES
-  SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
+    AC_MSG_RESULT([no])
+    WITHOUT_PPDS=YES
+    SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
 fi
 AC_SUBST(WITHOUT_PPDS)
 
@@ -7653,12 +7657,12 @@ dnl Test whether to include afms
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include AFMs])
 if test "$with_afms" != "no"; then
-  AC_MSG_RESULT([yes])
-  BUILD_TYPE="$BUILD_TYPE AFMS"
+    AC_MSG_RESULT([yes])
+    BUILD_TYPE="$BUILD_TYPE AFMS"
 else
-  AC_MSG_RESULT([no])
-  WITHOUT_AFMS=YES
-  SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
+    AC_MSG_RESULT([no])
+    WITHOUT_AFMS=YES
+    SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
 fi
 AC_SUBST(WITHOUT_AFMS)
 
@@ -7667,15 +7671,15 @@ dnl Test whether to include extra galleries
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra galleries])
 if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then
-  AC_MSG_RESULT([no])
-  WITH_EXTRA_GALLERY=NO
-  OOOP_GALLERY_PACK=""
+    AC_MSG_RESULT([no])
+    WITH_EXTRA_GALLERY=NO
+    OOOP_GALLERY_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  WITH_EXTRA_GALLERY=YES
-  BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
-  SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"
-  OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip"
+    AC_MSG_RESULT([yes])
+    WITH_EXTRA_GALLERY=YES
+    BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
+    SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"
+    OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip"
 fi
 AC_SUBST(WITH_EXTRA_GALLERY)
 AC_SUBST(OOOP_GALLERY_PACK)
@@ -7685,15 +7689,15 @@ dnl Test whether to include extra templates
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra templates])
 if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then
-  AC_MSG_RESULT([no])
-  WITH_EXTRA_TEMPLATE=NO
-  OOOP_TEMPLATES_PACK=""
+    AC_MSG_RESULT([no])
+    WITH_EXTRA_TEMPLATE=NO
+    OOOP_TEMPLATES_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  WITH_EXTRA_TEMPLATE=YES
-  BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
-  SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
-  OOOP_TEMPLATES_PACK="1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip"
+    AC_MSG_RESULT([yes])
+    WITH_EXTRA_TEMPLATE=YES
+    BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
+    SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
+    OOOP_TEMPLATES_PACK="1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip"
 fi
 AC_SUBST(WITH_EXTRA_TEMPLATE)
 AC_SUBST(OOOP_TEMPLATES_PACK)
@@ -7703,15 +7707,15 @@ dnl Test whether to include extra samples
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra samples])
 if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then
-  AC_MSG_RESULT([no])
-  WITH_EXTRA_SAMPLE=NO
-  OOOP_SAMPLES_PACK=""
+    AC_MSG_RESULT([no])
+    WITH_EXTRA_SAMPLE=NO
+    OOOP_SAMPLES_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  WITH_EXTRA_SAMPLE=YES
-  BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
-  SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
-  OOOP_SAMPLES_PACK="a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip"
+    AC_MSG_RESULT([yes])
+    WITH_EXTRA_SAMPLE=YES
+    BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
+    SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
+    OOOP_SAMPLES_PACK="a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip"
 fi
 AC_SUBST(WITH_EXTRA_SAMPLE)
 AC_SUBST(OOOP_SAMPLES_PACK)
@@ -7721,15 +7725,15 @@ dnl Test whether to include extra fonts
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include extra fonts])
 if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then
-  AC_MSG_RESULT([no])
-  WITH_EXTRA_FONT=NO
-  OOOP_FONTS_PACK=""
+    AC_MSG_RESULT([no])
+    WITH_EXTRA_FONT=NO
+    OOOP_FONTS_PACK=""
 else
-  AC_MSG_RESULT([yes])
-  WITH_EXTRA_FONT=YES
-  BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
-  SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
-  OOOP_FONTS_PACK="a10aa597411643326e27d7fc128af12d-OOOP-fonts-pack-2.9.0.0.zip"
+    AC_MSG_RESULT([yes])
+    WITH_EXTRA_FONT=YES
+    BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
+    SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
+    OOOP_FONTS_PACK="a10aa597411643326e27d7fc128af12d-OOOP-fonts-pack-2.9.0.0.zip"
 fi
 AC_SUBST(WITH_EXTRA_FONT)
 AC_SUBST(OOOP_FONTS_PACK)
@@ -7739,24 +7743,46 @@ dnl Test whether to build global menu support
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build global menu support])
 if test "z$enable_lomenubar" = "z" -o "z$enable_lomenubar" = "zno" ; then
-  AC_MSG_RESULT([no])
-  ENABLE_LOMENUBAR="FALSE"
+    AC_MSG_RESULT([no])
+    ENABLE_LOMENUBAR="FALSE"
 else
-  AC_MSG_RESULT([yes])
-  ENABLE_LOMENUBAR="TRUE"
+    AC_MSG_RESULT([yes])
+    ENABLE_LOMENUBAR="TRUE"
 fi
 AC_SUBST(ENABLE_LOMENUBAR)
 
 dnl ===================================================================
+dnl Test whether to enable online update service
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable online update])
+ENABLE_ONLINE_UPDATE=
+if test "z$enable_online_update" = "z" ; then
+    if test "$_os" = "WINNT" -o "$_os" = "Darwin" ; then
+        AC_MSG_RESULT([yes])
+        ENABLE_ONLINE_UPDATE="TRUE"
+    else
+        AC_MSG_RESULT([no])
+    fi
+else
+    if test "z$enable_online_update" = "zyes" ; then
+        AC_MSG_RESULT([yes])
+        ENABLE_ONLINE_UPDATE="TRUE"
+    else
+        AC_MSG_RESULT([no])
+    fi
+fi
+AC_SUBST(ENABLE_ONLINE_UPDATE)
+
+dnl ===================================================================
 dnl Test whether build target is Release Build
 dnl ===================================================================
 AC_MSG_CHECKING([whether build target is Release Build])
 if test "z$enable_release_build" = "z" -o "z$enable_release_build" = "zno" ; then
-  AC_MSG_RESULT([no])
-  ENABLE_RELEASE_BUILD="FALSE"
+    AC_MSG_RESULT([no])
+    ENABLE_RELEASE_BUILD="FALSE"
 else
-  AC_MSG_RESULT([yes])
-  ENABLE_RELEASE_BUILD="TRUE"
+    AC_MSG_RESULT([yes])
+    ENABLE_RELEASE_BUILD="TRUE"
 fi
 AC_SUBST(ENABLE_RELEASE_BUILD)
 
@@ -7764,72 +7790,72 @@ dnl ===================================================================
 dnl Test whether to enable ActiveX embedding
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
-  AC_MSG_CHECKING([whether to enable ActiveX embedding of LibreOffice components])
-  if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
-    ENABLE_ACTIVEX_COMPONENT="TRUE"
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT"
-  else
-    ENABLE_ACTIVEX_COMPONENT=""
-    AC_MSG_RESULT([no])
-  fi
-  AC_SUBST(ENABLE_ACTIVEX_COMPONENT)
-  AC_SUBST(SCPDEFS)
+    AC_MSG_CHECKING([whether to enable ActiveX embedding of LibreOffice components])
+    if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
+        ENABLE_ACTIVEX_COMPONENT="TRUE"
+        AC_MSG_RESULT([yes])
+        SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT"
+    else
+        ENABLE_ACTIVEX_COMPONENT=""
+        AC_MSG_RESULT([no])
+    fi
+    AC_SUBST(ENABLE_ACTIVEX_COMPONENT)
+    AC_SUBST(SCPDEFS)
 fi
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
 if test "$_os" = "Darwin"; then
-   USE_XINERAMA=YES
-   XINERAMA_LINK=dynamic
-   AC_MSG_RESULT([yes])
+    USE_XINERAMA=YES
+    XINERAMA_LINK=dynamic
+    AC_MSG_RESULT([yes])
 elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-   if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
-      # we have both versions, let the user decide but use the dynamic one
-      # per default
-      USE_XINERAMA=YES
-      if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then
-         XINERAMA_LINK=dynamic
-      else
-         XINERAMA_LINK=static
-      fi
-   elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
-      # we have only the dynamic version
-      USE_XINERAMA=YES
-      XINERAMA_LINK=dynamic
-   elif test -e "$XLIB/libXinerama.a"; then
-      # static version
-      if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
-         USE_XINERAMA=YES
-         XINERAMA_LINK=static
-      else
-         USE_XINERAMA=NO
-         XINERAMA_LINK=none
-      fi
-   else
-      # no Xinerama
-      USE_XINERAMA=NO
-      XINERAMA_LINK=none
-   fi
-   if test "$USE_XINERAMA" = "YES"; then
-      AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
-      AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
-          [AC_MSG_ERROR(Xinerama header not found.)], [])
-      XINERAMA_EXTRA_LIBS="-L$XLIB -lXext"
-      if test "$_os" = "FreeBSD"; then
-          XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -lXt"
-      fi
-      if test "$_os" = "Linux"; then
-          XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
-      fi
-      AC_CHECK_LIB(Xinerama, XineramaIsActive, [],
-          [AC_MSG_ERROR(Xinerama not functional?)], [$XINERAMA_EXTRA_LIBS])
-   else
-      AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
-   fi
-else
-   USE_XINERAMA=NO
-   XINERAMA_LINK=none
-   AC_MSG_RESULT([no])
+    if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
+        # we have both versions, let the user decide but use the dynamic one
+        # per default
+        USE_XINERAMA=YES
+        if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then
+            XINERAMA_LINK=dynamic
+        else
+            XINERAMA_LINK=static
+        fi
+    elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
+        # we have only the dynamic version
+        USE_XINERAMA=YES
+        XINERAMA_LINK=dynamic
+    elif test -e "$XLIB/libXinerama.a"; then
+        # static version
+        if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
+            USE_XINERAMA=YES
+            XINERAMA_LINK=static
+        else
+            USE_XINERAMA=NO
+            XINERAMA_LINK=none
+        fi
+    else
+        # no Xinerama
+        USE_XINERAMA=NO
+        XINERAMA_LINK=none
+    fi
+    if test "$USE_XINERAMA" = "YES"; then
+        AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
+        AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
+            [AC_MSG_ERROR(Xinerama header not found.)], [])
+        XINERAMA_EXTRA_LIBS="-L$XLIB -lXext"
+        if test "$_os" = "FreeBSD"; then
+            XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -lXt"
+        fi
+        if test "$_os" = "Linux"; then
+            XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
+        fi
+        AC_CHECK_LIB(Xinerama, XineramaIsActive, [],
+            [AC_MSG_ERROR(Xinerama not functional?)], [$XINERAMA_EXTRA_LIBS])
+    else
+        AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
+    fi
+else
+    USE_XINERAMA=NO
+    XINERAMA_LINK=none
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(USE_XINERAMA)
 AC_SUBST(XINERAMA_LINK)
@@ -7849,79 +7875,78 @@ AC_MSG_CHECKING([what librsvg to use])
 
 case "$enable_librsvg" in
 no|disable)
-   AC_MSG_RESULT([none])
-   enable_librsvg=no
-   ;;
+    AC_MSG_RESULT([none])
+    enable_librsvg=no
+    ;;
 
 ""|yes|auto)
-   if test $build_os = cygwin -o \
+    if test $build_os = cygwin -o \
            $_os = Darwin; then
-      dnl When building on/for these OSes always use the internal one,
-      dnl if at all. Add more OSes above as needed.
-      AC_MSG_RESULT([internal])
-      enable_librsvg=internal
-   elif test  $_os = iOS -o $_os = Android; then
-      AC_MSG_RESULT([none])
-      enable_librsvg=no
-   else
-      if test "$with_system_libs" = yes; then
-         AC_MSG_RESULT([system])
-         PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
-         enable_librsvg=system
-      elif test "$with_system_libs" = no; then
-         AC_MSG_RESULT([internal])
-         enable_librsvg=internal
-      else
-         AC_MSG_RESULT([checking further])
-         PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14,, [:])
-         if test -z "$LIBRSVG_PKG_ERRORS"; then
+        dnl When building on/for these OSes always use the internal one,
+        dnl if at all. Add more OSes above as needed.
+        AC_MSG_RESULT([internal])
+        enable_librsvg=internal
+    elif test  $_os = iOS -o $_os = Android; then
+        AC_MSG_RESULT([none])
+        enable_librsvg=no
+    else
+        if test "$with_system_libs" = yes; then
+            AC_MSG_RESULT([system])
+            PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
             enable_librsvg=system
-         else
+        elif test "$with_system_libs" = no; then
+            AC_MSG_RESULT([internal])
             enable_librsvg=internal
-         fi
-      fi
-   fi
-   ;;
+        else
+            AC_MSG_RESULT([checking further])
+            PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14,, [:])
+            if test -z "$LIBRSVG_PKG_ERRORS"; then
+                enable_librsvg=system
+            else
+                enable_librsvg=internal
+            fi
+        fi
+    fi
+    ;;
 
 internal)
-   AC_MSG_RESULT([internal])
-   ;;
+    AC_MSG_RESULT([internal])
+    ;;
 
 system)
-   if test $_os = WINNT -a "$WITH_MINGW" != yes; then
-      AC_MSG_ERROR([Must use internal librsvg when building with MSVC])
-   fi
-   AC_MSG_RESULT([system])
-   PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
-   ;;
+    if test $_os = WINNT -a "$WITH_MINGW" != yes; then
+        AC_MSG_ERROR([Must use internal librsvg when building with MSVC])
+    fi
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
+    ;;
 
 *)
-   AC_MSG_ERROR([Incorrect --enable-librsvg option])
-   ;;
+    AC_MSG_ERROR([Incorrect --enable-librsvg option])
+    ;;
 esac
 
 dnl By now enable_librsvg should be "system", "internal" or "no"
 case $enable_librsvg in
 system)
-   ENABLE_LIBRSVG=SYSTEM
-   SYSTEM_LIBRSVG=YES
-   ;;
+    ENABLE_LIBRSVG=SYSTEM
+    SYSTEM_LIBRSVG=YES
+    ;;
 
 internal)
-   ENABLE_LIBRSVG=INTERNAL
-   SYSTEM_LIBRSVG=NO
-   BUILD_TYPE="$BUILD_TYPE LIBRSVG"
-   ;;
+    ENABLE_LIBRSVG=INTERNAL
+    SYSTEM_LIBRSVG=NO
+    BUILD_TYPE="$BUILD_TYPE LIBRSVG"
+    ;;
 
 no)
-   ENABLE_LIBRSVG=NO
-   SYSTEM_LIBRSVG=NO
-   ENABLE_CAIRO=
-   ;;
+    ENABLE_LIBRSVG=NO
+    SYSTEM_LIBRSVG=NO
+    ;;
 
 *)
-   AC_MSG_ERROR([Internal configure script error, invalid enable_librsvg value "$enable_librsvg"])
-   ;;
+    AC_MSG_ERROR([Internal configure script error, invalid enable_librsvg value "$enable_librsvg"])
+    ;;
 esac
 
 AC_SUBST(ENABLE_LIBRSVG)
@@ -7930,12 +7955,66 @@ AC_SUBST(LIBRSVG_LIBS)
 AC_SUBST(SYSTEM_LIBRSVG)
 
 dnl ===================================================================
+dnl Test whether to build cairo or rely on the system version
+dnl ===================================================================
+
+SYSTEM_CAIRO=""
+
+AC_MSG_CHECKING([whether to use the system cairo])
+
+if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_system_cairo" != no \); then
+    SYSTEM_CAIRO=YES
+    AC_MSG_RESULT([yes])
+
+    PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
+
+    if test "$with_system_xrender_headers" = "yes"; then
+         AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
+         AC_TRY_RUN([
+#include <X11/extensions/Xrender.h>
+
+int main(int argc, char **argv) {
+#ifdef PictStandardA8
+      return 0;
+#else
+      return 1;
+#endif
+}
+        ],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_ERROR([no, X headers too old.])]
+        )
+    fi
+else
+    AC_MSG_RESULT([no])
+
+    if test $_os = Android; then
+        dnl For Android cairo isn't
+        dnl buildable yet.
+        :
+    elif test $_os = WINNT; then
+        dnl We only need cairo for Windows if we
+        dnl build librsvg
+        if test "$ENABLE_LIBRSVG" != NO; then
+            BUILD_TYPE="$BUILD_TYPE CAIRO"
+        fi
+    else
+        BUILD_TYPE="$BUILD_TYPE CAIRO"
+    fi
+fi
+
+AC_SUBST(SYSTEM_CAIRO)
+AC_SUBST(CAIRO_CFLAGS)
+AC_SUBST(CAIRO_LIBS)
+
+
+dnl ===================================================================
 dnl Test whether to build gdk-pixbuf or rely on the system version
 dnl ===================================================================
 
 AC_MSG_CHECKING([whether to use the system gdk-pixbuf])
 
-dnl As long as the only thing we need gdk-pxbuf for is below
+dnl As long as the only thing we need gdk-pixbuf for is below
 dnl librsvg, use the same --enable-librsvg (possibly implied
 dnl by --with-system-libs) to override this.
 
@@ -7944,14 +8023,14 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_GDKPIXBUF=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_GDKPIXBUF=YES
-            AC_MSG_RESULT([yes])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_GDKPIXBUF=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_GDKPIXBUF=YES
+        AC_MSG_RESULT([yes])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_GDKPIXBUF)
@@ -7971,14 +8050,14 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_GLIB=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_GLIB=YES
-            AC_MSG_RESULT([yes])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_GLIB=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_GLIB=YES
+        AC_MSG_RESULT([yes])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_GLIB)
@@ -7995,14 +8074,14 @@ if test "$with_system_gettext" = yes -o \( "$with_system_libs" = yes -a "$with_s
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_GETTEXT=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_GETTEXT=YES
-            AC_MSG_RESULT([yes])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_GETTEXT=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_GETTEXT=YES
+        AC_MSG_RESULT([yes])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_GETTEXT)
@@ -8022,14 +8101,14 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_LIBCROCO=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_LIBCROCO=YES
-            AC_MSG_RESULT([yes])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_LIBCROCO=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_LIBCROCO=YES
+        AC_MSG_RESULT([yes])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_LIBCROCO)
@@ -8049,14 +8128,14 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_PANGO=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_PANGO=YES
-            AC_MSG_RESULT([yes])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_PANGO=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_PANGO=YES
+        AC_MSG_RESULT([yes])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_PANGO)
@@ -8076,14 +8155,14 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_LIBGSF=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_LIBGSF=YES
-            AC_MSG_RESULT([yes])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_LIBGSF=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_LIBGSF=YES
+        AC_MSG_RESULT([yes])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_LIBGSF)
@@ -8103,14 +8182,14 @@ if test "$with_system_libpng" = yes -o \( "$with_system_libs" = yes -a "$with_sy
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_LIBPNG=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_LIBPNG=YES
-            AC_MSG_RESULT([no])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_LIBPNG=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_LIBPNG=YES
+        AC_MSG_RESULT([no])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_LIBPNG)
@@ -8129,14 +8208,14 @@ if test "$SYSTEM_JPEG" == "YES"; then
     AC_MSG_RESULT([yes])
 else
     case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_LIBJPEG=NO
-            AC_MSG_RESULT([no])
-            ;;
-        *)
-            SYSTEM_LIBJPEG=YES
-            AC_MSG_RESULT([yes])
-            ;;
+    WINNT|Darwin|iOS|Android)
+        SYSTEM_LIBJPEG=NO
+        AC_MSG_RESULT([no])
+        ;;
+    *)
+        SYSTEM_LIBJPEG=YES
+        AC_MSG_RESULT([yes])
+        ;;
     esac
 fi
 AC_SUBST(SYSTEM_LIBJPEG)
@@ -8145,20 +8224,20 @@ dnl ===================================================================
 dnl Check for runtime JVM search path
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
-  AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
-  if test -n "$with_jvm_path" && test "$with_jvm_path" != "no"; then
-     AC_MSG_RESULT([yes])
-     if ! test -d "$with_jvm_path"; then
-        AC_MSG_ERROR(["$with_jvm_path" not a directory])
-     fi
-     if ! test -d "$with_jvm_path"jvm; then
-        AC_MSG_ERROR(["$with_jvm_path"jvm not found, point with_jvm_path to \[/path/to/\]jvm])
-     fi
-     JVM_ONE_PATH_CHECK="$with_jvm_path"
-     AC_SUBST(JVM_ONE_PATH_CHECK)
-  else
-     AC_MSG_RESULT([no])
-  fi
+    AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
+    if test -n "$with_jvm_path" && test "$with_jvm_path" != "no"; then
+        AC_MSG_RESULT([yes])
+        if ! test -d "$with_jvm_path"; then
+            AC_MSG_ERROR(["$with_jvm_path" not a directory])
+        fi
+        if ! test -d "$with_jvm_path"jvm; then
+            AC_MSG_ERROR(["$with_jvm_path"jvm not found, point with_jvm_path to \[/path/to/\]jvm])
+        fi
+        JVM_ONE_PATH_CHECK="$with_jvm_path"
+        AC_SUBST(JVM_ONE_PATH_CHECK)
+    else
+        AC_MSG_RESULT([no])
+    fi
 fi
 
 dnl ===================================================================
@@ -8166,180 +8245,182 @@ dnl Test for the presence of Ant and that it works
 dnl ===================================================================
 
 if test "$SOLAR_JAVA" != ""; then
-ANT_HOME=; export ANT_HOME
-WITH_ANT_HOME=; export WITH_ANT_HOME
-if test -z "$with_ant_home"; then
-   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
-else
-   if test "$_os" = "WINNT"; then
-      with_ant_home=`cygpath -u "$with_ant_home"`
-   fi
-   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
-   WITH_ANT_HOME=$with_ant_home
-   ANT_HOME=$with_ant_home
-fi
-
-if test -z "$ANT"; then
-  AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
-else
-  # resolve relative or absolute symlink
-  while test -h "$ANT"; do
-     a_cwd=`pwd`
-     a_basename=`basename "$ANT"`
-     a_script=`ls -l "$ANT" | $SED "s/.*${a_basename} -> //g"`
-     cd "`dirname "$ANT"`"
-     cd "`dirname "$a_script"`"
-     ANT="`pwd`"/"`basename "$a_script"`"
-     cd "$a_cwd"
-  done
-
-  AC_MSG_CHECKING([if $ANT works])
-cat > conftest.java << EOF
-    public class conftest {
-    int testmethod(int a, int b) {
-            return a + b;
-    }
-    }
+    ANT_HOME=; export ANT_HOME
+    WITH_ANT_HOME=; export WITH_ANT_HOME
+    if test -z "$with_ant_home"; then
+        AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
+    else
+        if test "$_os" = "WINNT"; then
+            with_ant_home=`cygpath -u "$with_ant_home"`
+        fi
+        AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
+        WITH_ANT_HOME=$with_ant_home
+        ANT_HOME=$with_ant_home
+    fi
+
+    if test -z "$ANT"; then
+        AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
+    else
+        # resolve relative or absolute symlink
+        while test -h "$ANT"; do
+            a_cwd=`pwd`
+            a_basename=`basename "$ANT"`
+            a_script=`ls -l "$ANT" | $SED "s/.*${a_basename} -> //g"`
+            cd "`dirname "$ANT"`"
+            cd "`dirname "$a_script"`"
+            ANT="`pwd`"/"`basename "$a_script"`"
+            cd "$a_cwd"
+        done
+
+        AC_MSG_CHECKING([if $ANT works])
+        cat > conftest.java << EOF
+        public class conftest {
+            int testmethod(int a, int b) {
+                    return a + b;
+            }
+        }
 EOF
 
-cat > conftest.xml << EOF
-    <project name="conftest" default="conftest">
-    <target name="conftest">
+        cat > conftest.xml << EOF
+        <project name="conftest" default="conftest">
+        <target name="conftest">
             <javac srcdir="." includes="conftest.java">
-        </javac>
-    </target>
-    </project>
+            </javac>
+        </target>
+        </project>
 EOF
-  oldJAVA_HOME=$JAVA_HOME
-  if test "$JAVACISGCJ" = "yes"; then
-    JAVA_HOME=; export JAVA_HOME
-    ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-  else
-    ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-  fi
-  AC_TRY_EVAL(ant_cmd)
-  if test $? = 0 && test -f ./conftest.class ; then
-    AC_MSG_RESULT([Ant works])
-    if test -z "$WITH_ANT_HOME"; then
-        ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"`
-        if test -z "$ANT_HOME"; then
-            ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
+
+        oldJAVA_HOME=$JAVA_HOME
+        if test "$JAVACISGCJ" = "yes"; then
+            JAVA_HOME=; export JAVA_HOME
+            ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
+        else
+            ant_cmd="$ANT -buildfile conftest.xml 1>&2"
         fi
-    else
-        ANT_HOME="$WITH_ANT_HOME"
+        AC_TRY_EVAL(ant_cmd)
+        if test $? = 0 && test -f ./conftest.class ; then
+            AC_MSG_RESULT([Ant works])
+            if test -z "$WITH_ANT_HOME"; then
+                ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"`
+                if test -z "$ANT_HOME"; then
+                    ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
+                fi
+            else
+                ANT_HOME="$WITH_ANT_HOME"
+            fi
+        else
+            echo "configure: Ant test failed" >&5
+            cat conftest.java >&5
+            cat conftest.xml >&5
+            AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
+            ANT_HOME=""
+            echo "Ant does not work - Some Java projects will not build!" >>warn
+        fi
+        JAVA_HOME=$oldJAVA_HOME
+        rm -f conftest* core core.* *.core
     fi
-  else
-    echo "configure: Ant test failed" >&5
-    cat conftest.java >&5
-    cat conftest.xml >&5
-    AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
-    ANT_HOME=""
-    echo "Ant does not work - Some Java projects will not build!" >>warn
-  fi
-  JAVA_HOME=$oldJAVA_HOME
-  rm -f conftest* core core.* *.core
-fi
-if test -z "$ANT_HOME"; then
-   ANT_HOME="NO_ANT_HOME"
-fi
-AC_SUBST(ANT_HOME)
-
-dnl Checking for ant.jar
-if test "$ANT_HOME" != "NO_ANT_HOME"; then
-   AC_MSG_CHECKING([Ant lib directory])
-   if test -f $ANT_HOME/lib/ant.jar; then
-      ANT_LIB="$ANT_HOME/lib"
-   else
-      if test -f $ANT_HOME/ant.jar; then
-         ANT_LIB="$ANT_HOME"
-      else
-          if test -f /usr/share/java/ant.jar; then
-              ANT_LIB=/usr/share/java
-          else
-             if test -f /usr/share/ant-core/lib/ant.jar; then
-                 ANT_LIB=/usr/share/ant-core/lib
-             else
-                if test -f $ANT_HOME/lib/ant/ant.jar; then
-                    ANT_LIB="$ANT_HOME/lib/ant"
+    if test -z "$ANT_HOME"; then
+        ANT_HOME="NO_ANT_HOME"
+    fi
+    AC_SUBST(ANT_HOME)
+
+    dnl Checking for ant.jar
+    if test "$ANT_HOME" != "NO_ANT_HOME"; then
+        AC_MSG_CHECKING([Ant lib directory])
+        if test -f $ANT_HOME/lib/ant.jar; then
+            ANT_LIB="$ANT_HOME/lib"
+        else
+            if test -f $ANT_HOME/ant.jar; then
+                ANT_LIB="$ANT_HOME"
+            else
+                if test -f /usr/share/java/ant.jar; then
+                    ANT_LIB=/usr/share/java
                 else
-                   if test -f /usr/share/lib/ant/ant.jar; then
-                       ANT_LIB=/usr/share/lib/ant
-                   else
-                       AC_MSG_ERROR([Ant libraries not found!])
-                   fi
+                    if test -f /usr/share/ant-core/lib/ant.jar; then
+                        ANT_LIB=/usr/share/ant-core/lib
+                    else
+                        if test -f $ANT_HOME/lib/ant/ant.jar; then
+                            ANT_LIB="$ANT_HOME/lib/ant"
+                        else
+                            if test -f /usr/share/lib/ant/ant.jar; then
+                                ANT_LIB=/usr/share/lib/ant
+                            else
+                                AC_MSG_ERROR([Ant libraries not found!])
+                            fi
+                        fi
+                    fi
                 fi
-             fi
-          fi
-      fi
-   fi
-   AC_MSG_RESULT([Ant lib directory found.])
-fi
-AC_SUBST(ANT_LIB)
-
-ant_minver=1.6.0
-ant_minminor1=`echo $ant_minver | cut -d"." -f2`
-
-AC_MSG_CHECKING([whether Ant is >= $ant_minver])
-ant_version=`$ANT -version | $AWK '{ print $4; }'`
-ant_version_major=`echo $ant_version | cut -d. -f1`
-ant_version_minor=`echo $ant_version | cut -d. -f2`
-echo "configure: ant_version $ant_version " >&5
-echo "configure: ant_version_major $ant_version_major " >&5
-echo "configure: ant_version_minor $ant_version_minor " >&5
-if test "$ant_version_major" -ge "2"; then
-   AC_MSG_RESULT([yes, $ant_version])
-elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-   AC_MSG_RESULT([yes, $ant_version])
-else
-   AC_MSG_ERROR([no, you need at least Ant >= $ant_minver])
-fi
+            fi
+        fi
+        AC_MSG_RESULT([Ant lib directory found.])
+    fi
+    AC_SUBST(ANT_LIB)
+
+    ant_minver=1.6.0
+    ant_minminor1=`echo $ant_minver | cut -d"." -f2`
+
+    AC_MSG_CHECKING([whether Ant is >= $ant_minver])
+    ant_version=`$ANT -version | $AWK '{ print $4; }'`
+    ant_version_major=`echo $ant_version | cut -d. -f1`
+    ant_version_minor=`echo $ant_version | cut -d. -f2`
+    echo "configure: ant_version $ant_version " >&5
+    echo "configure: ant_version_major $ant_version_major " >&5
+    echo "configure: ant_version_minor $ant_version_minor " >&5
+    if test "$ant_version_major" -ge "2"; then
+        AC_MSG_RESULT([yes, $ant_version])
+    elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
+        AC_MSG_RESULT([yes, $ant_version])
+    else
+        AC_MSG_ERROR([no, you need at least Ant >= $ant_minver])
+    fi
 
-if test "$ENABLE_MEDIAWIKI" = "YES"; then
-AC_MSG_CHECKING([whether Ant supports mapper type="regexp"])
-rm -rf confdir
-mkdir confdir
-cat > conftest.java << EOF
-    public class conftest {
-        int testmethod(int a, int b) {
-            return a + b;
-        }
-    }
+    if test "$ENABLE_MEDIAWIKI" = "YES"; then
+        AC_MSG_CHECKING([whether Ant supports mapper type="regexp"])
+        rm -rf confdir
+        mkdir confdir
+        cat > conftest.java << EOF
+            public class conftest {
+                int testmethod(int a, int b) {
+                    return a + b;
+                }
+            }
 EOF
 
-cat > conftest.xml << EOF
-    <project name="conftest" default="conftest">
-        <target name="conftest" depends="copytest">
-            <javac srcdir="." includes="conftest.java">
-            </javac>
-        </target>
-        <target name="copytest">
-             <copy todir="confdir">
+        cat > conftest.xml << EOF
+            <project name="conftest" default="conftest">
+            <target name="conftest" depends="copytest">
+                <javac srcdir="." includes="conftest.java">
+                </javac>
+            </target>
+            <target name="copytest">
+                 <copy todir="confdir">
                  <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
                  <filterset/>
                  <mapper type="regexp" from="^(.*[/\\])foo([/\\].*)" to="\1baa\2"/>
-             </copy>
-        </target>
-    </project>
+                 </copy>
+            </target>
+            </project>
 EOF
-  if test "$JAVACISGCJ" = "yes"; then
-    JAVA_HOME=; export JAVA_HOME
-    ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-  else
-    ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-  fi
-  AC_TRY_EVAL(ant_cmd)
-  if test $? = 0 && test -f ./conftest.class ; then
-    AC_MSG_RESULT([yes])
-    rm -rf confdir
-  else
-    echo "configure: Ant test failed" >&5
-    cat conftest.java >&5
-    cat conftest.xml >&5
-    rm -rf confdir
-    AC_MSG_ERROR([no. Did you install ant-apache-regexp?])
-  fi
-fi
-rm -f conftest* core core.* *.core
+
+        if test "$JAVACISGCJ" = "yes"; then
+            JAVA_HOME=; export JAVA_HOME
+            ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
+        else
+            ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+        fi
+        AC_TRY_EVAL(ant_cmd)
+        if test $? = 0 && test -f ./conftest.class ; then
+            AC_MSG_RESULT([yes])
+            rm -rf confdir
+        else
+            echo "configure: Ant test failed" >&5
+            cat conftest.java >&5
+            cat conftest.xml >&5
+            rm -rf confdir
+            AC_MSG_ERROR([no. Did you install ant-apache-regexp?])
+        fi
+    fi
+    rm -f conftest* core core.* *.core
 fi
 
 OOO_JUNIT_JAR=
@@ -8400,19 +8481,19 @@ ALL_LANGS="en-US $completelangiso"
 # check the configured localizations
 WITH_LANG="$with_lang"
 if test -z "$WITH_LANG"; then
-   AC_MSG_RESULT([en-US])
+    AC_MSG_RESULT([en-US])
 else
-   AC_MSG_RESULT([$WITH_LANG])
-   GIT_REPO_NAMES="$GIT_REPO_NAMES translations"
+    AC_MSG_RESULT([$WITH_LANG])
+    GIT_REPO_NAMES="$GIT_REPO_NAMES translations"
 fi
 # check that the list is valid
 for lang in $WITH_LANG ; do
-   test "$lang" = "ALL" && continue;
-   test "$lang" = "kid" && continue;
-   # need to check for the exact string, so add space before and after the list of all languages
-   all_langs=" $ALL_LANGS "
-   test `echo "$all_langs" | sed "s|.* $lang .*|found|"` = "found" && continue;
-   AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS])
+    test "$lang" = "ALL" && continue;
+    test "$lang" = "kid" && continue;
+    # need to check for the exact string, so add space before and after the list of all languages
+    all_langs=" $ALL_LANGS "
+    test `echo "$all_langs" | sed "s|.* $lang .*|found|"` = "found" && continue;
+    AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS])
 done
 AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)
@@ -8421,26 +8502,26 @@ AC_SUBST(GIT_REPO_NAMES)
 AC_MSG_CHECKING([for another 'intro' bitmap])
 INTRO_BITMAP=
 if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
-   INTRO_BITMAP=
-   AC_MSG_RESULT([none])
+    INTRO_BITMAP=
+    AC_MSG_RESULT([none])
 else
-   case "$with_intro_bitmap" in
-      *.png) INTRO_BITMAP="$with_intro_bitmap" ;;
-      *)     AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
-   esac
-   AC_MSG_RESULT([$INTRO_BITMAP])
+    case "$with_intro_bitmap" in
+    *.png) INTRO_BITMAP="$with_intro_bitmap" ;;
+    *)     AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
+    esac
+    AC_MSG_RESULT([$INTRO_BITMAP])
 fi
 AC_SUBST(INTRO_BITMAP)
 
 AC_MSG_CHECKING([for another 'about' bitmap])
 ABOUT_BITMAP=
 if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no" ; then
-   ABOUT_BITMAP=
-   AC_MSG_RESULT([none])
+    ABOUT_BITMAP=
+    AC_MSG_RESULT([none])
 else
    case "$with_about_bitmap" in
-      *.png) ABOUT_BITMAP="$with_about_bitmap" ;;
-      *)     AC_MSG_WARN([About bitmap should be a .png file!]) ;;
+   *.png) ABOUT_BITMAP="$with_about_bitmap" ;;
+   *)     AC_MSG_WARN([About bitmap should be a .png file!]) ;;
    esac
    AC_MSG_RESULT([$ABOUT_BITMAP])
 fi
@@ -8449,40 +8530,40 @@ AC_SUBST(ABOUT_BITMAP)
 OOO_VENDOR=
 AC_MSG_CHECKING([for vendor])
 if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
-   AC_MSG_RESULT([not set])
+    AC_MSG_RESULT([not set])
 else
-   OOO_VENDOR="$with_vendor"
-   AC_MSG_RESULT([$OOO_VENDOR])
+    OOO_VENDOR="$with_vendor"
+    AC_MSG_RESULT([$OOO_VENDOR])
 fi
 AC_SUBST(OOO_VENDOR)
 
 UNIXWRAPPERNAME=
 AC_MSG_CHECKING([for UNIX wrapper name])
 if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no"  -o "$with_unix_wrapper" = "yes" ; then
-   AC_MSG_RESULT([not set])
+    AC_MSG_RESULT([not set])
 else
-   UNIXWRAPPERNAME="$with_unix_wrapper"
-   AC_MSG_RESULT([$UNIXWRAPPERNAME])
+    UNIXWRAPPERNAME="$with_unix_wrapper"
+    AC_MSG_RESULT([$UNIXWRAPPERNAME])
 fi
 AC_SUBST(UNIXWRAPPERNAME)
 
 AC_MSG_CHECKING([whether to statically link to Gtk])
 if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
-   ENABLE_STATIC_GTK="TRUE"
-   AC_MSG_RESULT([yes])
+    ENABLE_STATIC_GTK="TRUE"
+    AC_MSG_RESULT([yes])
 else
-   ENABLE_STATIC_GTK="FALSE"
-   AC_MSG_RESULT([no])
+    ENABLE_STATIC_GTK="FALSE"
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_STATIC_GTK)
 
 AC_MSG_CHECKING([whether to use layout dialogs])
 if test -n "$enable_layout" && test "$enable_layout" != "no"; then
-   ENABLE_LAYOUT="TRUE"
-   AC_MSG_RESULT([yes])
+    ENABLE_LAYOUT="TRUE"
+    AC_MSG_RESULT([yes])
 else
-   ENABLE_LAYOUT="FALSE"
-   AC_MSG_RESULT([no])
+    ENABLE_LAYOUT="FALSE"
+    AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_LAYOUT)
 
@@ -8491,16 +8572,16 @@ AC_SUBST(ENABLE_LAYOUT)
 # ===================================================================
 AC_MSG_CHECKING([build verbosity])
 if test -n "$enable_verbose"; then
-   if test "$enable_verbose" = "yes"; then
-      VERBOSE="TRUE"
-      AC_MSG_RESULT([high])
-   fi
-   if test "$enable_verbose" = "no"; then
-      VERBOSE="FALSE"
-      AC_MSG_RESULT([low])
-   fi
+    if test "$enable_verbose" = "yes"; then
+        VERBOSE="TRUE"
+        AC_MSG_RESULT([high])
+    fi
+    if test "$enable_verbose" = "no"; then
+        VERBOSE="FALSE"
+        AC_MSG_RESULT([low])
+    fi
 else
-   AC_MSG_RESULT([not set])
+    AC_MSG_RESULT([not set])
 fi
 AC_SUBST(VERBOSE)
 
@@ -8509,13 +8590,13 @@ dnl Use zenity during build
 dnl ===================================================================
 AC_MSG_CHECKING([whether to use zenity during build])
 if test "$enable_zenity" = "yes"; then
-   AC_MSG_RESULT([yes])
-   AC_PATH_PROGS( ZNTY, zenity )
-   if test -z "$ZNTY"; then
-      ENABLE_ZENITY=FALSE
-   else
-      ENABLE_ZENITY=TRUE
-   fi
+    AC_MSG_RESULT([yes])
+    AC_PATH_PROGS( ZNTY, zenity )
+    if test -z "$ZNTY"; then
+        ENABLE_ZENITY=FALSE
+    else
+        ENABLE_ZENITY=TRUE
+    fi
 else
     ENABLE_ZENITY=FALSE
     AC_MSG_RESULT([no])
@@ -8540,16 +8621,25 @@ dnl ===================================================================
 dnl Number of CPUs to use during the build
 dnl ===================================================================
 AC_MSG_CHECKING([for number of processors to use])
-if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o "z`uname -s`" = "zOpenBSD"; then
-    BUILD_NCPUS=`sysctl -n hw.ncpu`
-else
-    BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
-fi
-if test "z$with_num_cpus" != "z"; then
+if test -n "$with_num_cpus"; then
     BUILD_NCPUS=$with_num_cpus
-fi
-if echo "$BUILD_NCPUS" | $EGREP -q '^[[[:space:]]]*0[[[:space:]]]*$' ; then
-   BUILD_NCPUS=1
+else
+    case `uname -s` in
+
+    Darwin|FreeBSD|NetBSD|OpenBSD)
+        BUILD_NCPUS=`sysctl -n hw.ncpu`
+        ;;
+
+    *)
+        BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
+        ;;
+    esac
+
+    # If we hit the catch-all case, but /proc/cpuinfo doesn't exist or has an
+    # unexpected format, 'wc -l' will have returned 0.
+    if test "$BUILD_NCPUS" -eq 0; then
+        BUILD_NCPUS=1
+    fi
 fi
 AC_MSG_RESULT([$BUILD_NCPUS])
 AC_SUBST(BUILD_NCPUS)
@@ -8562,9 +8652,9 @@ BUILD_MAX_JOBS="1"
 if test "z$with_max_jobs" != "z"; then
     BUILD_MAX_JOBS="$with_max_jobs"
 else
-   if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
-      BUILD_MAX_JOBS="10"
-   fi
+    if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
+        BUILD_MAX_JOBS="10"
+    fi
 fi
 AC_MSG_RESULT([$BUILD_MAX_JOBS])
 AC_SUBST(BUILD_MAX_JOBS)
@@ -8575,17 +8665,17 @@ dnl ===================================================================
 echo "setting up the build environment variables..."
 
 if test -z "$COMPATH"; then
-   AC_MSG_ERROR([No compiler found.])
+    AC_MSG_ERROR([No compiler found.])
 fi
 AC_SUBST(COMPATH)
 
 AC_MSG_CHECKING([solver path])
 if test -z "$with_local_solver"; then
-   LOCAL_SOLVER="DEFAULT"
-   AC_MSG_RESULT([default])
+    LOCAL_SOLVER="DEFAULT"
+    AC_MSG_RESULT([default])
 else
-   LOCAL_SOLVER=$with_local_solver
-   AC_MSG_RESULT([$with_local_solver])
+    LOCAL_SOLVER=$with_local_solver
+    AC_MSG_RESULT([$with_local_solver])
 fi
 AC_SUBST(LOCAL_SOLVER)
 
@@ -8604,20 +8694,20 @@ chmod +x post_download
 
 # Generate a configuration timestamp we can use for deps
 if test -f set_soenv; then
-   mv -f set_soenv set_soenv.last
+    mv -f set_soenv set_soenv.last
 else
-   echo > set_soenv.last
+    echo > set_soenv.last
 fi
 
 AC_OUTPUT([set_soenv Makefile bin/repo-list])
 
 # touch the config timestamp file set_soenv.stamp
 if test ! -f set_soenv.stamp; then
-   echo > set_soenv.stamp
+    echo > set_soenv.stamp
 elif diff set_soenv set_soenv.last >/dev/null 2>&1; then
-   echo "Configuration unchanged - avoiding scp2 stamp update"
+    echo "Configuration unchanged - avoiding scp2 stamp update"
 else
-   echo > set_soenv.stamp
+    echo > set_soenv.stamp
 fi
 
 dnl Run the set_soenv script to setup the *Env.sh script that sets
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 927cf255a39f..90d710b3deb1 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -1,6 +1,5 @@
 --host=arm-linux-androideabi
 --disable-cups
---disable-fontconfig
 --disable-gconf
 --disable-gnome-vfs
 --disable-gstreamer
diff --git a/distro-configs/LibreOfficeDragonFly.conf b/distro-configs/LibreOfficeDragonFly.conf
index 5753203a5eb5..c65d1629089f 100644
--- a/distro-configs/LibreOfficeDragonFly.conf
+++ b/distro-configs/LibreOfficeDragonFly.conf
@@ -1,5 +1,4 @@
 --enable-symbols
---enable-debug
 --disable-epm
 --disable-mozilla
 --disable-neon
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 40c15e048a67..5b6eefd0c9af 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -1,6 +1,7 @@
 --disable-build-mozilla
 --disable-dbus
 --disable-epm
+--disable-gnome-vfs
 --disable-kde
 --disable-kde4
 --disable-mozilla
@@ -11,8 +12,6 @@
 --disable-unix-qstart-libpng
 --disable-xrender-link
 --enable-binfilter
---enable-cairo
---enable-gnome-vfs
 --enable-gstreamer
 --enable-lockdown
 --enable-ext-presenter-minimizer
@@ -20,6 +19,7 @@
 --enable-ext-presenter-console
 --enable-ext-report-builder
 --enable-ext-wiki-publisher
+--enable-python=system
 --with-alloc=system
 --with-ant-home=/usr/local/ant
 --with-extension-integration
@@ -44,7 +44,6 @@
 --with-system-neon
 --with-system-openssl
 --with-system-poppler
---with-system-python
 --with-system-redland
 --with-system-stdlibs
 --with-system-xrender-headers
diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
index f71ad6f98214..bae5ff99bf94 100755
--- a/git-hooks/pre-commit
+++ b/git-hooks/pre-commit
@@ -12,96 +12,60 @@ use Cwd;
 
 $ENV{LC_ALL} = "C";
 
-# attempt to fix whitespace in one file
-# $1 - file to fix
-# $2 - list of lines containing whitespace errors
-sub fix_whitespace($$) {
-    my ( $file, $lines ) = @_;
-
-    open( IN, "$file" ) || die "Cannot open $file for reading";
-    my ( $out, $tmpfile ) = mkstemp( "/tmp/whitespace-fixing-XXXXXX" );
-
-    my $changed = 0;
-    my $line_no = 1;
-    while ( my $line = <IN> ) {
-        if ( $lines->{$line_no} && $line =~ /^(.*[^ \t])[ \t]+$/ ) {
-            $changed = 1;
-            print $out "$1\n";
-        }
-        elsif ( $lines->{$line_no} && $line =~ /^[ \t]+$/ ) {
-            $changed = 1;
-            print $out "\n";
-        }
-        else {
-            print $out $line;
-        }
-        ++$line_no;
-    }
-    close( $out );
-    close( IN );
-
-    if ( $changed )
-    {
-        move( $tmpfile, $file ) or die "Cannot move '$tmpfile' to '$file'";
-
-        system( "git add $file" );
-        print "Fixed whitespace in '$file'\n";
-    }
-}
-
-# go through the patch and collect lines to fix
-sub check_and_fix_whitespace($)
+sub check_whitespaces($)
 {
-    my ( $head ) = @_;
-
-    my $file = "";
-    my %lines = ();
-    my $line_no = 0;
-    my $line_max = -1;
-
-    my $stash = "";
-
-    # any not staged changes to stash away?
-    system( "git update-index -q --refresh" );
-    if ( `git diff --name-only --` ) {
-        my $fd;
-        ( $fd, $stash ) = mkstemp( "/tmp/unstaged-changes-XXXXXX" );
-        close( $fd );
-
-        # this will keep the staged changes
-        system( "git diff > $stash" );
-        system( "git checkout ." );
+    my ($h) = @_;
+
+    my $found_bad = 0;
+    my $filename;
+    my $reported_filename = "";
+    my $lineno;
+    sub bad_line {
+	my ($why, $line) = @_;
+	if (!$found_bad) {
+	    print STDERR "*\n";
+	    print STDERR "* You have some suspicious patch lines:\n";
+	    print STDERR "*\n";
+	    $found_bad = 1;
+	}
+	if ($reported_filename ne $filename) {
+	    print STDERR "* In $filename\n";
+	    $reported_filename = $filename;
+	}
+	print STDERR "* $why (line $lineno)\n";
+	print STDERR "$filename:$lineno:$line\n";
     }
-    open( FILES, "git diff-index --cached --diff-filter=ACM --name-only $head |" ) || die "Cannot run git diff-index.";
-    while( my $file = <FILES> ) {
-        chomp( $file );
-        if ( $file ne "GNUmakefile" &&
-           ( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pl|pm|pmk|py|sdi|sh|src|tab)/ ) ) {
-            open( F, "git diff-index -p --cached $head -- $file |" );
-            while ( my $line = <F> ) {
-                if ( $line =~ /^\+\+\+ (.*)/ ) {
-                    %lines = ();
-                    $line_no = 0;
-                    $line_max = -1;
-                }
-                elsif ( $line =~ /^@@ -[0-9]+,[0-9]+ \+([0-9]+),([0-9]+) @@/ ) {
-                    $line_no = $1;
-                    $line_max = $line_no + $2;
-                }
-                elsif ( ( $line_no < $line_max ) && ( $line =~ /^[ +]/ ) ) {
-                    if ( $line =~ /^\+.*[ \t]$/ ) {
-                        $lines{$line_no} = 1;
-                    }
-                    ++$line_no;
-                }
-            }
-            fix_whitespace( $file, \%lines );
-            close( IN );
-            if ($stash) {
-                system( "git apply < $stash" );
-                unlink( $stash );
-            }
-        }
+    open( FILES, "git-diff-index -p -M --cached $h |" ) ||  die "Cannot run git diff-index.";
+    while (<FILES>) {
+	if (m|^diff --git a/(.*) b/\1$|) {
+	    $filename = $1;
+	    next;
+	}
+	if (/^@@ -\S+ \+(\d+)/) {
+	    $lineno = $1 - 1;
+	    next;
+	}
+	if (/^ /) {
+	    $lineno++;
+	    next;
+	}
+	if (s/^\+//) {
+	    $lineno++;
+	    chomp;
+	    if (/\s$/) {
+		bad_line("trailing whitespace", $_);
+	    }
+	    if (/^\s* 	/) {
+		bad_line("indent SP followed by a TAB", $_);
+	    }
+	    if (/^(?:[<>=]){7}/) {
+		bad_line("unresolved merge conflict", $_);
+	    }
+	}
+    }
+    if ( $found_bad)
+    {
+	exit($found_bad);
     }
 }
 
@@ -222,7 +186,7 @@ EOM
 }
 
 # fix whitespace in code
-check_and_fix_whitespace( $against );
+check_whitespaces( $against );
 
 # check the rest of the files
 my $filter_patches=`git diff-index --check --cached $against -- | sed '/\.\(diff\|patch\):/,/.*/d'`;
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 3c93c3fdf387..92be378811fc 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -42,12 +42,7 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
 .ENDIF			# "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
 
-.IF "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
 ENABLE_DOWNLOADSETS*=TRUE
-.ENDIF			# "$(CWS_WORK_STAMP)"=="" || "$(UPDATER)"!=""
-.IF "$(FORCE_DOWNLOADSETS)"!=""
-ENABLE_DOWNLOADSETS=TRUE
-.ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
 
 .EXPORT: ENABLE_DOWNLOADSETS
 .EXPORT: LAST_MINOR
@@ -77,18 +72,17 @@ LOCALPYFILES= \
     $(BIN)$/msgbox.py
 .ENDIF
 
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
 
 allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j  $i $(NULL))))
 
 xxxx:
     echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
 
-.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 ALLTAR  : $(LOCALPYFILES)
     @echo "No EPM: do no packaging at this stage"
-.ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
-.IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+.ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
 ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack)
@@ -102,10 +96,7 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(
 ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
 .ENDIF
 .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
-ALLTAR : updatepack
-.ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
-.ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+.ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 
 .IF "$(FORCE2ARCHIVE)" == "TRUE"
 PKGFORMAT = archive
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index bd8268e90dc2..35c927d39963 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,15 +4,15 @@ Globals
 	{
 		variables
 		{
-			OOOBASEVERSION 3.4
-  			OOOPACKAGEVERSION 3.4.0
-			UREPACKAGEVERSION 3.4.0
+			OOOBASEVERSION 3.5
+  			OOOPACKAGEVERSION 3.5.0
+			UREPACKAGEVERSION 3.5.0
 			URELAYERVERSION 1
 			BASISROOTNAME LibreOffice
-			UNIXBASISROOTNAME libreoffice3.4
-			SERVICETAG_PRODUCTNAME LibreOffice 3.4
-			SERVICETAG_PRODUCTVERSION 3.4
-			SERVICETAG_PARENTNAME LibreOffice 3.4
+			UNIXBASISROOTNAME libreoffice3.5
+			SERVICETAG_PRODUCTNAME LibreOffice 3.5
+			SERVICETAG_PRODUCTVERSION 3.5
+			SERVICETAG_PARENTNAME LibreOffice 3.5
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 			SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
 			HIDELICENSEDIALOG 1
@@ -53,16 +53,16 @@ LibreOffice
 		variables
 		{
 			PRODUCTNAME LibreOffice
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc2
+			SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.4
+			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
             PCPFILENAME openoffice.pcp
 			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -73,7 +73,7 @@ LibreOffice
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -118,16 +118,16 @@ LibreOffice_wJRE
 		variables
 		{
 			PRODUCTNAME LibreOffice
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc2
+			SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.4
+			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
 			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -137,7 +137,7 @@ LibreOffice_wJRE
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			WITHJREPRODUCT 1
@@ -182,18 +182,18 @@ LibreOffice_Dev
 		variables
 		{
 			PRODUCTNAME LibO-dev
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION rc2
+			SHORT_PRODUCTEXTENSION alpha0
 			BASISROOTNAME LibO-dev
 			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.4
+			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX libobasis-dev
 			UREPACKAGEPREFIX lodev
@@ -207,7 +207,7 @@ LibreOffice_Dev
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -255,13 +255,13 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 3.4
-            PACKAGEVERSION 3.4
+            PRODUCTVERSION 3.5
+            PACKAGEVERSION 3.5
             PACKAGEREVISION 1
             PRODUCTEXTENSION
-            BRANDPACKAGEVERSION 3.4
+            BRANDPACKAGEVERSION 3.5
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc2
+            SHORT_PRODUCTEXTENSION alpha0
             LICENSENAME LGPL
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
@@ -296,14 +296,14 @@ LibreOffice_SDK
         variables
         {
             PRODUCTNAME LibreOffice
-            PRODUCTVERSION 3.4
+            PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc2
+            SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.4
-            PACKAGEVERSION 3.4.0
+            BRANDPACKAGEVERSION 3.5
+            PACKAGEVERSION 3.5.0
             PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             POOLPRODUCT 0
@@ -342,16 +342,16 @@ LibreOffice_Dev_SDK
         variables
         {
             PRODUCTNAME LibO-dev
-            PRODUCTVERSION 3.4
+            PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION rc2
+            SHORT_PRODUCTEXTENSION alpha0
             BASISROOTNAME LibO-dev
             UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.4
-            PACKAGEVERSION 3.4.0
+            BRANDPACKAGEVERSION 3.5
+            PACKAGEVERSION 3.5.0
             PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX libobasis-dev
             UREPACKAGEPREFIX lodev
@@ -394,16 +394,16 @@ OxygenOffice
 		variables
 		{
 			PRODUCTNAME OxygenOffice
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION  rc2
+			SHORT_PRODUCTEXTENSION  alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.4
+			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
             PCPFILENAME openoffice.pcp
 			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -414,7 +414,7 @@ OxygenOffice
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -464,16 +464,16 @@ OxygenOffice_wJRE
 		variables
 		{
 			PRODUCTNAME OxygenOffice
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION rc2
+			SHORT_PRODUCTEXTENSION alpha0
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.4
+			BRANDPACKAGEVERSION 3.5
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
 			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -483,7 +483,7 @@ OxygenOffice_wJRE
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
diff --git a/ooo.lst.in b/ooo.lst.in
index bcd039083db6..09f736611fa9 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -74,7 +74,6 @@ d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
 220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz
 a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
-
 314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
@@ -85,11 +84,11 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
 8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2
 29721a16f25967d59969d5f0ae485b4a-libwps-0.2.2.tar.bz2
-7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
+3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
-763bb9b14eec5ba9a533d7a9279301db-libvisio-0.0.0.tar.gz
+979a3f3da4dc176e80fe8c6b759cb7f4-libvisio-0.0.2.tar.bz2
 http://download.go-oo.org/extern
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 38fbd9610934..677bf2843386 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -186,6 +186,14 @@
         Styles  = (PACKED); \
     End
 
+#define BINFILTER_RES_FILE(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Name    = STRING(CONCAT3(name,en-US,.res)); \
+        Dir     = gid_Dir_Resource; \
+        Styles  = (PACKED); \
+    End
+
 #define BRAND_RES_FILE(id,name) \
     File id \
         TXT_FILE_BODY; \
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 580280561694..f225c3e3e849 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    TRANSLATIONS:translations i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    TRANSLATIONS:translations i18npool DESKTOP:setup_native DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 951caadf69fb..140a430afd2e 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -58,17 +58,16 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
 STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
 STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
 STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
-
+STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
 STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
 STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
 
-STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
-STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
-STD_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
-STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
-STD_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
-STD_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
-STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
-STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
-STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
-STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index 4857ecf3804b..873652e6e16a 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -53,25 +53,15 @@ Module gid_Module_Optional_Binfilter
     gid_File_Lib_Bf_Wrapper,
     gid_File_Lib_Legacy_Binfilters,
     gid_File_Lib_Bf_Migratefilter,
-    gid_File_Lib_Bindet);
+    gid_File_Lib_Bindet,
+    gid_File_Res_Bf_Sch,
+    gid_File_Res_Bf_Svx,
+    gid_File_Res_Bf_Svt,
+    gid_File_Res_Bf_Frm,
+    gid_File_Res_Bf_Ofa,
+    gid_File_Res_Bf_Sc,
+    gid_File_Res_Bf_Sd,
+    gid_File_Res_Bf_Sm,
+    gid_File_Res_Bf_Sw,
+    gid_File_Res_Bf_Sfx);
 End
-
-Module gid_Module_Langpack_Binfilter_Template
-    ParentID = gid_Module_Optional_Binfilter;
-    Name = "gid_Module_Langpack_Binfilter_Template";
-    Description = "gid_Module_Langpack_Binfilter_Template";
-    Default = YES;
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Bf_Sch,
-             gid_File_Res_Bf_Svx,
-             gid_File_Res_Bf_Svt,
-             gid_File_Res_Bf_Frm,
-             gid_File_Res_Bf_Ofa,
-             gid_File_Res_Bf_Sc,
-             gid_File_Res_Bf_Sd,
-             gid_File_Res_Bf_Sm,
-             gid_File_Res_Bf_Sw,
-             gid_File_Res_Bf_Sfx);
-End
-
-#include "alllangmodules_binfilter.inc"
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 4c38d168ac96..c5e1f133a9b1 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -42,9 +42,13 @@ SCP_PRODUCT_TYPE=osl
 PARFILES= canvascommons.par		\
           vclcanvas.par         \
 
-.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
 PARFILES+= cairocanvas.par
 .ENDIF
+.ENDIF
+
 .IF "$(ENABLE_DIRECTX)" != ""
 .IF "$(USE_DIRECTX5)" != ""
 SCPDEFS+=-DUSE_DIRECTX5
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8e08d6980bd6..6809f7422b7d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -54,6 +54,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Crashreport_Script,
              gid_Brand_File_Bin_Crashreport_Com,
              gid_Brand_File_Bin_Python,
+             gid_Brand_File_Gdb_Trace,
              gid_Brand_File_Bin_Soffice,
              gid_Brand_File_Bin_Soffice_Bin,
              gid_Brand_File_Bin_Soffice_Bin_Manifest,
@@ -483,6 +484,17 @@ File gid_Brand_File_Html_Thirdpartylicensereadme
     TXT_FILE_BODY;
 End
 
+#if defined UNX
+
+File gid_Brand_File_Gdb_Trace
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = gdbtrace;
+    Styles = (PACKED);
+End
+
+#endif
+
 File gid_Brand_File_Bin_Soffice
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -1084,7 +1096,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl
     Section = "Version";
     Order = 15;
     Key = "UpdateURL";
-  #if defined(BUILD_SPECIAL)
+  #if defined(ENABLE_ONLINE_UPDATE)
   #ifdef WNT
     Value = "${UPDATEURL}";
   #else  // defined WNT
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9474eb4357e5..98d25ec51752 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -503,7 +503,7 @@ File gid_File_Lib_Desktopbe
     Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
 End
 
-#ifdef ENABLE_GTK
+#if defined(ENABLE_GTK) && !defined(ENABLE_GTK3)
 #ifdef GTK_TWO_FOUR
 File gid_File_Lib_Fps_Gnome
     TXT_FILE_BODY;
@@ -572,7 +572,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 
 
-#if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO))
+#ifndef SYSTEM_CAIRO
 
 File gid_File_Lib_Cairo
     TXT_FILE_BODY;
@@ -593,6 +593,8 @@ File gid_File_Lib_Cairo
   #endif
 End
 
+#ifndef WNT
+
 File gid_File_Lib_Pixman
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -603,13 +605,13 @@ File gid_File_Lib_Pixman
     #else
        Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
     #endif
-  #elif defined(WNT)
-    Name = "libpixman-1-0.dll";
   #endif
 End
 
 #endif
 
+#endif
+
 STD_LIB_FILE( gid_File_Lib_Frm , frm)
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
@@ -898,6 +900,8 @@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
 
 STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 
+STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
+
 #ifdef WNT
 #if defined(_gcc3)
 
@@ -1006,8 +1010,6 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Preload, preload)
-
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
 
 #if defined(UNX) && ! defined(QUARTZ)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 28891ed60f1d..fb85ddf0f8ba 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1746,15 +1746,6 @@ File gid_File_Config_Javasettingsunopkginstall
   #endif
 End
 
-#ifdef ENABLE_SVCTAGS
-File gid_File_Jar_Productregistration
-    TXT_FILE_BODY;
-    Name = "productregistration.jar";
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED);
-End
-#endif
-
 #ifdef THEME_DEFAULT
 File gid_File_Images_Zip
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index cbd8ff609721..7cfbb4fc2df5 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -66,8 +66,6 @@ STD_RES_FILE( gid_File_Res_Pcr, pcr)
 
 STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
 
-STD_RES_FILE( gid_File_Res_Preload, preload)
-
 STD_RES_FILE( gid_File_Res_Productregistration, productregistration)
 
 #ifdef UNX
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index f27828489d64..8fc9ad5a924b 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC
 SCPDEFS+=-DBUILD_SPECIAL
 .ENDIF
 
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
+SCPDEFS+=-DENABLE_ONLINE_UPDATE
+.ENDIF
+
 .IF "$(BUILD_X64)"!=""
 SCPDEFS+=-DBUILD_X64
 .ENDIF
@@ -91,18 +95,17 @@ SCPDEFS+=-DENABLE_EVOAB2
 SCPDEFS+=-DENABLE_DIRECTX
 .ENDIF
 
-.IF "$(SYSTEM_FREETYPE)" == "YES"
-SCPDEFS+=-DSYSTEM_FREETYPE
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
+SCPDEFS+=-DENABLE_CAIROCANVAS
+.ENDIF
 .ENDIF
 
 .IF "$(SYSTEM_CAIRO)" == "YES"
 SCPDEFS+=-DSYSTEM_CAIRO
 .ENDIF
 
-.IF "$(ENABLE_CAIRO)" == "YES"
-SCPDEFS+=-DENABLE_CAIRO
-.ENDIF
-
 .IF "$(SYSTEM_LIBXML)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXML
 .ENDIF
@@ -180,11 +183,6 @@ SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
 SCPDEFS+=-DGCJ
 .ENDIF
 
-
-.IF "$(ENABLE_CAIRO)" == "TRUE"
-SCPDEFS+=-DENABLE_CAIRO
-.ENDIF
-
 .IF "$(SYSTEM_LUCENE)" == "YES"
 SCPDEFS+=-DSYSTEM_LUCENE
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4cf3c5825b59..f9f29be41a28 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -234,7 +234,6 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Pdffilter,
 	gid_File_Lib_Pk,
 	gid_File_Lib_Pl,
-	gid_File_Lib_Preload,
 	gid_File_Lib_Sf_Prothdlr,
 	gid_File_Lib_Psp,
 	gid_File_Lib_Res,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 60ee02b8b760..efc2d98db0e7 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -74,7 +74,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Ofa,
              gid_File_Res_Pcr,
              gid_File_Res_Pdffilter,
-             gid_File_Res_Preload,
              gid_File_Res_San,
              gid_File_Res_Productregistration,
              gid_File_Res_Sb,
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index af4861d10e1d..ff2037fa59ec 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -206,15 +206,18 @@ SCP1FILES += \
 SCP1FILES += \
              vclcanvas.par \
 
-.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
 SCP1FILES += cairocanvas.par
 .ENDIF
+.ENDIF
 
 .IF "$(ENABLE_LAYOUT)" == "TRUE"
 SCP1FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP1FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par
@@ -391,7 +394,7 @@ SCP2FILES += \
 SCP2FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP2FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par
diff --git a/set_soenv.in b/set_soenv.in
index 5ea6bbf03b09..99a4ffbe6438 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -323,7 +323,7 @@ elsif ( $platform =~ m/freebsd/ )
       $OS             = "FREEBSD";
       $PATH_SEPERATOR = $ps;
       $OSVERSION      = '@OSVERSION@';
-   if ($platform =~ m/^amd64/)
+   if ($platform =~ m/^(amd64|x86_64)/)
    {  my ( $JAVA_OS );
       print "Setting FreeBSD AMD64 specific values... ";
       $outfile        = "FreeBSDAMDEnv.Set.sh";
@@ -655,7 +655,9 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
   {   print "Setting Windows (MinGW) specific values... ";
       # At the moment this implies the use of tcsh
       # WTF does that mean?
-      $FLIPCMD        = "slfl.pl";
+
+      $FLIPCMD        = "slfl.pl" if '@build_os@' eq 'cygwin';
+
       $PATH_SEPERATOR = ';';
       $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin';
       $outfile        = "WindowsMinGWEnv.Set.sh";
@@ -670,8 +672,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
   else # The MSVC section starts here
   {   print "Setting Windows (MSVC) specific values... ";
       $outfile        = "WindowsMSVCEnv.Set.sh";
-      # Temporary hack: remove the old winenv.set.sh to avoid confusion... drop after a few weeks
-      unlink('winenv.set.sh');
       $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci@COMEX@";
@@ -1291,13 +1291,14 @@ elsif ($platform =~ m/cygwin|mingw32/)
                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
 }
 elsif ($platform =~ m/darwin/)
-{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.$USR_LIB;
+{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
+   if ($platform !~ m/^arm-apple/)
+   {  $SOLARLIB      .= $L.$USR_LIB;
+   }
     # [ed] 6/15/02 Add in X11 libraries onto the library path
     if ($GUIBASE eq "unx") {
        $SOLARLIB      .= $L.$XLIB;
     }
-
 }
 
 if ($SYSTEM_MOZILLA eq "YES")
@@ -1321,7 +1322,7 @@ if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 $SOLARINC            .= '/SC5 ';
 }
 # Platform dependent include path at the top of this list of include paths
-if ($platform =~ m/solaris/)
+if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 {
     $SOLARINC         .= $I.$COMPATH.$INCLUDE;
 }
@@ -1518,6 +1519,7 @@ ToFile( "NO_BSYMBOLIC",      $NO_BSYMBOLIC,      "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
 }
+ToFile( "ENABLE_DEBUG_STL",  "@ENABLE_DEBUG_STL@", "e" );
 if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
 }
@@ -1547,7 +1549,6 @@ ToFile( "GTHREAD_CFLAGS",    "@GTHREAD_CFLAGS@",   "e" );
 ToFile( "GTHREAD_LIBS",      "@GTHREAD_LIBS@",     "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
-ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
@@ -1682,6 +1683,8 @@ if ( $platform =~ m/cygwin/ )
 }
 elsif ( $platform =~ m/mingw32/ )
 {  ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
+   ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
+   ToFile( "DISABLE_ATL",       "@DISABLE_ATL@",    "e" );
 }
 
 if ("@WITH_VC_REDIST@" eq "TRUE") {
@@ -1828,6 +1831,8 @@ ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@",  "e" );
 ToFile( "ENABLE_CUPS",       "@ENABLE_CUPS@",       "e" );
 ToFile( "ENABLE_RANDR",      "@ENABLE_RANDR@",      "e" );
 ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
+ToFile( "FONTCONFIG_LIBS",   "@FONTCONFIG_LIBS@",   "e");
+ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e");
 ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
 ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
 ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
@@ -1927,7 +1932,6 @@ ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
 ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
 ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
 ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
-ToFile( "BUILD_PIXMAN",      "@BUILD_PIXMAN@",     "e" );
 ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
 ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
 ToFile( "XRANDR_CFLAGS",     "@XRANDR_CFLAGS@",    "e" );
@@ -1966,6 +1970,7 @@ ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
 ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
 ToFile( "ENABLE_LOMENUBAR",  "@ENABLE_LOMENUBAR@", "e" );
+ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
 ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
 ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
 ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
diff --git a/soldep/bootstrp/command.cxx b/soldep/bootstrp/command.cxx
deleted file mode 100644
index ed5ff4c0be14..000000000000
--- a/soldep/bootstrp/command.cxx
+++ /dev/null
@@ -1,681 +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.
- *
- ************************************************************************/
-
-#ifdef SCO
-#define _IOSTREAM_H
-#endif
-
-#include <tools/fsys.hxx>
-#include <tools/stream.hxx>
-#include "soldep/command.hxx"
-#include <tools/debug.hxx>
-#include <soldep/appdef.hxx>
-
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#endif
-
-#include <iostream>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-
-//#define MH_TEST2  1           // fuers direkte Testen
-
-#if defined(WNT)
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#endif
-#include <process.h>    // for _SPAWN
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-#endif
-#ifdef UNX
-#include <sys/types.h>
-#include <unistd.h>
-#if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \
-    || defined (HPUX) || defined (MACOSX)
-#include <sys/wait.h>
-#else
-#include <wait.h>
-#endif
-#define P_WAIT 1        // erstmal einen dummz
-#endif
-
-#if defined WNT
-#include <windows.h>
-#endif
-
-#if defined(WNT)
-#define     cPathSeperator ';'
-#endif
-#ifdef UNX
-#define     cPathSeperator  ':'
-#endif
-
-/*****************************************************************************/
-CommandLine::CommandLine(sal_Bool bWrite)
-/*****************************************************************************/
-                : bTmpWrite(bWrite)
-{
-    CommandBuffer = new char [1];
-    if (CommandBuffer == NULL) {
-        //cout << "Error: nospace" << endl;
-        exit(0);
-    }
-    CommandBuffer[0] = '\0';
-    nArgc = 0;
-    ppArgv = new char * [1];
-    ppArgv[0] = NULL;
-
-    ComShell = new char [128];
-    char* pTemp = getenv("COMMAND_SHELL");
-    if(!pTemp)
-        strcpy(ComShell,COMMAND_SHELL);
-    else
-        strcpy(ComShell,pTemp);
-
-    strcpy(&ComShell[strlen(ComShell)]," -C ");
-}
-
-/*****************************************************************************/
-CommandLine::CommandLine(const char *CommandString, sal_Bool bWrite)
-/*****************************************************************************/
-                : bTmpWrite(bWrite)
-{
-    CommandBuffer = new char [1];
-    if (CommandBuffer == NULL) {
-        //cout << "Error: nospace" << endl;
-        exit(0);
-    }
-    nArgc = 0;
-    ppArgv = new char * [1];
-    ppArgv[0] = NULL;
-
-    ComShell = new char [128];
-    char* pTemp = getenv("COMMAND_SHELL");
-    if(!pTemp)
-        strcpy(ComShell,COMMAND_SHELL);
-    else
-        strcpy(ComShell,pTemp);
-
-    strcpy(&ComShell[strlen(ComShell)]," -C ");
-
-    BuildCommand(CommandString);
-}
-
-/*****************************************************************************/
-CommandLine::CommandLine(const CommandLine& CCommandLine, sal_Bool bWrite)
-/*****************************************************************************/
-                : bTmpWrite(bWrite)
-{
-    CommandBuffer = new char [1];
-    if (CommandBuffer == NULL) {
-        //cout << "Error: nospace" << endl;
-        exit(0);
-    }
-    nArgc = 0;
-    ppArgv = new char * [1];
-    ppArgv[0] = NULL;
-
-    ComShell = new char [128];
-    char* pTemp = getenv("COMMAND_SHELL");
-    if(!pTemp)
-        strcpy(ComShell,COMMAND_SHELL);
-    else
-        strcpy(ComShell,pTemp);
-
-    strcpy(&ComShell[strlen(ComShell)]," -C ");
-
-    BuildCommand(CCommandLine.CommandBuffer);
-}
-
-/*****************************************************************************/
-CommandLine::~CommandLine()
-/*****************************************************************************/
-{
-    delete [] CommandBuffer;
-    delete [] ComShell;
-    //for (int i = 0; ppArgv[i] != '\0'; i++) {
-    for (int i = 0; ppArgv[i] != 0; i++) {
-        delete [] ppArgv[i];
-    }
-    delete [] ppArgv;
-
-}
-
-/*****************************************************************************/
-CommandLine& CommandLine::operator=(const CommandLine& CCommandLine)
-/*****************************************************************************/
-{
-    strcpy (CommandBuffer, CCommandLine.CommandBuffer);
-    for (int i = 0; i != nArgc; i++) {
-        delete [] ppArgv[i];
-    }
-    delete [] ppArgv;
-        ppArgv = new char * [1];
-        ppArgv[0] = NULL;
-    BuildCommand(CommandBuffer);
-    return *this;
-}
-
-/*****************************************************************************/
-CommandLine& CommandLine::operator=(const char *CommandString)
-/*****************************************************************************/
-{
-    strcpy (CommandBuffer, CommandString);
-    for (int i = 0; i != nArgc; i++) {
-        delete [] ppArgv[i];
-    }
-    delete [] ppArgv;
-        ppArgv = new char * [1];
-        ppArgv[0] = NULL;
-    BuildCommand(CommandBuffer);
-
-    return *this;
-}
-
-/*****************************************************************************/
-void CommandLine::Print()
-/*****************************************************************************/
-{
-    //cout << "******* start print *******" << endl;
-    //cout << "nArgc = " << nArgc << endl;
-    //cout << "CommandBuffer = " << CommandBuffer << endl;
-    for (int i = 0; ppArgv[i] != NULL; i++) {
-        //cout << "ppArgv[" << i << "] = " << ppArgv[i] << endl;
-    }
-    //cout << "******** end print ********" << endl;
-}
-
-/*****************************************************************************/
-void CommandLine::BuildCommand(const char *CommandString)
-/*****************************************************************************/
-{
-    int index = 0, pos=0;
-    char buffer[1024];
-    char WorkString[1024];
-
-    strcpy(WorkString,CommandString);
-
-    //falls LogWindow -> in tmpfile schreiben
-    if(bTmpWrite)
-    {
-        strcpy(&WorkString[strlen(WorkString)]," >&");
-        strcpy(&WorkString[strlen(WorkString)],getenv("TMP"));
-        strcpy(&WorkString[strlen(WorkString)],TMPNAME);
-    }
-
-    // delete old memory and get some new memory for CommandBuffer
-
-    delete [] CommandBuffer;
-    CommandBuffer =  new char [strlen(ComShell)+strlen(WorkString)+1];
-    if (CommandBuffer == NULL) {
-        //cout << "Error: nospace" << endl;
-        exit(0);
-    }
-    strcpy (CommandBuffer, ComShell);
-    strcpy (&CommandBuffer[strlen(ComShell)], WorkString);
-
-    CommandString = CommandBuffer;
-
-    // get the number of tokens
-    Strtokens(CommandString);
-
-    // delete the space for the old CommandLine
-
-    for (int i = 0; ppArgv[i] != 0; i++) {
-        delete [] ppArgv[i];
-    }
-    delete [] ppArgv;
-
-    /* get space for the new command line */
-
-    ppArgv = (char **) new char * [nArgc+1];
-    if (ppArgv == NULL) {
-        //cout << "Error: no space" << endl;
-        exit(0);
-    }
-
-    // flush the white space
-
-    while ( isspace(*CommandString) )
-        CommandString++;
-
-    index = 0;
-
-    // start the loop to build all the individual tokens
-
-    while (*CommandString != '\0') {
-
-        pos = 0;
-
-        // copy the token until white space is found
-
-        while ( !isspace(*CommandString) && *CommandString != '\0') {
-
-            buffer[pos++] = *CommandString++;
-
-        }
-
-        buffer[pos] = '\0';
-
-        // get space for the individual tokens
-
-        ppArgv[index] = (char *) new char [strlen(buffer)+1];
-        if (ppArgv[index] == NULL) {
-            //cout << "Error: nospace" << endl;
-            exit(0);
-        }
-
-        // copy the token
-
-        strcpy (ppArgv[index++], buffer);
-
-        // flush while space
-
-        while ( isspace(*CommandString) )
-            CommandString++;
-
-    }
-
-    // finish by setting the las pointer to NULL
-    ppArgv[nArgc]= NULL;
-
-}
-
-/*****************************************************************************/
-void CommandLine::Strtokens(const char *CommandString)
-/*****************************************************************************/
-{
-    int count = 0;
-    const char *temp;
-
-    temp = CommandString;
-
-    /* bypass white space */
-
-    while (isspace(*temp)) temp++;
-
-    for (count=0; *temp != '\0'; count++) {
-
-        /* continue until white space of string terminator is found */
-
-        while ((!isspace(*temp)) && (*temp != '\0')) temp++;
-
-        /* bypass white space */
-
-        while (isspace(*temp)) temp++;
-
-    }
-    nArgc = count;
-}
-
-/*****************************************************************************/
-CCommand::CCommand( ByteString &rString )
-/*****************************************************************************/
-{
-    rString.SearchAndReplace( '\t', ' ' );
-    aCommand = rString.GetToken( 0, ' ' );
-    aCommandLine = Search( "PATH" );
-#ifndef UNX
-    aCommandLine += " /c ";
-#else
-    aCommandLine += " -c ";
-#endif
-
-    ByteString sCmd( rString.GetToken( 0, ' ' ));
-    ByteString sParam( rString.Copy( sCmd.Len()));
-
-    aCommandLine += Search( "PATH", sCmd );
-    aCommandLine += sParam;
-
-    ImplInit();
-}
-
-/*****************************************************************************/
-CCommand::CCommand( const char *pChar )
-/*****************************************************************************/
-{
-    ByteString aString = pChar;
-    aString.SearchAndReplace( '\t', ' ' );
-    aCommand = aString.GetToken( 0, ' ' );
-
-    aCommandLine = Search( "PATH" );
-#ifndef UNX
-    aCommandLine += " /c ";
-#else
-    aCommandLine += " -c ";
-#endif
-    ByteString rString( pChar );
-
-    ByteString sCmd( rString.GetToken( 0, ' ' ));
-    ByteString sParam( rString.Copy( sCmd.Len()));
-
-    aCommandLine += Search( "PATH", sCmd );
-    aCommandLine += sParam;
-
-    ImplInit();
-}
-
-/*****************************************************************************/
-void CCommand::ImplInit()
-/*****************************************************************************/
-{
-    char pTmpStr[255];
-    size_t *pPtr;
-    char *pChar;
-    int nVoid = sizeof( size_t * );
-    nArgc = aCommandLine.GetTokenCount(' ');
-    sal_uIntPtr nLen = aCommandLine.Len();
-
-    ppArgv = (char **) new char[ (sal_uIntPtr)(nLen + nVoid * (nArgc +2) + nArgc ) ];
-    pChar = (char *) ppArgv + ( (1+nArgc) * nVoid );
-    pPtr = (size_t *) ppArgv;
-    for ( xub_StrLen i=0; i<nArgc; i++ )
-    {
-        (void) strcpy( pTmpStr, aCommandLine.GetToken(i, ' ' ).GetBuffer() );
-        size_t nStrLen = strlen( pTmpStr ) + 1;
-        strcpy( pChar, pTmpStr );
-        *pPtr = (sal_uIntPtr) pChar;
-        pChar += nStrLen;
-        pPtr += 1;
-#ifdef UNX
-        if ( i == 1 )
-        {
-            sal_uInt16 nWo = aCommandLine.Search("csh -c ");
-            if (nWo != STRING_NOTFOUND)
-                aCommandLine.Erase(0, nWo + 7);
-            else
-                aCommandLine.Erase(0, 16);
-            i = nArgc;
-            strcpy( pChar, aCommandLine.GetBuffer() );
-            *pPtr = (sal_uIntPtr) pChar;
-            pPtr += 1;
-        }
-#endif
-    }
-    *pPtr = 0;
-}
-
-/*****************************************************************************/
-CCommand::operator int()
-/*****************************************************************************/
-{
-    int nRet;
-#if defined WNT
-    nRet = _spawnv( P_WAIT, ppArgv[0], (const char **) ppArgv );
-#elif defined UNX
-    //fprintf( stderr, "CComand : operator (int) not implemented\n");
-    // **** Unix Implementierung ***************
-    pid_t pid;
-
-    if (( pid = fork()) < 0 )
-    {
-        DBG_ASSERT( sal_False, "fork error" );
-    }
-    else if ( pid == 0 )
-    {
-        if ( execv( ppArgv[0], (char * const *) ppArgv ) < 0 )
-        {
-            DBG_ASSERT( sal_False, "execv failed" );
-        }
-    }
-    //fprintf( stderr, "parent: %s %s\n", ppArgv[0] , ppArgv[1] );
-    if ( (nRet = waitpid( pid, NULL, 0 ) < 0) )
-    {
-        DBG_ASSERT( sal_False, "wait error" );
-    }
-#endif
-
-    switch ( errno )
-    {
-        case    E2BIG :
-                    nError = COMMAND_TOOBIG;
-                    break;
-        case    EINVAL :
-                    nError = COMMAND_INVALID;
-                    break;
-        case    ENOENT:
-                    nError = COMMAND_NOTFOUND;
-                    break;
-        case    ENOEXEC :
-                    nError = COMMAND_NOEXEC;
-                    break;
-        case    ENOMEM :
-                    nError = COMMAND_NOMEM;
-                    break;
-        default:
-                nError = COMMAND_UNKNOWN;
-    }
-
-    if ( nRet )
-        fprintf( stderr, "Program returned with errros\n");
-    return nRet;
-}
-
-/*****************************************************************************/
-ByteString CCommand::Search(ByteString aEnv, ByteString sItem)
-/*****************************************************************************/
-{
-    // default wird eine Shell im Path gesucht,
-    // wenn aber compsec gestzt ist holen wir uns die
-    // Shell von dort
-    if ( sItem.Equals( COMMAND_SHELL ))
-    {
-        ByteString aComspec = GetEnv( "COMSPEC" );
-        if ( !aComspec.Equals(""))
-            return aComspec;
-    }
-
-    DirEntry aItem( String( sItem, RTL_TEXTENCODING_ASCII_US ));
-    if ( aItem.Exists())
-        return sItem;
-
-    ByteString aEntry, sReturn;
-    ByteString sEnv( aEnv );
-    ByteString sEnvironment = GetEnv( sEnv.GetBuffer());
-    xub_StrLen nCount = sEnvironment.GetTokenCount( cPathSeperator );
-
-    sal_Bool bFound = sal_False;
-
-    for ( xub_StrLen i=0; i<nCount && !bFound; i++ )
-    {
-        aEntry = sEnvironment.GetToken(i, cPathSeperator );
-#ifndef UNX
-        aEntry += '\\';
-#else
-        aEntry += '/';
-#endif
-        aEntry += sItem;
-
-        String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
-        DirEntry aDirEntry( sEntry );
-        aDirEntry.ToAbs();
-        if ( aDirEntry.Exists()) {
-            sReturn = aEntry;
-            bFound = sal_True;
-        }
-    }
-    if ( !bFound )
-    {
-        sEnv = sEnv.ToUpperAscii();
-        ByteString sEnvironment2 = GetEnv(sEnv.GetBuffer() );
-        xub_StrLen nCount2 = sEnvironment2.GetTokenCount( cPathSeperator );
-        for ( xub_StrLen i=0; i<nCount2 && !bFound; i++ )
-        {
-            aEntry = sEnvironment2.GetToken(i, cPathSeperator );
-#ifndef UNX
-            aEntry += '\\';
-#else
-            aEntry += '/';
-#endif
-            aEntry += sItem;
-
-            String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
-            DirEntry aDirEntry( sEntry );
-            aDirEntry.ToAbs();
-            if ( aDirEntry.Exists()) {
-                sReturn = aEntry;
-                bFound = sal_True;
-            }
-        }
-    }
-
-    if ( sReturn.Equals( "" ))
-        sReturn = sItem;
-
-    return sReturn;
-}
-
-/*****************************************************************************/
-CCommandd::CCommandd( ByteString &rString, CommandBits nBits )
-/*****************************************************************************/
-                : CCommand( rString ),
-                nFlag( nBits )
-{
-}
-
-
-/*****************************************************************************/
-CCommandd::CCommandd( const char *pChar, CommandBits nBits )
-/*****************************************************************************/
-                : CCommand( pChar ),
-                nFlag( nBits )
-{
-}
-
-/*****************************************************************************/
-CCommandd::operator int()
-/*****************************************************************************/
-{
-    int nRet = 0;
-
-#ifdef WNT
-    LPCTSTR lpApplicationName = NULL;
-    LPTSTR lpCommandLine = (char *) GetCommandLine_().GetBuffer();
-    LPSECURITY_ATTRIBUTES lpProcessAttributes = NULL;
-    LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL;
-    sal_Bool bInheritHandles = sal_True;
-
-    // wie wuenschen wir denn gestartet zu werden ??
-    DWORD dwCreationFlags;
-
-    if ( nFlag & COMMAND_EXECUTE_START )
-        dwCreationFlags = DETACHED_PROCESS;
-    else
-        dwCreationFlags = CREATE_NEW_CONSOLE;
-
-    // wir erben vom Vaterprozess
-    LPVOID lpEnvironment = NULL;
-
-    // das exe im Pfad suchen
-    LPCTSTR lpCurrentDirectory = NULL;
-
-    // in dieser Struktur bekommen wir die erzeugte Processinfo
-    // zurueck
-    PROCESS_INFORMATION aProcessInformation;
-
-    // weiteres Startupinfo anlegen
-    STARTUPINFO aStartupInfo;
-
-    aStartupInfo.cb = sizeof( STARTUPINFO );
-    aStartupInfo.lpReserved = NULL;
-    aStartupInfo.lpDesktop = NULL;
-
-    // das Fenster bekommt den Namen des Exes
-    aStartupInfo.lpTitle = NULL;
-    aStartupInfo.dwX = 100;
-    aStartupInfo.dwY = 100;
-    //aStartupInfo.dwXSize = 400;
-    //aStartupInfo.dwYSize = 400;
-    aStartupInfo.dwXCountChars = 40;
-    aStartupInfo.dwYCountChars = 40;
-
-    // Farben setzen
-    aStartupInfo.dwFillAttribute = FOREGROUND_RED | BACKGROUND_RED |
-                                BACKGROUND_BLUE | BACKGROUND_GREEN;
-
-//  aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
-    //aStartupInfo.wShowWindow = SW_NORMAL; //SW_SHOWDEFAULT;
-    //aStartupInfo.wShowWindow = SW_HIDE; //SW_SHOWNOACTIVATE;
-    aStartupInfo.wShowWindow = SW_SHOWNOACTIVATE;
-    aStartupInfo.cbReserved2 = NULL;
-    aStartupInfo.lpReserved2 = NULL;
-    //aStartupInfo.hStdInput = stdin;
-    //aStartupInfo.hStdOutput = stdout;
-    //aStartupInfo.hStdError = stderr;
-
-    if ( nFlag & COMMAND_EXECUTE_HIDDEN )
-    {
-        aStartupInfo.wShowWindow = SW_HIDE;
-        aStartupInfo.dwFlags = aStartupInfo.dwFlags | STARTF_USESHOWWINDOW;
-    }
-
-    bool bProcess = CreateProcess( lpApplicationName,
-                        lpCommandLine, lpProcessAttributes,
-                        lpThreadAttributes, bInheritHandles,
-                        dwCreationFlags, lpEnvironment, lpCurrentDirectory,
-                        &aStartupInfo, &aProcessInformation );
-
-    LPVOID lpMsgBuf;
-
-    if ( bProcess )
-    {
-        FormatMessage(
-                FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                NULL,
-                GetLastError(),
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                (LPTSTR) &lpMsgBuf,
-                0,
-                NULL );
-
-        ByteString aErrorString = (char *) lpMsgBuf;
-
-        if ( nFlag & COMMAND_EXECUTE_WAIT )
-        {
-            DWORD aProcessState = STILL_ACTIVE;
-            while(aProcessState == STILL_ACTIVE)
-            {
-                GetExitCodeProcess(aProcessInformation.hProcess,&aProcessState);
-            }
-        }
-    }
-    else
-        fprintf( stderr, "Can not start Process !" );
-
-#endif
-    return nRet;
-}
diff --git a/soldep/inc/soldep/command.hxx b/soldep/inc/soldep/command.hxx
deleted file mode 100644
index 93c01616e593..000000000000
--- a/soldep/inc/soldep/command.hxx
+++ /dev/null
@@ -1,160 +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.
- *
- ************************************************************************/
-
-#ifndef COMMAND_HXX
-#define COMMAND_HXX
-
-#include <iostream>
-
-#include <tools/stream.hxx>
-#define STRLEN 100
-#ifndef UNX
-#define TMPNAME "\\command.tmp"
-#else
-#define TMPNAME "/tmp/command.tmp"
-#endif
-
-/** Different types of spawnable programs
-*/
-enum ExeType
-{
-    EXE,    /// programm is a native executable
-    BAT,    /// programm is a DOS-Batch
-    BTM     /// programm is a 4DOS-Batch
-};
-
-#define COMMAND_NOTFOUND    0x0001
-#define COMMAND_TOOBIG      0x0002
-#define COMMAND_INVALID     0x0004
-#define COMMAND_NOEXEC      0x0008
-#define COMMAND_NOMEM       0x0010
-#define COMMAND_UNKNOWN     0x0020
-
-#ifdef WNT
-#define COMMAND_SHELL   "4nt.exe"
-#endif
-#ifdef UNX
-#define COMMAND_SHELL   "csh"
-#endif
-
-class CommandLine;
-class LogWindow;
-
-class CommandLine
-{
-friend class ChildProcess;
-private:
-    char            *CommandBuffer;
-    char            *ComShell;
-    char            **ppArgv;
-    sal_Bool            bTmpWrite;
-
-public:
-                    CommandLine(sal_Bool bTmpWrite = sal_False);
-                    CommandLine(const char *, sal_Bool bTmpWrite = sal_False);
-                    CommandLine(const CommandLine&, sal_Bool bTmpWrite = sal_False);
-    virtual         ~CommandLine();
-
-    int             nArgc;
-
-    CommandLine&    operator=(const CommandLine&);
-    CommandLine&    operator=(const char *);
-    void            BuildCommand(const char *);
-    char**          GetCommand(void) { return ppArgv; }
-    void            Strtokens(const char *);
-    void            Print();
-};
-
-/** Declares and spawns a child process.
-    The spawned programm could be a native executable or a schell script.
-*/
-class CCommand
-{
-private:
-    ByteString          aCommandLine;
-    ByteString          aCommand;
-    char                *pArgv;
-    char                **ppArgv;
-    sal_uIntPtr             nArgc;
-    int                 nError;
-
-protected:
-    void            ImplInit();
-    void            Initpp( sal_uIntPtr nCount, ByteString &rStr );
-
-public:
-                    /** Creates the process specified without spawning it
-                        @param rString specifies the programm or shell scrip
-                    */
-                    CCommand( ByteString &rString );
-
-                    /** Creates the process specified without spawning it
-                        @param pChar specifies the programm or shell scrip
-                    */
-                    CCommand( const char *pChar );
-
-                    /** Try to find the given programm in specified path
-                        @param sEnv specifies the current search path, defaulted by environment
-                        @param sItem specifies the system shell
-                        @return the Location (when programm was found)
-                    */
-    static ByteString   Search( ByteString sEnv,
-                                    ByteString sItem = COMMAND_SHELL );
-
-                    /** Spawns the Process
-                        @return 0 when spawned without errors, otherwise a error code
-                    */
-    operator int();
-
-    ByteString          GetCommandLine_() { return aCommandLine; }
-    ByteString          GetCommand() { return aCommand; }
-
-    char**  GetCommandStr() { return ppArgv; }
-};
-
-#define COMMAND_EXECUTE_WINDOW  0x0000001
-#define COMMAND_EXECUTE_CONSOLE 0x0000002
-#define COMMAND_EXECUTE_HIDDEN  0x0000004
-#define COMMAND_EXECUTE_START   0x0000008
-#define COMMAND_EXECUTE_WAIT    0x0000010
-#define COMMAND_EXECUTE_REMOTE  0x1000000
-
-typedef sal_uIntPtr CommandBits;
-
-/** Allowes to spawn programms hidden, waiting etc.
-    @see CCommand
-*/
-class CCommandd : public CCommand
-{
-    CommandBits     nFlag;
-public:
-                    CCommandd( ByteString &rString, CommandBits nBits );
-                    CCommandd( const char *pChar, CommandBits nBits );
-    operator int();
-};
-
-#endif
diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines
index 71d42090121d..e7491c24ac08 100755
--- a/solenv/bin/add-modelines
+++ b/solenv/bin/add-modelines
@@ -31,7 +31,7 @@ set -o posix
 # Change these to taste
 FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */'
 LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab: */'
-SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h'
+SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.mm'
 
 # Set defaults (don't change these)
 ModelineReplace="false"
@@ -160,11 +160,11 @@ if [ -z "$findPath" ]; then
 fi
 
 for FileType in ${SourceFiles}; do
-    findArgs="$findArgs"' ( -iname '"$FileType"' -print ) , '
+    findArgs="$findArgs"' ( -iname '"$FileType"' -print -o -true ) -a '
 done
 
-# This gets rid of the final " , " in the find argument list
-findArgs="${findArgs:0:(${#findArgs}-2)}"
+# This gets rid of the final " -a " in the find argument list
+findArgs="${findArgs:0:(${#findArgs}-3)}"
 
 for file in $($findCMD $findArgs); do
     EditFile "$file"
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 896d0095e4ac..cc53a5dcc477 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -248,7 +248,6 @@
         exit 0;
     }
     get_module_and_buildlist_paths();
-    provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS}));
 
     $deliver_command .= ' -verbose' if ($html || $verbose);
     $deliver_command .= ' '. $dlv_switch if ($dlv_switch);
@@ -2191,22 +2190,6 @@ sub modules_classify {
 };
 
 #
-# This procedure provides consistency for cws
-# and optimized build (ie in case of --with_branches, -all:prj_name
-# and -since switches)
-#
-sub provide_consistency {
-    check_dir();
-    foreach my $var_ref (\$build_all_cont, \$build_since) {
-        if ($$var_ref) {
-            return if (defined $module_paths{$$var_ref});
-            print_error("Cannot find module '$$var_ref'", 9);
-            return;
-        };
-    };
-};
-
-#
 # Procedure clears up module for incompatible build
 #
 sub ensure_clear_module {
@@ -2359,7 +2342,7 @@ sub prepare_incompatible_build {
     @modules_built = keys %$deps_hash;
     %add_to_config = %$deps_hash;
     if ($prepare) {
-        if ((!(defined $ENV{UPDATER} && (!defined $ENV{CWS_WORK_STAMP}))) || (defined $ENV{CWS_WORK_STAMP})) {
+        if (!(defined $ENV{UPDATER})) {
             $source_config->add_active_modules([keys %add_to_config], 0);
         }
         clear_delivered();
@@ -2570,9 +2553,8 @@ sub read_ssolar_vars {
 
     my ($source_root, $cwsname);
     $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED});
-    my $cws_name = "-cwsname $ENV{CWS_WORK_STAMP}" if (defined $ENV{CWS_WORK_STAMP});
 
-    my $param = "-$ENV{WORK_STAMP} $source_root $cws_name $pro $platform";
+    my $param = "-$ENV{WORK_STAMP} $source_root $pro $platform";
     my $ss_command = "$perl $setsolar -file $tmp_file $param $nul";
     if (system($ss_command)) {
         unlink $tmp_file;
@@ -2720,8 +2702,7 @@ sub generate_html_file {
     my $build_duration = get_time_line(time - $build_time);
     my $temp_html_file = File::Temp::tmpnam($tmp_dir);
     my $title;
-    $title = $ENV{CWS_WORK_STAMP} . ': ' if (defined $ENV{CWS_WORK_STAMP});
-    $title .= $ENV{INPATH};
+    $title = $ENV{INPATH};
     die("Cannot open $temp_html_file") if (!open(HTML, ">$temp_html_file"));
     print HTML '<html><head>';
     print HTML '<TITLE id=MainTitle>' . $title . '</TITLE>';
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
index f518f8198dcc..5119f60a0ed1 100755
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@ -357,11 +357,7 @@ sub do_job {
         delete $ENV{$_} foreach (keys %ENV);
         $ENV{$_} = $$solar_vars{$_} foreach (keys %$solar_vars);
         print 'Workspace: ';
-        if (defined $ENV{CWS_WORK_STAMP}) {
-            print $ENV{CWS_WORK_STAMP};
-        } else {
-            print $ENV{SOLARSRC};
-        };
+        print $ENV{SOLARSRC};
 
         print "\nplatform: $ENV{INPATH} $^O";
         print "\ndir: $job_hash{job_dir}\n";
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 1d1c53618105..aba400453c0e 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -120,7 +120,7 @@ if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the e
 $tempcounter        = 0;
 
 # zip is default for RE master builds
-$opt_zip = 1 if ( defined($ENV{DELIVER_TO_ZIP}) && uc($ENV{DELIVER_TO_ZIP}) eq 'TRUE' && ! defined($ENV{CWS_WORK_STAMP}));
+$opt_zip = 1 if ( defined($ENV{DELIVER_TO_ZIP}) && uc($ENV{DELIVER_TO_ZIP}) eq 'TRUE');
 
 $has_symlinks       = 0;            # system supports symlinks
 
@@ -506,8 +506,8 @@ sub init_globals
                 [ '%GUI%',              $gui            ]
               );
 
-    # find out if the system supports symlinks
-    $has_symlinks = eval { symlink("",""); 1 };
+    # find out if the *HOST* system supports symlinks. They all do except Windows
+    $has_symlinks = $ENV{GUI} ne 'WNT';
 }
 
 sub get_base
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 654c95b7290a..2deb4d438e08 100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -43,13 +43,22 @@ if ($Dest =~ /--help/ || @ARGV < 1) {
 
 foreach $File (@ARGV) {
     my $string;
-    my $normalized_file = $File;
-    $normalized_file =~ s/\.so\.\d+/.so/;
-    open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$normalized_file|") || die "Failed to exec $cc -print-file-name=$normalized_file $!";
-    $string=<GCCOut>;
-    chomp ($string);
-    $SrcAndDest{$string} = "$Dest/$File";
-    close (GCCOut);
+
+    my $NormFile = $File;
+    $NormFile =~ s/\.so\.\d+/.so/;
+    @search = ($File, $NormFile);
+
+    foreach $entry (@search) {
+        open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$entry|") ||
+            next;
+        $string=<GCCOut>;
+        chomp ($string);
+        close (GCCOut);
+        if (-e $string) {
+            $SrcAndDest{$string} = "$Dest/$File";
+            last;
+        }
+    }
 }
 
 while (($Src, $FullDest) = each %SrcAndDest) {
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
index 068960481130..124e915b72c9 100644
--- a/solenv/bin/getcompver.awk
+++ b/solenv/bin/getcompver.awk
@@ -52,13 +52,13 @@ BEGIN {
     x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ )
     CCversion = substr( $0, RSTART, RLENGTH)
 }
-/^[0-9]*[.][0-9]*\x0d*$/ {
+/^[0-9]*[.][0-9]*\r*$/ {
     if ( compiler_matched == 0 ) {
 # need to blow to x.xx.xx for comparing
     	CCversion = $0 ".0"
     }
 }
-/^[0-9]*[.][0-9]*[.][0-9]*\x0d*$/ {
+/^[0-9]*[.][0-9]*[.][0-9]*\r*$/ {
     if ( compiler_matched == 0 ) {
         CCversion = $0
     }
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index b1fdc6e271d0..a1a469ae9d58 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -74,18 +74,19 @@ $program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FI
 
 my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
+my $dllre = '\.so$';
+$dllre = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
+
 my %replaceable = (
-    $program_dir => '\.so',
+    $program_dir => "($dllre|\.rdb)",
+    $ure_lib_dir => "$dllre",
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
     'basis-link/share/config' => '\.zip$',
+    'ure/share/misc' => '\.rdb'
 #    'share/uno_packages' => '\.zip$'
 );
 
-# strangely enough, OSX has those small differences...
-$replaceable{$program_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
-$replaceable{$ure_lib_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
-
 my @search_dirs = ( 'lib', 'bin', 'class' );
 
 my @known_duplicates = ( 'db.jar', 'libi18n' );
@@ -303,25 +304,6 @@ sub link_iso_res()
     print "\n";
 }
 
-# Hack for (renamed) types.rdb (types.db)
-sub link_oovbaapi_rdb()
-{
-    print "oovbaapi.rdb case:";
-    my $src  = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
-    my $dest = "$OOO_INSTALL/" . $program_dir;
-    do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
-    print "\n";
-}
-
-sub link_types_rdb()
-{
-    print "Types.rdb case:";
-    my $src  = "$OOO_BUILD/offapi/$TARGET/ucr";
-    my $dest = "$OOO_INSTALL/" . $ure_misc_dir;
-    do_link ($src, $dest, 'types.db', 'types.rdb');
-    print "\n";
-}
-
 sub link_pagein_files()
 {
     print "pagein case:";
@@ -377,8 +359,6 @@ my $installed_files = build_installed_list ($OOO_INSTALL);
 
 scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
 link_iso_res();
-link_types_rdb();
-link_oovbaapi_rdb();
 link_pagein_files();
 
 if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 3f6b43f563fb..def9869ba706 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -478,11 +478,8 @@ sub check_updatepack
         $infoline = "\nEnvironment variable UPDATER set\n";
         push(@installer::globals::globallogfileinfo, $infoline);
 
-        if ( ! $ENV{'CWS_WORK_STAMP'} ) # the environment variable CWS_WORK_STAMP must not be set (set only in CWS)
+        # There are no CWSes any more, no environment variable CWS_WORK_STAMP
         {
-            $infoline = "Environment variable CWS_WORK_STAMP not set\n";
-            push(@installer::globals::globallogfileinfo, $infoline);
-
             if ( $ENV{'SHIPDRIVE'} )    # the environment variable SHIPDRIVE must be set
             {
                 $shipdrive = $ENV{'SHIPDRIVE'};
@@ -584,11 +581,6 @@ sub check_updatepack
                 push(@installer::globals::globallogfileinfo, $infoline);
             }
         }
-        else
-        {
-            $infoline = "Environment variable CWS_WORK_STAMP defined: No updatepack\n";
-            push(@installer::globals::globallogfileinfo, $infoline);
-        }
     }
 
     if ( $installer::globals::updatepack ) { $infoline = "Setting updatepack true\n\n"; }
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 604f7574cc95..a21fdad0bb62 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -490,11 +490,7 @@ sub get_download_version
     my $devproduct = 0;
     if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
 
-    my $cwsproduct = 0;
-    # the environment variable CWS_WORK_STAMP is set only in CWS
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
-
-    if (( $cwsproduct ) || ( $devproduct ))  # use "DEV300m75"
+    if ( $devproduct )  # use "DEV300m75"
     {
         my $source = uc($installer::globals::build); # DEV300
         my $localminor = "";
@@ -525,14 +521,10 @@ sub set_date_string
     my $devproduct = 0;
     if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
 
-    my $cwsproduct = 0;
-    # the environment variable CWS_WORK_STAMP is set only in CWS
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
-
     my $releasebuild = 1;
     if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; }
 
-    if (( ! $devproduct ) && ( ! $cwsproduct ) && ( ! $releasebuild ))
+    if (( ! $devproduct ) && ( ! $releasebuild ))
     {
         my @timearray = localtime(time);
 
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index f6b3909a53a0..34f16ec0be64 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -802,10 +802,13 @@ sub replace_setup_variables
 
     if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }   # using "680" instead of "src680"
 
-    my $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
-
-    # the environment variable CWS_WORK_STAMP is set only in CWS
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
+    my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`;
+    if (!$buildidstring) {
+        $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
+    }
+    else {
+        $buildidstring = substr($buildidstring, 0, -1);
+    }
 
     if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
 
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index e5aa5f5a3fdc..fa8ebd2cae1a 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -432,6 +432,45 @@ sub create_feature_table
             }
         }
 
+        # Sorting names of language packs and dictionaries
+        my @tempfeaturetable;
+        my @langlist;
+        my @langpack;
+        my @dictlist;
+        my @sorteddictlist;
+        my @sortedlanglist;
+
+        foreach (@featuretable) {
+            if (/^gm_r_Extension_Dictionary_/) {
+                push (@dictlist, $_);
+            }
+            elsif (/^gm_Langpack_r_/) {
+                push (@langlist, $_);
+            }
+            elsif (/\tgm_Langpack_r_/) {
+                push (@langpack, $_);
+            }
+            else {
+                push (@tempfeaturetable, $_);
+            }
+        }
+
+        @sorteddictlist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @dictlist;
+        @sortedlanglist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @langlist;
+
+        @featuretable = (@tempfeaturetable, @sorteddictlist);
+
+        foreach (@sortedlanglist) {
+            my $sortedlanglistline = $_;
+            push (@featuretable, $sortedlanglistline);
+            foreach (@langpack) {
+                my $langpackline = $_;
+                if ( (split(/\t/, $langpackline))[1] eq (split(/\t/, $sortedlanglistline))[0] ) {
+                    push (@featuretable, $langpackline);
+                }
+            }
+        }
+
         # Saving the file
 
         my $featuretablename = $basedir . $installer::globals::separator . "Feature.idt" . "." . $onelanguage;
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 7593c96a6ea8..c62e9923d5fb 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -524,7 +524,6 @@ sub set_mspfilename
         my $hotfixaddon = "hotfix_";
         $hotfixaddon = $hotfixaddon . $installer::globals::buildid;
         my $cwsname = "";
-        if ( $ENV{'CWS_WORK_STAMP'} ) { $hotfixaddon = $ENV{'CWS_WORK_STAMP'}; }
         if ( $allvariables->{'OVERWRITE_CWSNAME'} ) { $hotfixaddon = $allvariables->{'OVERWRITE_CWSNAME'}; }
         $databasename = $databasename . "_" . $hotfixaddon;
     }
@@ -904,10 +903,6 @@ sub change_patchmetadata_table
     my $displayaddon = "";
     if ( $allvariables->{'PATCHDISPLAYADDON'} ) { $displayaddon = $allvariables->{'PATCHDISPLAYADDON'}; }
 
-    my $cwsname = "";
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsname = $ENV{'CWS_WORK_STAMP'}; }
-    if (( $cwsname ne "" ) && ( $allvariables->{'OVERWRITE_CWSNAME'} )) { $cwsname = $allvariables->{'OVERWRITE_CWSNAME'}; }
-
     my $patchsequence = get_patchsequence($allvariables);
 
     if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 ))
@@ -917,8 +912,8 @@ sub change_patchmetadata_table
     }
     else
     {
-        $displaynamevalue = $base . " Hotfix " . $cwsname . " " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
-        $descriptionvalue = $base . " Hotfix " . $cwsname . " " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
+        $displaynamevalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
+        $descriptionvalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
         $displaynamevalue =~ s/    / /g;
         $descriptionvalue =~ s/    / /g;
         $displaynamevalue =~ s/   / /g;
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 5cfa674dd7c0..7a2bc5193d25 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -74,9 +74,6 @@ sub get_arpcomments_for_property_table
 
     my $buildidstring = "(" . $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . "))";
 
-    # the environment variable CWS_WORK_STAMP is set only in CWS
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
-
     $comment = $comment . " " . $buildidstring;
 
     return $comment;
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index d3b96d155e59..ada43720fc75 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -1611,9 +1611,6 @@ sub prepare_windows_patchfiles
     if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); }
     my $windowspatchlevel = $installer::globals::buildid;
 
-    # the environment variable CWS_WORK_STAMP is set only in CWS
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $windowspatchlevel = $ENV{'CWS_WORK_STAMP'} . $windowspatchlevel; }
-
     for ( my $i = 0; $i <= $#{$filesref}; $i++ )
     {
         my $onefile = ${$filesref}[$i];
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index d52e97bf4e87..f0ea1acaddc7 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -734,9 +734,6 @@ sub replace_variables_in_ziplist_variables
 
     my $buildidstringcws = $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . ")";
 
-    # the environment variable CWS_WORK_STAMP is set only in CWS
-    if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstringcws = $buildidstringcws . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
-
     for ( my $i = 0; $i <= $#{$blockref}; $i++ )
     {
         if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; }
diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm
index 014d53b19efe..f84ae22355f4 100644
--- a/solenv/bin/modules/packager/work.pm
+++ b/solenv/bin/modules/packager/work.pm
@@ -268,7 +268,6 @@ sub do_broadcast
 
     if ( ! $ENV{'WORK_STAMP'} ) { packager::exiter::exit_program("ERROR: Environment variable WORK_STAMP not set!", "do_broadcast"); }
     my $workstamp = $ENV{WORK_STAMP};
-    my $cwsworkstamp = $ENV{CWS_WORK_STAMP};
 
     my $prjdir = $tempdir;
     $prjdir =~ s/$prj/$prjname/;
@@ -280,14 +279,8 @@ sub do_broadcast
     if ( ! $tmpfile_handle ) {
         packager::exiter::exit_program("ERROR: Couldn't open temporary file \"$tmpfile_name\"!", "do_broadcast");
     }
-    if (defined($cwsworkstamp)) {
-        print $tmpfile_handle "\"$cwsworkstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"";
-        print "to tmpfile: \"$cwsworkstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n";
-    }
-    else {
-        print $tmpfile_handle "\"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"";
-        print "to tmpfile: \"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n";
-    }
+    print $tmpfile_handle "\"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"";
+    print "to tmpfile: \"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n";
     close $tmpfile_handle;
     my $returnvalue = system("cmd_bcst -s 18 \@$tmpfile_name");
     print "cmd_bcst -s 18 \@$tmpfile_name\n";
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index fe4f30649da2..2d48d9f49770 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -46,7 +46,7 @@
 
 # SrsPartMergeTarget class
 
-gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
+gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build,transex3)
 # gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
 
 gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
@@ -343,8 +343,8 @@ $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,
 
 $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) 
 $(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1))
 
 endef
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e4351451c235..d267d92da473 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -45,6 +45,8 @@ ifeq ($(strip $(VALGRIND)),memcheck)
 gb_CppunitTest_VALGRINDTOOL += --leak-check=yes
 G_SLICE := always-malloc
 export G_SLICE
+GLIBCXX_FORCE_NEW := 1
+export GLIBCXX_FORCE_NEW
 endif
 endif
 
@@ -150,6 +152,7 @@ gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_lin
 endef
 
 $(eval $(foreach method,\
+	add_api \
 	add_cobject \
 	add_cobjects \
 	add_cxxobject \
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 42707c0f8484..ab97350602b2 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -34,15 +34,27 @@ gb_Deliver_CLEARONDELIVER := $(true)
 
 define gb_Deliver_init
 gb_Deliver_DELIVERABLES :=
+gb_Deliver_DELIVERABLES_INDEX := 
 
 endef
 
-define gb_Deliver_add_deliverable
-gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+define gb_Deliver_do_add
+$$(if $(3),,$$(error - missing third parameter for deliverable $(1)))
+gb_Deliver_DELIVERABLES_$(notdir $(3)) += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+gb_Deliver_DELIVERABLES_INDEX := $(sort $(gb_Deliver_DELIVERABLES_INDEX) $(notdir $(3)))
 $(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),)
 
 endef
 
+define gb_Deliver_add_deliverable
+ifeq ($(MAKECMDGOALS),showdeliverables)
+$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+else
+$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+endif
+
+endef
+
 ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
 define gb_Deliver__deliver
 mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -f) $(1) $(2) && touch -r $(1) $(2)
@@ -70,7 +82,7 @@ ifeq ($$(words $(gb_Module_ALLMODULES)),1)
 $$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1))
 deliverlog : COMMAND := \
  mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \
- && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(gb_Deliver_DELIVERABLES))) \
+ && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(foreach list,$$(gb_Deliver_DELIVERABLES_INDEX),$$(gb_Deliver_DELIVERABLES_$$(list))))) \
  && $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \
 		> $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
  && rm -f $$$${RESPONSEFILE}
@@ -95,7 +107,7 @@ endef
 
 showdeliverables :
 	$(eval MAKEFLAGS := s)
-	$(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
+	$(foreach deliverable,$(sort $(foreach list,$(gb_Deliver_DELIVERABLES_INDEX),$(gb_Deliver_DELIVERABLES_$(list)))),\
 			$(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
 	true
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 283d39d5499c..a0baf9b5fa11 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -54,7 +54,7 @@ $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Executable_Executable_platform,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
 
 endef
 
@@ -95,6 +95,7 @@ $(eval $(foreach method,\
 	set_ldflags \
 	add_libs \
 	set_library_path_flags \
+	add_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	use_external \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 9e6d54352fab..3667a35c6c81 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -74,7 +74,7 @@ $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
 $$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
 
 endef
 
@@ -130,6 +130,7 @@ $(eval $(foreach method,\
 	set_ldflags \
 	add_libs \
 	set_library_path_flags \
+	add_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	use_external \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f1f696e677d0..2a585686d452 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -609,6 +609,17 @@ define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
 endef
 
+define gb_LinkTarget_add_api
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+	$$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc))
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+endif
+
+endef
+
 define gb_LinkTarget_add_linked_libs
 ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
 $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index db02b8083c15..51d36a71c8dd 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -34,8 +34,7 @@ $(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%)
 define gb_PackagePart_PackagePart
 $(OUTDIR)/$(1) : $(2)
 $(2) :| $(3)
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2))
-
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2),$(3))
 endef
 
 
@@ -44,8 +43,9 @@ endef
 .PHONY : $(call gb_Package_get_clean_target,%)
 $(call gb_Package_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PKG,2)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(FILES))
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
+	&& cat $${RESPONSEFILE} | xargs rm -f \
+ 	&& rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :
 	mkdir -p $(dir $@) && touch $@
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 81f007272498..1b5bb7d5be39 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -31,7 +31,7 @@
 
 # SdiTarget class
 
-gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target,svidl)
+gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
 gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET)
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 33fe714d7256..a6d7e3afef2e 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -69,7 +69,7 @@ $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
 
 endef
 
@@ -79,6 +79,7 @@ gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary_get_
 endef
 
 $(eval $(foreach method,\
+	add_api \
 	add_cobject \
 	add_cobjects \
 	add_cxxobject \
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index bcca63f49c5c..f66e91a9c872 100755..100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -30,11 +30,12 @@
 gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
 gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
 gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT)
+gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
 gb_PackagePart_get_destinations = \
 	$(OUTDIR)/xml \
 	$(OUTDIR)/pck \
 	$(OUTDIR)/inc \
+	$(OUTDIR)/idl \
 	$(OUTDIR)/bin \
 
 gb_PackagePart_get_target = $(OUTDIR)/$(1)
@@ -99,6 +100,10 @@ gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
 gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
 gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
+gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
+gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb
+gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
+gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
 gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
@@ -137,7 +142,8 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	SrsTemplateTarget \
 	CppunitTest \
 	CustomTarget \
-    WinResTarget \
+	UnoApiTarget \
+	WinResTarget \
 	Zip \
 ))
 
@@ -146,6 +152,7 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
 	Library \
 	Package \
 	StaticLibrary \
+	UnoApiOutTarget \
 ))
 
 $(eval $(call gb_Helper_make_dep_targets,\
@@ -157,6 +164,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
 	LinkTarget \
 	SrsPartTarget \
 	SrsTarget \
+	UnoApiTarget \
 ))
 
 # other getters
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
new file mode 100644
index 000000000000..951d2051225b
--- /dev/null
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -0,0 +1,210 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+define gb_UnoApiTarget_autopackage_inc
+$$(eval $$(call gb_Package_Package,$(1)_inc,$$(patsubst %/empty,%,$$(call gb_UnoApiTarget_get_header_target,empty))))
+$(foreach onefile,$(gb_UnoApiTarget_HPPFILES_$(1)), \
+	$$(eval $$(call gb_Package_add_file,$(1)_inc,$(patsubst $(1)/%,inc/$(1)/%,$(onefile)),$(onefile))))
+
+$(call gb_Package_get_target,$(1)_inc) : $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+# TODO: make multi repo safe
+define gb_UnoApiTarget_autopackage_idl
+$$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR)))
+$(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
+	$$(eval $$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(onefile)),$(onefile))))
+
+endef
+
+$(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_target,$(1))
+	mkdir -p $$(dir $$@)
+
+define gb_UnoApiTarget_UnoApiTarget
+$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
+$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+gb_UnoApiTarget_HPPFILES_$(1) :=
+gb_UnoApiTarget_IDLFILES_$(1) :=
+
+.DELETE_ON_ERROR : \
+    $(call gb_UnoApiTarget_get_clean_target,$(1)) \
+    $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+define gb_UnoApiTarget_add_idlfiles
+$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile,$(1),$(idl)))
+
+endef
+
+define gb_UnoApiTarget_add_idlfile
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
+$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
+gb_UnoApiTarget_HPPFILES_$(1) += $(2).hdl
+gb_UnoApiTarget_HPPFILES_$(1) += $(2).hpp
+gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
+
+$(call gb_UnoApiTarget_get_header_target,)$(2).hpp :| $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiTarget_get_header_target,)$(2).hdl :| $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+define gb_UnoApiTarget_add_idlfiles_noheader
+$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(idl)))
+
+endef
+
+define gb_UnoApiTarget_add_idlfile_noheader
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
+$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
+gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
+
+endef
+
+define gb_UnoApiTarget_add_idlfiles_nohdl
+$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(idl)))
+
+endef
+
+define gb_UnoApiTarget_add_idlfile_nohdl
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
+$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
+gb_UnoApiTarget_HPPFILES_$(1) += $(2).hpp
+gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
+
+$(call gb_UnoApiTarget_get_header_target,)$(2).hpp :| $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+define gb_UnoApiTarget_add_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_rdbfile,$(1),$(rdb)))
+
+endef
+
+define gb_UnoApiTarget_add_rdbfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiOutTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_target,$(1)) : \
+	$(call gb_UnoApiOutTarget_get_target,$(2)) \
+	$(call gb_Package_get_target,$(2)_idl)
+
+endef
+
+define gb_UnoApiTarget_add_merge_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_merge_rdbfile,$(1),$(rdb)))
+
+endef
+
+define gb_UnoApiTarget_add_merge_rdbfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiOutTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$(2))
+
+endef
+
+#UNOAPI_REFERENCE_$(1) := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
+define gb_UnoApiTarget_add_reference_rdbfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
+
+endef
+
+define gb_UnoApiTarget_set_include
+$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2)
+
+endef
+
+.PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%)
+$(call gb_UnoApiOutTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),UNOAPI,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_UnoApiOutTarget_get_target,$*)) 
+
+.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
+$(call gb_UnoApiTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),UNOAPI,1)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_UnoApiTarget_get_target,$*)) 
+	-rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\
+			$(call gb_UnoApiPartTarget_get_target,$*)
+
+# idlc doesn't return error codes != 0 in case of an error, so
+# check self 
+define gb_UnoApiPartTarget__command
+mkdir -p $(dir $(1)) && \
+	mkdir -p  $(gb_Helper_MISC) && \
+	RESPONSEFILE=`$(gb_MKTEMP)` && \
+	echo "$(call gb_Helper_convert_native,$(5) $(6) -O $(call gb_UnoApiPartTarget_get_target,$(2)) -verbose -C $(4))" > $${RESPONSEFILE} && \
+	$(gb_UnoApiTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
+	rm -f $${RESPONSEFILE} && \
+	test -f $(@)
+
+endef
+
+$(call gb_UnoApiPartTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),IDL,2)
+	$(call gb_UnoApiPartTarget__command,$@,$(dir $*),$<,$?,$(INCLUDE),$(DEFS))
+	
+
+define gb_UnoApiTarget__command
+	mkdir -p $(dir $(1)) && \
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(4) $(5))) && \
+	$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
+	rm -f $${RESPONSEFILE}
+
+endef
+
+define gb_UnoApiHeaderTarget__command
+$(call gb_Helper_abbreviate_dirs_native,\
+	mkdir -p $(dir $(1)) && \
+	mkdir -p  $(gb_Helper_MISC) && \
+	RESPONSEFILE=`$(gb_MKTEMP)` && \
+	echo " -Gc -L -BUCR -O$(call gb_UnoApiTarget_get_header_target,$*) $(7) \
+		$(1) \
+		" > $${RESPONSEFILE} && \
+	$(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
+	rm -f $${RESPONSEFILE})
+
+endef
+
+# TODO:
+# - get idlc switch "-P" (generate .urd into package dir)
+# - generate dependencies for included idls
+# - empty $? in headertarget?
+
+# TODO: reenable the check
+$(call gb_UnoApiTarget_get_target,%):
+	$(call gb_Output_announce,$*,$(true),RDB,3)
+	$(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)))))
+	$(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
+	$(if $(and $(false),$(UNOAPI_REFERENCE)), \
+		$(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
+	    $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@))
+	$(if $(gb_UnoApiTarget_IDLFILES_$*), \
+		$(call gb_Output_announce,$*,$(true),HPP,4) \
+		$(call gb_UnoApiHeaderTarget__command,$@,$*,$<,$?,$(INCLUDE),$(DEFS),$(UNOAPI_DEPS)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0214f14c2f88..220e0e3f77ce 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -173,6 +173,15 @@ else
 $(eval $(call gb_Output_error,Unsupported OS: $(OS)))
 endif
 
+ifeq ($(CROSS_COMPILING),YES)
+# We can safely Assume all cross-compilation is from Unix systems.
+gb_Executable_EXT_for_build :=
+else
+gb_Executable_EXT_for_build := $(gb_Executable_EXT)
+endif
+
+include $(GBUILDDIR)/Tempfile.mk
+
 include $(GBUILDDIR)/Tempfile.mk
 
 include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
@@ -285,6 +294,7 @@ include $(foreach class, \
 	JavaClassSet \
 	JunitTest \
 	Module \
+	UnoApiTarget \
 	Zip \
 ,$(GBUILDDIR)/$(class).mk)
 
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index df39d54a3ddb..09ac56239d9f 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -35,4 +35,28 @@ gb_CFLAGS += -fno-omit-frame-pointer
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
+# No unit testing can be run
+gb_CppunitTest_CPPTESTPRECOMMAND := :
+
+# Set the proper enirotment variable so that our BUILD platform
+# build-time shared libraries are found.
+ifeq ($(OS_FOR_BUILD),MACOSX)
+gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+else
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+endif
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index 591b47bb6d37..4c1c635f57a7 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -41,4 +41,24 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
 
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 39cce14c660d..10b02878c640 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -39,4 +39,24 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index d1ee20edee51..4eb34da2c7ee 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -31,21 +31,19 @@ COM := GCC
 # Darwin mktemp -t expects a prefix, not a pattern
 gb_MKTEMP := /usr/bin/mktemp -t gbuild.
 
-gb_CC := "gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
-gb_CXX := "g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
-gb_GCCP := "gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk"
-gb_AR := ar
-gb_AWK := awk
-gb_CLASSPATHSEP := :
+ifeq ($(CC),)
+$(error You must set CC in the environment. See README.cross for example.)
+endif
+ifeq ($(CXX),)
+$(error You must set CXX in the environment. See README.cross for example.)
+endif
 
-# use CC/CXX if they are nondefaults
-ifneq ($(origin CC),default)
 gb_CC := $(CC)
-gb_GCCP := $(CC)
-endif
-ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
-endif
+gb_GCCP := $(CC)
+gb_AR := ar
+gb_AWK := awk
+gb_CLASSPATHSEP := :
 
 gb_OSDEFS := \
 	-D$(OS) \
@@ -63,11 +61,7 @@ gb_COMPILERDEFS := \
 
 gb_CPUDEFS := -DARM32
 
-gb_SDKDIR := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
-
-
 gb_CFLAGS := \
-	-isysroot $(gb_SDKDIR) \
 	-Wall \
 	-Wendif-labels \
 	-Wextra \
@@ -78,7 +72,6 @@ gb_CFLAGS := \
 	-pipe \
 
 gb_CXXFLAGS := \
-	-isysroot $(gb_SDKDIR) \
 	-Wall \
 	-Wendif-labels \
 	-Wextra \
@@ -96,9 +89,9 @@ gb_CXXFLAGS := \
 
 # these are to get g++ to switch to Objective-C++ mode
 # (see toolkit module for a case where it is necessary to do it this way)
-gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
+gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
 
-gb_OBJCFLAGS := -x objective-c
+gb_OBJCFLAGS := -x objective-c -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
@@ -115,7 +108,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-fno-exceptions \
 
 gb_LinkTarget_LDFLAGS := \
-	-Wl,-syslibroot,$(gb_SDKDIR) \
 	$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete	-Wl,-multiply_defined,suppress \
 
@@ -133,7 +125,7 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
 gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
-# convert parametters filesystem root to native notation
+# convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
@@ -278,6 +270,7 @@ gb_Library_DEFS :=
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .a
+gb_Library_DLLEXT := .a
 gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
 
 gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
@@ -354,14 +347,13 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := :
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
 define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) :
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
 
 endef
@@ -378,11 +370,11 @@ endef
 
 # SdiTarget class
 
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
 # SrsPartMergeTarget
 
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
 # SrsPartTarget class
 
@@ -402,10 +394,23 @@ endef
 
 # ComponentTarget
 
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 gb_Library_COMPONENTPREFIXES := \
 	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
 	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
 
 
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-ARM.mk b/solenv/gbuild/platform/linux-ARM.mk
index df39d54a3ddb..bec4f1bc1d24 100644
--- a/solenv/gbuild/platform/linux-ARM.mk
+++ b/solenv/gbuild/platform/linux-ARM.mk
@@ -33,6 +33,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
-include $(GBUILDDIR)/platform/unxgcc.mk
+include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/linux-AXP.mk
index ebf88fb7f71c..d47484c33ca7 100644
--- a/solenv/gbuild/platform/linux-AXP.mk
+++ b/solenv/gbuild/platform/linux-AXP.mk
@@ -34,6 +34,6 @@ gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_LinkTarget_LDFLAGS += -Wl,--no-relax
 
-include $(GBUILDDIR)/platform/unxgcc.mk
+include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-GODSON.mk b/solenv/gbuild/platform/linux-GODSON.mk
index 0f17660b2122..626323a4e202 100644
--- a/solenv/gbuild/platform/linux-GODSON.mk
+++ b/solenv/gbuild/platform/linux-GODSON.mk
@@ -31,6 +31,6 @@
 gb_CPUDEFS += -DMIPS
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 
-include $(GBUILDDIR)/platform/unxgcc.mk
+include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/linux-HPPA.mk
index ad5fba8ca592..200de396e973 100644
--- a/solenv/gbuild/platform/linux-HPPA.mk
+++ b/solenv/gbuild/platform/linux-HPPA.mk
@@ -31,6 +31,6 @@
 gb_CPUDEFS += -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 
-include $(GBUILDDIR)/platform/unxgcc.mk
+include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/linux-M68K.mk
index 670a33183ea9..4a708f4199e6 100644
--- a/solenv/gbuild/platform/linux-M68K.mk
+++ b/solenv/gbuild/platform/linux-M68K.mk
@@ -33,6 +33,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
 
-include $(GBUILDDIR)/platform/unxgcc.mk
+include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/linux-POWERPC.mk
index ba730c9b265b..c468553ba03a 100644
--- a/solenv/gbuild/platform/linux-POWERPC.mk
+++ b/solenv/gbuild/platform/linux-POWERPC.mk
@@ -33,6 +33,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -fsigned-char
 gb_CFLAGS += -fsigned-char
 
-include $(GBUILDDIR)/platform/unxgcc.mk
+include $(GBUILDDIR)/platform/linux.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 4ef02d54b2f7..b6bc82bb4623 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -30,4 +30,24 @@ gb_LinkTarget_LDFLAGS += \
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
-# vim: set noet sw=4:
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 5f11ede7136c..280df583da0f 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -148,7 +148,14 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
 gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 
-# convert parametters filesystem root to native notation
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
@@ -329,6 +336,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .dylib
+gb_Library_DLLEXT := .dylib
 gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
 
 gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
@@ -472,6 +480,19 @@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_Library_COMPONENTPREFIXES := \
 	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
 	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
index 5644f0cf7941..57fbc057e265 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -41,4 +41,24 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib:/usr/X11R7/lib
 
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index 187c207ac962..d867217e63f7 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -57,4 +57,24 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o $(1))
 endef
 
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index e0547b8de4ec..b78ab48d3341 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -130,7 +130,14 @@ gb_COMPILERNOOPTFLAGS :=
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
-# convert parametters filesystem root to native notation
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
@@ -236,6 +243,7 @@ gb_Library_TARGETTYPEFLAGS := -Bdynamic -z text -G
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .so
+gb_Library_DLLEXT := .so
 gb_Library_RTEXT := C52$(gb_Library_PLAINEXT)
 
 gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
@@ -249,6 +257,7 @@ gb_STDLIBS := \
 gb_Library_PLAINLIBS_NONE += \
 	$(gb_STDLIBS) \
 	dl \
+	fontconfig \
 	freetype \
 	GL \
 	GLU \
@@ -392,5 +401,17 @@ gb_Library_COMPONENTPREFIXES := \
 	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
 	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
     NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 59c3a4eb091d..9083d4c60886 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,6 +120,10 @@ ifeq ($(HAVE_CXX0X),TRUE)
 gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
 endif
 
+ifeq ($(ENABLE_DEBUG_STL),TRUE)
+gb_CXXFLAGS += -D_GLIBCXX_DEBUG
+endif
+
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
@@ -178,7 +182,7 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
-# convert parametters filesystem root to native notation
+# convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
@@ -263,7 +267,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
 		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
 		$(LIBS) \
-		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
+		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
 		-o $(1))
 endef
 
@@ -292,6 +296,7 @@ gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .so
+gb_Library_DLLEXT := .so
 gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
 
 gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 5e322b158043..fb244c450639 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -243,7 +243,18 @@ endef
 
 gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 
-# convert parametters filesystem root to native notation
+# convert parameters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
+# convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
@@ -383,6 +394,8 @@ gb_Library_get_rpath :=
 gb_Library_SYSPRE := i
 gb_Library_PLAINEXT := .lib
 
+gb_Library_win32_OLDNAMES := oldnames
+
 gb_Library_PLAINLIBS_NONE += \
 	advapi32 \
 	d3d9 \
@@ -397,7 +410,7 @@ gb_Library_PLAINLIBS_NONE += \
 	msvcrt \
 	msvcprt \
 	mpr \
-	oldnames \
+	$(gb_Library_win32_OLDNAMES) \
 	ole32 \
 	oleaut32 \
 	shell32 \
@@ -465,7 +478,7 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
 
 endif
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
@@ -537,7 +550,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2),\
 
 $(call gb_Executable_get_target,$(1)) \
 $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest)
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest,$(1))
 
 $(call gb_LinkTarget_get_target,$(2)) \
 $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
@@ -704,4 +717,17 @@ gb_Library_COMPONENTPREFIXES := \
 	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
     NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index a8e981461144..1bf118242ccb 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -38,9 +38,9 @@ gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
 gb_CC := $(CC)
 gb_CXX := $(CXX)
-gb_LINK := $(shell $(CC) -print-prog-name=ld)
 gb_AR := $(shell $(CC) -print-prog-name=ar)
 gb_AWK := awk
+gb_RC := $(WINDRES)
 ifeq ($(USE_MINGW),cygwin)
 gb_MINGWLIBDIR := $(COMPATH)/lib/mingw
 else
@@ -84,7 +84,6 @@ endif
 
 gb_COMPILERDEFS := \
 	-DGCC \
-	-DGLIBC=2 \
 	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 	-DCPPU_ENV=gcc3 \
 	-D_MT \
@@ -114,7 +113,6 @@ gb_CFLAGS := \
 	-fmessage-length=0 \
 	-fno-strict-aliasing \
 	-pipe \
-	-nostdinc \
 
 gb_CXXFLAGS := \
 	-Wall \
@@ -128,7 +126,6 @@ gb_CXXFLAGS := \
 	-fmessage-length=0 \
 	-fno-strict-aliasing \
 	-pipe \
-	-nostdinc \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
 gb_CFLAGS_WERROR := -Werror
@@ -154,13 +151,10 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
-	--export-all-symbols \
-	--kill-at \
-	--exclude-libs ALL \
-	--enable-stdcall-fixup \
-	--enable-runtime-pseudo-reloc-v2 \
-	-L$(gb_Library_DLLDIR) \
-	$(patsubst %,-L%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+	-Wl,--export-all-symbols \
+	-Wl,--enable-stdcall-fixup \
+	-Wl,--enable-runtime-pseudo-reloc-v2 \
+	$(subst -L../lib , ,$(SOLARLIB)) \
 
 ifeq ($(MINGW_GCCLIB_EH),YES)
 gb_LinkTarget_LDFLAGS += -shared-libgcc
@@ -182,11 +176,7 @@ gb_STDLIBS := \
 	mingw32 \
 	$(gb_MINGW_LIBGCC) \
 	uwinapi \
-	moldname \
 	mingwex \
-	kernel32 \
-	msvcrt \
-	msvcprt \
 
 
 # Helper class
@@ -203,12 +193,33 @@ gb_Helper_OUTDIR_NATIVE := $(OUTDIR)
 gb_Helper_REPODIR_NATIVE := $(REPODIR)
 endif
 
+# convert parameters filesystem root to native notation
 define gb_Helper_abbreviate_dirs_native
 R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
 endef
 
-# convert parametters filesystem root to native notation
+# Set the proper enirotment variable so that our BUILD platform
+# build-time shared libraries are found.
+ifeq ($(OS_FOR_BUILD),WNT)
+gb_Helper_set_ld_path := PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH
+else ifeq ($(OS_FOR_BUILD),MACOSX)
+gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+else
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
+endif
+
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
+# convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
@@ -224,7 +235,7 @@ endef
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_Object__command_deponcompile
 $(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+	$(OUTDIR_FOR_BUILD)/bin/makedepend \
 		$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
 		-I$(dir $(3)) \
 		$(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
@@ -286,7 +297,7 @@ gb_PrecompiledHeader_get_enableflags = -I$(WORKDIR)/PrecompiledHeader/$(gb_Preco
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_PrecompiledHeader__command_deponcompile
 $(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+	$(OUTDIR_FOR_BUILD)/bin/makedepend \
 		$(4) $(5) \
 		-I$(dir $(3)) \
 		$(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
@@ -329,7 +340,7 @@ gb_NoexPrecompiledHeader_get_enableflags = -I$(WORKDIR)/NoexPrecompiledHeader/$(
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_NoexPrecompiledHeader__command_deponcompile
 $(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+	$(OUTDIR_FOR_BUILD)/bin/makedepend \
 		$(4) $(5) \
 		-I$(dir $(3)) \
 		$(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
@@ -382,61 +393,47 @@ define gb_LinkTarget__command_dynamiclinkexecutable
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
-	$(gb_LINK) \
+	$(gb_CXX) $(strip \
 		$(gb_Executable_TARGETTYPEFLAGS) \
 		$(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
-		$(T_LDFLAGS) \
-		$(gb_MINGWLIBDIR)/crt2.o \
-		$(MINGW_CLIB_DIR)/crtbegin.o \
-		@$${RESPONSEFILE} \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
-		--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
+		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
 		$(LIBS) \
-		$(MINGW_CLIB_DIR)/crtend.o \
-		-Map $(basename $(1)).map \
-		-o $(1))
+		-Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \
+		-o $(1)))
 endef
 
 define gb_LinkTarget__command_dynamiclinklibrary
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
-	rm -f $(1) && \
-	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
-	$(gb_LINK) \
+	$(gb_CXX) $(strip \
 		$(gb_Library_TARGETTYPEFLAGS) \
 		$(T_LDFLAGS) \
-		--enable-auto-image-base \
-		-e _DllMainCRTStartup@12 \
-		$(gb_MINGWLIBDIR)/dllcrt2.o \
-		$(MINGW_CLIB_DIR)/crtbegin.o \
-		@$${RESPONSEFILE} \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
-		--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
+		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
 		$(LIBS) \
-		$(MINGW_CLIB_DIR)/crtend.o \
-		-Map $(basename $(DLLTARGET)).map \
-		-o $(DLLTARGET) && touch $(1))
+		-Wl$(COMMA)-Map$(COMMA)$(basename $(DLLTARGET)).map \
+		-Wl$(COMMA)--out-implib$(COMMA)$(1) \
+		-o $(dir $(1))/$(notdir $(DLLTARGET))))
 endef
 
 define gb_LinkTarget__command_staticlinklibrary
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo "$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+	$(gb_AR) -rsu $(1) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
-	$(gb_AR) -rsu\
-		$(1) \
-		@$${RESPONSEFILE})
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
+		2> /dev/null)
 endef
 
 define gb_LinkTarget__command
@@ -453,8 +450,27 @@ gb_Library_DEFS := -D_DLL
 gb_Library_TARGETTYPEFLAGS := -shared
 gb_Library_get_rpath :=
 
-gb_Library_SYSPRE := i
-gb_Library_PLAINEXT := .lib
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_UDK_MAJORVER := 3
+
+gb_Library_PLAINEXT := .dll.a
+
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+gb_Library_RTVEREXT := $(gb_Library_RTEXT)
+gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT)
+
+gb_Library_DLLEXT := .dll
+
+gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT)
+gb_Library_RTVERDLLEXT := $(gb_Library_RTDLLEXT)
+gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
+gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT)
+gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT)
+
+gb_Library_win32_OLDNAMES := moldname
 
 gb_Library_PLAINLIBS_NONE += \
 	mingwthrd \
@@ -469,11 +485,13 @@ gb_Library_PLAINLIBS_NONE += \
 	gdi32 \
 	gdiplus \
 	gnu_getopt \
+	imm32 \
 	kernel32 \
+	msimg32 \
 	msvcrt \
 	msvcprt \
 	mpr \
-	moldname \
+	$(gb_Library_win32_OLDNAMES) \
 	ole32 \
 	oleaut32 \
 	shell32 \
@@ -483,6 +501,8 @@ gb_Library_PLAINLIBS_NONE += \
 	uuid \
 	uwinapi \
 	winmm \
+	version \
+	winspool \
 
 gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@ -496,26 +516,27 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
 
 gb_Library_FILENAMES :=\
-	$(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
 
-gb_Library_DLLEXT := .dll
-gb_Library_MAJORVER := 3
-gb_Library_RTEXT := gcc3$(gb_Library_DLLEXT)
-gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
-gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
-gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT)
-
-gb_Library_DLLFILENAMES := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
+
+gb_Library_DLLFILENAMES :=\
+	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
+	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \
+	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
+	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \
 
 gb_Library_IARCSYSPRE := lib
 gb_Library_IARCEXT := .a
@@ -523,7 +544,7 @@ gb_Library_IARCEXT := .a
 gb_Library_ILIBEXT := .lib
 
 define gb_Library_Library_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
+$(call gb_LinkTarget_set_dlltarget,$(2),$(OUTDIR)/bin/$(notdir $(3)))
 
 $(call gb_LinkTarget_set_auxtargets,$(2),\
 	$(patsubst %.dll,%.map,$(3)) \
@@ -532,7 +553,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2),\
 $(call gb_Library_get_target,$(1)) \
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 
 endef
 
@@ -560,6 +581,10 @@ define gb_Library_get_dllname
 $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
 endef
 
+define gb_Library_get_implibname
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+endef
+
 
 # StaticLibrary class
 
@@ -586,7 +611,11 @@ gb_Executable_TARGETGUI :=
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND :=
+ifeq ($(CROSS_COMPILING),YES)
+gb_CppunitTest_CPPTESTPRECOMMAND := :
+else
+gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+endif
 gb_CppunitTest_SYSPRE := itest_
 gb_CppunitTest_EXT := .lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
@@ -603,21 +632,21 @@ endef
 
 # SdiTarget class
 
-gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
 
 # SrsPartMergeTarget
 
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
 
 # SrsPartTarget class
 
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc.exe
-gb_SrsPartTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+	$(OUTDIR_FOR_BUILD)/bin/makedepend \
 		$(INCLUDE) \
 		$(DEFS) \
 		$(2) \
@@ -636,7 +665,7 @@ endif
 
 # WinResTarget class
 
-gb_WinResTarget_POSTFIX :=_res.o
+gb_WinResTarget_POSTFIX :=.res
 
 define gb_WinResTarget__command
 $(call gb_Output_announce,$(2),$(true),RES,3)
@@ -646,10 +675,8 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(DEFS) $(FLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE) \
-		-Fo$(patsubst %_res.o,%.res,$(1)) \
+		-o $(1) \
 		$(RCFILE) )
-	windres $(patsubst %_res.o,%.res,$(1)) $(1)
-	rm $(patsubst %_res.o,%.res,$(1))
 endef
 
 $(eval $(call gb_Helper_make_dep_targets,\
@@ -659,7 +686,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_WinResTarget__command_dep
 $(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+	$(OUTDIR_FOR_BUILD)/bin/makedepend \
 		$(INCLUDE) \
 		$(DEFS) \
 		$(2) \
@@ -678,10 +705,23 @@ endif
 
 # ComponentTarget
 
-gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
 gb_Library_COMPONENTPREFIXES := \
 	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
 	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+	
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
 
 # vim: set noet sw=4:
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index cf56b9c31f9c..bb2dabe62a9a 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -76,7 +76,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -95,7 +94,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP1RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -103,7 +101,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
     @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_1.cmd
@@ -114,7 +111,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -132,7 +128,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
 .ENDIF			# "$(APP1LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
     @cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP1RESO)
@@ -144,12 +139,11 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \
         -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \
         $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_1.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP1LINKER) @$(mktmp \
@@ -288,7 +282,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -307,7 +300,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP2RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -315,7 +307,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
     @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_2.cmd
@@ -326,7 +317,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -344,7 +334,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
 .ENDIF			# "$(APP2LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
     @cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP2RESO)
@@ -356,12 +345,11 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \
         -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \
         $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_2.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP2LINKER) @$(mktmp \
@@ -500,7 +488,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -519,7 +506,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP3RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -527,7 +513,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
     @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_3.cmd
@@ -538,7 +523,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -556,7 +540,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
 .ENDIF			# "$(APP3LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
     @cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP3RESO)
@@ -568,12 +551,11 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \
         -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \
         $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_3.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP3LINKER) @$(mktmp \
@@ -712,7 +694,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -731,7 +712,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP4RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -739,7 +719,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
     @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_4.cmd
@@ -750,7 +729,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -768,7 +746,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
 .ENDIF			# "$(APP4LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
     @cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP4RESO)
@@ -780,12 +757,11 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \
         -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \
         $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_4.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP4LINKER) @$(mktmp \
@@ -924,7 +900,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -943,7 +918,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP5RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -951,7 +925,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
     @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_5.cmd
@@ -962,7 +935,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -980,7 +952,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
 .ENDIF			# "$(APP5LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
     @cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP5RESO)
@@ -992,12 +963,11 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \
         -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \
         $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_5.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP5LINKER) @$(mktmp \
@@ -1136,7 +1106,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -1155,7 +1124,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP6RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -1163,7 +1131,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
     @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_6.cmd
@@ -1174,7 +1141,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -1192,7 +1158,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
 .ENDIF			# "$(APP6LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
     @cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP6RESO)
@@ -1204,12 +1169,11 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \
         -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \
         $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_6.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP6LINKER) @$(mktmp \
@@ -1348,7 +1312,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -1367,7 +1330,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP7RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -1375,7 +1337,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
     @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_7.cmd
@@ -1386,7 +1347,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -1404,7 +1364,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
 .ENDIF			# "$(APP7LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
     @cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP7RESO)
@@ -1416,12 +1375,11 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \
         -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \
         $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_7.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP7LINKER) @$(mktmp \
@@ -1560,7 +1518,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -1579,7 +1536,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP8RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -1587,7 +1543,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
     @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_8.cmd
@@ -1598,7 +1553,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -1616,7 +1570,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
 .ENDIF			# "$(APP8LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
     @cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP8RESO)
@@ -1628,12 +1581,11 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \
         -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \
         $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_8.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP8LINKER) @$(mktmp \
@@ -1772,7 +1724,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -1791,7 +1742,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP9RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -1799,7 +1749,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
     @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_9.cmd
@@ -1810,7 +1759,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -1828,7 +1776,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
 .ENDIF			# "$(APP9LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
     @cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP9RESO)
@@ -1840,12 +1787,11 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \
         -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \
         $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_9.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP9LINKER) @$(mktmp \
@@ -1984,7 +1930,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -2003,7 +1948,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP10RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -2011,7 +1955,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
     @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_10.cmd
@@ -2022,7 +1965,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -2040,7 +1982,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
 .ENDIF			# "$(APP10LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
     @cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP10RESO)
@@ -2052,12 +1993,11 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         $(APP_LINKTYPE) $(APP10LIBSALCPPRT) \
         -Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \
         $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_10.cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_10.cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP10LINKER) @$(mktmp \
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index ea9d53ed5ea2..b0b35d8d5c99 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -56,95 +56,95 @@ $(DEF1TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF1TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB1NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL1TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL1TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
 .ELSE
 .IF "$(SHL1USE_EXPORTS)"==""
-    @-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
 .ELSE			# "$(SHL1USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL1USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB1NAME)"!=""
 .IF "$(DEF1EXPORT1)"!=""
-    @echo $(DEF1EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT2)"!=""
-    @echo $(DEF1EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT3)"!=""
-    @echo $(DEF1EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT4)"!=""
-    @echo $(DEF1EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT5)"!=""
-    @echo $(DEF1EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT6)"!=""
-    @echo $(DEF1EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT7)"!=""
-    @echo $(DEF1EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT8)"!=""
-    @echo $(DEF1EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT9)"!=""
-    @echo $(DEF1EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT10)"!=""
-    @echo $(DEF1EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT11)"!=""
-    @echo $(DEF1EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT12)"!=""
-    @echo $(DEF1EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT13)"!=""
-    @echo $(DEF1EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT14)"!=""
-    @echo $(DEF1EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT15)"!=""
-    @echo $(DEF1EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT16)"!=""
-    @echo $(DEF1EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT17)"!=""
-    @echo $(DEF1EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT18)"!=""
-    @echo $(DEF1EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT19)"!=""
-    @echo $(DEF1EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORT20)"!=""
-    @echo $(DEF1EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF1EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF1EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -153,15 +153,15 @@ $(DEF1TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF1TARGETN): \
         $(DEF1DEPN) \
         $(DEF1EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF1TARGETN)"!=""
 
@@ -225,95 +225,95 @@ $(DEF2TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF2TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB2NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL2TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL2TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
 .ELSE
 .IF "$(SHL2USE_EXPORTS)"==""
-    @-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
 .ELSE			# "$(SHL2USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL2USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB2NAME)"!=""
 .IF "$(DEF2EXPORT1)"!=""
-    @echo $(DEF2EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT2)"!=""
-    @echo $(DEF2EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT3)"!=""
-    @echo $(DEF2EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT4)"!=""
-    @echo $(DEF2EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT5)"!=""
-    @echo $(DEF2EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT6)"!=""
-    @echo $(DEF2EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT7)"!=""
-    @echo $(DEF2EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT8)"!=""
-    @echo $(DEF2EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT9)"!=""
-    @echo $(DEF2EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT10)"!=""
-    @echo $(DEF2EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT11)"!=""
-    @echo $(DEF2EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT12)"!=""
-    @echo $(DEF2EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT13)"!=""
-    @echo $(DEF2EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT14)"!=""
-    @echo $(DEF2EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT15)"!=""
-    @echo $(DEF2EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT16)"!=""
-    @echo $(DEF2EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT17)"!=""
-    @echo $(DEF2EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT18)"!=""
-    @echo $(DEF2EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT19)"!=""
-    @echo $(DEF2EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORT20)"!=""
-    @echo $(DEF2EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF2EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF2EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -322,15 +322,15 @@ $(DEF2TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF2TARGETN): \
         $(DEF2DEPN) \
         $(DEF2EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF2TARGETN)"!=""
 
@@ -394,95 +394,95 @@ $(DEF3TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF3TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB3NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL3TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL3TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
 .ELSE
 .IF "$(SHL3USE_EXPORTS)"==""
-    @-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
 .ELSE			# "$(SHL3USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL3USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB3NAME)"!=""
 .IF "$(DEF3EXPORT1)"!=""
-    @echo $(DEF3EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT2)"!=""
-    @echo $(DEF3EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT3)"!=""
-    @echo $(DEF3EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT4)"!=""
-    @echo $(DEF3EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT5)"!=""
-    @echo $(DEF3EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT6)"!=""
-    @echo $(DEF3EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT7)"!=""
-    @echo $(DEF3EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT8)"!=""
-    @echo $(DEF3EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT9)"!=""
-    @echo $(DEF3EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT10)"!=""
-    @echo $(DEF3EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT11)"!=""
-    @echo $(DEF3EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT12)"!=""
-    @echo $(DEF3EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT13)"!=""
-    @echo $(DEF3EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT14)"!=""
-    @echo $(DEF3EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT15)"!=""
-    @echo $(DEF3EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT16)"!=""
-    @echo $(DEF3EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT17)"!=""
-    @echo $(DEF3EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT18)"!=""
-    @echo $(DEF3EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT19)"!=""
-    @echo $(DEF3EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORT20)"!=""
-    @echo $(DEF3EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF3EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF3EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -491,15 +491,15 @@ $(DEF3TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF3EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF3TARGETN): \
         $(DEF3DEPN) \
         $(DEF3EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF3TARGETN)"!=""
 
@@ -563,95 +563,95 @@ $(DEF4TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF4TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB4NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL4TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL4TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
 .ELSE
 .IF "$(SHL4USE_EXPORTS)"==""
-    @-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
 .ELSE			# "$(SHL4USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL4USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB4NAME)"!=""
 .IF "$(DEF4EXPORT1)"!=""
-    @echo $(DEF4EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT2)"!=""
-    @echo $(DEF4EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT3)"!=""
-    @echo $(DEF4EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT4)"!=""
-    @echo $(DEF4EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT5)"!=""
-    @echo $(DEF4EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT6)"!=""
-    @echo $(DEF4EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT7)"!=""
-    @echo $(DEF4EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT8)"!=""
-    @echo $(DEF4EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT9)"!=""
-    @echo $(DEF4EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT10)"!=""
-    @echo $(DEF4EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT11)"!=""
-    @echo $(DEF4EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT12)"!=""
-    @echo $(DEF4EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT13)"!=""
-    @echo $(DEF4EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT14)"!=""
-    @echo $(DEF4EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT15)"!=""
-    @echo $(DEF4EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT16)"!=""
-    @echo $(DEF4EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT17)"!=""
-    @echo $(DEF4EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT18)"!=""
-    @echo $(DEF4EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT19)"!=""
-    @echo $(DEF4EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORT20)"!=""
-    @echo $(DEF4EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF4EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF4EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -660,15 +660,15 @@ $(DEF4TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF4EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF4TARGETN): \
         $(DEF4DEPN) \
         $(DEF4EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF4TARGETN)"!=""
 
@@ -732,95 +732,95 @@ $(DEF5TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF5TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB5NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL5TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL5TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
 .ELSE
 .IF "$(SHL5USE_EXPORTS)"==""
-    @-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
 .ELSE			# "$(SHL5USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL5USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB5NAME)"!=""
 .IF "$(DEF5EXPORT1)"!=""
-    @echo $(DEF5EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT2)"!=""
-    @echo $(DEF5EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT3)"!=""
-    @echo $(DEF5EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT4)"!=""
-    @echo $(DEF5EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT5)"!=""
-    @echo $(DEF5EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT6)"!=""
-    @echo $(DEF5EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT7)"!=""
-    @echo $(DEF5EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT8)"!=""
-    @echo $(DEF5EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT9)"!=""
-    @echo $(DEF5EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT10)"!=""
-    @echo $(DEF5EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT11)"!=""
-    @echo $(DEF5EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT12)"!=""
-    @echo $(DEF5EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT13)"!=""
-    @echo $(DEF5EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT14)"!=""
-    @echo $(DEF5EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT15)"!=""
-    @echo $(DEF5EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT16)"!=""
-    @echo $(DEF5EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT17)"!=""
-    @echo $(DEF5EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT18)"!=""
-    @echo $(DEF5EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT19)"!=""
-    @echo $(DEF5EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORT20)"!=""
-    @echo $(DEF5EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF5EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF5EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -829,15 +829,15 @@ $(DEF5TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF5EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF5TARGETN): \
         $(DEF5DEPN) \
         $(DEF5EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF5TARGETN)"!=""
 
@@ -901,95 +901,95 @@ $(DEF6TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF6TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB6NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL6TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL6TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
 .ELSE
 .IF "$(SHL6USE_EXPORTS)"==""
-    @-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
 .ELSE			# "$(SHL6USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL6USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB6NAME)"!=""
 .IF "$(DEF6EXPORT1)"!=""
-    @echo $(DEF6EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT2)"!=""
-    @echo $(DEF6EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT3)"!=""
-    @echo $(DEF6EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT4)"!=""
-    @echo $(DEF6EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT5)"!=""
-    @echo $(DEF6EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT6)"!=""
-    @echo $(DEF6EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT7)"!=""
-    @echo $(DEF6EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT8)"!=""
-    @echo $(DEF6EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT9)"!=""
-    @echo $(DEF6EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT10)"!=""
-    @echo $(DEF6EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT11)"!=""
-    @echo $(DEF6EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT12)"!=""
-    @echo $(DEF6EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT13)"!=""
-    @echo $(DEF6EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT14)"!=""
-    @echo $(DEF6EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT15)"!=""
-    @echo $(DEF6EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT16)"!=""
-    @echo $(DEF6EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT17)"!=""
-    @echo $(DEF6EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT18)"!=""
-    @echo $(DEF6EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT19)"!=""
-    @echo $(DEF6EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORT20)"!=""
-    @echo $(DEF6EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF6EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF6EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -998,15 +998,15 @@ $(DEF6TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF6EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF6TARGETN): \
         $(DEF6DEPN) \
         $(DEF6EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF6TARGETN)"!=""
 
@@ -1070,95 +1070,95 @@ $(DEF7TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF7TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB7NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL7TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL7TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
 .ELSE
 .IF "$(SHL7USE_EXPORTS)"==""
-    @-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
 .ELSE			# "$(SHL7USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL7USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB7NAME)"!=""
 .IF "$(DEF7EXPORT1)"!=""
-    @echo $(DEF7EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT2)"!=""
-    @echo $(DEF7EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT3)"!=""
-    @echo $(DEF7EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT4)"!=""
-    @echo $(DEF7EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT5)"!=""
-    @echo $(DEF7EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT6)"!=""
-    @echo $(DEF7EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT7)"!=""
-    @echo $(DEF7EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT8)"!=""
-    @echo $(DEF7EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT9)"!=""
-    @echo $(DEF7EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT10)"!=""
-    @echo $(DEF7EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT11)"!=""
-    @echo $(DEF7EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT12)"!=""
-    @echo $(DEF7EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT13)"!=""
-    @echo $(DEF7EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT14)"!=""
-    @echo $(DEF7EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT15)"!=""
-    @echo $(DEF7EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT16)"!=""
-    @echo $(DEF7EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT17)"!=""
-    @echo $(DEF7EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT18)"!=""
-    @echo $(DEF7EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT19)"!=""
-    @echo $(DEF7EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORT20)"!=""
-    @echo $(DEF7EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF7EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF7EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -1167,15 +1167,15 @@ $(DEF7TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF7EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF7TARGETN): \
         $(DEF7DEPN) \
         $(DEF7EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF7TARGETN)"!=""
 
@@ -1239,95 +1239,95 @@ $(DEF8TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF8TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB8NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL8TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL8TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
 .ELSE
 .IF "$(SHL8USE_EXPORTS)"==""
-    @-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
 .ELSE			# "$(SHL8USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL8USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB8NAME)"!=""
 .IF "$(DEF8EXPORT1)"!=""
-    @echo $(DEF8EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT2)"!=""
-    @echo $(DEF8EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT3)"!=""
-    @echo $(DEF8EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT4)"!=""
-    @echo $(DEF8EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT5)"!=""
-    @echo $(DEF8EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT6)"!=""
-    @echo $(DEF8EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT7)"!=""
-    @echo $(DEF8EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT8)"!=""
-    @echo $(DEF8EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT9)"!=""
-    @echo $(DEF8EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT10)"!=""
-    @echo $(DEF8EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT11)"!=""
-    @echo $(DEF8EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT12)"!=""
-    @echo $(DEF8EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT13)"!=""
-    @echo $(DEF8EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT14)"!=""
-    @echo $(DEF8EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT15)"!=""
-    @echo $(DEF8EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT16)"!=""
-    @echo $(DEF8EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT17)"!=""
-    @echo $(DEF8EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT18)"!=""
-    @echo $(DEF8EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT19)"!=""
-    @echo $(DEF8EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORT20)"!=""
-    @echo $(DEF8EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF8EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF8EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -1336,15 +1336,15 @@ $(DEF8TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF8EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF8TARGETN): \
         $(DEF8DEPN) \
         $(DEF8EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF8TARGETN)"!=""
 
@@ -1408,95 +1408,95 @@ $(DEF9TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF9TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB9NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL9TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL9TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
 .ELSE
 .IF "$(SHL9USE_EXPORTS)"==""
-    @-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
 .ELSE			# "$(SHL9USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL9USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB9NAME)"!=""
 .IF "$(DEF9EXPORT1)"!=""
-    @echo $(DEF9EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT2)"!=""
-    @echo $(DEF9EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT3)"!=""
-    @echo $(DEF9EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT4)"!=""
-    @echo $(DEF9EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT5)"!=""
-    @echo $(DEF9EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT6)"!=""
-    @echo $(DEF9EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT7)"!=""
-    @echo $(DEF9EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT8)"!=""
-    @echo $(DEF9EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT9)"!=""
-    @echo $(DEF9EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT10)"!=""
-    @echo $(DEF9EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT11)"!=""
-    @echo $(DEF9EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT12)"!=""
-    @echo $(DEF9EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT13)"!=""
-    @echo $(DEF9EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT14)"!=""
-    @echo $(DEF9EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT15)"!=""
-    @echo $(DEF9EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT16)"!=""
-    @echo $(DEF9EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT17)"!=""
-    @echo $(DEF9EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT18)"!=""
-    @echo $(DEF9EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT19)"!=""
-    @echo $(DEF9EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORT20)"!=""
-    @echo $(DEF9EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF9EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF9EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -1505,15 +1505,15 @@ $(DEF9TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF9EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF9TARGETN): \
         $(DEF9DEPN) \
         $(DEF9EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF9TARGETN)"!=""
 
@@ -1577,95 +1577,95 @@ $(DEF10TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF10TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB10NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL10TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL10TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
 .ELSE
 .IF "$(SHL10USE_EXPORTS)"==""
-    @-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
 .ELSE			# "$(SHL10USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL10USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB10NAME)"!=""
 .IF "$(DEF10EXPORT1)"!=""
-    @echo $(DEF10EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT2)"!=""
-    @echo $(DEF10EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT3)"!=""
-    @echo $(DEF10EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT4)"!=""
-    @echo $(DEF10EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT5)"!=""
-    @echo $(DEF10EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT6)"!=""
-    @echo $(DEF10EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT7)"!=""
-    @echo $(DEF10EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT8)"!=""
-    @echo $(DEF10EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT9)"!=""
-    @echo $(DEF10EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT10)"!=""
-    @echo $(DEF10EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT11)"!=""
-    @echo $(DEF10EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT12)"!=""
-    @echo $(DEF10EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT13)"!=""
-    @echo $(DEF10EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT14)"!=""
-    @echo $(DEF10EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT15)"!=""
-    @echo $(DEF10EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT16)"!=""
-    @echo $(DEF10EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT17)"!=""
-    @echo $(DEF10EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT18)"!=""
-    @echo $(DEF10EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT19)"!=""
-    @echo $(DEF10EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORT20)"!=""
-    @echo $(DEF10EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF10EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF10EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -1674,15 +1674,15 @@ $(DEF10TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF10EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF10TARGETN): \
         $(DEF10DEPN) \
         $(DEF10EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF10TARGETN)"!=""
 
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 4f1d099dbdf8..a60f9cec8a47 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -66,13 +66,15 @@ SHL1IMPLIB=i$(TARGET)_t1
 USE_1IMPLIB=-implib:$(LB)/$(SHL1IMPLIB).lib
 SHL1IMPLIBN=$(LB)/$(SHL1IMPLIB).lib
 .ELSE
-SHL1IMPLIBN=$(LB)/lib$(SHL1IMPLIB).dll.a
 USE_1IMPLIB=-Wl,--out-implib=$(SHL1IMPLIBN)
+SHL1IMPLIBN=$(LB)/lib$(SHL1IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL1IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL1DEF=$(SHL1DEF)
@@ -241,6 +243,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL1IMPLIBN)" != ""
+$(SHL1IMPLIBN) : $(SHL1TARGETN)
+.ENDIF
+
 $(SHL1TARGETN) : \
                     $(SHL1OBJS)\
                     $(SHL1LIBS)\
@@ -284,10 +290,10 @@ $(SHL1TARGETN) : \
     $(WINDRES) $(SHL1LINKRES) $(SHL1LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL1ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL1LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -309,13 +315,6 @@ $(SHL1TARGETN) : \
     @noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB1NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL1TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL1VERSIONOBJ) \
-        @(ALL1OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL1LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -323,7 +322,7 @@ $(SHL1TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL1DEF) \
         $(USE_1IMPLIB) \
         $(STDOBJ) \
         $(SHL1VERSIONOBJ) $(SHL1OBJS) \
@@ -571,13 +570,15 @@ SHL2IMPLIB=i$(TARGET)_t2
 USE_2IMPLIB=-implib:$(LB)/$(SHL2IMPLIB).lib
 SHL2IMPLIBN=$(LB)/$(SHL2IMPLIB).lib
 .ELSE
-SHL2IMPLIBN=$(LB)/lib$(SHL2IMPLIB).dll.a
 USE_2IMPLIB=-Wl,--out-implib=$(SHL2IMPLIBN)
+SHL2IMPLIBN=$(LB)/lib$(SHL2IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL2IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL2DEF=$(SHL2DEF)
@@ -746,6 +747,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL2IMPLIBN)" != ""
+$(SHL2IMPLIBN) : $(SHL2TARGETN)
+.ENDIF
+
 $(SHL2TARGETN) : \
                     $(SHL2OBJS)\
                     $(SHL2LIBS)\
@@ -789,10 +794,10 @@ $(SHL2TARGETN) : \
     $(WINDRES) $(SHL2LINKRES) $(SHL2LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL2ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL2LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -814,13 +819,6 @@ $(SHL2TARGETN) : \
     @noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB2NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL2TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL2VERSIONOBJ) \
-        @(ALL2OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL2LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -828,7 +826,7 @@ $(SHL2TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL2DEF) \
         $(USE_2IMPLIB) \
         $(STDOBJ) \
         $(SHL2VERSIONOBJ) $(SHL2OBJS) \
@@ -1076,13 +1074,15 @@ SHL3IMPLIB=i$(TARGET)_t3
 USE_3IMPLIB=-implib:$(LB)/$(SHL3IMPLIB).lib
 SHL3IMPLIBN=$(LB)/$(SHL3IMPLIB).lib
 .ELSE
-SHL3IMPLIBN=$(LB)/lib$(SHL3IMPLIB).dll.a
 USE_3IMPLIB=-Wl,--out-implib=$(SHL3IMPLIBN)
+SHL3IMPLIBN=$(LB)/lib$(SHL3IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL3IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL3DEF=$(SHL3DEF)
@@ -1251,6 +1251,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL3IMPLIBN)" != ""
+$(SHL3IMPLIBN) : $(SHL3TARGETN)
+.ENDIF
+
 $(SHL3TARGETN) : \
                     $(SHL3OBJS)\
                     $(SHL3LIBS)\
@@ -1294,10 +1298,10 @@ $(SHL3TARGETN) : \
     $(WINDRES) $(SHL3LINKRES) $(SHL3LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL3ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL3LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -1319,13 +1323,6 @@ $(SHL3TARGETN) : \
     @noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB3NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL3TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL3VERSIONOBJ) \
-        @(ALL3OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL3LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -1333,7 +1330,7 @@ $(SHL3TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL3DEF) \
         $(USE_3IMPLIB) \
         $(STDOBJ) \
         $(SHL3VERSIONOBJ) $(SHL3OBJS) \
@@ -1581,13 +1578,15 @@ SHL4IMPLIB=i$(TARGET)_t4
 USE_4IMPLIB=-implib:$(LB)/$(SHL4IMPLIB).lib
 SHL4IMPLIBN=$(LB)/$(SHL4IMPLIB).lib
 .ELSE
-SHL4IMPLIBN=$(LB)/lib$(SHL4IMPLIB).dll.a
 USE_4IMPLIB=-Wl,--out-implib=$(SHL4IMPLIBN)
+SHL4IMPLIBN=$(LB)/lib$(SHL4IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL4IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL4DEF=$(SHL4DEF)
@@ -1756,6 +1755,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL4IMPLIBN)" != ""
+$(SHL4IMPLIBN) : $(SHL4TARGETN)
+.ENDIF
+
 $(SHL4TARGETN) : \
                     $(SHL4OBJS)\
                     $(SHL4LIBS)\
@@ -1799,10 +1802,10 @@ $(SHL4TARGETN) : \
     $(WINDRES) $(SHL4LINKRES) $(SHL4LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL4ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL4LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -1824,13 +1827,6 @@ $(SHL4TARGETN) : \
     @noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB4NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL4TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL4VERSIONOBJ) \
-        @(ALL4OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL4LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -1838,7 +1834,7 @@ $(SHL4TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL4DEF) \
         $(USE_4IMPLIB) \
         $(STDOBJ) \
         $(SHL4VERSIONOBJ) $(SHL4OBJS) \
@@ -2086,13 +2082,15 @@ SHL5IMPLIB=i$(TARGET)_t5
 USE_5IMPLIB=-implib:$(LB)/$(SHL5IMPLIB).lib
 SHL5IMPLIBN=$(LB)/$(SHL5IMPLIB).lib
 .ELSE
-SHL5IMPLIBN=$(LB)/lib$(SHL5IMPLIB).dll.a
 USE_5IMPLIB=-Wl,--out-implib=$(SHL5IMPLIBN)
+SHL5IMPLIBN=$(LB)/lib$(SHL5IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL5IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL5DEF=$(SHL5DEF)
@@ -2261,6 +2259,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL5IMPLIBN)" != ""
+$(SHL5IMPLIBN) : $(SHL5TARGETN)
+.ENDIF
+
 $(SHL5TARGETN) : \
                     $(SHL5OBJS)\
                     $(SHL5LIBS)\
@@ -2304,10 +2306,10 @@ $(SHL5TARGETN) : \
     $(WINDRES) $(SHL5LINKRES) $(SHL5LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL5ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL5LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -2329,13 +2331,6 @@ $(SHL5TARGETN) : \
     @noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB5NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL5TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL5VERSIONOBJ) \
-        @(ALL5OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL5LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -2343,7 +2338,7 @@ $(SHL5TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL5DEF) \
         $(USE_5IMPLIB) \
         $(STDOBJ) \
         $(SHL5VERSIONOBJ) $(SHL5OBJS) \
@@ -2591,13 +2586,15 @@ SHL6IMPLIB=i$(TARGET)_t6
 USE_6IMPLIB=-implib:$(LB)/$(SHL6IMPLIB).lib
 SHL6IMPLIBN=$(LB)/$(SHL6IMPLIB).lib
 .ELSE
-SHL6IMPLIBN=$(LB)/lib$(SHL6IMPLIB).dll.a
 USE_6IMPLIB=-Wl,--out-implib=$(SHL6IMPLIBN)
+SHL6IMPLIBN=$(LB)/lib$(SHL6IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL6IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL6DEF=$(SHL6DEF)
@@ -2766,6 +2763,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL6IMPLIBN)" != ""
+$(SHL6IMPLIBN) : $(SHL6TARGETN)
+.ENDIF
+
 $(SHL6TARGETN) : \
                     $(SHL6OBJS)\
                     $(SHL6LIBS)\
@@ -2809,10 +2810,10 @@ $(SHL6TARGETN) : \
     $(WINDRES) $(SHL6LINKRES) $(SHL6LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL6ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL6LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -2834,13 +2835,6 @@ $(SHL6TARGETN) : \
     @noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB6NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL6TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL6VERSIONOBJ) \
-        @(ALL6OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL6LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -2848,7 +2842,7 @@ $(SHL6TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL6DEF) \
         $(USE_6IMPLIB) \
         $(STDOBJ) \
         $(SHL6VERSIONOBJ) $(SHL6OBJS) \
@@ -3096,13 +3090,15 @@ SHL7IMPLIB=i$(TARGET)_t7
 USE_7IMPLIB=-implib:$(LB)/$(SHL7IMPLIB).lib
 SHL7IMPLIBN=$(LB)/$(SHL7IMPLIB).lib
 .ELSE
-SHL7IMPLIBN=$(LB)/lib$(SHL7IMPLIB).dll.a
 USE_7IMPLIB=-Wl,--out-implib=$(SHL7IMPLIBN)
+SHL7IMPLIBN=$(LB)/lib$(SHL7IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL7IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL7DEF=$(SHL7DEF)
@@ -3271,6 +3267,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL7IMPLIBN)" != ""
+$(SHL7IMPLIBN) : $(SHL7TARGETN)
+.ENDIF
+
 $(SHL7TARGETN) : \
                     $(SHL7OBJS)\
                     $(SHL7LIBS)\
@@ -3314,10 +3314,10 @@ $(SHL7TARGETN) : \
     $(WINDRES) $(SHL7LINKRES) $(SHL7LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL7ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL7LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -3339,13 +3339,6 @@ $(SHL7TARGETN) : \
     @noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB7NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL7TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL7VERSIONOBJ) \
-        @(ALL7OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL7LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -3353,7 +3346,7 @@ $(SHL7TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL7DEF) \
         $(USE_7IMPLIB) \
         $(STDOBJ) \
         $(SHL7VERSIONOBJ) $(SHL7OBJS) \
@@ -3601,13 +3594,15 @@ SHL8IMPLIB=i$(TARGET)_t8
 USE_8IMPLIB=-implib:$(LB)/$(SHL8IMPLIB).lib
 SHL8IMPLIBN=$(LB)/$(SHL8IMPLIB).lib
 .ELSE
-SHL8IMPLIBN=$(LB)/lib$(SHL8IMPLIB).dll.a
 USE_8IMPLIB=-Wl,--out-implib=$(SHL8IMPLIBN)
+SHL8IMPLIBN=$(LB)/lib$(SHL8IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL8IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL8DEF=$(SHL8DEF)
@@ -3776,6 +3771,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL8IMPLIBN)" != ""
+$(SHL8IMPLIBN) : $(SHL8TARGETN)
+.ENDIF
+
 $(SHL8TARGETN) : \
                     $(SHL8OBJS)\
                     $(SHL8LIBS)\
@@ -3819,10 +3818,10 @@ $(SHL8TARGETN) : \
     $(WINDRES) $(SHL8LINKRES) $(SHL8LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL8ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL8LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -3844,13 +3843,6 @@ $(SHL8TARGETN) : \
     @noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB8NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL8TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL8VERSIONOBJ) \
-        @(ALL8OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL8LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -3858,7 +3850,7 @@ $(SHL8TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL8DEF) \
         $(USE_8IMPLIB) \
         $(STDOBJ) \
         $(SHL8VERSIONOBJ) $(SHL8OBJS) \
@@ -4106,13 +4098,15 @@ SHL9IMPLIB=i$(TARGET)_t9
 USE_9IMPLIB=-implib:$(LB)/$(SHL9IMPLIB).lib
 SHL9IMPLIBN=$(LB)/$(SHL9IMPLIB).lib
 .ELSE
-SHL9IMPLIBN=$(LB)/lib$(SHL9IMPLIB).dll.a
 USE_9IMPLIB=-Wl,--out-implib=$(SHL9IMPLIBN)
+SHL9IMPLIBN=$(LB)/lib$(SHL9IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL9IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL9DEF=$(SHL9DEF)
@@ -4281,6 +4275,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL9IMPLIBN)" != ""
+$(SHL9IMPLIBN) : $(SHL9TARGETN)
+.ENDIF
+
 $(SHL9TARGETN) : \
                     $(SHL9OBJS)\
                     $(SHL9LIBS)\
@@ -4324,10 +4322,10 @@ $(SHL9TARGETN) : \
     $(WINDRES) $(SHL9LINKRES) $(SHL9LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL9ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL9LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -4349,13 +4347,6 @@ $(SHL9TARGETN) : \
     @noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB9NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL9TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL9VERSIONOBJ) \
-        @(ALL9OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL9LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -4363,7 +4354,7 @@ $(SHL9TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL9DEF) \
         $(USE_9IMPLIB) \
         $(STDOBJ) \
         $(SHL9VERSIONOBJ) $(SHL9OBJS) \
@@ -4611,13 +4602,15 @@ SHL10IMPLIB=i$(TARGET)_t10
 USE_10IMPLIB=-implib:$(LB)/$(SHL10IMPLIB).lib
 SHL10IMPLIBN=$(LB)/$(SHL10IMPLIB).lib
 .ELSE
-SHL10IMPLIBN=$(LB)/lib$(SHL10IMPLIB).dll.a
 USE_10IMPLIB=-Wl,--out-implib=$(SHL10IMPLIBN)
+SHL10IMPLIBN=$(LB)/lib$(SHL10IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL10IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL10DEF=$(SHL10DEF)
@@ -4786,6 +4779,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL10IMPLIBN)" != ""
+$(SHL10IMPLIBN) : $(SHL10TARGETN)
+.ENDIF
+
 $(SHL10TARGETN) : \
                     $(SHL10OBJS)\
                     $(SHL10LIBS)\
@@ -4829,10 +4826,10 @@ $(SHL10TARGETN) : \
     $(WINDRES) $(SHL10LINKRES) $(SHL10LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL10ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL10LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -4854,13 +4851,6 @@ $(SHL10TARGETN) : \
     @noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB10NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL10TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL10VERSIONOBJ) \
-        @(ALL10OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL10LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -4868,7 +4858,7 @@ $(SHL10TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL10DEF) \
         $(USE_10IMPLIB) \
         $(STDOBJ) \
         $(SHL10VERSIONOBJ) $(SHL10OBJS) \
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index bc4baa85bb12..69e57381da1c 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -46,10 +46,10 @@ my_file = file://
 .END
 
 # The following conditional is an approximation of: UPDATER set to YES and
-# SHIPDRIVE set and CWS_WORK_STAMP not set and either SOL_TMP not set or
+# SHIPDRIVE set and either SOL_TMP not set or
 # SOLARENV set to a pathname of which SOL_TMP is not a prefix:
 .IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
-    "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
+    "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
 my_instsets = $(shell ls -dt \
     $(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
 installationtest_instset = $(my_instsets:1)
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 0d1a7b00e334..baa847365f6d 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -34,17 +34,14 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
 .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
-# No ODMA on UNX
-ODMA_LIB_LIB=
+.IF "$(GUI)" == "WNT"
+ODMA_LIB_LIB=-lodma_lib
+.ENDIF
 
 #
 #externe libs in plattform.mk
 #
-.IF "$(GUI)$(COM)"=="WNTGCC"
-AWTLIB*=$(JAVA_HOME)/lib/jawt.lib
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 AWTLIB*=-ljawt
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 AVMEDIALIB=-lavmedia$(DLLPOSTFIX)
 .IF "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
 ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
@@ -69,13 +66,8 @@ LDAPBERLIB=-lldapber
 TOOLSLIBST=-latools
 BPICONVLIB=-lbpiconv
 TOOLSLIB=-ltl$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-CPPULIB=-lcppu$(UDK_MAJOR)
-CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 UCBHELPERLIB=-lucbhelper4$(COMID)
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 OPENSSLLIB=$(OPENSSL_LIBS)
@@ -88,20 +80,11 @@ OPENSSLLIBST=-lssl_static -lcrypto_static
 OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
 .ENDIF          # "$(GUI)$(COM)"=="WNTGCC"
 .ENDIF          # "$(SYSTEM_OPENSSL)" == "YES"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-REGLIB=-lreg$(UDK_MAJOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 REGLIB=-lreg
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 XMLOFFLIB=-lxo$(DLLPOSTFIX)
 XMLOFFLLIB=-lxol
-.IF "$(GUI)$(COM)"=="WNTGCC"
-STORELIB=-lstore$(UDK_MAJOR)
-SALLIB=-luno_sal$(UDK_MAJOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 STORELIB=-lstore
 SALLIB=-luno_sal
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 ODBCLIB=-lodbc$(DLLPOSTFIX)
 ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
 DBFILELIB=-lfile$(DLLPOSTFIX)
@@ -248,30 +231,18 @@ ISCLIB=-lsc$(DLLPOSTFIX)
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(COMID)
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.IF "$(OS)" == "WNT"
-CPPUNITLIB = -lcygcppunit-1-12-1
-.ELSE
 .IF "$(SYSTEM_CPPUNIT)"=="YES"
 CPPUNITLIB = $(CPPUNIT_LIBS)
 .ELSE
 CPPUNITLIB = -lcppunit
 .ENDIF
-.ENDIF
 .IF "$(SYSTEM_LIBXSLT)"=="YES"
 XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE
 XSLTLIB=-lxslt $(LIBXML2LIB)
 .ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC"
-JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMFWKLIB = -ljvmfwk
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 .IF "$(SYSTEM_REDLAND)"=="YES"
 REDLANDLIB=$(REDLAND_LIBS)
 .ELSE
@@ -327,7 +298,7 @@ ULINGULIB=-lulingu
 .IF "$(SYSTEM_HUNSPELL)" == "YES"
 HUNSPELLLIB=$(HUNSPELL_LIBS)
 .ELSE
-HUNSPELLLIB=-lhunspell-1.2
+HUNSPELLLIB=-lhunspell-1.3
 .ENDIF
 .IF "$(SYSTEM_MYTHES)" == "YES"
 MYTHESLIB=$(MYTHES_LIBS)
@@ -341,6 +312,35 @@ UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
 XMLREADERLIB=-lxmlreader
 
+.IF "$(OS)" == "IOS"
+
+# As we build static libraries for iOS, we append to each library its
+# dependencies, recursively. Start from the bottom of the dependency
+# stack. This is experimental and obviously incomplete.
+
+UCBHELPERLIB+=$(SALHELPERLIB)
+
+UNOTOOLSLIB+=$(I18NISOLANGLIB)
+UNOTOOLSLIB+=$(UCBHELPERLIB)
+
+TOOLSLIB+=$(BASEGFXLIB)
+TOOLSLIB+=$(ZLIB3RDLIB)
+
+VCLLIB+=$(ICUUCLIB)
+
+.ENDIF
+
+.IF "$(OS)" == "ANDROID"
+
+# Some of the external libraries get built as static libraries for
+# Android, mostly by accident, because we haven't bothered fixing up
+# their configury to realize that it would work to build shared
+# libraries.
+
+CURLLIB+=$(ZLIB3RDLIB)
+
+.ENDIF
+
 .ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
 ODMA_LIB_LIB=odma_lib.lib
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 38646f16b5b3..c4403f37ae39 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=350
-RSCREVISION=350m1(Build:1)
-BUILD=1
+RSCREVISION=350m1(Build:0)
+BUILD=0
 LAST_MINOR=m1
 SOURCEVERSION=OOO350
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 15ea3085f0e7..fc5ffcdd5382 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -28,5 +28,5 @@
 PRODUCTLIST = libreoffice oxygenoffice
 
 # default values to minimize maintainance effort
-PRODUCTVERSION = 3.4
+PRODUCTVERSION = 3.5
 PRODUCTVERSIONSHORT = 3
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 9dd6cc1963c4..1669a2511d7a 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -135,7 +135,11 @@ $(PAR)/%.par :
     @echo "Making:   " $@
     @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
 .IF "$(GUI)"=="WNT"
+.IF "$(CROSS_COMPILING)" == "NO"
     $(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
+.ELSE
+    $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I#$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
+.ENDIF
 .ENDIF
 # YD: INCLUDE macro too long, include only few items (scp2 compile)
 .IF "$(GUI)"=="UNX"
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 0ff659c7ec1b..ca816d8e664b 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -97,8 +97,8 @@ $(OBJ)/%.obj : %.cc
 PCHOUTDIR=$(SLO)/pch
 PCHEXOUTDIR=$(SLO)/pch_ex
 .ELSE			# "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT)
+PCHOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)$(PROEXT)
+PCHEXOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)_ex$(PROEXT)
 .ENDIF			# "$(NETWORK_BUILD)"==""
 $(SLO)/precompiled.% .PHONY:
     -$(MKDIRHIER) $(SLO)/pch
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index e44458fc99a7..352b8503b5ec 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -57,7 +57,7 @@ NETWORK_BUILD:=TRUE
 PLATFORMID = $(RTL_OS:l)_$(RTL_ARCH:l)
 EXTNAME*=$(EXTENSIONNAME)_in
 
-.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.IF "$(UPDATER)"!=""
 
 .IF "$(SOURCEVERSION)"!="$(WORK_STAMP)"
 .ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version!
@@ -69,7 +69,7 @@ WRONG_SOURCEVERSION
     @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc
     @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
     @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
-.ENDIF          # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.ENDIF          # "$(UPDATER)"!=""
 
 # Force creation of $(SOLARVERSION)/$(INPATH)/inc/
 # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
@@ -1005,16 +1005,32 @@ LNTFLAGSOUTOBJ=-os
 
 DLLPOSTFIX=lo
 
+.IF "$(CROSS_COMPILING)" == "YES"
+# Assume always cross-compiling from Unix
+EXECPOST_FOR_BUILD=
+.ELSE
+EXECPOST_FOR_BUILD=$(EXECPOST)
+.ENDIF
+
 .IF "$(OOO_LIBRARY_PATH_VAR)" != ""
 # Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
 # path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from
 # an existing office/URE installation; the ": &&" enables this to work at the
 # start of a recipe line that is not prefixed by "+" as well as in the middle of
 # an existing && chain:
+.IF "$(CROSS_COMPILING)"=="YES" && "$(OS)"=="WNT"
+# Sigh, special-case cross-compiling to Windows. Here OOO_LIBRARY_PATH_VAR is the correct one
+# for the BUILD platform but SOLARSHAREDBIN is the one for Windows, i.e. "foo/bin".
+AUGMENT_LIBRARY_PATH = : && \
+    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARLIBDIR_FOR_BUILD))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
+AUGMENT_LIBRARY_PATH_LOCAL = : && \
+    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
+.ELSE
 AUGMENT_LIBRARY_PATH = : && \
     $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
 AUGMENT_LIBRARY_PATH_LOCAL = : && \
     $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
+.ENDIF
 .END
 
 # for multiprocess building in external modules
@@ -1032,6 +1048,8 @@ VALGRINDTOOL=valgrind --tool=$(VALGRIND) --num-callers=50
 VALGRINDTOOL+=--leak-check=yes
 G_SLICE*:=always-malloc
 .EXPORT : G_SLICE
+GLIBCXX_FORCE_NEW*:=1
+.EXPORT : GLIBCXX_FORCE_NEW
 .ENDIF
 .ENDIF
 
@@ -1053,7 +1071,11 @@ CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
 GDBCPPUNITTRACE=$(GDBTRACE)
 .ENDIF
 
+.IF "$(CROSS_COMPILING)" == "YES"
+CPPUNITTESTER=\#
+.ELSE
 CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(SOLARBINDIR)/cppunit/cppunittester
+.ENDIF
 HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
 LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
 HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
@@ -1070,7 +1092,14 @@ JAVA*:=$(JAVAINTERPRETER)
 SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
 SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
 LZIP*=lzip
+
+# Note that $(CPPLCC) is oddly enough only used when $(OS)==WNT, see pstrules.mk.
+# For the BUILD platform when cross-compiling (always Unix), it is called cpp.lcc
+.IF "$(CROSS_COMPILING)" == "YES"
+CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc
+.ELSE
 CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
+.ENDIF
 
 .IF "$(DISABLE_ENHANCED_COMID)"==""
 .INCLUDE : tg_compv.mk
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index ed4a7b9c7566..4ef0a232a1f7 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -49,7 +49,7 @@ INCEXT*=.
 INCPRE*=.
 INCPOST*=.
 .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/offuh
+UNOINCLUDES=$(SOLARINCDIR)/udkapi -I$(SOLARINCDIR)/offapi -I$(SOLARINCDIR)/oovbaapi
 .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
 SOLARINC+=$(JDKINCS)
 # make sure INCLUDE isn't set
@@ -1417,7 +1417,7 @@ $(SCP_PRODUCT_TYPE):
     $(TOUCH) $@
 
 .IF "$(COMPVERMK)"!=""
-.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.IF "$(UPDATER)"!=""
 .IF "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
 COMPVERMK_PHONY:=.PHONY
 .ENDIF			# "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
@@ -1444,7 +1444,7 @@ COMPVTMP:=$(mktmp iii)
 .ENDIF          # "$(CCNUMVER)"!=""
 
 .ENDIF			# "$(COMPVERMK)"!=""
-.ENDIF			# "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.ENDIF			# "$(UPDATER)"!=""
 
 .IF "$(JAVAVERMK)"!=""
 .IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index cd9d44424369..a6fb32df1ac0 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -105,7 +105,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @echo "Making:   " $(@:f)
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(@:b).list
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @-$(RM) $(MISC)/$(@:b).strip
@@ -124,7 +123,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
 # libraries at runtime
     @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
     @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @ls -l $@
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         app $(APP$(TNR)RPATH) $@
 .IF "$(TARGETTYPE)"=="GUI"
@@ -132,7 +130,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @macosx-create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
-    @echo unx
     @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
     $(APP$(TNR)OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@@ -143,7 +140,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
   .IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
   .ENDIF
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
@@ -161,7 +157,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     $(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
 .ENDIF			# "$(APP$(TNR)LINKRES)" != ""
 .IF "$(COM)" == "GCC"
-    @echo mingw
 .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
     @cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) >  $(MISC)/$(@:b)_all.res
     $(WINDRES) $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
@@ -173,12 +168,11 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \
         -Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \
         $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
   .IF "$(VERBOSE)" == "TRUE"
     @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
   .ENDIF
     @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @ls -l $@
 .ELSE	# "$(COM)" == "GCC"
 .IF "$(linkinc)" == ""
     $(COMMAND_ECHO)$(APP$(TNR)LINKER) @$(mktmp \
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index a9fc9202ea2c..2eb256d5f478 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -53,12 +53,6 @@ CFLAGSVERSION_CMD= -V  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
 CFLAGSNUMVERSION_CMD= -V  $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
 .ENDIF
 
-.IF "$(COM)"=="C730"
-CFLAGSVERSION= -version
-CFLAGSVERSION_CMD= -version |& cut -d" " -f4-
-CFLAGSNUMVERSION_CMD= -version |& cut -d" " -f4-
-.ENDIF
-
 # that's the version known by the specific
 # compiler
 CCVER:=$(shell @-$(CXX) $(CFLAGSVERSION_CMD))
@@ -130,11 +124,6 @@ COMNAME=sunpro5
 .ENDIF
 .ENDIF
 
-.IF "$(COM)"=="C730"
-COMID=C730
-COMNAME=MipsPro
-.ENDIF
-
 .IF "$(COMNAME)"==""
 
 # "EXCEPTIONSFILES" get compiled before this, but shouldn't
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 763ad26e5021..0e677e681493 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -85,95 +85,95 @@ $(DEF$(TNR)TARGETN) : \
 .ELSE			# "$(link_always)"==""
 $(DEF$(TNR)TARGETN) .PHONY :
 .ENDIF			# "$(link_always)"==""
-    @-$(RM) $@.tmpfile
+    $(COMMAND_ECHO)-$(RM) $@.tmpfile
     @echo "Making:    module definition file" $(@:f)
-    @echo LIBRARY	  $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" 								 >$@.tmpfile
+    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" 								 >$@.tmpfile
 .IF "$(COM)"!="GCC"
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
+    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
 .ENDIF
-    @echo EXPORTS													>>$@.tmpfile
+    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
 .IF "$(VERSIONOBJ)"!=""
 #	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
+    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
 .ENDIF
 .IF "$(DEFLIB$(TNR)NAME)"!=""
 .IF "$(COM)"=="GCC"
-    @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
-    $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
+    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
         `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
     $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
+    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
 .ELSE
 .IF "$(SHL$(TNR)USE_EXPORTS)"==""
-    @-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
-    @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib
-    @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
+    $(COMMAND_ECHO)-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
+    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib
+    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
     $(COMMAND_ECHO)$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
 .ELSE			# "$(SHL$(TNR)USE_EXPORTS)"==""
-    @$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct
-    @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
+    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct
+    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 .ENDIF
 .ENDIF				# "$(DEFLIB$(TNR)NAME)"!=""
 .IF "$(DEF$(TNR)EXPORT1)"!=""
-    @echo $(DEF$(TNR)EXPORT1)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT1)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT2)"!=""
-    @echo $(DEF$(TNR)EXPORT2)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT2)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT3)"!=""
-    @echo $(DEF$(TNR)EXPORT3)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT3)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT4)"!=""
-    @echo $(DEF$(TNR)EXPORT4)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT4)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT5)"!=""
-    @echo $(DEF$(TNR)EXPORT5)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT5)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT6)"!=""
-    @echo $(DEF$(TNR)EXPORT6)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT6)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT7)"!=""
-    @echo $(DEF$(TNR)EXPORT7)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT7)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT8)"!=""
-    @echo $(DEF$(TNR)EXPORT8)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT8)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT9)"!=""
-    @echo $(DEF$(TNR)EXPORT9)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT9)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT10)"!=""
-    @echo $(DEF$(TNR)EXPORT10)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT10)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT11)"!=""
-    @echo $(DEF$(TNR)EXPORT11)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT11)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT12)"!=""
-    @echo $(DEF$(TNR)EXPORT12)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT12)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT13)"!=""
-    @echo $(DEF$(TNR)EXPORT13)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT13)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT14)"!=""
-    @echo $(DEF$(TNR)EXPORT14)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT14)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT15)"!=""
-    @echo $(DEF$(TNR)EXPORT15)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT15)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT16)"!=""
-    @echo $(DEF$(TNR)EXPORT16)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT16)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT17)"!=""
-    @echo $(DEF$(TNR)EXPORT17)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT17)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT18)"!=""
-    @echo $(DEF$(TNR)EXPORT18)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT18)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT19)"!=""
-    @echo $(DEF$(TNR)EXPORT19)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT19)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORT20)"!=""
-    @echo $(DEF$(TNR)EXPORT20)										>>$@.tmpfile
+    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT20)										>>$@.tmpfile
 .ENDIF
 .IF "$(DEF$(TNR)EXPORTFILE)"!=""
 .IF "$(COM)"=="GCC"
@@ -182,15 +182,15 @@ $(DEF$(TNR)TARGETN) .PHONY :
     $(COMMAND_ECHO)$(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@.tmpfile
 .ENDIF
 .ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
+    $(COMMAND_ECHO)-$(RM) $@
+    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
 .ENDIF			# "$(GUI)"=="WNT"
 
 .IF "$(GUI)"=="UNX"
 $(DEF$(TNR)TARGETN): \
         $(DEF$(TNR)DEPN) \
         $(DEF$(TNR)EXPORTFILE)
-    @echo just a dummy for UNIX > $@
+    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
 .ENDIF
 .ENDIF			# "$(DEF$(TNR)TARGETN)"!=""
 
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index e8c2b7596a16..d6bcbc82511b 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -95,13 +95,15 @@ SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR)
 USE_$(TNR)IMPLIB=-implib:$(LB)/$(SHL$(TNR)IMPLIB).lib
 SHL$(TNR)IMPLIBN=$(LB)/$(SHL$(TNR)IMPLIB).lib
 .ELSE
-SHL$(TNR)IMPLIBN=$(LB)/lib$(SHL$(TNR)IMPLIB).dll.a
 USE_$(TNR)IMPLIB=-Wl,--out-implib=$(SHL$(TNR)IMPLIBN)
+SHL$(TNR)IMPLIBN=$(LB)/lib$(SHL$(TNR)IMPLIB).dll.a
 .ENDIF			# "$(COM)" != "GCC"
 ALLTAR : $(SHL$(TNR)IMPLIBN)
 
 .IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
 USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
+.ENDIF
 .ENDIF			# "$(USE_DEFFILE)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
@@ -270,6 +272,10 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
+.IF "$(COM)" == "GCC" && "$(SHL$(TNR)IMPLIBN)" != ""
+$(SHL$(TNR)IMPLIBN) : $(SHL$(TNR)TARGETN)
+.ENDIF
+
 $(SHL$(TNR)TARGETN) : \
                     $(SHL$(TNR)OBJS)\
                     $(SHL$(TNR)LIBS)\
@@ -313,10 +319,10 @@ $(SHL$(TNR)TARGETN) : \
     $(WINDRES) $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
-.IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
 # GNU ld since 2.17 supports @cmdfile syntax
 .IF "$(USE_DEFFILE)"!=""
-    @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL$(TNR)LINKFLAGS) \
         $(LINKFLAGSSHL) \
 	$(SOLARLIB) \
@@ -338,13 +344,6 @@ $(SHL$(TNR)TARGETN) : \
     @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB$(TNR)NAME)"!=""
-    $(COMMAND_ECHO)$(DLLTOOL) @@(mktmp \
-        --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
-        --kill-at \
-        --output-exp $(MISC)/$(@:b)_exp.o \
-        $(SHL$(TNR)VERSIONOBJ) \
-        @(ALL$(TNR)OBJLIST)
-    )
     $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
         $(SHL$(TNR)LINKFLAGS) \
         $(LINKFLAGSSHL) \
@@ -352,7 +351,7 @@ $(SHL$(TNR)TARGETN) : \
         $(MINGWSSTDOBJ) \
         -o $@ \
         -Wl,-Map,$(MISC)/$(@:b).map \
-        $(MISC)/$(@:b)_exp.o \
+        $(SHL$(TNR)DEF) \
         $(USE_$(TNR)IMPLIB) \
         $(STDOBJ) \
         $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 893340e9125f..c07e5c36f6cc 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -87,7 +87,9 @@ COPYUPDATE=-u
 ECHON=echo -n
 ECHONL=echo
 FIND*=find
+.IF "$(OS_FOR_BUILD)"=="WNT"
 FLIPCMD*=$(PERL) $(SOLARENV)/bin/slfl.pl
+.ENDIF
 GNUCOPY*=cp
 GNUMAKE*=make
 GREP*=grep
@@ -115,9 +117,10 @@ COPYRECURSE=-r
 .ENDIF
 .IF "$(OS)"=="SOLARIS"
 AWK*=nawk
-GNUCOPY*=gnucp
-GNUPATCH*=gnupatch
+GNUCOPY*=/usr/gnu/bin/cp
+GNUPATCH*=/usr/gnu/bin/patch
 GNUTAR*=/usr/sfw/bin/gtar
+GNUMAKE=/usr/sfw/bin/make
 DEREFERENCE=
 .ELIF "$(OS)"=="AIX"
 AWK*=/opt/freeware/bin/awk
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 752de80c7b36..79d10d274fc0 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -90,6 +90,9 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
 .IF "$(HAVE_CXX0X)" == "TRUE"
 CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
 .ENDIF # "$(HAVE_CXX0X)" == "TRUE"
+.IF "$(ENABLE_DEBUG_STL)" == "TRUE"
+CFLAGSCXX += -D_GLIBCXX_DEBUG
+.ENDIF
 
 CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
 CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 3235026c9846..2e7599e1010a 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -32,10 +32,10 @@ CFLAGS=-c $(EXTRA_CFLAGS)
 LINKC*=$(CC)
 LINK*=$(CXX)
 
-STDLIBCUIMT=-framework CoreFoundation
-STDLIBGUIMT=-framework CoreFoundation
-STDSHLCUIMT=-framework CoreFoundation
-STDSHLGUIMT=-framework CoreFoundation
+STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
+STDLIBGUIMT=$(STDLIBCUIMT)
+STDSHLCUIMT=
+STDSHLGUIMT=
 
 LIBMGR*=ar
 LIBFLAGS=-r
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index 8b65c5f393e3..dd3e0c8ce6f7 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -66,4 +66,10 @@ JAVA_RUNTIME=javai_g.lib
 .ENDIF
 .ENDIF
 
+.IF "$(CROSS_COMPILING)"!="YES"
 OOO_LIBRARY_PATH_VAR = PATH
+.ELIF "$(OS_FOR_BUILD)"=="MACOSX"
+OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
+.ELSE
+OOO_LIBRARY_PATH_VAR = LD_LIBRARY_PATH
+.ENDIF
diff --git a/solenv/src/component.map b/solenv/src/component.map
index 62b8829a0f51..d31fc61278dc 100755
--- a/solenv/src/component.map
+++ b/solenv/src/component.map
@@ -1,6 +1,5 @@
 UDK_3_0_0 {
     global:
-        component_getImplementationEnvironment;
         component_getFactory;
     local:
     *;
diff --git a/solenv/src/reg-component.map b/solenv/src/reg-component.map
index ac2c3750bfe0..264c32a0404b 100755
--- a/solenv/src/reg-component.map
+++ b/solenv/src/reg-component.map
@@ -1,6 +1,5 @@
 UDK_3_0_0 {
     global:
-        component_getImplementationEnvironment;
         component_writeInfo;
         component_getFactory;
     local:
diff --git a/solenv/src/unloadablecomponent.map b/solenv/src/unloadablecomponent.map
index 2da0c5709c7b..caeb98c1c478 100755
--- a/solenv/src/unloadablecomponent.map
+++ b/solenv/src/unloadablecomponent.map
@@ -1,6 +1,5 @@
 UDK_3_0_0 {
     global:
-        component_getImplementationEnvironment;
         component_getFactory;
         component_canUnload;
     local:
diff --git a/solenv/wntgcci/inc/sehandler.hxx b/solenv/wntgcci/inc/sehandler.hxx
new file mode 100644
index 000000000000..2fabe486a452
--- /dev/null
+++ b/solenv/wntgcci/inc/sehandler.hxx
@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+// Provenance of this code unclear. From crosswin32-dtrans-mingw.diff,
+// but from where it got there, I don't know.
+
+
+#ifndef _SEHANDLER_HXX
+#define _SEHANDLER_HXX
+
+#ifndef __MINGW32__
+#error This file should be included only in a MinGW compilation
+#endif
+
+#include <windows.h>
+#include <setjmp.h>
+
+#ifndef EH_UNWINDING
+// See _EH_UNWINDING in MSVS9/VC/crt/src/except.inc
+#define EH_UNWINDING 2
+#endif
+
+namespace {
+class __SEHandler
+{
+public:
+    __SEHandler() {}
+    ~__SEHandler() {}
+    typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
+    typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
+    typedef void (*PN)(void *);
+    void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
+    {
+        __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
+        m_pData=pdata;
+        switch (reinterpret_cast<int>(pfilter))
+            {
+            default:
+                m_filter=pfilter;
+                break;
+            case EXCEPTION_CONTINUE_EXECUTION:
+                m_filter=DefaultFilterContinueExecution;
+                break;
+            case EXCEPTION_EXECUTE_HANDLER:
+                m_filter=DefaultFilterExecuteHandler;
+                break;
+            case EXCEPTION_CONTINUE_SEARCH:
+                m_filter=DefaultFilterContinueSearch;
+                break;
+            }
+        if (phandlerbody)
+            m_handlerbody=phandlerbody;
+        else
+            m_handlerbody=DefaultHandler;
+        if (pfinal)
+            m_final=pfinal;
+        else
+            m_final=DefaultFinal;
+        m_ER.pHandlerClass = this;
+        m_ER.hp = handler;
+        asm("movl %%fs:0, %%eax\n\t"
+            "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
+        asm("movl %0, %%eax\n\t"
+            "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
+    }
+    void Reset()
+    {
+        m_final(m_pData);
+        asm("movl %0, %%eax \n\t"
+            "movl %%eax, %%fs:0"
+            : : "m" (m_ER.prev): "%eax");
+    }
+private:
+    __SEHandler(const __SEHandler&);
+    __SEHandler& operator=(const __SEHandler&);
+    struct _ER {
+        _ER* prev;
+        PEXCEPTION_HANDLER hp;
+        __SEHandler *pHandlerClass;
+    };
+    static EXCEPTION_DISPOSITION handler(struct _EXCEPTION_RECORD *pExceptionRecord,
+                                         void * EstablisherFrame,
+                                         struct _CONTEXT *ContextRecord,
+                                         void * /*DispatcherContext*/)
+    {
+        __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
+        if  (pExceptionRecord->ExceptionFlags & EH_UNWINDING)
+            {
+                pThis->m_final(pThis->m_pData);
+                return ExceptionContinueSearch;
+            }
+        EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
+        switch (pThis->m_filter(pThis->m_pData, &ep))
+            {
+            case EXCEPTION_EXECUTE_HANDLER:
+                RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
+            __set_label:
+                pThis->m_handlerbody(pThis->m_pData, &ep);
+                ContextRecord->Ebp = pThis->m_jmpbuf[0];
+                ContextRecord->Eip = pThis->m_jmpbuf[1];
+                ContextRecord->Esp = pThis->m_jmpbuf[2];
+                return ExceptionContinueExecution;
+            case EXCEPTION_CONTINUE_SEARCH:
+                return ExceptionContinueSearch;
+            case EXCEPTION_CONTINUE_EXECUTION:
+                return ExceptionContinueExecution;
+            }
+        return ExceptionContinueExecution;
+    }
+    static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
+    static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
+    static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
+    static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
+    static void DefaultFinal(void *) {}
+    typedef int (*handler_p)(struct _EXCEPTION_RECORD *ExceptionRecord,
+                             void * EstablisherFrame,
+                             struct _CONTEXT *ContextRecord,
+                             void * DispatcherContext);
+    _ER m_ER;
+    void *m_pData;
+    PN m_final;
+    PH m_handlerbody;
+    PF m_filter;
+    jmp_buf m_jmpbuf;
+};
+
+} // namespace {
+
+#endif // _SEHANDLER_HXX
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index 6b0fe3df69a9..f9dc0f764ebd 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -141,14 +141,13 @@ int
 #else
 void
 #endif
-catch (sig)
-    int sig;
+catch (int sig)
 {
     fflush (stdout);
     fatalerr ("got signal %d\n", sig);
 }
 
-#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(Lynx_22)
+#if (defined(i386) && defined(SYSV)) || defined(WIN32)
 #define USGISH
 #endif
 
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index 003cf1c203c2..f00c98c109fd 100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -38,5 +38,7 @@ HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
 .ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
 HELP_COMPATH:=$(COMPATH)
 .ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
+.IF "$(COM)"!="GCC"
 SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
 .ENDIF
+.ENDIF
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 65eda027916d..a29e4d983f29 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi offuh oovbaapi oox package qadevOOo rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript  NULL
+tb      tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi oox package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript  NULL
 tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/unusedcode.easy b/unusedcode.easy
new file mode 100644
index 000000000000..bdb356732021
--- /dev/null
+++ b/unusedcode.easy
@@ -0,0 +1,4738 @@
+(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
+(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
+AlphaMask::Crop(Rectangle const&)
+AlphaMask::Expand(unsigned long, unsigned long, unsigned char*)
+AlphaMask::Invert()
+AlphaMask::Mirror(unsigned long)
+AlphaMask::Replace(unsigned char*, unsigned char*, unsigned long, unsigned long*)
+AlphaMask::Rotate(long, unsigned char)
+AlphaMask::Scale(Size const&, unsigned long)
+AlphaMask::Scale(double const&, double const&, unsigned long)
+Application::PostUserEvent(unsigned long, void*)
+BasicError::BasicError()
+BasicIDEDLL::Exit()
+BasicIDEShell::LinkStubAccelSelectHdl(void*, void*)
+BasicLibInfo::BasicLibInfo(String const&)
+BasicLibInfo::Store(SotStorageStream&, String const&, unsigned char)
+BasicLibs::Last()
+BasicLibs::Prev()
+BasicManager::BasicManager()
+BasicManager::ClearErrors()
+BasicManager::SetFlagToAllLibs(short, unsigned char) const
+BasicPrinter::BasicPrinter()
+BitSet::BitSet(Range const&)
+BitSet::BitSet(unsigned short*, unsigned short)
+Bitmap::GetSourceSizePixel() const
+Bitmap::SetSizePixel(Size const&)
+BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const
+BitmapLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&)
+BitmapPalette::IsGreyPalette() const
+BitmapReadAccess::Flush()
+BitmapReadAccess::ReAccess(unsigned char)
+BitmapWriteAccess::DrawPolyPolygon(PolyPolygon const&)
+BitmapWriteAccess::GetFillColor() const
+BitmapWriteAccess::GetLineColor() const
+BitmapWriteAccess::SetFillColor()
+BitmapWriteAccess::SetLineColor()
+BreakPointList::clear()
+BreakPointList::push_back(BreakPoint*)
+BreakpointWindow::FindBreakpoint(Point const&)
+BreakpointWindow::FindBreakpoint(unsigned int)
+BreakpointWindow::Reset()
+BreakpointWindow::SetMarkerPos(unsigned int, bool)
+BufferNode::childAt(int) const
+Button::Button(Window*, ResId const&)
+Button::Button(Window*, long)
+Button::GetFocusRect() const
+Button::GetModeBitmap() const
+Button::IsImageDisplayEnabled()
+Button::IsTextDisplayEnabled()
+Button::SetModeBitmap(BitmapEx const&)
+ButtonDialog::AddButton(PushButton*, unsigned short, unsigned short, long)
+ButtonDialog::ButtonDialog(Window*, ResId const&)
+ButtonDialog::GetButtonHelpId(unsigned short) const
+ButtonDialog::GetButtonHelpText(unsigned short) const
+ButtonDialog::GetButtonText(unsigned short) const
+ButtonDialog::SetButtonHelpId(unsigned short, rtl::OString const&)
+ByteArr::Append(char)
+ByteArr::ByteArr(unsigned char, unsigned char)
+ByteArr::Contains(char) const
+ByteArr::Insert(unsigned short, char)
+ByteArr::Remove(char)
+ByteArr::~ByteArr()
+CAT::Inverse() const
+CAT::makeChromaticAdaptationTag() const
+CDEIntegrator::CDEIntegrator()
+CIccCmm::FromInternalEncoding(icColorSpaceSignature, unsigned char*, float const*)
+CIccCmm::FromInternalEncoding(icColorSpaceSignature, unsigned short*, float const*)
+CIccCmm::GetFloatColorEncoding(char const*)
+CIccCmm::GetFloatColorEncoding(icFloatColorEncoding)
+CIccCmm::IsInGamut(float*)
+CIccCmm::ToInternalEncoding(icColorSpaceSignature, float*, unsigned char const*)
+CIccCmm::ToInternalEncoding(icColorSpaceSignature, float*, unsigned short const*)
+CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
+CIccIO::ReadLine(void*, long)
+CIccInfo::GetSpotShapeName(icSpotShape)
+CIccMBB::NewCLUT(unsigned char*, unsigned char)
+CIccMemIO::Alloc(unsigned long, bool)
+CIccMpeCLUT::SetCLUT(CIccCLUT*)
+CIccMpeCreator::DoGetElementSigName(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, icElemTypeSignature)
+CIccMpeCurveSet::SetCurve(int, CIccCurveSetCurve*)
+CIccMruCmm::Attach(CIccCmm*, unsigned char)
+CIccNamedColorCmm::CIccNamedColorCmm(icColorSpaceSignature, icColorSpaceSignature, bool)
+CIccNamedColorCmm::SetLastXformDest(icColorSpaceSignature)
+CIccProfile::DeleteTag(unsigned long)
+CIccProfile::GetSpaceSamples() const
+CIccProfileIdDesc::CIccProfileIdDesc(CIccProfile&)
+CIccProfileIdDesc::CIccProfileIdDesc(icProfileID, CIccTagMultiLocalizedUnicode)
+CIccSegmentedCurve::Insert(CIccCurveSegment*)
+CIccTagCurve::SetGamma(float)
+CIccTagFixedNum<long, (icTagTypeSignature)1936077618>::GetSize() const
+CIccTagFixedNum<unsigned long, (icTagTypeSignature)1969632050>::GetSize() const
+CIccTagMultiLocalizedUnicode::SetText(unsigned short const*, unsigned short, unsigned short)
+CIccTagMultiProcessElement::GetElement(int)
+CIccTagNamedColor2::FindRootColor(char const*)
+CIccTagNamedColor2::Lab4ToLab2(float*, float const*)
+CIccTagNamedColor2::NegClip(float)
+CIccTagNum<unsigned char, (icTagTypeSignature)1969827896>::GetSize() const
+CIccTagNum<unsigned long long, (icTagTypeSignature)1969829428>::GetSize() const
+CIccTagNum<unsigned long, (icTagTypeSignature)1969828658>::GetSize() const
+CIccTagNum<unsigned short, (icTagTypeSignature)1969828150>::GetSize() const
+CIccTagProfileSequenceId::AddProfileDescription(CIccProfileIdDesc const&)
+CIccTagProfileSequenceId::GetFirst()
+CIccTagProfileSequenceId::GetLast()
+CIccTagProfileSequenceId::ParseMem(unsigned char*, unsigned long)
+CIccTagResponseCurveSet16::GetFirstCurves()
+CIccTagResponseCurveSet16::GetNextCurves()
+CIccTagResponseCurveSet16::NewResponseCurves(icMeasurementUnitSig)
+CIccTagResponseCurveSet16::SetNumChannels(unsigned short)
+CIccXform::Create(CIccProfile&, bool, icRenderingIntent, icXformInterp, icXformLutType, bool)
+CIccXformMpe::Create(CIccProfile*, bool, icRenderingIntent, icXformInterp, icXformLutType)
+CLUT::Iterate(IIccCLUTExec*)
+CLUT::adaptedXYZToMeasuredXYZ(float*, float const*, float const*, float, CAT const*)
+CLUT::makeAToBxTag(unsigned int, float const*, float const*, float const*, CAT const*, float, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, float const*, bool)
+CNames::Insert(CNames const*, unsigned short, unsigned short)
+CNames::Insert(ControlItem const*&, unsigned short&)
+CNames::Insert(ControlItem const**, unsigned short)
+CNames::Remove(ControlItem const*&, unsigned short)
+CNames::Remove(unsigned short, unsigned short)
+Calendar::AddDateInfo(Date const&, String const&, Color const*, Color const*, unsigned short)
+Calendar::Calendar(Window*, ResId const&)
+Calendar::ClearDateInfo()
+Calendar::GetDateInfoText(Date const&)
+Calendar::GetDropDate(Date&) const
+Calendar::GetSelectDateCount() const
+Calendar::RemoveDateInfo(Date const&)
+Calendar::SelectDateRange(Date const&, Date const&, unsigned char)
+Calendar::SetMinimumNumberOfDaysInWeek(short)
+Calendar::SetSaturdayColor(Color const&)
+Calendar::SetStandardColor(Color const&)
+Calendar::SetSundayColor(Color const&)
+Calendar::SetWeekStart(short)
+Calendar::ShowDropPos(Point const&, Date&)
+CalendarField::CalendarField(Window*, ResId const&)
+CalendarWrapper::getMinimumNumberOfDaysForFirstWeek() const
+Camera3D::Reset()
+Camera3D::Rotate(double, double)
+Camera3D::RotateAroundLookAt(double, double)
+Camera3D::SetFocalLengthWithCorrect(double)
+CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
+CffSubsetterContext::getHintPair(int, float*, float*) const
+CfgStack::Push(CfgStackData*)
+CharAttribList::DbgCheckAttribs()
+CharAttribList::HasAttrib(unsigned short) const
+CharClass::isAlpha(String const&) const
+CharClass::isAlphaNumeric(String const&) const
+CharClass::isAsciiAlphaNumeric(String const&)
+CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsigned short)
+CharPosArray::Replace(int const&, unsigned short)
+CharPosArray::Replace(int const*, unsigned short, unsigned short)
+CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
+CloneList::Count() const
+CmdBaseStream::GenReturn(unsigned short, rtl::OString*, unsigned short, unsigned char)
+CmdStream::GenCmdFlow(unsigned short, String)
+CmdStream::GenCmdFlow(unsigned short, unsigned short)
+CntByteItem::CntByteItem(unsigned short, SvStream&)
+CntContentTypeItem::CntContentTypeItem(unsigned short, INetContentType)
+CntContentTypeItem::SetPresentation(String const&)
+CollatorWrapper::compareSubstring(rtl::OUString const&, int, int, rtl::OUString const&, int, int) const
+CollatorWrapper::listCollatorOptions(rtl::OUString const&) const
+CollatorWrapper::loadCollatorAlgorithmWithEndUserOption(rtl::OUString const&, com::sun::star::lang::Locale const&, com::sun::star::uno::Sequence<int> const&)
+Color::CMYKtoRGB(double, double, double, double)
+Color::IncreaseContrast(unsigned char)
+Color::RGBtoCMYK(double&, double&, double&, double&)
+ComboBox::GetEntryPos(void const*) const
+ComboBox::GetListPosSizePixel() const
+ComboBox::GetProminentEntryType() const
+ComboBox::GetSeparatorPos() const
+ComboBox::GetUserItemSize() const
+ComboBox::IsDDAutoWidthEnabled() const
+ComboBox::IsUserDrawEnabled() const
+ComboBox::SetSeparatorPos()
+ComboBox::ShowProminentEntry(unsigned short)
+CommandExtTextInputData::CommandExtTextInputData()
+CommandLine::get_arg(unsigned long) const
+CommandLine::get_arg_count() const
+CommandLine::get_arg_names() const
+CommandLine::set_arg_prefix(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short)
+CommunicationLinkList::Insert(CommunicationLink const*&, unsigned short&)
+CommunicationLinkList::Insert(CommunicationLink const**, unsigned short)
+CommunicationLinkList::Insert(CommunicationLinkList const*, unsigned short, unsigned short)
+CommunicationLinkList::Remove(CommunicationLink const*&, unsigned short)
+Config::Config()
+Config::EnterLock()
+Config::GetLineEnd() const
+Config::LeaveLock()
+Config::SetLineEnd(LineEnd)
+Config::Update()
+Container::GetObjectPtr(unsigned long)
+Container::GetPos(void const*, unsigned long, unsigned char) const
+Container::Insert(void*, void*)
+Container::Replace(void*)
+Control::GetLineCount() const
+ControlItem::ControlItem(ControlData*)
+CurrencyBox::CurrencyBox(Window*, ResId const&)
+CurrencyBox::GetValue(unsigned short) const
+CurrencyBox::GetValuePos(long) const
+CurrencyBox::InsertValue(long, unsigned short)
+CurrencyBox::RemoveValue(long)
+CurrencyField::CurrencyField(Window*, ResId const&)
+CurrencyFormatter::SetCurrencySymbol(String const&)
+Cursor::SetHeight(long)
+Cursor::SetOffsetY(long)
+Cursor::SetSlant(long)
+CustomPropertiesControl::Initialize()
+CustomPropertiesWindow::DoesCustomPropertyExist(String const&) const
+CustomToolBarImportHelper::showToolbar(rtl::OUString const&)
+DateBox::GetDate(unsigned short) const
+DateBox::GetDatePos(Date const&) const
+DateBox::InsertDate(Date const&, unsigned short)
+DateBox::RemoveDate(Date const&)
+DateFormatter::GetRealDate() const
+DateFormatter::IsDateModified() const
+DateTime::MakeDateTimeFromSec(Date const&, unsigned long)
+DbGridControl::IsForceHideScrollbars() const
+DbGridControl::SetMultiSelection(unsigned char)
+DbGridControl::forceROController(unsigned char)
+DbGridControl::forceSyncDisplay()
+DdeGetPutItem::DdeGetPutItem(DdeItem const&)
+DdeTopic::RemoveItem(DdeItem const&)
+DecoToolBox::DecoToolBox(Window*, ResId const&)
+DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
+Dialog::Dialog(Window*, ResId const&)
+Dialog::ImplCenterDialog()
+Dialog::IsStartedModal() const
+DicEntry::DicEntry()
+DirEntry::GetDevice() const
+DirEntry::GetPathStyle()
+DisclosureButton::DisclosureButton(Window*, long)
+DlgEdObj::LinkStubOnCreate(void*, void*)
+DockingWindow::GetMaxOutputSizePixel() const
+DockingWindow::IsTitleButtonVisible(unsigned short) const
+DockingWindow::SetTabStop()
+DomBuilderContext::getNode()
+DomExport::qualifiedName(com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> const&)
+DoubleCurrencyField::DoubleCurrencyField(Window*, ResId const&)
+DropListBox_Impl::LinkStubOnAsyncExecuteError(void*, void*)
+E3dCompoundObject::SetCreateNormals(unsigned char)
+E3dCompoundObject::SetCreateTexture(unsigned char)
+E3dCompoundObject::SetMaterialAmbientColor(Color const&)
+E3dCubeObj::SetSideFlags(unsigned short)
+E3dLatheObj::ReSegment(unsigned int, unsigned int)
+E3dPolygonObj::E3dPolygonObj(E3dDefaultAttributes&, basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, basegfx::B2DPolyPolygon const&, unsigned char)
+E3dPolygonObj::E3dPolygonObj(E3dDefaultAttributes&, basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, unsigned char)
+E3dScene::GetShadowPlaneDirection() const
+E3dScene::SetShadowPlaneDirection(basegfx::B3DVector const&)
+E3dSphereObj::ReSegment(unsigned int, unsigned int)
+E3dView::HasMarkedScene()
+E3dView::MergeScenes()
+EECharAttribArray::Insert(EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
+EECharAttribArray::Replace(EECharAttrib const&, unsigned short)
+EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short)
+EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(EECharAttrib const&, void*), void*)
+EditDbg::GetTextPortionInfo(TextPortionList&)
+EditDbg::ShowPortionData(ParaPortion*)
+EditEngine::CreateFontFromItemSet(SfxItemSet const&)
+EditEngine::CursorLeft(ESelection const&, unsigned short) const
+EditEngine::CursorRight(ESelection const&, unsigned short) const
+EditEngine::EnableIdleFormatter(unsigned char)
+EditEngine::EnablePasteSpecial(unsigned char)
+EditEngine::GetAvailableSearchOptions()
+EditEngine::GetGroupChars() const
+EditEngine::ImportBulletItem(SvxNumBulletItem&, unsigned short, SvxBulletItem const*, SvxLRSpaceItem const*)
+EditEngine::IsFirstWordCapitalization() const
+EditEngine::IsIdleFormatterEnabled() const
+EditEngine::IsParagraphVisible(unsigned short)
+EditEngine::IsPasteSpecialEnabled() const
+EditEngine::RegisterClipboardFormatName()
+EditEngine::SelectSentence(ESelection const&) const
+EditEngine::SetActiveView(EditView*)
+EditEngine::SetGroupChars(String const&)
+EditEngine::SetText(unsigned short, EditTextObject const&)
+EditEngine::StopSelectionMode()
+EditEngine::WordLeft(ESelection const&, unsigned short) const
+EditEngine::WordRight(ESelection const&, unsigned short) const
+EditSelectionEngine::GetCurView()
+EditTextObject::Skip(SvStream&)
+EditView::Drop(DropEvent const&)
+EditView::GetDropPos()
+EditView::GetSelectionMode() const
+EditView::GetWordUnderMousePointer() const
+EditView::IndentBlock()
+EditView::IsPasteEnabled() const
+EditView::MatchGroup()
+EditView::QueryDrop(DropEvent&)
+EditView::SetCursor(Cursor const&)
+EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
+EditView::SetPointer(Pointer const&)
+EditView::UnindentBlock()
+ElementCollector::isAbleToNotify() const
+ElementCollector::setSecurityId(int)
+EnhWMFReader::ReadGDIComment()
+ErrorHandler::ForwCreateString(ErrorInfo const*, String&, unsigned short&) const
+ExtraKernInfo::HasKernPairs() const
+ExtraPortionInfo::DestroyOrgDXArray()
+FieldEntry::GetBookmarkType()
+FileControl::ResetButtonText()
+FileControl::SetButtonText(String const&)
+FileCopier::FileCopier()
+FileCopier::GetError() const
+FileCopier::GetErrorHdl() const
+FileCopier::GetErrorSource() const
+FileCopier::GetErrorTarget() const
+FileCopier::SetErrorHdl(Link const&)
+FileDialog::RemoveAllFilter()
+FileDialog::RemoveFilter(String const&)
+FileDialog::SetCancelButtonText(String const&)
+FileDialog::SetOkButtonText(String const&)
+FileList::GetFormat()
+FileStat::FileStat(void const*, void const*)
+FileStat::SetDateTime(String const&, DateTime const&)
+FileStream::FileStream(rtl::OString const&, FileAccessMode)
+FillAttrLB::FillAttrLB(Window*, ResId)
+FillAttrLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&)
+FilterConfigCache::FilterConfigCacheEntry::IsValid()
+FilterConfigCache::IsImportDialog(unsigned short)
+FilterConfigItem::ReadSize(rtl::OUString const&, com::sun::star::awt::Size const&)
+FilterConfigItem::WriteSize(rtl::OUString const&, com::sun::star::awt::Size const&)
+FilterConfigItem::WriteString(rtl::OUString const&, rtl::OUString const&)
+FixedBitmap::GetModeBitmap() const
+FixedBitmap::SetModeBitmap(Bitmap const&)
+FixedBorder::FixedBorder(Window*, long)
+FixedBorder::SetBorderType(unsigned short)
+FixedBorder::SetTransparent(unsigned char)
+FixedImage::CalcImagePos(Point const&, Size const&, Size const&)
+FloatingWindow::RemovePopupModeWindow(Window*)
+FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
+FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
+FmEntryDataArray::Insert(FmEntryData* const*, unsigned short)
+FmEntryDataArray::Insert(FmEntryDataArray const*, unsigned short, unsigned short)
+FmEntryDataArray::Remove(FmEntryData* const&, unsigned short)
+FmFieldWinMgr::GetChildWindowId()
+FmFormModel::FmFormModel(SfxItemPool*, SfxObjectShell*, bool)
+FmFormObj::getType() const
+FmGridControl::restored(com::sun::star::lang::EventObject const&)
+FmPropBrwMgr::GetChildWindowId()
+FmXFilterCell::getImplementation(com::sun::star::uno::Reference<com::sun::star::awt::XControl> const&)
+FmXFormShell::clearFilter()
+FontCharMap::GetLastChar() const
+FontInfo::IsDeviceFont() const
+FontInfo::SupportsCJK() const
+FontInfo::SupportsCTL() const
+FontInfo::SupportsLatin() const
+FontList::GetFontNameType(String const&) const
+FontSizeBox::GetValue(unsigned short, FieldUnit) const
+FontSizeBox::SetUserValue(long, FieldUnit)
+FontStyleBox::FontStyleBox(Window*, long)
+FontStyleMenu::Fill(String const&, FontList const*)
+FontStyleMenu::FontStyleMenu()
+FormattedField::SetValidateText(String const&, String const*)
+FormatterBase::SetFieldText(String const&, unsigned char)
+Fraction::Fraction(long, long, long, long)
+GDIMetaFile::CopyAction(unsigned long) const
+GDIMetaFile::GetActionPos(String const&)
+GDIMetaFile::GetLabel(unsigned long)
+GDIMetaFile::GetLabelCount() const
+GDIMetaFile::InsertLabel(String const&, unsigned long)
+GDIMetaFile::IsEqual(GDIMetaFile const&) const
+GDIMetaFile::RemoveLabel(String const&)
+GDIMetaFile::RenameLabel(String const&, String const&)
+GDIMetaFile::ReplaceColors(Color const&, Color const&, unsigned long)
+GDIMetaFile::SaveStatus()
+GDIMetaFile::Wind(unsigned long)
+GDIMetaFile::WindEnd()
+GDIMetaFile::WindNext()
+GHEditWindow::Clear()
+Gallery::CreateImportTheme(INetURLObject const&, String const&)
+GalleryExplorer::DrawCentered(OutputDevice*, FmFormModel const&)
+GalleryExplorer::GetObjCount(unsigned long)
+GalleryExplorer::GetVCDrawModel(FmFormModel&) const
+GalleryExplorer::InsertGraphicObj(unsigned long, Graphic const&)
+GalleryExplorer::InsertSdrObj(unsigned long, FmFormModel&)
+GalleryTheme::ImplRead()
+GlobalEventConfig::EstablishFrameCallback(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&)
+GlobalEventConfig_Impl::getEvents()
+GlyphCache::CalcByteCount() const
+GlyphCache::ClearFontPath()
+GlyphCache::LoadFonts()
+GradientLB::GradientLB(Window*, long, unsigned char)
+GraphCtrl::GetStringFromDouble(double const&)
+GraphCtrl::GraphCtrl(Window*, long)
+Graphic::Draw(OutputDevice*, String const&, Font&, Bitmap const&, Point const&, Size const&)
+Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*)
+GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsigned long)
+GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
+GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
+GraphicHelper::getDeviceInfo() const
+GraphicManager::ClearCache()
+GraphicManager::GetCacheTimeout() const
+GraphicManager::GetFreeCacheSize() const
+GraphicManager::GetMaxCacheSize() const
+GraphicManager::GetMaxObjCacheSize() const
+GraphicManager::GetUsedCacheSize() const
+GraphicObject::GetChecksum() const
+GraphicObject::GetSwapStreamHdl() const
+GraphicObject::GraphicObject(Graphic const&, String const&, GraphicManager const*)
+GraphicObject::ResetAnimationLoopCount()
+GraphicObject::SetAnimationNotifyHdl(Link const&)
+GraphicObject::SetGraphicManager(GraphicManager const&)
+GraphicReader::IsPreviewModeEnabled() const
+GroupTable::SkipCurrentGroup()
+HTMLControls::Insert(HTMLControl const*&, unsigned short&)
+HTMLControls::Insert(HTMLControl const**, unsigned short)
+HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
+HTMLControls::Remove(HTMLControl const*&, unsigned short)
+HTMLControls::Remove(unsigned short, unsigned short)
+Hatch::SetStyle(HatchStyle)
+HatchingLB::HatchingLB(Window*, long, unsigned char)
+HatchingLB::SelectEntryByList(XHatchList const*, String const&, XHatch const&, unsigned short)
+HeaderBar::GetItemData(unsigned short) const
+HeaderBar::GetItemImage(unsigned short) const
+HeaderBar::InsertItem(unsigned short, Image const&, String const&, long, unsigned short, unsigned short)
+HeaderBar::InsertItem(unsigned short, Image const&, long, unsigned short, unsigned short)
+HeaderBar::SetHelpId(unsigned short, rtl::OString const&)
+HeaderBar::SetHelpText(unsigned short, String const&)
+HeaderBar::SetItemData(unsigned short, void*)
+HeaderBar::SetItemImage(unsigned short, Image const&)
+HelpTextWindow::RegisterAccessibleParent()
+HelpTextWindow::RevokeAccessibleParent()
+HttpRequest::Abort()
+HttpRequest::GetStatus()
+HttpRequest::~HttpRequest()
+IMapWindow::GetSdrObj(IMapObject const*) const
+INetURLObject::hasPassword() const
+IconChoiceDialog::RemoveResetButton()
+IconChoiceDialog::RemoveTabPage(unsigned short)
+ImageAryData::ImageAryData()
+ImageButton::ImageButton(unsigned short)
+ImageList::Clear()
+ImageList::GetImageIds(std::vector<unsigned short, std::allocator<unsigned short> >&) const
+ImageList::RemoveImage(rtl::OUString const&)
+ImageList::ReplaceImage(rtl::OUString const&, rtl::OUString const&)
+ImageList::ReplaceImage(unsigned short, Image const&)
+ImageMap::GetBoundRect() const
+ImpBitmap::ImplDestroy()
+ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyState>&)
+ImpEditEngine::ImplFillTextMarkingVector(com::sun::star::lang::Locale const&, std::vector<EEngineData::TextMarkingClass, std::allocator<EEngineData::TextMarkingClass> >&, String const&, unsigned short, unsigned short) const
+ImpEditEngine::Repeat(EditView*)
+ImpEditView::CalcSelectedRegion()
+ImpLabelList::ImplFirst()
+ImpLabelList::ImplNext()
+ImpSdrHdcMerk::ImpSdrHdcMerk(OutputDevice const&, unsigned short, bool)
+ImpSdrHdcMerk::Restore(OutputDevice&, unsigned short) const
+ImpSdrHdcMerk::~ImpSdrHdcMerk()
+ImpSvMEdit::SetInsertMode(unsigned char)
+ImpSvMEdit::SetTextWindowOffset(Point const&)
+ImpSvlData::~ImpSvlData()
+ImpSvtData::~ImpSvtData()
+ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&)
+ImplBorderWindow::SetHelpButton(unsigned char)
+ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
+ImplDockingWindowWrapper::GetFloatingPos() const
+ImplDockingWindowWrapper::GetMaxOutputSizePixel() const
+ImplDockingWindowWrapper::GetMinOutputSizePixel() const
+ImplDockingWindowWrapper::GetOutputSizePixel() const
+ImplDockingWindowWrapper::GetRollUpOutputSizePixel() const
+ImplDockingWindowWrapper::IsPined() const
+ImplDockingWindowWrapper::IsRollUp() const
+ImplDockingWindowWrapper::IsTitleButtonVisible(unsigned short) const
+ImplDockingWindowWrapper::RollDown()
+ImplDockingWindowWrapper::RollUp()
+ImplDockingWindowWrapper::SetFloatingPos(Point const&)
+ImplDockingWindowWrapper::SetOutputSizePixel(Size const&)
+ImplDockingWindowWrapper::SetPin(unsigned char)
+ImplDockingWindowWrapper::SetRollUpOutputSizePixel(Size const&)
+ImplEntryList::IsEntrySelected(String const&) const
+ImplFontSelectData::ImplFontSelectData(ImplFontData const&, Size const&, float, int, bool)
+ImplImageBmp::Create(long, long, unsigned short)
+ImplImageBmp::Expand(unsigned short)
+ImplImageBmp::GetBitmapEx(unsigned short, unsigned short*) const
+ImplImageBmp::Invert()
+ImplImageBmp::Replace(unsigned short, BitmapEx const&)
+ImplImageBmp::Replace(unsigned short, ImplImageBmp const&, unsigned short)
+ImplImageBmp::Replace(unsigned short, unsigned short)
+ImplImageBmp::ReplaceColors(Color const*, Color const*, unsigned long)
+ImplImageList::GetImageCount() const
+ImplListBox::GetEntryFlags(unsigned short) const
+ImplRegionBand::IsInside(long, long)
+ImplRegionBand::IsOver(long, long)
+ImplTaskBarFloat::ImplTaskBarFloat(TaskBar*)
+ImplWin::GetModeImage() const
+ImplWin::SetModeImage(Image const&)
+Impl_OlePres::Read(SvStream&)
+IniParser::Dump()
+InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
+InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
+InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
+InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
+InsCapOptArr::Remove(unsigned short, unsigned short)
+InternalResMgr::GetBitmapStream(unsigned int)
+IntlWrapper::ImplNewCalendar() const
+IntlWrapper::ImplNewCharClass() const
+IntroWindow::SetBackgroundBitmap(Bitmap const&)
+IntroWindow_Impl::IntroWindow_Impl(Bitmap const&)
+IntroWindow_Impl::Slide()
+ItemList::FindAttrib(unsigned short)
+JavaChildWindow::JavaChildWindow(Window*, ResId const&)
+JavaChildWindow::JavaChildWindow(Window*, long)
+JavaChildWindow::getParentWindowHandleForJava()
+JobSetup::GetValue(String const&) const
+KeyCode::GetSymbolName(String const&, Window*) const
+KeyEvent::InitKeyEvent(com::sun::star::awt::KeyEvent&) const
+KeyEvent::KeyEvent(com::sun::star::awt::KeyEvent const&)
+KeyboardSettings::CopyData()
+LWPFilterImportFilter::getSupportedServiceNames_Static()
+Line::Enum(Link const&)
+Line::NearestPoint(Point const&) const
+LineInfo::isDashDotOrFatLineUsed() const
+LineLB::SelectEntryByList(XDashList const*, String const&, XDash const&, unsigned short)
+LineListBox::GetEntryDistance(unsigned short) const
+LineListBox::GetEntryLine1(unsigned short) const
+LineListBox::GetEntryLine2(unsigned short) const
+LinguMgr::UpdateAll()
+LinguOptions::GetValue(com::sun::star::uno::Any&, int) const
+LinguOptions::SetValue(com::sun::star::uno::Any&, com::sun::star::uno::Any const&, int)
+LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
+ListBox::CalcWindowSizePixel(unsigned short) const
+ListBox::GetMRUEntries(unsigned short) const
+ListBox::GetMaxMRUCount() const
+ListBox::GetProminentEntryType() const
+ListBox::GetUserItemSize() const
+ListBox::IsDDAutoWidthEnabled() const
+ListBox::IsUserDrawEnabled() const
+ListBox::SetMRUEntries(String const&, unsigned short)
+ListBox::SetMaxMRUCount(unsigned short)
+ListBox::SetProminentEntryType(ProminentEntry)
+ListBox::SetSeparatorPos()
+ListBox::ShowProminentEntry(unsigned short)
+LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&)
+LocaleDataWrapper::getCollatorImplementations() const
+LocaleDataWrapper::getTransliterations() const
+LongCurrencyBox::GetValue(unsigned short) const
+LongCurrencyBox::GetValuePos(BigInt) const
+LongCurrencyBox::InsertValue(BigInt, unsigned short)
+LongCurrencyBox::LongCurrencyBox(Window*, ResId const&)
+LongCurrencyBox::RemoveValue(BigInt)
+LongCurrencyField::ImplLoadRes(ResId const&)
+LongCurrencyField::LongCurrencyField(Window*, ResId const&)
+LongCurrencyFormatter::Denormalize(BigInt) const
+LongCurrencyFormatter::IsValueModified() const
+LongCurrencyFormatter::Normalize(BigInt) const
+LongCurrencyFormatter::SetEmptyValue()
+LotAttrCache::ENTRY::ENTRY(ScPatternAttr const&)
+LotAttrCol::Clear()
+LwpBulletStyleMgr::GetSectionName(LwpPara*)
+LwpBulletStyleMgr::OutputBulletListHeader(IXFStream*, unsigned char, rtl::OUString const&, short, unsigned char)
+LwpBulletStyleMgr::OutputBulletListTail(IXFStream*, unsigned short)
+LwpCHBlkMarker::ProcessPageNumber(XFContentContainer*, unsigned char)
+LwpCellLayout::GetLeaderChar()
+LwpChangeMgr::ConvertFribContent(XFContentContainer*, LwpFrib*)
+LwpCharacterBorderOverride::Override(LwpCharacterBorderOverride*)
+LwpDLList::LwpDLList(LwpDLList*, LwpDLList*)
+LwpDefaultObject::LwpDefaultObject(LwpObjectHeader&, LwpSvStream*)
+LwpDocData::SkipAtomHandler(LwpSvStream*)
+LwpDocData::SkipExtra(LwpSvStream*)
+LwpDocument::GetMaxNumberOfPages()
+LwpDocument::ParseMasterDoc(IXFStream*)
+LwpFootnote::FindFootnoteTable()
+LwpFootnote::GetEnSuperTableLayout()
+LwpFoundry::FindBookMarkByName(rtl::OUString)
+LwpFribTable::Parse(IXFStream*)
+LwpGraphicObject::GetRectIn100thMM()
+LwpGraphicObject::GetRectInCM()
+LwpMiddleLayout::SetScaleCenter(unsigned short)
+LwpMiddleLayout::SetScaleHeight(double)
+LwpMiddleLayout::SetScaleMode(unsigned short)
+LwpMiddleLayout::SetScalePercentage(unsigned int)
+LwpMiddleLayout::SetScaleTile(unsigned short)
+LwpMiddleLayout::SetScaleWidth(double)
+LwpNumberingOverride::Override(LwpNumberingOverride*)
+LwpObject::LwpObject()
+LwpObjectID::GetBuffer(char*)
+LwpObjectID::ReadCompressed(LwpSvStream*, LwpObjectID&)
+LwpObjectStream::QuickReadInt8(bool*)
+LwpOleObject::GetOLEObjectSize(SotStorage*) const
+LwpOlePres::Write(SvStream&)
+LwpPara::GetLayoutWithMyStory()
+LwpPara::IsNumberRight()
+LwpPara::OverrideTab(LwpTabOverride*, LwpTabOverride*, XFParaStyle*)
+LwpPlacableLayout::GetRelativeDistance()
+LwpPlacableLayout::GetRelativeFromWhere()
+LwpPlacableLayout::GetTetherType()
+LwpPlacableLayout::GetTetherWhere()
+LwpRowHeadingLayout::GetRowLayout()
+LwpSortOption::Skip(LwpObjectStream*)
+LwpStory::XFConvertFrame(XFContentContainer*)
+LwpSuperTableLayout::ParseFrame(XFFrame*)
+LwpTableHint::LwpTableHint(LwpObjectHeader&, LwpSvStream*)
+LwpUIDocument::LwpUIDocument()
+LwpVerDocument::GetTabSpacing()
+MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
+MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
+MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
+MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
+MSDffImportRecords::Remove(unsigned short, unsigned short)
+MSFilterTracer::EndElement(rtl::OUString const&)
+MSFilterTracer::SetProperty(rtl::OUString const&, com::sun::star::uno::Any const&)
+MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>)
+MachineSettings::CopyData()
+MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
+MaskSet::MaskSet(SvxBmpMask*, long)
+Menu::ConvertPoint(Point&, Window*) const
+Menu::GetAccessibleDescription(unsigned short) const
+Menu::GetDisplayItemId(long) const
+Menu::GetDisplayText() const
+Menu::GetItemStartEnd(unsigned short) const
+Menu::GetLineCount() const
+Menu::ImplSelectWithStart(Menu*)
+Menu::IsItemVisible(unsigned short) const
+Menu::SetAccessibleDescription(unsigned short, String const&)
+Menu::doLazyDelete()
+MenuBar::AddMenuBarButton(Image const&, Link const&, unsigned short)
+MenuBar::ShowFloatButton(unsigned char)
+MenuBar::ShowHideButton(unsigned char)
+MenuItemList::GetCharClass() const
+MergeData::~MergeData()
+MergeDataFile::Dump()
+MessBox::GetModeImage() const
+MessBox::MessBox(unsigned short)
+MessBox::SetDefaultCheckBoxText()
+MessBox::SetModeImage(Image const&)
+MetaCommentAction::MetaCommentAction(unsigned char const*, unsigned int)
+MetricBox::RemoveValue(long, FieldUnit)
+MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
+MiscSettings::SetDisablePrinting(unsigned char)
+MiscSettings::SetEnableATToolSupport(unsigned char)
+ModulWindow::LinkStubBasicErrorHdl(void*, void*)
+MoreButton::RemoveWindow(Window*)
+MouseEvent::InitMouseEvent(com::sun::star::awt::MouseEvent&) const
+MultiLineEdit::GetHScrollBar() const
+MultiLineEdit::GetLeftMargin() const
+MultiLineEdit::GetTextLines() const
+MultiLineEdit::IsFocusSelectionHideEnabled() const
+MultiLineEdit::IsRightToLeft() const
+MultiLineEditSyntaxHighlight::EnableBracketHilight(bool)
+MultiLineEditSyntaxHighlight::IsBracketHilight()
+MultiPropertySetHelper::MultiPropertySetHelper(rtl::OUString const*)
+MultiSelection::Append(long)
+MultiSelection::PrevSelected()
+NameNode::IsOrderTree() const
+NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const&, short) const
+NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const&)
+NfCurrencyEntry::IsEuro() const
+NfCurrencyEntry::NfCurrencyEntry()
+NfCurrencyEntry::SetEuro()
+NfShCurrencyEntries::DeleteAndDestroy(unsigned short, unsigned short)
+NotificationSettings::CopyData()
+NotifyBrokenPackage::isAborted()
+NumberFormatCodeWrapper::getDefault(short, short) const
+NumericBox::GetValue(unsigned short) const
+NumericBox::GetValuePos(long) const
+NumericBox::RemoveValue(long)
+NumericFormatter::ConvertToFraction(long)
+NumericFormatter::ConvertToLong(Fraction const&)
+OLEObjCache::SetSize(unsigned long)
+ORegKey::acquireKey(void*)
+OUStringsSort_Impl::DeleteAndDestroy(unsigned short, unsigned short)
+OUStringsSort_Impl::Insert(OUStringsSort_Impl const*, unsigned short, unsigned short)
+OUStringsSort_Impl::Insert(rtl::OUString* const&)
+OUStringsSort_Impl::Insert(rtl::OUString* const&, unsigned short&)
+OUStringsSort_Impl::Insert(rtl::OUString* const*, unsigned short)
+OUStringsSort_Impl::Remove(rtl::OUString* const&, unsigned short)
+OUStringsSort_Impl::Remove(unsigned short, unsigned short)
+Octree::AddColor(BitmapColor const&)
+Octree::Octree(unsigned long)
+OdtGeneratorPrivate::_writeBegin()
+OpenStormBento::AswEntry::SetClassId(OpenStormBento::ClsId const&)
+OpenStormBento::AswEntry::SetName(String const&)
+OpenStormBento::AswEntry::Store(void*)
+OpenStormBento::CBenObject::DeleteProperty(OpenStormBento::CBenProperty*)
+OpenStormBento::CBenObject::GetNextProperty(OpenStormBento::CBenProperty*)
+OpenStormBento::CBenObject::UseSingleValue()
+OpenStormBento::CBenObject::UseValueWithPropertyName(char const*)
+OpenStormBento::CBenTOCReader::GetWord(unsigned short*)
+OpenStormBento::CBenValue::GetReferencedListID()
+OpenStormBento::CBenValue::GetReferencedObject(OpenStormBento::CBenReference*)
+OpenStormBento::CBenValue::NewReference(unsigned long, OpenStormBento::CBenReference*)
+OpenStormBento::CBenValue::ReadValueDataKnownSize(void*, unsigned long, unsigned long)
+OpenStormBento::CBenValue::TruncateValueSize(unsigned long)
+OpenStormBento::CBenValue::WriteImmediateValueData(void const*, unsigned short)
+OpenStormBento::CUtList::CircularGetNext(OpenStormBento::CUtListElmt const*)
+OpenStormBento::CUtList::CircularGetPrev(OpenStormBento::CUtListElmt const*)
+OpenStormBento::CUtList::GetCount()
+OpenStormBento::CUtList::GetIndex(OpenStormBento::CUtListElmt*)
+OpenStormBento::CUtList::GetIndex(int)
+OpenStormBento::CUtList::GetPrevOrNULL(OpenStormBento::CUtListElmt*)
+OpenStormBento::LtcBenContainer::ConvertAswStorageToOLE2Stream(char const*)
+OpenStormBento::LtcBenContainer::CreateGraphicStreams(std::vector<SvStream*, std::allocator<SvStream*> >*)
+OpenStormBento::LtcBenContainer::GetPosition(unsigned long*)
+OpenStormBento::LtcBenContainer::RegisterTypeName(char const*, OpenStormBento::CBenTypeName**)
+OpenStormBento::LtcBenContainer::Release()
+Options::getExtraInputFile(unsigned short) const
+Options::getInputFile(unsigned short)
+Options::getOptions()
+Outliner::Draw(OutputDevice*, Rectangle const&, Point const&)
+Outliner::EndSpelling()
+Outliner::GetAsianCompressionMode() const
+Outliner::GetBeginDropHdl() const
+Outliner::GetBigTextObjectStart() const
+Outliner::GetDefTab() const
+Outliner::GetDocPos(Paragraph*)
+Outliner::GetEndDropHdl() const
+Outliner::GetFirstLineOffset(unsigned long)
+Outliner::GetForbiddenCharsTable() const
+Outliner::GetHyphenator() const
+Outliner::GetNotifyHdl() const
+Outliner::GetPolygon()
+Outliner::HasOnlineSpellErrors() const
+Outliner::IsAddExtLeading() const
+Outliner::IsAutoColorEnabled() const
+Outliner::IsFixedCellHeight() const
+Outliner::IsKernAsianPunctuation() const
+Outliner::RemoveParaFlag(Paragraph*, unsigned short)
+Outliner::SetBigTextObjectStart(unsigned short)
+Outliner::SetVisible(Paragraph*, unsigned char)
+OutlinerView::AdjustDepth(Paragraph*, short, unsigned char)
+OutlinerView::AdjustHeight(Paragraph*, long, unsigned char)
+OutlinerView::Collapse(Paragraph*)
+OutlinerView::CompleteAutoCorrect()
+OutlinerView::EnablePaste(unsigned char)
+OutlinerView::Expand(Paragraph*)
+OutlinerView::GetFieldUnderMousePointer(unsigned short&, unsigned short&) const
+OutlinerView::ImpDragScroll(Point const&)
+OutlinerView::ImpGetDocPos(Point const&)
+OutlinerView::ImpGetInsertionPara(Point const&)
+OutlinerView::ImpShowDDCursor()
+OutlinerView::Redo()
+OutlinerView::RemoveCharAttribs(unsigned long, unsigned short)
+OutlinerView::SetOutliner(Outliner*)
+OutlinerView::SetStyleSheet(SfxStyleSheet*)
+OutlinerView::SpellIgnoreWord()
+OutlinerView::Undo()
+OutlinerView::Write(SvStream&, EETextFormat)
+OutputDevice::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, unsigned int, ImplControlValue const&, rtl::OUString)
+OutputDevice::GetDownsampledBitmapEx(Size const&, Point const&, Size const&, BitmapEx const&, long, long)
+OutputDevice::GetFontSubstitute(unsigned short, String&, String&, unsigned short&)
+OutputDevice::GetMinKashida(Font const&) const
+OutputDevice::GetPixel(Polygon const&) const
+OutputDevice::ImplFloatDevicePixelToLogicHeight(float) const
+OutputDevice::ImplFloatDevicePixelToLogicWidth(float) const
+OutputDevice::ImplFloatLogicWidthToDevicePixel(float) const
+OutputDevice::ImplGetTextWidth(SalLayout const&) const
+OutputDevice::IsTextUnderlineAbove(Font const&)
+OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
+OutputDevice::LogicToLogic(long*, unsigned short, MapMode const*, MapMode const*) const
+OutputDevice::LogicToPixel(Region const&, MapMode const&) const
+OutputDevice::LogicToPixel(basegfx::B2DPolyPolygon const&) const
+OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
+OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
+OutputDevice::PixelToLogic(Region const&, MapMode const&) const
+OutputDevice::PixelToLogic(basegfx::B2DPolyPolygon const&) const
+OutputDevice::PixelToLogic(basegfx::B2DPolygon const&) const
+PageSpan::getMarginLeft() const
+PageSpan::getMarginRight() const
+ParaPortion::DbgCheckTextPortions()
+ParaPortionList::DbgCheck(EditDoc&)
+ParagraphList::GetVisPos(Paragraph*) const
+ParagraphList::PrevVisible(Paragraph*) const
+ParagraphObj::ImplMapSize(com::sun::star::awt::Size const&)
+ParagraphObj::ParagraphObj(ParagraphObj&)
+PathDialog::SetPath(Edit const&)
+PatternBox::GetString(unsigned short) const
+PatternBox::GetStringPos(String const&) const
+PatternBox::InsertString(String const&, unsigned short)
+PatternBox::PatternBox(Window*, ResId const&)
+PatternBox::RemoveString(String const&)
+PatternField::PatternField(Window*, ResId const&)
+PatternFormatter::SelectFixedFont()
+PluginConnector::getInstance(_NPP*)
+PluginConnector::getInstanceById(unsigned int)
+PolyPolygon::Distort(Rectangle const&, Polygon const&)
+PolyPolygon::SlantX(long, double, double)
+PolyPolygon::SlantY(long, double, double)
+Polygon::GetArea() const
+Polygon::GetDifference(PolyPolygon const&, PolyPolygon&) const
+Polygon::GetIntersection(PolyPolygon const&, PolyPolygon&) const
+Polygon::GetUnion(PolyPolygon const&, PolyPolygon&) const
+Polygon::GetXOR(PolyPolygon const&, PolyPolygon&) const
+Polygon::ImplGetFlagAry()
+Polygon::ImplGetPointAry()
+Polygon::IsControl(unsigned short) const
+Polygon::IsSmooth(unsigned short) const
+Polygon::Remove(unsigned short, unsigned short)
+PopupMenu::SetSelectedEntry(unsigned short)
+PropBrwMgr::GetChildWindowId()
+ProposalList::Remove(rtl::OUString const&)
+PushButton::GetSymbolAlign() const
+REResourceList::REResourceList()
+REResourceList::~REResourceList()
+ResData::Dump()
+Ruler::GetArrowCount() const
+Ruler::GetArrows() const
+Ruler::GetBorderCount() const
+Ruler::GetBorders() const
+Ruler::GetDocType(Point const&, RulerType, unsigned short*) const
+Ruler::GetIndentCount() const
+Ruler::GetIndents() const
+Ruler::GetLineCount() const
+Ruler::GetLines() const
+Ruler::GetMargin1Style() const
+Ruler::GetMargin2Style() const
+Ruler::GetPageWidth() const
+Ruler::SetArrows(unsigned short, RulerArrow const*)
+SVGExport::GetGlyphPlacement() const
+SVGExport::IsUseGradient() const
+SVGExport::popClip()
+SVGExport::pushClip(basegfx::B2DPolyPolygon const&)
+SVGFilter::implImport(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
+SVTXGridControl::ImplGetPropertyIds(std::list<unsigned short, std::allocator<unsigned short> >&)
+SalColormap::SalColormap(BitmapPalette const&)
+SalColormap::SetPalette(BitmapPalette const&)
+SalConverterCache::ConvertStringUTF16(unsigned short const*, int, char*, unsigned long, unsigned short)
+SalConverterCache::EncodingHasChar(unsigned short, unsigned short)
+SalConverterCache::GetInstance()
+SalConverterCache::GetT2UConverter(unsigned short)
+SalConverterCache::IsSingleByteEncoding(unsigned short)
+SalConverterCache::~SalConverterCache()
+SalDisplay::IsLocal()
+SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*)
+SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&)
+SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector const&, basegfx::B2DLineJoin)
+SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double)
+SalI18N_InputContext::CommitStringCallback(unsigned short*, unsigned long)
+SalI18N_InputContext::SetPreeditState(int)
+SalI18N_KeyboardExtension::LookupKeysymInGroup(unsigned int, unsigned int, unsigned int) const
+SalLayout::Reference() const
+SalVisual::Convert(int&, int&, int&, int&)
+SanExtensionImpl::extractCertExt()
+SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
+SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
+SbMethod::GetLocals()
+SbPropertyContainer::SbPropertyContainer()
+SbPropertySetInfo::SbPropertySetInfo()
+SbTextPortions::Insert(SbTextPortions const*, unsigned short, unsigned short, unsigned short)
+SbTextPortions::Replace(SbTextPortion const&, unsigned short)
+SbTextPortions::Replace(SbTextPortion const*, unsigned short, unsigned short)
+SbTextPortions::_ForEach(unsigned short, unsigned short, unsigned char (*)(SbTextPortion const&, void*), void*)
+SbiBuffer::Add(void const*, unsigned short)
+SbiBuffer::Align(int)
+SbiDisas::Disas(SvStream&)
+SbiDisas::PromptOp(String&)
+SbiExprNode::IsString()
+SbiExpression::SbiExpression(SbiParser*, SbiToken)
+SbiExpression::SbiExpression(SbiParser*, String const&)
+SbiExpression::VBA_Imp()
+SbiImage::Load(SvStream&)
+SbiIoSystem::NextChannel()
+SbiRuntime::GetParams()
+SbiSymPool::Clear()
+SbxAlias::SbxAlias(String const&, SbxVariable*)
+SbxAppData::~SbxAppData()
+SbxBase::StaticEnableBroadcasting(unsigned char)
+SbxDecimal::SbxDecimal()
+SbxDecimal::getByte(unsigned char&)
+SbxDecimal::getChar(unsigned short&)
+SbxDecimal::getInt(int&)
+SbxDecimal::getLong(int&)
+SbxDecimal::getShort(short&)
+SbxDecimal::getString(rtl::OUString&)
+SbxDecimal::getUInt(unsigned int&)
+SbxDecimal::getULong(unsigned int&)
+SbxDecimal::getUShort(unsigned short&)
+SbxDecimal::setShort(short)
+SbxDecimal::setString(rtl::OUString*)
+SbxDecimal::setUShort(unsigned short)
+SbxDimArray::GetRef(SbxArray*)
+SbxDimArray::GetRef(short const*)
+SbxDimArray::GetRef32(int const*)
+SbxDimArray::Offset(SbxArray*)
+SbxDimArray::Put(SbxVariable*, SbxArray*)
+SbxInfo::AddParam(SbxParamInfo const&)
+SbxObject::GarbageCollection(unsigned long)
+SbxObject::SetPos(SbxVariable*, unsigned short)
+SbxObject::VCPtrInsert(SbxVariable*)
+SbxObject::VCPtrRemove(SbxVariable*)
+SbxValue::GetData() const
+SbxValue::GetErr() const
+SbxValue::GetInt() const
+SbxValue::GetNoBroadcast(SbxValues&)
+SbxValue::HasObject() const
+SbxValue::PutData(void*)
+SbxValue::PutDecimal(SbxDecimal*)
+SbxValue::PutInt(int)
+SbxValue::PutString(unsigned short const*)
+SbxValue::PutpChar(unsigned short const*)
+ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&)
+ScAddInAsyncs::Insert(ScAddInAsync* const*, unsigned short)
+ScAddInAsyncs::Insert(ScAddInAsyncs const*, unsigned short, unsigned short)
+ScAddInDocs::DeleteAndDestroy(unsigned short, unsigned short)
+ScAddInDocs::Insert(ScAddInDocs const*, unsigned short, unsigned short)
+ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
+ScAddInDocs::Insert(ScDocument* const*, unsigned short)
+ScAddInDocs::Remove(ScDocument* const&, unsigned short)
+ScAreaLinkSaveCollection::clear()
+ScAttrArray::HasLines(int, int, Rectangle&, unsigned char, unsigned char) const
+ScCellMergeOption::ScCellMergeOption()
+ScChangeActionContent::SetNewValue(String const&, ScDocument*)
+ScColumn::GetSimpleTextNeededSize(unsigned long, OutputDevice*, bool)
+ScCompressedArray<int, unsigned char>::GetEntryCount() const
+ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long)
+ScCompressedArray<int, unsigned short>::GetValue(int) const
+ScCompressedArray<int, unsigned short>::Insert(int, unsigned long)
+ScCompressedArray<int, unsigned short>::Remove(int, unsigned long)
+ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const&, unsigned long)
+ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const*, unsigned long)
+ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
+ScConditionalFormatList::MarkUsedExternalReferences() const
+ScConditionalFormats_Impl::Insert(ScConditionalFormat* const&, unsigned short&)
+ScConditionalFormats_Impl::Insert(ScConditionalFormat* const*, unsigned short)
+ScConditionalFormats_Impl::Insert(ScConditionalFormats_Impl const*, unsigned short, unsigned short)
+ScConditionalFormats_Impl::Remove(ScConditionalFormat* const&, unsigned short)
+ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
+ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
+ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_cxx::__normal_iterator<void**, std::vector<void*, std::allocator<void*> > >, ScDBData>)
+ScDBCollection::AnonDBs::size() const
+ScDLL::Exit()
+ScDPCache::GetAdditionalItemID(String const&) const
+ScDPCache::GetDimNumType(short) const
+ScDPCache::GetSortedItemData(short, int) const
+ScDPCache::IsEmptyMember(int, unsigned short) const
+ScDPFieldControlBase::GetParentDlg() const
+ScDPFieldControlBase::ModifySelectionOffset(long)
+ScDPFieldControlBase::SetSelectedField(unsigned long)
+ScDPItemData::CreateTypeString()
+ScDPItemData::GetNumFormat() const
+ScDPSaveData::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&)
+ScDdeLink::ResetValue()
+ScDocRowHeightUpdater::TabRanges::TabRanges()
+ScDocument::HasControl(short, Rectangle const&)
+ScDocument::InvalidateControls(Window*, short, Rectangle const&)
+ScDocument::IsLoadingMedium() const
+ScDocument::ValidNewTabName(std::vector<String, std::allocator<String> > const&) const
+ScExternalRefManager::setCacheTableReferencedPermanently(unsigned short, rtl::OUString const&, unsigned long)
+ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+ScFormulaCell::ScFormulaCell()
+ScGridWindow::InvertSimple(short, int, short, int, unsigned char, unsigned char)
+ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
+ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
+ScHTMLColOffset::Insert(unsigned long const*, unsigned short)
+ScHTMLColOffset::Remove(unsigned long const&, unsigned short)
+ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short)
+ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
+ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
+ScInputBarGroup::GainFocus()
+ScJobSetup::ScJobSetup(SfxPrinter*)
+ScLeftFooterEditPage::GetRanges()
+ScLeftHeaderEditPage::GetRanges()
+ScMatrix::CalcOffset(unsigned long, unsigned long) const
+ScMyCellInfo::ScMyCellInfo()
+ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
+ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
+ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const&, formula::FormulaGrammar::Grammar)
+ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+ScOutputData::DrawEditAsianVertical(ScOutputData::DrawEditParam&)
+ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
+ScPivotParam::ClearPivotArrays()
+ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
+ScRTFColTwips::Insert(unsigned long const&, unsigned short&)
+ScRTFColTwips::Insert(unsigned long const*, unsigned short)
+ScRTFColTwips::Remove(unsigned long const&, unsigned short)
+ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
+ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
+ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
+ScRangeData::ScRangeData(unsigned short)
+ScRightFooterEditPage::GetRanges()
+ScRightHeaderEditPage::GetRanges()
+ScSheetSourceDesc::GetCacheId() const
+ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
+ScStringCell::ScStringCell()
+ScSubTotalDescriptorBase::GetData(ScSubTotalParam&) const
+ScSubTotalDescriptorBase::PutData(ScSubTotalParam const&)
+ScTabPageSortFields::GetRanges()
+ScTabPageSortOptions::GetRanges()
+ScTabViewShell::LinkStubHtmlOptionsHdl(void*, void*)
+ScTable::IsRangeNameInUse(short, int, short, int, unsigned short) const
+ScTable::SetColFlags(short, unsigned char)
+ScTpCalcOptions::GetRanges()
+ScTpPrintOptions::GetRanges()
+ScTpSubTotalGroup::GetRanges()
+ScTpUserLists::GetRanges()
+ScUserList::end()
+ScUserList::end() const
+ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
+ScValidationEntries_Impl::Insert(ScValidationData* const*, unsigned short)
+ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short, unsigned short)
+ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
+ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
+ScValueCell::ScValueCell()
+ScVbaChart::areIndicesValid(int, int)
+ScVbaColorFormat::setColorFormat(short)
+ScVbaCommandBarControl::ScVbaCommandBarControl(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, boost::shared_ptr<VbaCommandBarHelper>, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, rtl::OUString const&, int, unsigned char)
+ScVbaCommentShape::ScVbaCommentShape(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::uno::Reference<ooo::vba::excel::XComment> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, int)
+ScVbaFormat<ooo::vba::excel::XRange>::getXServiceInfo()
+ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
+ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
+ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo()
+ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
+ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
+ScVbaLineFormat::calculateArrowheadSize() const
+ScVbaShape::ScVbaShape(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
+ScVbaShapes::AddShape(rtl::OUString const&, rtl::OUString const&, int, int, int, int)
+ScVbaWindows::ScVbaWindows(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
+ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+ScXMLExportDDELinks::CellsEqual(unsigned char, unsigned char, String const&, double const&, unsigned char, unsigned char, String const&, double const&) const
+ScXMLExportDatabaseRanges::WriteFilterDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSheetFilterDescriptor2> const&, rtl::OUString)
+ScXMLExportDatabaseRanges::WriteImportDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
+ScXMLExportDatabaseRanges::WriteSortDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
+ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor>, rtl::OUString)
+ScaList::Insert(void*, unsigned int)
+SchXMLExport::SetProgress(int)
+SchXMLExportHelper_Impl::getCellAddress(int, int)
+SchXMLImport::SchXMLImport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel>, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver>&, unsigned char, unsigned char)
+SchXMLImportHelper::GetAutoStyleAttrTokenMap()
+SchXMLImportHelper::GetNewLabeledDataSequence()
+SchXMLPositonAttributesHelper::getPosition() const
+SchXMLPositonAttributesHelper::getSize() const
+SchXMLSeriesHelper::getFirstCandleStickSeries(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&)
+ScrollBarBox::ScrollBarBox(Window*, ResId const&)
+ScrollableWindow::MakeVisible(Rectangle const&, unsigned char)
+ScrollableWindow::ScrollLines(long, long)
+ScrollableWindow::ScrollPages(long, unsigned long, long, unsigned long)
+ScrollableWindow::ScrollableWindow(Window*, ResId const&, unsigned short)
+ScrollableWindow::SetLineSize(unsigned long, unsigned long)
+ScrollableWindow::SetVisibleSize(Size const&)
+SdDLL::Exit()
+SdFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+SdTpOptionsMisc::LinkStubModifyOriginalScaleHdl(void*, void*)
+SdTpOptionsMisc::LinkStubModifyScaleHdl(void*, void*)
+SdXMLImExTransform2D::AddMatrix(basegfx::B2DHomMatrix const&)
+SdXMLImExTransform2D::AddScale(basegfx::B2DTuple const&)
+SdXMLImExTransform2D::AddSkewY(double)
+SdXMLImExTransform2D::SdXMLImExTransform2D(rtl::OUString const&, SvXMLUnitConverter const&)
+SdXMLImExTransform3D::AddRotateX(double)
+SdXMLImExTransform3D::AddRotateY(double)
+SdXMLImExTransform3D::AddRotateZ(double)
+SdXMLImExTransform3D::AddScale(basegfx::B3DTuple const&)
+SdXMLImExTransform3D::AddTranslate(basegfx::B3DTuple const&)
+SdXMLImport::ImportPoolDefaults(XMLPropStyleContext const*)
+SdXMLImport::SetProgress(int)
+SdXMLViewSettingsContext::SdXMLViewSettingsContext(SdXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
+SdrCaptionObj::SdrCaptionObj(Rectangle const&)
+SdrCreateView::ImpDelCreateAttr()
+SdrCustomShapeDataItem::SdrCustomShapeDataItem(String const&)
+SdrCustomShapeEngineItem::SdrCustomShapeEngineItem(String const&)
+SdrCustomShapeGeometryItem::ClearPropertyValue(rtl::OUString const&, rtl::OUString const&)
+SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem(String const&)
+SdrDragView::SetDetailedEdgeDragging(unsigned char)
+SdrDragView::SetDetailedEdgeDraggingLimit(unsigned short)
+SdrDragView::SetRubberEdgeDragging(unsigned char)
+SdrDragView::SetRubberEdgeDraggingLimit(unsigned short)
+SdrEdgeObj::ImpStripPolyPoints(XPolygon&) const
+SdrEditView::ImpBundleVirtObjOfMarkList()
+SdrEditView::MoveLayer(String const&, unsigned short)
+SdrEngineDefaults::LanguageHasChanged()
+SdrEscherImport::CheckMonotypeSorts() const
+SdrEscherImport::CheckTimesNewRoman() const
+SdrEscherImport::CheckWingdings() const
+SdrEscherImport::GetCharSet(unsigned int) const
+SdrEscherImport::IsFontAvailable(unsigned int) const
+SdrExchangeView::CutMarked(unsigned long)
+SdrExchangeView::GetPastePos(SdrObjList*, OutputDevice*)
+SdrExchangeView::IsExchangeFormatSupported(unsigned long) const
+SdrExchangeView::Paste(Bitmap const&, Point const&, SdrObjList*, unsigned int)
+SdrExchangeView::Paste(GDIMetaFile const&, Point const&, SdrObjList*, unsigned int)
+SdrExchangeView::YankMarked(unsigned long)
+SdrGlobalData::GetCharClass()
+SdrGlobalData::~SdrGlobalData()
+SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
+SdrGluePoint::Draw(OutputDevice&, SdrObject const*) const
+SdrGluePoint::Mirror(Point const&, Point const&, SdrObject const*)
+SdrGrafObj::GetGDIMetaFile() const
+SdrGrafObj::ImpSetGrafInfoToAttr()
+SdrGrafObj::IsGrafAnimationAllowed() const
+SdrGrafObj::SetFileName(String const&)
+SdrGrafObj::SetFilterName(String const&)
+SdrGrafObj::StopAnimation(OutputDevice*, long)
+SdrHdl::isMouseOver() const
+SdrHelpLine::IsVisibleEqual(SdrHelpLine const&, OutputDevice const&) const
+SdrHint::GetObjList() const
+SdrHint::GetRect() const
+SdrHint::SdrHint()
+SdrHint::SdrHint(SdrObject const&, Rectangle const&)
+SdrHint::SetObjList(SdrObjList const*)
+SdrHint::SetRect(Rectangle const&)
+SdrLayerAdmin::MoveLayer(SdrLayer*, unsigned short)
+SdrMark::GetObjList() const
+SdrMark::GetPage() const
+SdrMarkView::IsMoveOutside() const
+SdrMarkView::PickSomething(Point const&, short) const
+SdrMarkView::UnmarkGluePoint(SdrHdl const&)
+SdrMediaObj::getGraphic() const
+SdrMediaObj::hasPreferredSize() const
+SdrModel::BegUndo(SdrUndoGroup*)
+SdrModel::CheckConsistence() const
+SdrModel::GetNumberFormatter() const
+SdrModel::HasTransparentObjects(bool) const
+SdrModel::IsAllowShapePropertyChangeListener() const
+SdrObjEditView::AddTextEditOfs(MouseEvent&) const
+SdrObjEditView::Cut(unsigned long)
+SdrObjEditView::IsTextEditFrame() const
+SdrObjEditView::Paste(Window*, unsigned long)
+SdrObjEditView::Yank(unsigned long)
+SdrObjFactory::MakeNewObjUserData(unsigned int, unsigned short, SdrObject*)
+SdrObject::ClearObjectItem(unsigned short)
+SdrObject::ForceAutoTimer()
+SdrObject::FreeGlobalDrawObjectItemPool()
+SdrObject::GetHTMLName() const
+SdrObject::SetHTMLName(String const&)
+SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, String const&, bool)
+SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, bool)
+SdrPage::AddComment(sdr::Comment const&)
+SdrPage::GetBitmap(SetOfByte const&, bool) const
+SdrPage::GetCommentByIndex(unsigned int)
+SdrPage::GetMetaFile(SetOfByte const&, bool)
+SdrPage::ReplaceCommentByIndex(unsigned int, sdr::Comment const&)
+SdrPage::isHandoutMasterPage() const
+SdrPageView::GetActualGroupName() const
+SdrPageView::GetActualPathName(unsigned short) const
+SdrPageView::InvalidateAllWin(Rectangle const&, unsigned char)
+SdrPageView::RemovePageWindow(unsigned int)
+SdrPaintView::BegEncirclement(Point const&)
+SdrPaintView::PostPaint()
+SdrPaintView::SetAllLayersLocked(unsigned char)
+SdrPaintView::SetAllLayersPrintable(unsigned char)
+SdrPaintView::SetAllLayersVisible(unsigned char)
+SdrPaintView::getColorConfig() const
+SdrPaintWindow::HideOverlay(Region const&)
+SdrPolyEditView::ShutMarkedObjects()
+SdrRectObj::SdrRectObj(SdrObjKind, Rectangle const&, SvStream&, String const&, unsigned short)
+SdrSnapView::SnapRect(Rectangle const&, SdrPageView const*, long&, long&) const
+SdrTextObj::CreateDrawOutliner()
+SdrTextObj::GetTextHidden() const
+SdrTextObj::IsTextAnimationAllowed() const
+SdrTextObj::NbcResizeTextAttributes(Fraction const&, Fraction const&)
+SdrTextObj::NbcSetAutoGrowHeight(bool)
+SdrTextObj::NbcSetAutoGrowWidth(bool)
+SdrTextObj::NbcSetFitToSize(SdrFitToSizeType)
+SdrTextObj::NbcSetMaxTextFrameHeight(long)
+SdrTextObj::NbcSetMaxTextFrameWidth(long)
+SdrTextObj::NbcSetTextHidden(unsigned char)
+SdrTextObj::StartTextAnimation(OutputDevice*, Point const&, long)
+SdrTextObj::StopTextAnimation(OutputDevice*, long)
+SdrUndoAttrObj::SetRepeatAttr(SfxItemSet const&)
+SdrUndoGroup::SdrUndoGroup(SdrModel&, String const&)
+SdrUndoGroup::push_front(SdrUndoAction*)
+SdrView::IsAllMarkPrevNextPossible() const
+SdrView::IsAllMarked() const
+SdrView::IsDeleteMarkedPossible() const
+SdrView::IsMarkPossible() const
+SdrView::MarkNext(Point const&, unsigned char)
+SdrView::MarkNext(unsigned char)
+SdrView::SetMarkedRect(Rectangle const&)
+SdrViewIter::FirstOutDev()
+SdrViewIter::FirstPageView()
+SdrViewIter::FirstWindow()
+SdrViewIter::NextOutDev()
+SdrViewIter::NextPageView()
+SdrViewIter::NextWindow()
+SdrViewIter::SdrViewIter(SdrModel const*)
+SdrVirtObj::SdrVirtObj(SdrObject&, Point const&)
+SdwRectangle::GetOriginalRect(Point const&, long, long)
+SectReprArr::Insert(SectRepr* const&, unsigned short&)
+SectReprArr::Insert(SectRepr* const*, unsigned short)
+SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short)
+SectReprArr::Remove(SectRepr* const&, unsigned short)
+SectReprArr::Remove(unsigned short, unsigned short)
+SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+SelectionEngine::ActivateDragMode()
+ServerFont::TransformPoint(Point const&) const
+SetOfByte::GetClearBit(unsigned short) const
+SetOfByte::GetClearCount() const
+SetOfByte::GetSetBit(unsigned short) const
+SetOfByte::IsFull() const
+SfxAllEnumItem::RemoveAllValues()
+SfxAllEnumItem::SfxAllEnumItem(unsigned short, unsigned short, String const&)
+SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
+SfxApplication::DdeCreateLinkSource(String const&)
+SfxApplication::DdeGetData(String const&, String const&, com::sun::star::uno::Any&)
+SfxApplication::DdeSetData(String const&, String const&, com::sun::star::uno::Any const&)
+SfxApplication::EnterAsynchronCall_Impl()
+SfxApplication::GetResourceManager() const
+SfxApplication::GetStatusIndicator() const
+SfxApplication::InitializeDde()
+SfxApplication::LeaveAsynchronCall_Impl()
+SfxApplication::Main()
+SfxApplication::SaveAll_Impl(unsigned char, unsigned char)
+SfxBaseModel::impl_change()
+SfxBaseModel::impl_getObjectShell() const
+SfxBasicManagerHolder::isAnyContainerModified() const
+SfxBindings::ExecuteGlobal_Impl(unsigned short)
+SfxBindings::GetPopupAction_Impl() const
+SfxBroadcaster::BroadcastDelayed(SfxHint const&)
+SfxBroadcaster::BroadcastInIdle(SfxHint const&)
+SfxBrushItemLink::Set(SfxBrushItemLink*)
+SfxChildWinController_Impl::SfxChildWinController_Impl(unsigned short, SfxWorkWindow*)
+SfxChildWindow::SetHideAtToggle(unsigned char)
+SfxChildWindow::SetPosSizePixel(Point const&, Size&)
+SfxChildWindowContext::GetAlignment() const
+SfxColumnDateTimeItem::SfxColumnDateTimeItem(SfxDateTimeItem const&)
+SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short)
+SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short, DateTime const&)
+SfxControllerItem::GetCoreMetric() const
+SfxControllerItem::UpdateSlot()
+SfxDispatcher::DebugOutput_Impl() const
+SfxDispatcher::Execute(SfxExecuteItem const&)
+SfxDispatcher::ExecutePopup(unsigned short, Window*, Point const*, SfxPoolItem const*, ...)
+SfxDispatcher::GetSlotId(String const&)
+SfxDispatcher::HasSlot_Impl(unsigned short)
+SfxDispatcher::ResetObjectBars_Impl()
+SfxDispatcher::SetModalMode_Impl(unsigned char)
+SfxDispatcher::_Execute(SfxSlotServer const&)
+SfxDocInfoEditDlg::SfxDocInfoEditDlg(Window*)
+SfxDocTemplate_Impl::GetTemplates(ucbhelper::Content&, ucbhelper::Content&, RegionData_Impl*)
+SfxDockingWindow::GetSplitWindow_Impl() const
+SfxDockingWindow::IsPinned_Impl() const
+SfxDockingWrapper::GetChildWindowId()
+SfxDocumentTemplateDlg::GetTemplatePath()
+SfxDocumentTemplateDlg::NewTemplate(String const&)
+SfxDocumentTemplates::GetCount(String const&) const
+SfxDocumentTemplates::GetRegionNo(String const&) const
+SfxDocumentTemplates::SaveDir()
+SfxEnumMenu::SfxEnumMenu(unsigned short, SfxBindings*, SfxEnumItem const&)
+SfxExecuteItem::SfxExecuteItem(unsigned short, unsigned short, unsigned short)
+SfxExecuteItem::SfxExecuteItem(unsigned short, unsigned short, unsigned short, SfxPoolItem const*, ...)
+SfxFilterContainer::GetFilter4ClipBoardId(unsigned int, unsigned long, unsigned long) const
+SfxFilterContainer::GetFilter4Mime(String const&, unsigned long, unsigned long) const
+SfxFilterContainer::GetFilter4UIName(String const&, unsigned long, unsigned long) const
+SfxFilterPtrArr::DeleteAndDestroy(unsigned short, unsigned short)
+SfxFlagItem::SetFlag(unsigned char, int)
+SfxFlagItem::SfxFlagItem(unsigned short, SvStream&)
+SfxFoundCacheArr_Impl::Insert(SfxFoundCacheArr_Impl const*, unsigned short, unsigned short)
+SfxFoundCacheArr_Impl::Insert(SfxFoundCache_Impl const*&, unsigned short&)
+SfxFoundCacheArr_Impl::Insert(SfxFoundCache_Impl const**, unsigned short)
+SfxFoundCacheArr_Impl::Remove(SfxFoundCache_Impl const*&, unsigned short)
+SfxFoundCacheArr_Impl::Remove(unsigned short, unsigned short)
+SfxFrame::GetBroadcaster() const
+SfxFrame::IsTop() const
+SfxFrame::PositionWindow_Impl(Rectangle const&) const
+SfxFrame::SetDescriptor(SfxFrameDescriptor*)
+SfxFrame::SetWorkWindow_Impl(SfxWorkWindow*)
+SfxFrameDescriptor::CheckContent() const
+SfxFrameDescriptor::CompareOriginal(SfxFrameDescriptor&) const
+SfxFrameDescriptor::GetItemPos() const
+SfxFrameDescriptor::GetSize() const
+SfxFrameDescriptor::GetWallpaper() const
+SfxFrameDescriptor::GetWinBits() const
+SfxFrameDescriptor::SetURL(INetURLObject const&)
+SfxFrameDescriptor::TakeProperties(SfxFrameProperties const&)
+SfxFrameDescriptor::UnifyContent(unsigned char)
+SfxFrameHTMLWriter::CreateURL(SfxFrame*)
+SfxFrameProperties::SfxFrameProperties(SfxFrameDescriptor const*)
+SfxFrameWindow_Impl::LinkStubCloserHdl(void*, void*)
+SfxHTMLParser::FileDownloadDone(SfxHTMLParser*, void*)
+SfxHintPoster::SfxHintPoster()
+SfxImageItem::GetURL() const
+SfxImageItem::SfxImageItem(unsigned short, String const&)
+SfxImageManager::SetImages(ToolBox&)
+SfxImageManager::SetImages(ToolBox&, bool)
+SfxInPlaceClient::GetActiveWindow(SfxObjectShell*, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&)
+SfxInPlaceClient::IsObjectActive() const
+SfxItemIter::PrevItem()
+SfxItemPool::Cleanup()
+SfxItemPool::GetVersion() const
+SfxItemPool::SetStoringPool(SfxItemPool const*)
+SfxItemPropertySetInfo::getMap() const
+SfxItemSetHint::SfxItemSetHint(SfxItemSet*)
+SfxListener::EndListening(unsigned short)
+SfxLockBytesItem::SfxLockBytesItem(unsigned short, SvLockBytes*)
+SfxMacro::GenerateSource() const
+SfxMacro::GetLastStatement() const
+SfxMacro::GetMode() const
+SfxMacro::Record(SfxMacroStatement*)
+SfxMacro::Remove()
+SfxMacro::Replace(SfxMacroStatement*)
+SfxMacro::SfxMacro(SfxMacroMode)
+SfxMacroStatement::SfxMacroStatement(SfxShell const&, String const&, unsigned char, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
+SfxMacroStatement::SfxMacroStatement(String const&)
+SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
+SfxMailModel::GetCount() const
+SfxMailModel::MakeValueList(std::vector<String*, std::allocator<String*> >*, String&)
+SfxMedium::Cancel_Impl()
+SfxMedium::DataAvailable_Impl()
+SfxMedium::Exists(unsigned char)
+SfxMedium::GetCharset()
+SfxMedium::GetDataAvailableLink() const
+SfxMedium::GetDoneLink() const
+SfxMedium::GetHdl()
+SfxMedium::GetPreRedirectedURL() const
+SfxMedium::GetReferer() const
+SfxMedium::IsDownloadDone_Impl()
+SfxMedium::IsTemporary() const
+SfxMedium::RefreshName_Impl()
+SfxMedium::SetItemSet(SfxItemSet*)
+SfxMedium::SetOrigFilter_Impl(SfxFilter const*)
+SfxMedium::SetTemporary(unsigned char)
+SfxMedium::SfxMedium(SfxMedium const&, unsigned char)
+SfxMedium::StartDownload()
+SfxMenuControl::CreateControl(String const&, unsigned short, Menu&, SfxBindings&, SfxVirtualMenu*)
+SfxMenuControl::IsSpecialControl(unsigned short, SfxModule*)
+SfxMenuControl::RemovePopup()
+SfxMenuControl::SetOwnMenu(SfxVirtualMenu*)
+SfxMenuManager::Construct_Impl(Menu*, unsigned char)
+SfxMenuManager::UseDefault()
+SfxMiniRecordReader::ScanRecordType(SvStream*)
+SfxMiniRecordReader::SfxMiniRecordReader(SvStream*)
+SfxModelessDialog::SfxModelessDialog(SfxBindings*, SfxChildWindow*, Window*, long)
+SfxModule::IsActive() const
+SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*)
+SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
+SfxMultiFixRecordWriter::SfxMultiFixRecordWriter(SvStream*, unsigned short, unsigned char, unsigned int)
+SfxMultiRecordReader::SfxMultiRecordReader(SvStream*)
+SfxNavigatorWrapper::GetChildWindowId()
+SfxNewFileDialog::GetTemplateName() const
+SfxNewFileDialog::GetTemplateRegion() const
+SfxNewFileDialog_Impl::LinkStubTemplateSelect(void*, void*)
+SfxObjectFactory::GetDocumentTypeName() const
+SfxObjectFactory::SetDocumentTypeNameResource(ResId const&)
+SfxObjectList::GetFileName(unsigned short) const
+SfxObjectShell::Count()
+SfxObjectShell::CreateAndLoadObject(SfxItemSet const&, SfxFrame*)
+SfxObjectShell::DisconnectFromShared()
+SfxObjectShell::IsSecure()
+SfxObjectShell::LockAutoLoad(unsigned char)
+SfxObjectShell::SetFlags(unsigned int)
+SfxObjectShell::SetTemplate(unsigned char)
+SfxObjectShell_Impl::NeedsOfficeUpdateDialog()
+SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*)
+SfxOfficeDispatch::IsMasterUnoCommand() const
+SfxOleString16Property::SfxOleString16Property(int, String const&)
+SfxOrganizeDlg_Impl::OkHdl(Button*)
+SfxPartChildWnd_Impl::GetChildWindowId()
+SfxPasswordDialog::SetMaxLen(unsigned short)
+SfxPickList::GetMenuEntryTitle(unsigned int)
+SfxPointItem::SfxPointItem(unsigned short, SvStream&)
+SfxPopupMenuManager::AddClipboardFunctions()
+SfxPopupMenuManager::CheckItem(unsigned short, unsigned char)
+SfxPopupMenuManager::EndInsert()
+SfxPopupMenuManager::Execute(Point const&, Window*, SfxPoolItem const*, ...)
+SfxPopupMenuManager::InsertItem(unsigned short, String const&, unsigned short, rtl::OString const&, unsigned short)
+SfxPopupMenuManager::InsertSeparator(unsigned short)
+SfxPopupMenuManager::RemoveItem(unsigned short)
+SfxPopupMenuManager::SfxPopupMenuManager(ResId const&, SfxBindings&)
+SfxPopupMenuManager::StartInsert()
+SfxPopupWindow::EndCascading()
+SfxPopupWindow::LinkStubDelete(void*, void*)
+SfxPopupWindow::RemoveStatusListener(rtl::OUString const&)
+SfxPopupWindow::SfxPopupWindow(unsigned short, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, Window*, ResId const&)
+SfxPopupWindow::UpdateStatus(rtl::OUString const&)
+SfxPreviewBase_Impl::SetGDIFile(boost::shared_ptr<GDIMetaFile>)
+SfxPreviewWin::SfxPreviewWin(Window*, ResId const&, SfxObjectShellLock&)
+SfxPreviewWin_Impl::PreviewFactory(SfxFrame*, String const&)
+SfxProgress::GetStateText_Impl() const
+SfxProgress::GetWaitMode() const
+SfxProgress::Lock()
+SfxProgress::SetWaitMode(unsigned char)
+SfxProgress::StatusBarManagerGone_Impl(SfxStatusBarManager*)
+SfxPtrArr::Replace(void*, void*)
+SfxRangeItem::SfxRangeItem(unsigned short, SvStream&)
+SfxRecordingFloatWrapper_Impl::GetChildWindowId()
+SfxRectangleItem::SfxRectangleItem(unsigned short, SvStream&)
+SfxRequest::IsRecording() const
+SfxRequest::SetTarget(String const&)
+SfxScriptOrganizerItem::SfxScriptOrganizerItem(String const&)
+SfxShell::GetBroadcaster()
+SfxShell::RemoveItem(unsigned short)
+SfxSimpleResId::SfxSimpleResId(unsigned short)
+SfxSingleRecordReader::SfxSingleRecordReader(SvStream*)
+SfxSingleRecordWriter::SfxSingleRecordWriter(SvStream*, unsigned short, unsigned char, unsigned int)
+SfxSingleTabDialog::GetInputRanges(SfxItemPool const&)
+SfxSizeItem::SfxSizeItem(unsigned short, SvStream&)
+SfxSlotPool::NextInterface()
+SfxStatusListener::Bind()
+SfxStatusListener::Bind(unsigned short, rtl::OUString const&)
+SfxStoringHelper::ExecuteFilterDialog(SfxStoringHelper&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
+SfxStringListItem::Sort(unsigned char)
+SfxStyleSheet::SfxStyleSheet()
+SfxStyleSheetBasePool::GetStreamName()
+SfxStyleSheetBasePool::Load(SvStream&)
+SfxStyleSheetBasePool::Store(SvStream&, unsigned char)
+SfxStyleSheetHintExtended::SfxStyleSheetHintExtended(unsigned short, String const&)
+SfxTabDialog::FillOutputItemSet()
+SfxTabDialog::GetApplyButton()
+SfxTabDialog::GetApplyButton() const
+SfxTabDialog::GetApplyHandler() const
+SfxTabDialog::GetOutputItemSet(unsigned short) const
+SfxTabDialog::SfxTabDialog(Window*, ResId const&, unsigned short, SfxBindings&, unsigned char, String const*)
+SfxTabPage::GetExchangeItem(SfxItemSet const&, unsigned short)
+SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const&)
+SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*)
+SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const&) const
+SfxToDoStack_Implarr_::Insert(unsigned short, SfxToDo_Impl const&, unsigned short)
+SfxToDoStack_Implarr_::Remove(SfxToDo_Impl const&)
+SfxUINT32s::Insert(SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
+SfxUINT32s::Remove(unsigned short, unsigned short)
+SfxUINT32s::Replace(unsigned int const&, unsigned short)
+SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
+SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
+SfxULongRangeItem::SfxULongRangeItem(unsigned short, SvStream&)
+SfxULongRanges::Contains(unsigned long) const
+SfxULongRanges::Intersects(SfxULongRanges const&) const
+SfxULongRanges::SfxULongRanges(int, int, int, ...)
+SfxULongRanges::SfxULongRanges(unsigned long const*)
+SfxULongRanges::SfxULongRanges(unsigned long, unsigned long)
+SfxULongRangesItem::SfxULongRangesItem(unsigned short, unsigned int const*)
+SfxURLToolBoxControl_Impl::LinkStubWindowEventListener(void*, void*)
+SfxUShortRanges::Contains(unsigned short) const
+SfxUShortRanges::Intersects(SfxUShortRanges const&) const
+SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
+SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
+SfxUnoMenuControl::Select()
+SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&)
+SfxVersionTableDtor::GetVersions() const
+SfxViewFactory::InitFactory()
+SfxViewFactory::~SfxViewFactory()
+SfxViewFrame::Count()
+SfxViewFrame::DoAdjustPosSize(SfxViewShell*, Point, Size const&)
+SfxViewFrame::ExecReload_Impl(SfxRequest&, unsigned char)
+SfxViewFrame::ForceInnerResize_Impl(unsigned char)
+SfxViewFrame::Hide()
+SfxViewShell::AdjustVisArea(Rectangle const&)
+SfxViewShell::CheckOwnerShip_Impl()
+SfxViewShell::GetContextMenuInterceptors() const
+SfxViewShell::IsPrinterLocked() const
+SfxViewShell::LockPrinter(unsigned char)
+SfxViewShell::PlugInsActive() const
+SfxViewShell::SetAdditionalPrintOptions(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
+SfxViewShell::SetScrollingMode(SfxScrollingMode)
+SfxViewShell::SetSubShell(SfxShell*)
+SfxVirtualMenu::GetItemText(unsigned short) const
+SfxVirtualMenu::GetPopupMenu(unsigned short) const
+SfxVirtualMenu::SetHelpIds(ResMgr*)
+SfxVirtualMenu::UpdateImages()
+SfxWhichIter::LastWhich()
+SimpleResMgr::FreeBlob(void*)
+SimpleResMgr::GetLocale() const
+SimpleResMgr::ReadBlob(unsigned int, void**)
+Slider::SetRangeMax(long)
+Slider::SetRangeMin(long)
+Slider::Slider(Window*, ResId const&)
+SmFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+SmSymbolManager::Exit()
+SmSymbolManager::Init()
+SortedPositions::Insert(SortedPositions const*, unsigned short, unsigned short)
+SortedPositions::Insert(unsigned int const&, unsigned short&)
+SortedPositions::Insert(unsigned int const*, unsigned short)
+SortedPositions::Remove(unsigned int const&, unsigned short)
+SortedPositions::Remove(unsigned short, unsigned short)
+SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
+SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
+SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
+SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, unsigned short, unsigned short, unsigned short, unsigned long&, unsigned short&, unsigned long)
+SotFactory::DeInit()
+SotFactory::GetFactoryList()
+SotFactory::GetSvObjectCount()
+SotFactory::TestInvariant()
+SotObject::RemoveOwnerLock()
+SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
+SotStorage::GetTargetSvStream() const
+SotStorage::OpenOLEStorage(String const&, unsigned short, short)
+SotStorage::SotStorage(ucbhelper::Content const&, String const&, unsigned short, short)
+SourceTreeIterator::EndExecute()
+SpinButton::SpinButton(Window*, ResId const&)
+SplitWindow::CalcWindowSizePixel(Size const&, WindowAlign, long, unsigned char)
+SplitWindow::GetBaseSet() const
+SplitWindow::GetFadeInRect() const
+SplitWindow::GetFadeOutRect() const
+SplitWindow::GetItemBackground(unsigned short) const
+SplitWindow::GetItemBitmap(unsigned short) const
+SplitWindow::GetItemBits(unsigned short) const
+SplitWindow::GetItemSizeRange(unsigned short) const
+SplitWindow::GetItemWindow(unsigned short) const
+SplitWindow::GetSet(unsigned short, unsigned short&, unsigned short&) const
+SplitWindow::GetSplitSize(unsigned short) const
+SplitWindow::IsItemBackground(unsigned short) const
+SplitWindow::MoveItem(unsigned short, unsigned short, unsigned short)
+SplitWindow::SetBaseSet(unsigned short)
+SplitWindow::SetItemBackground(unsigned short)
+SplitWindow::SetItemBitmap(unsigned short, Bitmap const&)
+SplitWindow::SetItemBits(unsigned short, unsigned short)
+SplitWindow::SetNoAlign(unsigned char)
+SplitWindow::SetSplitSize(unsigned short, long, unsigned char)
+SplitWindow::SplitWindow(Window*, ResId const&)
+Splitter::GetKeyboardStepSize() const
+SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short)
+SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short)
+SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*)
+StackWindow::LinkStubButtonHdl(void*, void*)
+StandardErrorInfo::StandardErrorInfo(unsigned long, unsigned long, unsigned short)
+StatusBar::CopyItems(StatusBar const&)
+StatusBar::GetItemBits(unsigned short) const
+StatusBar::GetItemData(unsigned short) const
+StatusBar::GetItemWidth(unsigned short) const
+StatusBar::HideItem(unsigned short)
+StatusBar::HideItems()
+StatusBar::ResetProgressMode()
+StatusBar::SetBottomBorder(unsigned char)
+StatusBar::SetTopBorder(unsigned char)
+StatusBar::ShowItem(unsigned short)
+StatusBar::ShowItems()
+StatusBar::StatusBar(Window*, ResId const&)
+StgAvlIterator::Last()
+StgCache::Pos2Page(int)
+StgDirEntry::Copy(StgDirEntry&)
+StgEntry::GetTime(StgEntryTime) const
+StgEntry::SetTime(StgEntryTime, int*)
+StgHeader::SetClassId(ClsId const&)
+StorageStream::ValidateMode(unsigned short, StgDirEntry*) const
+String::CompareIgnoreCaseToAscii(unsigned short const*, unsigned short) const
+String::CompareTo(unsigned short const*, unsigned short) const
+String::Equals(unsigned short const*) const
+String::EqualsIgnoreCaseAscii(unsigned short const*, unsigned short, unsigned short) const
+String::Insert(unsigned short const*, unsigned short)
+String::Match(unsigned short const*) const
+String::SearchAndReplace(unsigned short const*, String const&, unsigned short)
+String::SearchAndReplaceAll(unsigned short const*, String const&)
+SvBaseEventDescriptor::mapEventIDToName(unsigned short) const
+SvBasicPropertyDataControl::GetData()
+SvBasicPropertyDataControl::GetName() const
+SvBasicPropertyDataControl::GetProperty() const
+SvBorder::SvBorder(Rectangle const&, Rectangle const&)
+SvByteStrings::DeleteAndDestroy(unsigned short, unsigned short)
+SvByteStringsSortDtor::Insert(ByteString* const&)
+SvByteStringsSortDtor::Insert(ByteString* const*, unsigned short)
+SvByteStringsSortDtor::Insert(SvByteStringsSortDtor const*, unsigned short, unsigned short)
+SvByteStringsSortDtor::Remove(ByteString* const&, unsigned short)
+SvByteStringsSortDtor::Remove(unsigned short, unsigned short)
+SvCacheStream::GetFilenameHdl() const
+SvCacheStream::SetFilenameHdl(Link const&)
+SvCacheStream::SvCacheStream(String const&, unsigned long, unsigned long)
+SvFileStream::ReOpen()
+SvFileStream::UnlockFile()
+SvGlobalNameList::Append(SvGlobalName const&)
+SvGlobalNameList::GetObject(unsigned long)
+SvGlobalNameList::IsEntry(SvGlobalName const&)
+SvGlobalNameList::SvGlobalNameList()
+SvGlobalNameList::~SvGlobalNameList()
+SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const&, unsigned short&)
+SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const*, unsigned short)
+SvI18NMap_Impl::Insert(SvI18NMap_Impl const*, unsigned short, unsigned short)
+SvI18NMap_Impl::Remove(SvI18NMapEntry_Impl* const&, unsigned short)
+SvI18NMap_Impl::Remove(unsigned short, unsigned short)
+SvImpLBox::IndentChanged(short)
+SvImpLBox::RepaintSelectionItems()
+SvInplaceEdit::StopEditing(unsigned char)
+SvInplaceEdit::SvInplaceEdit(Window*, Point const&, Size const&, String const&, Link const&, Selection const&)
+SvInsertAppletDialog::SvInsertAppletDialog(Window*, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&)
+SvInsertAppletDialog::SvInsertAppletDialog(Window*, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&)
+SvLBox::GetTargetView() const
+SvLBox::HasCursorEmphasis(SvLBoxEntry*) const
+SvLBox::SetCursorEmphasis(SvLBoxEntry*, unsigned char)
+SvLBox::SetInUseEmphasis(SvLBoxEntry*, unsigned char)
+SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image)
+SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
+SvLBoxButtonData::SvLBoxButtonData()
+SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short)
+SvLBoxItem::GetSize(SvLBoxEntry*, SvViewDataEntry*)
+SvListBoxForProperties::SvListBoxForProperties(Window*, ResId const&)
+SvListView::SvListView(SvTreeList*)
+SvNumberFormatter::HasTextFormat(unsigned int) const
+SvNumberFormatter::PrepareSave()
+SvNumberFormatter::PutEntry(rtl::OUString&, unsigned short&, short&, unsigned int&, unsigned short)
+SvNumberFormatter::SetFormatUsed(unsigned int)
+SvNumberFormatter::SkipNumberFormatterInStream(SvStream&)
+SvNumberFormatter::SvNumberFormatter(unsigned short)
+SvNumberNatNum::MapNatNumToDBNum(unsigned char, unsigned short, unsigned char)
+SvNumberformat::EraseComment(String&)
+SvNumberformat::ImpSwitchToSpecifiedCalendar(String&, double&, ImpSvNumFor const&) const
+SvNumberformat::SetComment(String const&, String&, String&)
+SvPersistBaseMemberList::SvPersistBaseMemberList(unsigned short, unsigned short)
+SvPersistStream::InsertObj(SvPersistBase*)
+SvPersistStream::RemoveObj(SvPersistBase*)
+SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&)
+SvPropertyBox::SvPropertyBox(Window*, ResId const&)
+SvPropertyBox::SvPropertyBox(Window*, long)
+SvPropertyLine::GetName() const
+SvPropertyLine::IsLineLocked()
+SvPropertyLine::IsShownAsHyperlink()
+SvPropertyLine::IsVisibleXButton()
+SvPropertyLine::SvPropertyLine(Window*, ResId const&)
+SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
+SvStream::WriteUniStringLine(String const&)
+SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short)
+SvStringsISort::Insert(String* const&)
+SvStringsISort::Insert(String* const&, unsigned short&)
+SvStringsISort::Insert(String* const*, unsigned short)
+SvStringsISort::Insert(SvStringsISort const*, unsigned short, unsigned short)
+SvStringsISort::Remove(String* const&, unsigned short)
+SvStringsISort::Remove(unsigned short, unsigned short)
+SvStringsISortDtor::Insert(String* const*, unsigned short)
+SvStringsSort::DeleteAndDestroy(unsigned short, unsigned short)
+SvStringsSort::Insert(String* const&, unsigned short&)
+SvStringsSort::Insert(String* const*, unsigned short)
+SvStringsSort::Insert(SvStringsSort const*, unsigned short, unsigned short)
+SvStringsSort::Remove(String* const&, unsigned short)
+SvStringsSortDtor::Insert(String* const*, unsigned short)
+SvStringsSortDtor::Insert(SvStringsSortDtor const*, unsigned short, unsigned short)
+SvStringsSortDtor::Remove(String* const&, unsigned short)
+SvStringsSortDtor::Remove(unsigned short, unsigned short)
+SvTabListBox::GetTabJustify(unsigned short) const
+SvTreeList::CheckIntegrity() const
+SvTreeList::Copy(SvListEntry*, SvListEntry*)
+SvTreeList::InsertTree(SvListEntry*, SvListEntry*)
+SvTreeList::SelectChilds(SvListView*, SvListEntry*, unsigned char)
+SvTreeListBox::CancelEditing()
+SvTreeListBox::CancelPendingEdit()
+SvTreeListBox::GetCollapsedNodeBmp() const
+SvTreeListBox::GetExtendedWinBits() const
+SvTreeListBox::GetFirstDynamicItem(SvLBoxEntry*)
+SvTreeListBox::GetTextOffset() const
+SvTreeListBox::IsAddMode() const
+SvTreeListBox::IsNodeButton(Point const&) const
+SvTreeListBox::IsSublistOpenWithLeftRight() const
+SvTreeListBox::IsSublistOpenWithReturn() const
+SvTreeListBox::RemoveHighlightRange()
+SvTreeListBox::SetAddMode(unsigned char)
+SvTreeListBox::SetTabBar(TabBar*)
+SvTreeListBox::SetUpdateModeFast(unsigned char)
+SvTreeListBox::ShowExpandBitmapOnCursor(unsigned char)
+SvULongs::Replace(unsigned long const&, unsigned short)
+SvULongs::Replace(unsigned long const*, unsigned short, unsigned short)
+SvULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
+SvUShorts::Replace(unsigned short const&, unsigned short)
+SvUShorts::Replace(unsigned short const*, unsigned short, unsigned short)
+SvUShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned short const&, void*), void*)
+SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+SvXMLAttributeList::SetAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
+SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const
+SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*)
+SvXMLAutoStylePoolP::Add(rtl::OUString&, int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
+SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&)
+SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
+SvXMLAutoStylePoolP::AddAndCache(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
+SvXMLAutoStylePoolP::Find(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&) const
+SvXMLAutoStylePoolP::FindAndRemoveCached(int) const
+SvXMLAutoStylePoolP::SvXMLAutoStylePoolP()
+SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const
+SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*)
+SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, char const*, unsigned char, unsigned char)
+SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, rtl::OUString const&, unsigned char, unsigned char)
+SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const&, unsigned short&)
+SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const*, unsigned short)
+SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElementArr const*, unsigned short, unsigned short)
+SvXMLEmbeddedElementArr::Remove(SvXMLEmbeddedElement* const&, unsigned short)
+SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short)
+SvXMLExport::GetErrors()
+SvXMLExport::SvXMLExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver> const&, short)
+SvXMLExportHelper::AddPercentage(int, rtl::OUStringBuffer&)
+SvXMLExportPropertyMapper::exportXML(SvXMLAttributeList&, XMLPropertyState const&, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned short) const
+SvXMLImport::GetErrors()
+SvXMLImport::GetMasterStyles()
+SvXMLImport::GetMasterStyles() const
+SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
+SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
+SvXMLImport::SvXMLImport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
+SvXMLImport::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
+SvXMLImportPropertyMapper::importXML(std::vector<XMLPropertyState, std::allocator<XMLPropertyState> >&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const
+SvXMLNamespaceMap::AddAtIndex(unsigned short, char const*, char const*, unsigned short)
+SvXMLNamespaceMap::GetKeyByIndex(unsigned short) const
+SvXMLNumFormatContext::AddCondition(int, rtl::OUString const&, LocaleDataWrapper const&)
+SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const
+SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
+SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const&, unsigned short&)
+SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short)
+SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
+SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short)
+SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
+SvXMLUnitConverter::clearUndefinedChars(rtl::OUString&, rtl::OUString const&)
+SvXMLUnitConverter::convertAny(com::sun::star::uno::Any&, rtl::OUString const&, rtl::OUString const&)
+SvXMLUnitConverter::convertEnum(rtl::OUStringBuffer&, unsigned short, SvXMLEnumStringMapEntry const*, char*)
+SvXMLUnitConverter::convertNumber64(rtl::OUStringBuffer&, long)
+SvXMLUnitConverter::initXMLStrings()
+SvXPropEvListener::GetKeyCode() const
+SvXPropertyComboBox::SvXPropertyComboBox(Window*, ResId const&)
+SvXPropertyEdit::SvXPropertyEdit(Window*, ResId const&)
+SvXPropertyListBox::SvXPropertyListBox(Window*, ResId const&)
+SvXPropertyListBox::SvXPropertyListBox(Window*, long)
+SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short)
+SvtAcceleratorConfiguration::CreateFromStream(SvStream&)
+SvtAcceleratorConfiguration::GetCommand(com::sun::star::awt::KeyEvent const&)
+SvtAcceleratorConfiguration::GetItems()
+SvtAcceleratorConfiguration::SetItems(std::list<SvtAcceleratorConfigItem, std::allocator<SvtAcceleratorConfigItem> > const&, bool)
+SvtAccessibilityOptions::GetIsForDrawings() const
+SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
+SvtCommandOptions::AddCommand(SvtCommandOptions::CmdOption, rtl::OUString const&)
+SvtCommandOptions::Clear(SvtCommandOptions::CmdOption)
+SvtCommandOptions::GetList(SvtCommandOptions::CmdOption) const
+SvtDocumentTemplateDialog::GetSelectedFileURL() const
+SvtDocumentTemplateDialog::IsFileSelected() const
+SvtDocumentTemplateDialog::SvtDocumentTemplateDialog(Window*, SvtDocumentTemplateDialog::SelectOnly)
+SvtDynamicMenuOptions::AppendItem(EDynamicMenuType, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
+SvtDynamicMenuOptions::Clear(EDynamicMenuType)
+SvtExtendedSecurityOptions::GetSecureExtensionList() const
+SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const
+SvtExtendedSecurityOptions::IsSecureHyperlink(rtl::OUString const&) const
+SvtExtendedSecurityOptions::SetOpenHyperlinkMode(SvtExtendedSecurityOptions::OpenHyperlinkMode)
+SvtFileView::GetUrlFilter() const
+SvtFileView::OpenFolder(com::sun::star::uno::Sequence<rtl::OUString> const&)
+SvtFileView::ResetCursor()
+SvtFilterOptions::SetUseEnhancedFields(unsigned char)
+SvtFontOptions::EnableReplacementTable(unsigned char)
+SvtFontOptions::IsReplacementTableEnabled() const
+SvtFrameWindow_Impl::ExecuteHdl_Impl(SvtFrameWindow_Impl*, SvtFrameWindow_Impl::SvtExecuteInfo*)
+SvtGraphicFill::setFillColor(Color)
+SvtGraphicFill::setFillRule(SvtGraphicFill::FillRule)
+SvtGraphicFill::setFillType(SvtGraphicFill::FillType)
+SvtGraphicFill::setGraphic(Graphic const&)
+SvtGraphicFill::setHatchColor(Color)
+SvtGraphicFill::setHatchType(SvtGraphicFill::HatchType)
+SvtGraphicFill::setTiling(bool)
+SvtGraphicFill::setTransform(SvtGraphicFill::Transform const&)
+SvtGraphicFill::setTransparency(double)
+SvtGraphicFill::toString() const
+SvtGraphicStroke::setCapType(SvtGraphicStroke::CapType)
+SvtGraphicStroke::setDashArray(std::vector<double, std::allocator<double> > const&)
+SvtGraphicStroke::setEndArrow(PolyPolygon const&)
+SvtGraphicStroke::setJoinType(SvtGraphicStroke::JoinType)
+SvtGraphicStroke::setMiterLimit(double)
+SvtGraphicStroke::setStartArrow(PolyPolygon const&)
+SvtGraphicStroke::setStrokeWidth(double)
+SvtGraphicStroke::setTransparency(double)
+SvtHelpOptions::GetHelpAgentRetryLimit() const
+SvtHelpOptions::GetLocale() const
+SvtHelpOptions::SetHelpAgentRetryLimit(int)
+SvtHistoryOptions::SetSize(EHistoryType, unsigned int)
+SvtIconChoiceCtrl::Clear()
+SvtIconChoiceCtrl::Flush()
+SvtIconChoiceCtrl::GetEntryTextMode(SvxIconChoiceCtrlEntry const*) const
+SvtIconChoiceCtrl::GetLogicPos(Point const&) const
+SvtIconChoiceCtrl::GetNextEntry(Point const&, SvxIconChoiceCtrlEntry*, unsigned char) const
+SvtIconChoiceCtrl::HandleShortCutKey(KeyEvent const&)
+SvtIconChoiceCtrl::InsertEntry(unsigned long, Point const*, unsigned short)
+SvtIconChoiceCtrl::SetUpdateMode(unsigned char)
+SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&)
+SvtIconWindow_Impl::GetSelectedIconText() const
+SvtInetOptions::addPropertiesChangeListener(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertiesChangeListener> const&)
+SvtInetOptions::removePropertiesChangeListener(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertiesChangeListener> const&)
+SvtInternalOptions::CrashMailEnabled() const
+SvtInternalOptions::IsRemoveMenuEntryBackToWebtop() const
+SvtInternalOptions::IsRemoveMenuEntryClose() const
+SvtInternalOptions::IsRemoveMenuEntryLogout() const
+SvtInternalOptions::IsRemoveMenuEntryNewWebtop() const
+SvtJavaOptions::GetNetAccess() const
+SvtJavaOptions::GetUserClassPath() const
+SvtJavaOptions::IsEnabled() const
+SvtJavaOptions::IsExecuteApplets() const
+SvtJavaOptions::IsReadOnly(SvtJavaOptions::EOption) const
+SvtJavaOptions::IsSecurity() const
+SvtJavaOptions::SetEnabled(unsigned char)
+SvtJavaOptions::SetExecuteApplets(unsigned char)
+SvtJavaOptions::SetNetAccess(int)
+SvtJavaOptions::SetSecurity(unsigned char)
+SvtJavaOptions::SetUserClassPath(rtl::OUString const&)
+SvtJavaOptions::SvtJavaOptions()
+SvtLanguageOptions::IsCTLSequenceChecking() const
+SvtLanguageOptions::IsCTLSequenceCheckingRestricted() const
+SvtLanguageOptions::IsCTLSequenceCheckingTypeAndReplace() const
+SvtLanguageOptions::IsChangeCaseMapEnabled() const
+SvtLanguageOptions::IsDoubleLinesEnabled() const
+SvtLanguageOptions::IsEmphasisMarksEnabled() const
+SvtLanguageOptions::IsRubyEnabled() const
+SvtLanguageOptions::IsVerticalCallOutEnabled() const
+SvtLinguConfig::IsReadOnly(int) const
+SvtLinguConfig::SetDisabledDictionaries(com::sun::star::uno::Sequence<rtl::OUString> const&) const
+SvtLinguConfig::SetOptions(SvtLinguOptions const&)
+SvtLinguConfig::SetOrCreateDictionaryEntry(rtl::OUString const&, SvtLinguConfigDictionaryEntry const&) const
+SvtLinguConfig::SetOrCreateSupportedDictionaryFormatsFor(rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Sequence<rtl::OUString> const&) const
+SvtListenerIter::First(void* (*)())
+SvtListenerIter::GoEnd()
+SvtListenerIter::GoPrev()
+SvtListenerIter::GoRoot()
+SvtListenerIter::Next()
+SvtLocalisationOptions::SetAutoMnemonic(unsigned char)
+SvtLocalisationOptions::SetDialogScale(int)
+SvtMenuOptions::IsFollowMouseEnabled() const
+SvtMenuOptions::SetEntryHidingState(unsigned char)
+SvtMenuOptions::SetFollowMouseState(unsigned char)
+SvtMiscOptions::GetCurrentSymbolsStyleName() const
+SvtMiscOptions::IsGetSymbolsSizeReadOnly() const
+SvtMiscOptions::IsGetSymbolsStyleReadOnly() const
+SvtMiscOptions::IsGetToolboxStyleReadOnly() const
+SvtMiscOptions::IsPluginsEnabledReadOnly() const
+SvtMiscOptions::IsTryUseODMADialogReadOnly() const
+SvtMiscOptions::SetPluginsEnabled(unsigned char)
+SvtModuleOptions::GetFactoryWindowAttributes(SvtModuleOptions::EFactory) const
+SvtModuleOptions::GetFeatures() const
+SvtModuleOptions::GetModuleName(SvtModuleOptions::EFactory) const
+SvtModuleOptions::SetFactoryWindowAttributes(SvtModuleOptions::EFactory, rtl::OUString const&)
+SvtOptionsDrawinglayer::SetMaximumPaperBottomMargin(unsigned int)
+SvtOptionsDrawinglayer::SetMaximumPaperHeight(unsigned int)
+SvtOptionsDrawinglayer::SetMaximumPaperLeftMargin(unsigned int)
+SvtOptionsDrawinglayer::SetMaximumPaperRightMargin(unsigned int)
+SvtOptionsDrawinglayer::SetMaximumPaperTopMargin(unsigned int)
+SvtOptionsDrawinglayer::SetMaximumPaperWidth(unsigned int)
+SvtOptionsDrawinglayer::SetOverlayBuffer(unsigned char)
+SvtOptionsDrawinglayer::SetOverlayBuffer_Calc(unsigned char)
+SvtOptionsDrawinglayer::SetOverlayBuffer_DrawImpress(unsigned char)
+SvtOptionsDrawinglayer::SetOverlayBuffer_Writer(unsigned char)
+SvtOptionsDrawinglayer::SetPaintBuffer(unsigned char)
+SvtOptionsDrawinglayer::SetPaintBuffer_Calc(unsigned char)
+SvtOptionsDrawinglayer::SetPaintBuffer_DrawImpress(unsigned char)
+SvtOptionsDrawinglayer::SetPaintBuffer_Writer(unsigned char)
+SvtOptionsDrawinglayer::SetQuadratic3DRenderLimit(unsigned int)
+SvtOptionsDrawinglayer::SetQuadraticFormControlRenderLimit(unsigned int)
+SvtOptionsDrawinglayer::SetRenderDecoratedTextDirect(unsigned char)
+SvtOptionsDrawinglayer::SetRenderSimpleTextDirect(unsigned char)
+SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent(unsigned short)
+SvtOptionsDrawinglayer::SetSnapHorVerLinesToDiscrete(unsigned char)
+SvtOptionsDrawinglayer::SetSolidDragCreate(unsigned char)
+SvtOptionsDrawinglayer::SetStripeColorA(Color)
+SvtOptionsDrawinglayer::SetStripeColorB(Color)
+SvtOptionsDrawinglayer::SetStripeLength(unsigned short)
+SvtPathOptions::GetPath(SvtPathOptions::Pathes) const
+SvtPathOptions::IsPathReadonly(SvtPathOptions::Pathes) const
+SvtPathOptions::SetPath(SvtPathOptions::Pathes, String const&)
+SvtPrintWarningOptions::IsNotFound() const
+SvtPrintWarningOptions::SetNotFound(unsigned char)
+SvtResId::SvtResId(unsigned short, com::sun::star::lang::Locale)
+SvtSaveOptions::SetSaveUnpacked(unsigned char)
+SvtSaveOptions::SetUseBlowfishInODF12(unsigned char)
+SvtSaveOptions::SetUseSHA1InODF12(unsigned char)
+SvtScriptedTextHelper::GetText() const
+SvtScriptedTextHelper::GetTextHeight() const
+SvtScriptedTextHelper::GetTextWidth() const
+SvtScriptedTextHelper::SvtScriptedTextHelper(OutputDevice&, Font*, Font*, Font*)
+SvtSearchOptions::IsSearchForStyles() const
+SvtSecurityOptions::IsTrustedAuthorsEnabled()
+SvtStartOptions::EnableIntro(unsigned char)
+SvtStartOptions::IsIntroEnabled() const
+SvtStartOptions::SetConnectionURL(rtl::OUString const&)
+SvtSysLocaleOptions::GetUILocale() const
+SvtTabAppearanceCfg::SetDragMode(unsigned short)
+SvtTmplDlg_Impl::getOfficeInstDirs()
+SvtURLBox::GetUrlFilter() const
+SvtUserOptions::GetLocale() const
+SvtWorkingSetOptions::GetWindowList() const
+SvtWorkingSetOptions::SetWindowList(com::sun::star::uno::Sequence<rtl::OUString> const&)
+Svx3DLightControl::Svx3DLightControl(Window*, ResId const&)
+Svx3DWin::LinkStubClickLightHdl(void*, void*)
+Svx3DWin::LinkStubDoubleClickHdl(void*, void*)
+SvxAcceptChgCtr::IsFilterPageVisible()
+SvxAcceptChgCtr::IsViewPageVisible()
+SvxAcceptChgCtr::SvxAcceptChgCtr(Window*, long)
+SvxAccessibleTextIndex::IsEditable() const
+SvxAccessibleTextPropertySet::getServiceName()
+SvxAngleCtl::SvxAngleCtl(Window*, ResId const&)
+SvxAngleCtl::SvxAngleCtl(Window*, ResId const&, Size)
+SvxAreaTabPage::LinkStubClickBitmapHdl_Impl(void*, void*)
+SvxAreaTabPage::LinkStubClickColorHdl_Impl(void*, void*)
+SvxAreaTabPage::LinkStubClickGradientHdl_Impl(void*, void*)
+SvxAreaTabPage::LinkStubClickHatchingHdl_Impl(void*, void*)
+SvxAreaTabPage::LinkStubClickInvisibleHdl_Impl(void*, void*)
+SvxAutoCorrect::SetShareAutoCorrFileName(String const&)
+SvxAutoCorrect::SetUserAutoCorrFileName(String const&)
+SvxAutocorrWordList::Insert(SvxAutocorrWord* const&, unsigned short&)
+SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short)
+SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short)
+SvxAutocorrWordList::Remove(SvxAutocorrWord* const&, unsigned short)
+SvxAutocorrWordList::Remove(unsigned short, unsigned short)
+SvxB3DVectorItem::SvxB3DVectorItem(unsigned short, SvStream&)
+SvxBmpMask::ImpMask(BitmapEx const&)
+SvxBulletItem::GetBitmap() const
+SvxBulletItem::SetBitmap(Bitmap const&)
+SvxBulletItem::SvxBulletItem(Bitmap const&, unsigned short)
+SvxBulletItem::SvxBulletItem(Font const&, unsigned short, unsigned short)
+SvxBulletItem::SvxBulletItem(GraphicObject const&, unsigned short)
+SvxBulletItem::SvxBulletItem(unsigned char, Font const&, unsigned short, unsigned short)
+SvxCSS1Map::Insert(SvxCSS1Map const*, unsigned short, unsigned short)
+SvxCSS1Map::Insert(SvxCSS1MapEntry* const&, unsigned short&)
+SvxCSS1Map::Insert(SvxCSS1MapEntry* const*, unsigned short)
+SvxCSS1Map::Remove(SvxCSS1MapEntry* const&, unsigned short)
+SvxCSS1Map::Remove(unsigned short, unsigned short)
+SvxCharMapData::LinkStubAssignHdl(void*, void*)
+SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr, unsigned short)
+SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient, unsigned short)
+SvxColorBox::LinkStubDelayHdl_Impl(void*, void*)
+SvxColorValueSet::SvxColorValueSet(Window*, long)
+SvxColumnItem::GetVisibleRight() const
+SvxContourDlg::ScaleContour(PolyPolygon&, Graphic const&, MapUnit, Size const&)
+SvxContourDlg::SetEditingObject(void*)
+SvxContourDlg::SetExecState(unsigned char)
+SvxContourDlg::SetGraphic(Graphic const&)
+SvxContourDlg::SetGraphicLinked(unsigned char)
+SvxContourDlg::SetPolyPolygon(PolyPolygon const&)
+SvxContourDlgChildWindow::UpdateContourDlg(Graphic const&, unsigned char, PolyPolygon const*, void*)
+SvxDashListItem::SetDashList(XDashList*)
+SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char)
+SvxDoubleItem::SvxDoubleItem(SvStream&, unsigned short)
+SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
+SvxDrawPage::GetPageForSdrPage(SdrPage*)
+SvxDrawPage::SvxDrawPage()
+SvxEditEngineViewForwarder::SvxEditEngineViewForwarder(EditView&)
+SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
+SvxEditSourceHint::SetEndValue(unsigned long)
+SvxEditSourceHint::SetStartValue(unsigned long)
+SvxEditSourceHint::SetValue(unsigned long)
+SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short, unsigned short) const
+SvxFontPrevWindow::IsTwoLines() const
+SvxFontPrevWindow::SetCJKFont(SvxFont const&)
+SvxFontPrevWindow::SetCTLFont(SvxFont const&)
+SvxFontPrevWindow::SetNoLines(unsigned char)
+SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char)
+SvxFontPrevWindow::SvxFontPrevWindow(Window*)
+SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
+SvxGrafToolBoxControl::RegisterControl(unsigned short, SfxModule*)
+SvxGraphCtrlAccessibleContext::checkChildIndex(long)
+SvxGraphCtrlAccessibleContext::setDescription(rtl::OUString const&)
+SvxGraphCtrlAccessibleContext::setName(rtl::OUString const&)
+SvxHtmlOptions::AddListenerLink(Link const&)
+SvxHtmlOptions::RemoveListenerLink(Link const&)
+SvxHyperlinkTabPageBase::FileExists(INetURLObject const&)
+SvxIMapDlg::GetTargetList() const
+SvxIconChoiceCtrlEntry::LockPos(unsigned char)
+SvxIconChoiceCtrlEntry::SetMoved(unsigned char)
+SvxIconChoiceCtrl_Impl::GetEntryPredecessor(SvxIconChoiceCtrlEntry*, SvxIconChoiceCtrlEntry**)
+SvxIconChoiceCtrl_Impl::GetGridCount(Size const&, unsigned char, unsigned char) const
+SvxIconChoiceCtrl_Impl::GetItem(SvxIconChoiceCtrlEntry*, Point const&)
+SvxIconChoiceCtrl_Impl::GetItemColumn(unsigned short, long&) const
+SvxIconChoiceCtrl_Impl::GetPopupMenuPosPixel() const
+SvxIconChoiceCtrl_Impl::GetTextMode(SvxIconChoiceCtrlEntry const*) const
+SvxIconChoiceCtrl_Impl::GoLeftRight(SvxIconChoiceCtrlEntry*, unsigned char)
+SvxIconChoiceCtrl_Impl::GoUpDown(SvxIconChoiceCtrlEntry*, unsigned char)
+SvxIconChoiceCtrl_Impl::HideFocus()
+SvxIconChoiceCtrl_Impl::HideShowDDIcon(SvxIconChoiceCtrlEntry*, Point const&)
+SvxIconChoiceCtrl_Impl::InvalidateBoundingRect(SvxIconChoiceCtrlEntry*)
+SvxIconChoiceCtrl_Impl::LockEntryPos(SvxIconChoiceCtrlEntry*, unsigned char)
+SvxIconChoiceCtrl_Impl::PrepareCommandEvent(CommandEvent const&)
+SvxIconChoiceCtrl_Impl::RecalcAllBoundingRects()
+SvxIconChoiceCtrl_Impl::SaveSelection(List**)
+SvxIconChoiceCtrl_Impl::SetEntryFlags(SvxIconChoiceCtrlEntry*, unsigned short)
+SvxIconChoiceCtrl_Impl::SetEntryListPos(SvxIconChoiceCtrlEntry*, unsigned long)
+SvxIconChoiceCtrl_Impl::ShowEntryFocusRect(SvxIconChoiceCtrlEntry const*)
+SvxIconChoiceCtrl_Impl::Tracking(TrackingEvent const&)
+SvxIconChoiceCtrl_Impl::UpdateBoundingRects()
+SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx&, long)
+SvxImportMSVBasic::Import(String const&, String const&, unsigned char, unsigned char)
+SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
+SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short)
+SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char)
+SvxLightCtl3D::SvxLightCtl3D(Window*, long)
+SvxLineColorItem::SvxLineColorItem(Color const&, unsigned short)
+SvxLineColorItem::SvxLineColorItem(SvStream&, unsigned short)
+SvxListBoxControl::RegisterControl(unsigned short, SfxModule*)
+SvxMSConvertOCXControls::OCX_Factory(String const&)
+SvxMSConvertOCXControls::WriteOCXExcelKludgeStream(SotStorageStreamRef&, com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> const&, com::sun::star::awt::Size const&, String&)
+SvxMSDffManager::GetAutoForm(MSO_SPT) const
+SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const
+SvxMSDffManager::ReadObjText(SvStream&, SdrObject*) const
+SvxMSDffManager::Scale(PolyPolygon&) const
+SvxMSDffManager::Scale(Rectangle&) const
+SvxMSDffManager::lcl_GetMetaFileFromGrf_Impl(Graphic const&, GDIMetaFile&)
+SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&, unsigned short&)
+SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const*, unsigned short)
+SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfos const*, unsigned short, unsigned short)
+SvxMSDffShapeInfos::Remove(SvxMSDffShapeInfo* const&, unsigned short)
+SvxMSDffShapeTxBxSort::DeleteAndDestroy(unsigned short, unsigned short)
+SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const&, unsigned short&)
+SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const*, unsigned short)
+SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, unsigned short)
+SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder* const&, unsigned short)
+SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
+SvxModifyControl::GetDefItemWidth(StatusBar const&)
+SvxNumRule::SetLevel(unsigned short, SvxNumberFormat const*)
+SvxNumRule::SvxNumRule(SvStream&)
+SvxNumberFormatShell::GetCurCurrencyEntry()
+SvxNumberFormatShell::GetCurrencyFormats(SvStrings&)
+SvxNumberFormatShell::IsBankingSymbol(unsigned short)
+SvxNumberInfoItem::SetDoubleValue(double const&)
+SvxNumberInfoItem::SetNumberFormatter(SvNumberFormatter*)
+SvxNumberInfoItem::SetStringValue(String const&)
+SvxOpenGraphicDialog::SetControlHelpIds(short const*, char const**)
+SvxParaPrevWindow::OutputSizeChanged()
+SvxPixelCtl::GetBitmapPixel(unsigned short)
+SvxPluginFileDlg::IsAvailable(unsigned short)
+SvxPopupWindowListBox::StartSelection()
+SvxPosSizeStatusBarControl::GetDefItemWidth(StatusBar const&)
+SvxPositionSizeTabPage::LinkStubChangePosXHdl(void*, void*)
+SvxPositionSizeTabPage::LinkStubChangePosYHdl(void*, void*)
+SvxRectCtlAccessibleContext::setDescription(rtl::OUString const&)
+SvxRectCtlAccessibleContext::setName(rtl::OUString const&)
+SvxRedlinTable::IsValidCalcEntry(String const&, RedlinData*)
+SvxRedlinTable::IsValidWriterEntry(String const&, RedlinData*)
+SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer&, ResId const&)
+SvxRelativeField::SvxRelativeField(Window*, long)
+SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
+SvxRubyChildWindow::GetChildWindowId()
+SvxRuler::GetDefTabDist() const
+SvxScriptOrgDialog::LinkStubMacroDoubleClickHdl(void*, void*)
+SvxSearchConfig::Count()
+SvxSearchConfig::GetData(rtl::OUString const&)
+SvxSearchConfig::GetData(unsigned short)
+SvxSearchConfig::RemoveData(rtl::OUString const&)
+SvxSearchConfig::SetData(SvxSearchEngineData const&)
+SvxSearchConfig::SvxSearchConfig(unsigned char)
+SvxSearchDialog::GetReplaceItems(SfxItemSet&)
+SvxSearchDialog::GetSearchItems(SfxItemSet&)
+SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings&)
+SvxSearchItem::GetFromDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor> const&)
+SvxSearchItem::SetToDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor>&)
+SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
+SvxShape::GetShapeForSdrObj(SdrObject*)
+SvxShape::getMaster()
+SvxShape::getMaster() const
+SvxShapePolyPolygonBezier::GetPolygonKind() const
+SvxShapeText::SvxShapeText()
+SvxShowCharSet::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
+SvxSimpleTable::ClearAll()
+SvxSimpleTable::TableToTop()
+SvxSimpleTableContainer::SvxSimpleTableContainer(Window*, long)
+SvxStringArray::GetStringByType(long) const
+SvxStringArray::GetValueByStr(String const&) const
+SvxSuperContourDlg::DoAutoCreate()
+SvxSuperContourDlg::ReducePoints(long)
+SvxTPFilter::DisableRange(unsigned char)
+SvxTPFilter::GetSelectedAuthorPos()
+SvxTPFilter::HideClocks(unsigned char)
+SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
+SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
+SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
+SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
+SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
+SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
+SvxTextEditSource::GetSdrObject() const
+SvxTextEncodingBox::IsTextEncodingSelected(unsigned short) const
+SvxTextEncodingBox::RemoveTextEncoding(unsigned short)
+SvxUnoFontDescriptor::getPropertyState(SfxItemSet const&)
+SvxUnoTextBase::InsertField(SvxFieldItem const&)
+SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*)
+SvxUnoTextContent::SvxUnoTextContent()
+SvxZoomStatusBarControl::GetDefItemWidth(StatusBar const&)
+SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
+SwBlinkList::Insert(SwBlinkPortion* const&, unsigned short&)
+SwBlinkList::Insert(SwBlinkPortion* const*, unsigned short)
+SwBlinkList::Remove(SwBlinkPortion* const&, unsigned short)
+SwBlockNames::Insert(SwBlockName const*&, unsigned short&)
+SwBlockNames::Insert(SwBlockName const**, unsigned short)
+SwBlockNames::Insert(SwBlockNames const*, unsigned short, unsigned short)
+SwBlockNames::Remove(SwBlockName const*&, unsigned short)
+SwBlockNames::Remove(unsigned short, unsigned short)
+SwCellFrms::DeleteAndDestroy(unsigned short, unsigned short)
+SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short)
+SwColumnPage::LinkStubTimeout(void*, void*)
+SwContentArr::Insert(SwContent* const&, unsigned short&)
+SwContentArr::Insert(SwContent* const*, unsigned short)
+SwContentArr::Insert(SwContentArr const*, unsigned short, unsigned short)
+SwContentArr::Remove(SwContent* const&, unsigned short)
+SwContentArr::Remove(unsigned short, unsigned short)
+SwCrsrShell::GoPrevSentence()
+SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short)
+SwCurrShells::Insert(CurrShell* const&, unsigned short&)
+SwCurrShells::Insert(CurrShell* const*, unsigned short)
+SwCurrShells::Insert(SwCurrShells const*, unsigned short, unsigned short)
+SwCurrShells::Remove(unsigned short, unsigned short)
+SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short)
+SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
+SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short)
+SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&)
+SwDestroyList::Insert(SwSectionFrm* const*, unsigned short)
+SwDestroyList::Remove(SwSectionFrm* const&, unsigned short)
+SwDoc::LinkStubDoUpdateAllCharts(void*, void*)
+SwEditShell::SetFixFields(unsigned char, DateTime const*)
+SwFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+SwFldDataOnlyDlgWrapper::GetChildWindowId()
+SwFormatTablePage::LinkStubRightModifyHdl(void*, void*)
+SwGlblDocContents::Insert(SwGlblDocContent* const&, unsigned short&)
+SwGlblDocContents::Insert(SwGlblDocContent* const*, unsigned short)
+SwGlblDocContents::Insert(SwGlblDocContents const*, unsigned short, unsigned short)
+SwGlblDocContents::Remove(SwGlblDocContent* const&, unsigned short)
+SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const*&, unsigned short&)
+SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const**, unsigned short)
+SwHTMLFmtInfos::Insert(SwHTMLFmtInfos const*, unsigned short, unsigned short)
+SwHTMLFmtInfos::Remove(SwHTMLFmtInfo const*&, unsigned short)
+SwHTMLFmtInfos::Remove(unsigned short, unsigned short)
+SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const&, unsigned short&)
+SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const*, unsigned short)
+SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrms const*, unsigned short, unsigned short)
+SwHTMLPosFlyFrms::Remove(SwHTMLPosFlyFrm* const&, unsigned short)
+SwHyphWrapper::LinkStubSpellError(void*, void*)
+SwInsDBColumns::Insert(SwInsDBColumn* const&, unsigned short&)
+SwInsDBColumns::Insert(SwInsDBColumn* const*, unsigned short)
+SwInsDBColumns::Insert(SwInsDBColumns const*, unsigned short, unsigned short)
+SwInsDBColumns::Remove(SwInsDBColumn* const&, unsigned short)
+SwInsDBColumns::Remove(unsigned short, unsigned short)
+SwLRects::Insert(SwLRects const*, unsigned short, unsigned short, unsigned short)
+SwLRects::Replace(SwLineRect const&, unsigned short)
+SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short)
+SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect const&, void*), void*)
+SwLoadOptPage::LinkStubCaptionHdl(void*, void*)
+SwMailMergeChildWindow::GetChildWindowId()
+SwModify::GetClientCount() const
+SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
+SwOutlineNodes::Insert(SwNode* const*, unsigned short)
+SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
+SwPaM::LessThan(SwPaM const&, SwPaM const&)
+SwPaM::Overlap(SwPaM const&, SwPaM const&)
+SwPageFrm::AddSidebarBorders(Rectangle&, ViewShell*, bool, bool)
+SwPageFrm::AddSidebarBorders(SwRect&, ViewShell*, bool, bool)
+SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short)
+SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&)
+SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
+SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short)
+SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short)
+SwPosFlyFrms::Remove(unsigned short, unsigned short)
+SwRects::Replace(SwRect const&, unsigned short)
+SwRects::Replace(SwRect const*, unsigned short, unsigned short)
+SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*)
+SwRedlineDataParentSortArr::DeleteAndDestroy(unsigned short, unsigned short)
+SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const&)
+SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short)
+SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned short, unsigned short)
+SwSections::DeleteAndDestroy(unsigned short, unsigned short)
+SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
+SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
+SwSortElements::Insert(SwSortElement* const&, unsigned short&)
+SwSortElements::Insert(SwSortElement* const*, unsigned short)
+SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short)
+SwSortElements::Remove(SwSortElement* const&, unsigned short)
+SwSortElements::Remove(unsigned short, unsigned short)
+SwSortTableLines::DeleteAndDestroy(unsigned short, unsigned short)
+SwSortTableLines::Insert(SwTableLine* const&)
+SwSortTableLines::Insert(SwTableLine* const&, unsigned short&)
+SwSortTableLines::Insert(SwTableLine* const*, unsigned short)
+SwSortTableLines::Remove(SwTableLine* const&, unsigned short)
+SwSortTableLines::Remove(unsigned short, unsigned short)
+SwSyncChildWin::GetChildWindowId()
+SwTOXMarks::DeleteAndDestroy(unsigned short, unsigned short)
+SwTOXSelectTabPage::LinkStubTOXAreaHdl(void*, void*)
+SwTOXSources::Insert(SwTOXSources const*, unsigned short, unsigned short, unsigned short)
+SwTOXSources::Remove(unsigned short, unsigned short)
+SwTOXSources::Replace(SwTOXSource const&, unsigned short)
+SwTOXSources::Replace(SwTOXSource const*, unsigned short, unsigned short)
+SwTOXSources::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwTOXSource const&, void*), void*)
+SwTOXStylesTabPage::LinkStubModifyHdl(void*, void*)
+SwTabFrm::GetLeaf(MakePageType, unsigned char)
+SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
+SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
+SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
+SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequence<com::sun::star::text::TableColumnSeparator> const&, double*)
+SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int)
+SwVbaStyle::getOOoStyleTypeFromMSWord(int)
+SwVbaTableHelper::setTableWidth(int)
+SwView::LinkStubHtmlOptionsHdl(void*, void*)
+SwView::LinkStubSpellError(void*, void*)
+SwViewImp::LinkStubSetStopPrt(void*, void*)
+SwWW8Writer::InsUInt32(std::vector<unsigned char, std::allocator<unsigned char> >&, unsigned int)
+SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
+SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
+SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned short)
+SwWriteTableCols::Remove(SwWriteTableCol* const&, unsigned short)
+SwWriteTableCols::Remove(unsigned short, unsigned short)
+SwWriteTableRows::Insert(SwWriteTableRow* const&, unsigned short&)
+SwWriteTableRows::Insert(SwWriteTableRow* const*, unsigned short)
+SwWriteTableRows::Insert(SwWriteTableRows const*, unsigned short, unsigned short)
+SwWriteTableRows::Remove(SwWriteTableRow* const&, unsigned short)
+SwWriteTableRows::Remove(unsigned short, unsigned short)
+SwXMLTableColumnsSortByWidth_Impl::GetPos(SwXMLTableColumn_Impl const*) const
+SwXMLTableColumnsSortByWidth_Impl::Remove(SwXMLTableColumn_Impl*)
+SwXMLTableColumns_Impl::Insert(SwXMLTableColumn_Impl* const&, unsigned short&)
+SwXMLTableColumns_Impl::Insert(SwXMLTableColumn_Impl* const*, unsigned short)
+SwXMLTableColumns_Impl::Insert(SwXMLTableColumns_Impl const*, unsigned short, unsigned short)
+SwXMLTableColumns_Impl::Remove(SwXMLTableColumn_Impl* const&, unsigned short)
+SwXMLTableColumns_Impl::Remove(unsigned short, unsigned short)
+SwpFmts::DeleteAndDestroy(unsigned short, unsigned short)
+SwpFmts::Insert(SwFmt const*&, unsigned short&)
+SwpFmts::Insert(SwFmt const**, unsigned short)
+SwpFmts::Insert(SwpFmts const*, unsigned short, unsigned short)
+SwpFmts::Remove(SwFmt const*&, unsigned short)
+SwpFmts::Remove(unsigned short, unsigned short)
+SwpHtEnd::Insert(SwTxtAttr const*&, unsigned short&)
+SwpHtEnd::Insert(SwTxtAttr const**, unsigned short)
+SwpHtEnd::Insert(SwpHtEnd const*, unsigned short, unsigned short)
+SwpHtEnd::Remove(SwTxtAttr const*&, unsigned short)
+SwpHtStart::Insert(SwTxtAttr const*&, unsigned short&)
+SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
+SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
+SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
+SymCharConverter::Convert(Font&, String&, OutputDevice*)
+TB::NeedsPositioning()
+TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned short)
+TESortedPositions::Insert(unsigned long const&, unsigned short&)
+TESortedPositions::Insert(unsigned long const*, unsigned short)
+TESortedPositions::Remove(unsigned long const&, unsigned short)
+TESortedPositions::Remove(unsigned short, unsigned short)
+TESortedPositions_SAR::Replace(unsigned long const&, unsigned short)
+TESortedPositions_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
+TESortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
+TEWritingDirectionInfos::Insert(TEWritingDirectionInfos const*, unsigned short, unsigned short, unsigned short)
+TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const&, unsigned short)
+TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const*, unsigned short, unsigned short)
+TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(TEWritingDirectionInfo const&, void*), void*)
+TPGalleryThemeProperties::LinkStubClickCloseBrowserHdl(void*, void*)
+TTProfiler::Dec(unsigned long)
+TTProperties::Img(Bitmap*)
+TaskStatusBar::ImplGetFieldItem(unsigned short) const
+TaskStatusFieldItem::TaskStatusFieldItem()
+TempFile::IsValid() const
+TestToolObj::TestToolObj(String, String)
+TextObj::TextObj(TextObj&)
+TextObj::Write(SvStream*)
+TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
+TypeName::TypeName(char*, unsigned int, unsigned int, unsigned short, int, int)
+UCBStorage::IsStorageFile(String const&)
+UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&)
+UNOStorageHolder::GetStorageName()
+UNOStorageHolder::UNOStorageHolder(SotStorage&, SotStorage&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage>, utl::TempFile*)
+UShortCont::Sort()
+UniqueIdContainer::CreateFreeId(unsigned long)
+UniqueIdContainer::CreateIdProt(unsigned long)
+UniqueIndex::Replace(unsigned long, void*)
+UnoComboBoxControl::getActionListeners()
+UnoComboBoxControl::getItemListeners()
+UnoControlBase::ImplGetPropertyValue_UINT16(unsigned short)
+UnoControlBase::ImplGetPropertyValue_UINT32(unsigned short)
+UnoControlBase::UnoControlBase()
+UnoControlModel::Clone() const
+UnoControlModel::GetImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
+UnoControlModel::UnoControlModel()
+UnoControlModel::getInfoHelper()
+UnoDialog::getMapsFromPixels(int) const
+UnoDialog::isHighContrast()
+UnoListBoxControl::getActionListeners()
+UnoListBoxControl::getItemListeners()
+UnoMemoryStream::UnoMemoryStream(unsigned int, unsigned int)
+VCLUnoHelper::ConvertToMeasurementUnit(MapUnit)
+VCLUnoHelper::CreatePointer()
+VCLXDevice::IsCreatedWithToolkit() const
+VCLXPrinterServer::getImplementationId()
+VCLXPrinterServer::getTypes()
+ValueSet::CopyItems(ValueSet const&)
+ValueSet::GetHighlightHdl() const
+ValueSet::GetItemBits(unsigned short) const
+ValueSet::HideDropPos()
+ValueSet::InsertSpace(unsigned short, unsigned long)
+ValueSet::IsRTLActive()
+ValueSet::SetFirstLine(unsigned short)
+ValueSet::SetItemBits(unsigned short, unsigned short)
+ValueSet::ShowDropPos(Point const&)
+ValueSetAcc::IsDisposed()
+ValueSetItem::ClearAccessible()
+VbaFontBase::getUnderline()
+VbaFontBase::setUnderline(com::sun::star::uno::Any const&)
+VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequence<rtl::OUString>&)
+VbaFoundFilesEnum::VbaFoundFilesEnum()
+VclEventListeners2::~VclEventListeners2()
+ViewShell::getIDocumentFieldsAccess() const
+WP1FixedLengthGroup::isGroupConsistent(WPXInputStream*, WPXEncryption*, unsigned char)
+WP3Resource::getResourceTypeString() const
+WP3ResourceFork::getResourcesByID(unsigned int) const
+WP3ResourceFork::getResourcesByType(unsigned int) const
+WP3StylesListener::insertCell()
+WP3StylesListener::insertRow()
+WP3SubDocument::WP3SubDocument(unsigned char*, unsigned int)
+WP42SubDocument::WP42SubDocument(unsigned char*, unsigned int)
+WP6SubDocument::WP6SubDocument(WPXInputStream*, WPXEncryption*, unsigned int)
+WPGTextDataHandler::endSubDocument()
+WPS8Parser::readText(WPXInputStream*, WPS8ContentListener*)
+WPXPropertyList::Iter::last()
+WPXPropertyListVector::Iter::last()
+WPXString::Iter::last()
+WPXSubDocument::WPXSubDocument()
+WinMtfOutput::DrawLine(Point const&, Point const&)
+WinMtfOutput::GetTextLayoutMode() const
+WinMtfOutput::SetFont(Font const&)
+Window::EnableChildNotify(unsigned char)
+Window::GetAccessibleRelationMemberOf() const
+Window::GetDragSourceDropTarget(com::sun::star::uno::Reference<com::sun::star::datatransfer::dnd::XDragSource>&, com::sun::star::uno::Reference<com::sun::star::datatransfer::dnd::XDropTarget>&)
+Window::GetPrevExtendedStyle() const
+Window::ImplCalcChildOverlapToTop(ImplCalcToTopData*)
+Window::ImplFrameToOutput(Rectangle&)
+Window::ImplGetCurrentBackgroundColor(Color&)
+Window::ImplGetSameParent(Window const*) const
+Window::ImplInit(Window*, long, com::sun::star::uno::Any const&)
+Window::ImplIsInTaskPaneList()
+Window::ImplIsMouseTransparent() const
+Window::ImplIsToolbox() const
+Window::ImplOutputToFrame(Rectangle&)
+Window::ImplSetActive(unsigned char)
+Window::InterceptChildWindowKeyDown(unsigned char)
+Window::IsAllResizeEnabled() const
+Window::IsAlwaysDisableInput() const
+Window::IsAutoScroll() const
+Window::IsChildNotify() const
+Window::IsChildPointerOverwrite() const
+Window::IsClipSiblingsEnabled() const
+Window::IsExtTextInput() const
+Window::IsParentPathVisible() const
+Window::IsParentUpdateMode() const
+Window::IsPointerVisible() const
+Window::PostUserEvent(unsigned long, void*)
+Window::SetAccessibleRelationLabelFor(Window*)
+Window::Validate(Rectangle const&, unsigned short)
+Window::Validate(Region const&, unsigned short)
+Window::removeWindow(Window*, Window*)
+Window::setIdentifier(rtl::OUString const&)
+WizardDialog::IsButtonFixedLineVisible()
+WordArr::Remove(short)
+Writer::OutHex(SvStream&, unsigned long, unsigned char)
+WrongRanges::Insert(WrongRanges const*, unsigned short, unsigned short, unsigned short)
+WrongRanges::Replace(WrongRange const&, unsigned short)
+WrongRanges::Replace(WrongRange const*, unsigned short, unsigned short)
+WrongRanges::_ForEach(unsigned short, unsigned short, unsigned char (*)(WrongRange const&, void*), void*)
+X11SalFrame::PostExtTextEvent(unsigned short, void*)
+X11SalFrame::SetWindowGravity(int) const
+X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
+X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+XBitmapList::Replace(XBitmapEntry*, long)
+XBitmapTable::Remove(long)
+XBitmapTable::Replace(long, XBitmapEntry*)
+XBitmapTable::XBitmapTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
+XDashTable::Remove(long)
+XDashTable::Replace(long, XDashEntry*)
+XDashTable::XDashTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
+XEditAttribute::XEditAttribute(SfxPoolItem const&)
+XFBookmarkRef::XFBookmarkRef()
+XFCell::SetCurrency(rtl::OUString)
+XFCell::SetDate(rtl::OUString)
+XFCell::SetDisplay(rtl::OUString)
+XFCell::SetPercent(double)
+XFCell::SetString(rtl::OUString)
+XFCell::SetTime(rtl::OUString)
+XFCellStyle::SetFont(XFFont*)
+XFCellStyle::SetIndent(double)
+XFCellStyle::SetMargins(double, double, double, double)
+XFCellStyle::SetParentStyle(rtl::OUString)
+XFCellStyle::SetShadow(enumXFShadowPos, double, XFColor&)
+XFColumn::GetMarginLeft()
+XFColumn::GetMarginRight()
+XFColumn::GetRelWidth()
+XFColumns::GetCount()
+XFColumns::SetSeperator(int, double, XFColor, enumXFAlignType)
+XFDrawCircle::XFDrawCircle()
+XFDrawCircle::XFDrawCircle(XFPoint, double)
+XFDrawEllipse::XFDrawEllipse()
+XFDrawPath::CalcViewBox()
+XFDrawPath::SmoothCurveTo(XFPoint, XFPoint, unsigned char)
+XFFileStream::XFFileStream(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
+XFFloatFrame::XFFloatFrame(int)
+XFFontDecl::SetFontFamily(rtl::OUString)
+XFFontDecl::SetFontName(rtl::OUString)
+XFFontDecl::SetFontPitchFixed(unsigned char)
+XFFontDecl::XFFontDecl()
+XFGlobal::GenGraphName()
+XFGlobal::GenObjName()
+XFHeaderStyle::SetPadding(double, double, double, double)
+XFIndex::AddEntry(rtl::OUString, rtl::OUString)
+XFIndex::AddTemplate(unsigned int, rtl::OUString, enumXFIndexTemplate, enumXFIndexTemplate, enumXFIndexTemplate, enumXFIndexTemplate)
+XFIndex::GetEntryCount()
+XFIndex::SetDefaultAlphaIndex(rtl::OUString, unsigned char, unsigned char)
+XFIndex::SetSectionStyle(rtl::OUString)
+XFIndex::SetTitle(rtl::OUString, rtl::OUString)
+XFList::AddItem(rtl::OUString)
+XFList::SetHeader(XFListItem*)
+XFList::XFList(unsigned char)
+XFMasterPage::SetPageMaster(XFPageMaster*)
+XFNumberStyle::XFNumberStyle(enumXFNumberType)
+XFOfficeMeta::SetGenerator(rtl::OUString)
+XFOfficeMeta::SetTitle(rtl::OUString)
+XFOleObject::SetOleData(unsigned char*, int)
+XFOleObject::XFOleObject()
+XFOutlineStyle::XFOutlineStyle()
+XFParaStyle::XFParaStyle(XFParaStyle&)
+XFParagraph::ClearContents()
+XFParagraph::XFParagraph(rtl::OUString&, rtl::OUString&)
+XFRow::GetRowName()
+XFRowStyle::SetbackImage(XFBGImage*)
+XFSection::SetHiden(unsigned char)
+XFSection::SetProtected(unsigned char)
+XFSection::SetSectionName(rtl::OUString)
+XFSectionStyle::SetBackColor(XFColor const&)
+XFSectionStyle::SetBackImage(XFBGImage*)
+XFShadow::Reset()
+XFStyleManager::AddFontDecl(rtl::OUString, rtl::OUString, unsigned char)
+XFSvgPathEntry::XFSvgPathEntry(rtl::OUString)
+XFTable::GetColumnStyle(int)
+XFTextHeading::SetLevel(short)
+XFTextHeading::SetText(rtl::OUString)
+XFTextHeading::XFTextHeading()
+XFTextSpan::GetText()
+XFTextSpan::SetText(rtl::OUString&)
+XFTime::XFTime()
+XFillBitmapItem::XFillBitmapItem(SfxItemPool*)
+XFillBitmapItem::XFillBitmapItem(long, XOBitmap const&)
+XFillExchangeData::RegisterClipboardFormatName()
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool*)
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(int, XGradient const&, unsigned char)
+XFillGradientItem::XFillGradientItem(SfxItemPool*)
+XFillHatchItem::XFillHatchItem(SfxItemPool*)
+XFillHatchItem::XFillHatchItem(int, XHatch const&)
+XFormTextShadowColorItem::XFormTextShadowColorItem(int, Color const&)
+XGradientTable::Remove(long)
+XGradientTable::Replace(long, XGradientEntry*)
+XGradientTable::XGradientTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
+XHatchTable::Remove(long)
+XHatchTable::Replace(long, XHatchEntry*)
+XHatchTable::XHatchTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
+XLineDashItem::XLineDashItem(SfxItemPool*)
+XLineDashItem::XLineDashItem(int, XDash const&)
+XLineEndItem::XLineEndItem(SfxItemPool*)
+XLineEndList::Replace(XLineEndEntry*, long)
+XLineEndTable::Remove(long)
+XLineEndTable::Replace(long, XLineEndEntry*)
+XLineEndTable::XLineEndTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
+XLineStartItem::XLineStartItem(SfxItemPool*)
+XMLAutoTextEventExport::XMLAutoTextEventExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> const&, unsigned short)
+XMLElement::Equals(rtl::OUString)
+XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter()
+XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&)
+XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&, rtl::OUString const&)
+XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
+XMLFamilyDataList_Impl::Remove(XMLFamilyData_Impl*)
+XMLFile::View()
+XMLFile::showType(XMLParentNode*)
+XMLFilterListBox::LinkStubHeaderSelect_Impl(void*, void*)
+XMLFilterTabDialog::LinkStubCancelHdl(void*, void*)
+XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
+XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
+XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
+XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
+XMLFormsContext::XMLFormsContext(SvXMLImport&, unsigned short, rtl::OUString const&)
+XMLPagePropertySetMapper::XMLPagePropertySetMapper(UniReference<XMLPropertyHandlerFactory> const&)
+XMLParentNode::AddChild(XMLChildNode*, unsigned long)
+XMLParentNode::GetChildElement(XMLElement*)
+XMLParentNode::RemoveChild(XMLElement*)
+XMLPropertyBackpatcher<rtl::OUString>::XMLPropertyBackpatcher(char const*)
+XMLPropertyBackpatcher<rtl::OUString>::XMLPropertyBackpatcher(char const*, char const*, unsigned char, rtl::OUString)
+XMLPropertyBackpatcher<rtl::OUString>::XMLPropertyBackpatcher(rtl::OUString const&, rtl::OUString const&, unsigned char, rtl::OUString)
+XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(char const*)
+XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(char const*, char const*, unsigned char, short)
+XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(rtl::OUString const&, rtl::OUString const&, unsigned char, short)
+XMLShapeImportHelper::CreateExternalShapePropMapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, SvXMLImport&)
+XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap()
+XMLShapeImportHelper::GetPathShapeAttrTokenMap()
+XMLShapeImportHelper::GetPolygonShapeAttrTokenMap()
+XMLSignatureHelper::CreateAndWriteSignature(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&)
+XMLSignatureHelper::GetSecurityEnvironmentByIndex(int)
+XMLSignatureHelper::GetSecurityEnvironmentNumber()
+XMLSignatureHelper::GetUriBinding() const
+XMLSignatureHelper::SetUriBinding(com::sun::star::uno::Reference<com::sun::star::xml::crypto::XUriBinding>&)
+XMLSignatureHelper::SetX509Certificate(int, int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
+XMLTextFieldExport::ProcessDate(xmloff::token::XMLTokenEnum, com::sun::star::util::Date const&, unsigned short)
+XMLTextFrameContext::CreateIfNotThere()
+XMLTextImportHelper::CreateCharExtPropMapper(SvXMLImport&, XMLFontStylesContext*)
+XMLTextImportHelper::GetFrameImportPropertySetMapper() const
+XMLTextImportHelper::GetRangeFor(rtl::OUString&)
+XMLTextImportHelper::HasDrawNameAttribute(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, SvXMLNamespaceMap&)
+XMLTextImportHelper::getCurrentFieldName()
+XMLTextListAutoStylePool::HasName(rtl::OUString const&) const
+XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
+XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
+XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const
+XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
+XMLTextParagraphExport::FindTextStyle(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, unsigned char&) const
+XMLTextParagraphExport::GetHeadingLevel(rtl::OUString const&)
+XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, Rectangle&, MapUnit)
+XMLVisAreaExport::XMLVisAreaExport(SvXMLExport&, char const*, Rectangle const&, MapUnit)
+XMLVisAreaExport::XMLVisAreaExport(SvXMLExport&, char const*, com::sun::star::awt::Rectangle const&, short)
+XMLVisAreaExport::~XMLVisAreaExport()
+XOutBitmap::CreateQuickDrawBitmapEx(Graphic const&, OutputDevice const&, MapMode const&, Size const&, Point const&, Size const&)
+XOutBitmap::DrawQuickDrawBitmapEx(OutputDevice*, Point const&, Size const&, BitmapEx const&)
+XOutBitmap::DrawTiledBitmapEx(OutputDevice*, Point const&, Size const&, Rectangle const&, BitmapEx const&)
+XPolyPolygon::Move(long, long)
+XPolyPolygon::Replace(XPolygon const&, unsigned short)
+XPolyPolygon::Rotate(Point const&, unsigned short)
+XPolyPolygon::Rotate20()
+XPolyPolygon::Scale(double, double)
+XPolyPolygon::SlantX(long, double, double)
+XPolyPolygon::SlantY(long, double, double)
+XPolyPolygon::Translate(Point const&)
+XPolyPolygon::XPolyPolygon(PolyPolygon const&)
+XPolyPolygon::XPolyPolygon(XPolygon const&)
+XPolygon::GetSize() const
+XPolygon::Insert(unsigned short, Polygon const&)
+XPolygon::Rotate(Point const&, unsigned short)
+XPolygon::SetSize(unsigned short)
+XPropertyList::Clear()
+XPropertyList::XPropertyList(SvStream&)
+XPropertyTable::Clear()
+XPropertyTable::GetBitmap(long) const
+XPropertyTable::XPropertyTable(SvStream&)
+XSecController::collectToSign(int, rtl::OUString const&)
+XSecController::getErrorMessage()
+XSecController::setSAXChainConnector(com::sun::star::uno::Reference<com::sun::star::xml::sax::XParser> const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::xml::crypto::sax::XElementStackKeeper> const&)
+XSecondaryFillColorItem::XSecondaryFillColorItem(int, Color const&)
+XWindowItem::XWindowItem(unsigned short, Window*)
+XWindowItem::XWindowItem(unsigned short, com::sun::star::uno::Reference<com::sun::star::awt::XWindow>&)
+XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool)
+XclExpName::IsHidden() const
+XclExpPivotCache::GetFieldAcc(String const&)
+XclExpString::SetFormats(std::vector<XclFormatRun, std::allocator<XclFormatRun> > const&)
+XclImpPTItem::GetVisItemName() const
+XclImpPalette::CreateColorSequence() const
+XclObjId::XclObjId()
+XclObjId::XclObjId(short, unsigned short)
+XclRoot::GetDatabaseRanges() const
+XclRoot::GetPixelXFromHmm(int) const
+XclRoot::GetPixelYFromHmm(int) const
+XclTokenArray::XclTokenArray(std::vector<unsigned char, std::allocator<unsigned char> >&, bool)
+XclTokenArrayIterator::Init()
+XclTools::GetBuiltInStyleName(String const&)
+XclTools::GetSbMacroUrl(String const&, String const&, SfxObjectShell*)
+XmlSec::GetDateTimeString(rtl::OUString const&, rtl::OUString const&)
+XmlSecStatusBarControl::GetDefItemWidth(StatusBar&)
+ZCodec::UpdateCRC(unsigned long, unsigned long)
+ZipPackageStream::SetBaseEncryptionData(rtl::Reference<BaseEncryptionData> const&)
+_CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
+_CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)
+_CpyTabFrms::Insert(_CpyTabFrms const*, unsigned short, unsigned short)
+_CpyTabFrms::Remove(_CpyTabFrm const&, unsigned short)
+_CpyTabFrms_SAR::Replace(_CpyTabFrm const&, unsigned short)
+_CpyTabFrms_SAR::Replace(_CpyTabFrm const*, unsigned short, unsigned short)
+_CpyTabFrms_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_CpyTabFrm const&, void*), void*)
+_MapTblFrmFmts::Insert(_MapTblFrmFmts const*, unsigned short, unsigned short, unsigned short)
+_MapTblFrmFmts::Remove(unsigned short, unsigned short)
+_MapTblFrmFmts::Replace(_MapTblFrmFmt const&, unsigned short)
+_MapTblFrmFmts::Replace(_MapTblFrmFmt const*, unsigned short, unsigned short)
+_MergePos::Insert(_CmpLPt const&, unsigned short&)
+_MergePos::Insert(_CmpLPt const*, unsigned short)
+_MergePos::Insert(_MergePos const*, unsigned short, unsigned short)
+_MergePos::Remove(_CmpLPt const&, unsigned short)
+_MergePos_SAR::Replace(_CmpLPt const&, unsigned short)
+_MergePos_SAR::Replace(_CmpLPt const*, unsigned short, unsigned short)
+_MergePos_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_CmpLPt const&, void*), void*)
+_SaveFlyArr::Insert(_SaveFlyArr const*, unsigned short, unsigned short, unsigned short)
+_SaveFlyArr::Remove(unsigned short, unsigned short)
+_SaveFlyArr::Replace(_SaveFly const&, unsigned short)
+_SaveFlyArr::Replace(_SaveFly const*, unsigned short, unsigned short)
+_SaveFlyArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(_SaveFly const&, void*), void*)
+_SetGetExpFlds::Insert(_SetGetExpFld* const&, unsigned short&)
+_SetGetExpFlds::Insert(_SetGetExpFld* const*, unsigned short)
+_SetGetExpFlds::Insert(_SetGetExpFlds const*, unsigned short, unsigned short)
+_SetGetExpFlds::Remove(_SetGetExpFld* const&, unsigned short)
+_SfxObjectList::Insert(_FileListEntry const*&, unsigned short&)
+_SfxObjectList::Insert(_FileListEntry const**, unsigned short)
+_SfxObjectList::Insert(_SfxObjectList const*, unsigned short, unsigned short)
+_SfxObjectList::Remove(_FileListEntry const*&, unsigned short)
+_SfxObjectList::Remove(unsigned short, unsigned short)
+_SfxPoolItems::DeleteAndDestroy(unsigned short, unsigned short)
+_SwFtnIdxs::Insert(SwTxtFtn* const&, unsigned short&)
+_SwFtnIdxs::Insert(SwTxtFtn* const*, unsigned short)
+_SwFtnIdxs::Remove(SwTxtFtn* const&, unsigned short)
+_SwPamRanges::Insert(SwPamRange const&, unsigned short&)
+_SwPamRanges::Insert(SwPamRange const*, unsigned short)
+_SwPamRanges::Insert(_SwPamRanges const*, unsigned short, unsigned short)
+_SwPamRanges::Remove(SwPamRange const&, unsigned short)
+_SwPamRanges_SAR::Replace(SwPamRange const&, unsigned short)
+_SwPamRanges_SAR::Replace(SwPamRange const*, unsigned short, unsigned short)
+_SwPamRanges_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwPamRange const&, void*), void*)
+_SwRedlineTbl::Insert(SwRedline* const*, unsigned short)
+_SwRedlineTbl::Insert(_SwRedlineTbl const*, unsigned short, unsigned short)
+_SwRedlineTbl::Remove(SwRedline* const&, unsigned short)
+_WPXTabStop::_WPXTabStop(double, WPXTabAlignment, unsigned short, unsigned char)
+_ZSortFlys::Insert(_ZSortFly const&, unsigned short&)
+_ZSortFlys::Insert(_ZSortFly const*, unsigned short)
+_ZSortFlys::Insert(_ZSortFlys const*, unsigned short, unsigned short)
+_ZSortFlys::Remove(_ZSortFly const&, unsigned short)
+_ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short)
+_ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
+_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*)
+accessibility::AccessibleCell::GetState(short)
+accessibility::AccessibleEditableTextPara::GetParaInterface(int)
+accessibility::AccessibleEditableTextPara::GetText(int)
+accessibility::AccessibleEditableTextPara::HasState(short)
+accessibility::AccessibleEditableTextPara::IsActive() const
+accessibility::AccessibleEditableTextPara::IsVisible() const
+accessibility::AccessibleImageBullet::GetIndexInParent() const
+accessibility::AccessibleParaManager::SetEditSource(SvxEditSourceAdapter*)
+accessibility::AccessibleShapeTreeInfo::AccessibleShapeTreeInfo(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleComponent> const&, com::sun::star::uno::Reference<com::sun::star::document::XEventBroadcaster> const&)
+accessibility::AccessibleShapeTreeInfo::GetDocumentWindow() const
+accessibility::AccessibleStaticTextBase::GetLineCount(int) const
+accessibility::AccessibleStaticTextBase::GetParagraphCount() const
+accessibility::AccessibleStaticTextBase::GetParagraphIndex() const
+accessibility::AccessibleTextEventQueue::Append(SfxHint const&)
+accessibility::AccessibleTextEventQueue::Append(SfxSimpleHint const&)
+accessibility::AccessibleTextHelper::GetAdditionalChildStates() const
+accessibility::ChildrenManagerImpl::GetChild(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&)
+accessibility::ChildrenManagerImpl::GetChildIndex(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&) const
+accessibility::DGColorNameLookUp::~DGColorNameLookUp()
+accessibility::DbgName_AccessibleGridControl()
+accessibility::DbgName_AccessibleGridControlAccess()
+accessibility::DbgName_AccessibleGridControlBase()
+accessibility::DbgName_AccessibleGridControlHeader()
+accessibility::DbgName_AccessibleGridControlTable()
+accessibility::DbgName_AccessibleGridControlTableBase()
+accessibility::DescriptionGenerator::AddPropertyNames()
+accessibility::DescriptionGenerator::AddUnknown(rtl::OUString const&, rtl::OUString const&)
+accessibility::ShapeTypeHandler::GetServiceName(int) const
+avmedia::MediaControl::execute(avmedia::MediaItem const&)
+avmedia::MediaControl::getState(avmedia::MediaItem&) const
+avmedia::MediaControl::update()
+avmedia::MediaWindow::disable()
+avmedia::MediaWindow::enable()
+avmedia::MediaWindow::getDuration() const
+avmedia::MediaWindow::getMediaTime() const
+avmedia::MediaWindow::getPointer() const
+avmedia::MediaWindow::getPosSize() const
+avmedia::MediaWindow::getRate() const
+avmedia::MediaWindow::getStopTime() const
+avmedia::MediaWindow::getZoom() const
+avmedia::MediaWindow::isMute() const
+avmedia::MediaWindow::isPlaybackLoop() const
+avmedia::MediaWindow::isPlaying() const
+avmedia::MediaWindow::setMediaTime(double)
+avmedia::MediaWindow::setMute(bool)
+avmedia::MediaWindow::setPlaybackLoop(bool)
+avmedia::MediaWindow::setRate(double)
+avmedia::MediaWindow::setStopTime(double)
+avmedia::MediaWindow::setZoom(com::sun::star::media::ZoomLevel)
+avmedia::MediaWindow::stop()
+avmedia::priv::MediaWindowImpl::update()
+basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
+basegfx::B1DRange::B1DRange(basegfx::B1IRange const&)
+basegfx::B2DCubicBezier::B2DCubicBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&)
+basegfx::B2DCubicBezier::getMaxDistancePositions(double*) const
+basegfx::B2DCubicBezierHelper::relativeToDistance(double) const
+basegfx::B2DEllipse::B2DEllipse()
+basegfx::B2DEllipse::setB2DEllipseCenter(basegfx::B2DPoint const&)
+basegfx::B2DEllipse::setB2DEllipseRadius(basegfx::B2DTuple const&)
+basegfx::B2DEllipse::transform(basegfx::B2DHomMatrix const&)
+basegfx::B2DHomMatrix::determinant() const
+basegfx::B2DHomMatrix::isNormalized() const
+basegfx::B2DHomMatrix::makeUnique()
+basegfx::B2DHomMatrix::normalize()
+basegfx::B2DHomMatrix::trace() const
+basegfx::B2DHomMatrix::transpose()
+basegfx::B2DHomPoint::getB2DPoint() const
+basegfx::B2DHomPoint::setX(double)
+basegfx::B2DHomPoint::setY(double)
+basegfx::B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter(basegfx::B2DPolyPolygon const&)
+basegfx::B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter(basegfx::B2DPolyPolygon const&, basegfx::B2DRange const&)
+basegfx::B2DPolyPolygonRasterConverter::rasterConvert(basegfx::FillRule)
+basegfx::B2DPolyRange::B2DPolyRange(basegfx::B2DRange const&, basegfx::B2VectorOrientation)
+basegfx::B2DPolyRange::B2DPolyRange(boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&)
+basegfx::B2DPolyRange::appendElement(boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&, unsigned int)
+basegfx::B2DPolyRange::begin()
+basegfx::B2DPolyRange::begin() const
+basegfx::B2DPolyRange::end()
+basegfx::B2DPolyRange::end() const
+basegfx::B2DPolyRange::flip()
+basegfx::B2DPolyRange::getBounds() const
+basegfx::B2DPolyRange::insertElement(unsigned int, basegfx::B2DRange const&, basegfx::B2VectorOrientation, unsigned int)
+basegfx::B2DPolyRange::insertElement(unsigned int, boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&, unsigned int)
+basegfx::B2DPolyRange::insertPolyRange(unsigned int, basegfx::B2DPolyRange const&)
+basegfx::B2DPolyRange::isInside(basegfx::B2DRange const&) const
+basegfx::B2DPolyRange::isInside(basegfx::B2DTuple const&) const
+basegfx::B2DPolyRange::makeUnique()
+basegfx::B2DPolyRange::remove(unsigned int, unsigned int)
+basegfx::B2DPolyRange::setElement(unsigned int, basegfx::B2DRange const&, basegfx::B2VectorOrientation)
+basegfx::B2DPolyRange::setElement(unsigned int, boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&)
+basegfx::B2DPolygon::insert(unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned int)
+basegfx::B2DPolygon::isBezierSegment(unsigned int) const
+basegfx::B2DPolygon::resetControlPoints(unsigned int)
+basegfx::B2DQuadraticBezier::B2DQuadraticBezier()
+basegfx::B2DQuadraticBezier::B2DQuadraticBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&)
+basegfx::B2DQuadraticBezier::B2DQuadraticBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&)
+basegfx::B2DQuadraticBezier::isBezier() const
+basegfx::B2DQuadraticBezier::~B2DQuadraticBezier()
+basegfx::B2DTuple::correctValues(double)
+basegfx::B2DVector::isNormalized() const
+basegfx::B2I64Tuple::getEmptyTuple()
+basegfx::B2IVector::angle(basegfx::B2IVector const&) const
+basegfx::B2IVector::cross(basegfx::B2IVector const&) const
+basegfx::B2IVector::getEmptyVector()
+basegfx::B2IVector::getLength() const
+basegfx::B3DHomMatrix::isInvertible() const
+basegfx::B3DHomMatrix::isNormalized() const
+basegfx::B3DHomMatrix::makeUnique()
+basegfx::B3DHomMatrix::normalize()
+basegfx::B3DHomMatrix::shearXZ(double, double)
+basegfx::B3DHomMatrix::shearYZ(double, double)
+basegfx::B3DHomMatrix::trace() const
+basegfx::B3DHomPoint::implHomogenize()
+basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolyPolygon const&)
+basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int)
+basegfx::B3DPolyPolygon::makeUnique()
+basegfx::B3DPolyPolygon::setClosed(bool)
+basegfx::B3DPolygon::B3DPolygon(basegfx::B3DPolygon const&, unsigned int, unsigned int)
+basegfx::B3DPolygon::insert(unsigned int, basegfx::B3DPoint const&, unsigned int)
+basegfx::B3DPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int, unsigned int)
+basegfx::B3DRange::B3DRange(basegfx::B3IRange const&)
+basegfx::B3DTuple::B3DTuple(basegfx::B3ITuple const&)
+basegfx::B3DVector::getProjectionOnPlane(basegfx::B3DVector const&) const
+basegfx::B3I64Tuple::getEmptyTuple()
+basegfx::B3ITuple::getEmptyTuple()
+basegfx::DebugPlotter::DebugPlotter(char const*)
+basegfx::DebugPlotter::DebugPlotter(char const*, std::basic_ostream<char, std::char_traits<char> >&)
+basegfx::DebugPlotter::plot(basegfx::B2DCubicBezier const&, char const*)
+basegfx::DebugPlotter::plot(basegfx::B2DPoint const&, char const*)
+basegfx::DebugPlotter::plot(basegfx::B2DPolyPolygon const&, char const*)
+basegfx::DebugPlotter::plot(basegfx::B2DPolygon const&, char const*)
+basegfx::DebugPlotter::plot(basegfx::B2DRange const&, char const*)
+basegfx::DebugPlotter::plot(basegfx::B2DVector const&, char const*)
+basegfx::DebugPlotter::~DebugPlotter()
+basegfx::absolute(basegfx::B2DHomPoint const&)
+basegfx::absolute(basegfx::B2ITuple const&)
+basegfx::average(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&)
+basegfx::average(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&, basegfx::B2DHomPoint&)
+basegfx::average(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
+basegfx::average(basegfx::B2ITuple const&, basegfx::B2ITuple const&, basegfx::B2ITuple const&)
+basegfx::computeSetDifference(std::vector<basegfx::B2IBox, std::allocator<basegfx::B2IBox> >&, basegfx::B2IBox const&, basegfx::B2IBox const&)
+basegfx::exportToSvg(basegfx::B2DHomMatrix const&)
+basegfx::fround(basegfx::B1DRange const&)
+basegfx::fround(basegfx::B3DRange const&)
+basegfx::getContinuity(basegfx::B2IVector const&, basegfx::B2IVector const&)
+basegfx::getOrientation(basegfx::B2IVector const&, basegfx::B2IVector const&)
+basegfx::getPerpendicular(basegfx::B2IVector const&)
+basegfx::interpolate(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&, double)
+basegfx::interpolate(basegfx::B2ITuple const&, basegfx::B2ITuple const&, double)
+basegfx::maximum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
+basegfx::maximum(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
+basegfx::minimum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
+basegfx::minimum(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
+basegfx::testtools::Plotter::Plotter(std::basic_ostream<char, std::char_traits<char> >&)
+basegfx::testtools::Plotter::plot(basegfx::B2DPolyPolygon const&)
+basegfx::testtools::Plotter::plot(basegfx::B2DRange const&)
+basegfx::testtools::Plotter::~Plotter()
+basegfx::tools::(anonymous namespace)::lcl_skipDoubleAndSpacesAndCommas(int&, rtl::OUString const&, int)
+basegfx::tools::(anonymous namespace)::lcl_skipNumberAndSpacesAndCommas(int&, rtl::OUString const&, int)
+basegfx::tools::B2DClipState::B2DClipState(basegfx::B2DPolygon const&)
+basegfx::tools::B2DClipState::B2DClipState(basegfx::B2DRange const&)
+basegfx::tools::B2DClipState::intersectClipState(basegfx::tools::B2DClipState const&)
+basegfx::tools::B2DClipState::intersectPolygon(basegfx::B2DPolygon const&)
+basegfx::tools::B2DClipState::isNull() const
+basegfx::tools::B2DClipState::makeClear()
+basegfx::tools::B2DClipState::makeUnique()
+basegfx::tools::B2DClipState::subtractClipState(basegfx::tools::B2DClipState const&)
+basegfx::tools::B2DClipState::subtractPolygon(basegfx::B2DPolygon const&)
+basegfx::tools::B2DClipState::unionClipState(basegfx::tools::B2DClipState const&)
+basegfx::tools::B2DClipState::unionPolygon(basegfx::B2DPolygon const&)
+basegfx::tools::B2DClipState::xorClipState(basegfx::tools::B2DClipState const&)
+basegfx::tools::B2DClipState::xorPolygon(basegfx::B2DPolygon const&)
+basegfx::tools::addPointsAtCuts(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&)
+basegfx::tools::addPointsAtCuts(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
+basegfx::tools::addPointsAtCuts(basegfx::B2DPolyPolygon const&, bool)
+basegfx::tools::addPointsAtCutsAndTouches(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
+basegfx::tools::applyLineDashing(basegfx::B3DPolyPolygon const&, std::vector<double, std::allocator<double> > const&, basegfx::B3DPolyPolygon*, basegfx::B3DPolyPolygon*, double)
+basegfx::tools::ciexyz2rgb(basegfx::BColor const&)
+basegfx::tools::clipPolyPolygonOnEdge(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, bool, bool)
+basegfx::tools::clipPolyPolygonOnPlane(basegfx::B3DPolyPolygon const&, basegfx::B3DPoint const&, basegfx::B3DVector const&, bool, bool)
+basegfx::tools::clipPolyPolygonOnRange(basegfx::B3DPolyPolygon const&, basegfx::B2DRange const&, bool, bool)
+basegfx::tools::clipPolyPolygonOnRange(basegfx::B3DPolyPolygon const&, basegfx::B3DRange const&, bool, bool)
+basegfx::tools::clipPolygonOnEdge(basegfx::B2DPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, bool, bool)
+basegfx::tools::clipPolygonOnPlane(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, basegfx::B3DVector const&, bool, bool)
+basegfx::tools::createPolygonFromRect(basegfx::B2DRange const&, double)
+basegfx::tools::createShearXB2DHomMatrix(double)
+basegfx::tools::createShearYB2DHomMatrix(double)
+basegfx::tools::createSimplifiedPolygon(basegfx::B2DPolygon const&)
+basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
+basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&)
+basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&)
+basegfx::tools::equal(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&)
+basegfx::tools::findCut(basegfx::B2DPolygon const&, unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned short, double*, double*)
+basegfx::tools::findCut(basegfx::B2DPolygon const&, unsigned int, unsigned int, unsigned short, double*, double*)
+basegfx::tools::getArea(basegfx::B3DPolygon const&)
+basegfx::tools::getCutBetweenLineAndPolygon(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, basegfx::B3DPoint const&, double&)
+basegfx::tools::getDistancePointToEndlessRay(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, double&)
+basegfx::tools::getIndexOfPredecessor(unsigned int, basegfx::B3DPolygon const&)
+basegfx::tools::getPositionRelative(basegfx::B3DPolygon const&, double, double)
+basegfx::tools::getPositiveOrientedNormal(basegfx::B3DPolygon const&)
+basegfx::tools::getRangeWithControlPoints(basegfx::B2DPolyPolygon const&)
+basegfx::tools::getSnippetRelative(basegfx::B2DPolygon const&, double, double, double)
+basegfx::tools::isInEpsilonRange(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, double)
+basegfx::tools::isInside(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&, bool)
+basegfx::tools::isPolyPolygonEqualRectangle(basegfx::B2DPolyPolygon const&, basegfx::B2DRange const&)
+basegfx::tools::liangBarskyClip2D(basegfx::B2DPoint&, basegfx::B2DPoint&, basegfx::B2DRange const&)
+basegfx::tools::reSegmentPolyPolygonEdges(basegfx::B2DPolyPolygon const&, unsigned int, bool, bool)
+basegfx::tools::rgb2yiq(basegfx::BColor const&)
+basegfx::tools::rgb2ypbpr(basegfx::BColor const&)
+basegfx::tools::rotateAroundPoint(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, double)
+basegfx::tools::setContinuity(basegfx::B2DPolyPolygon const&, basegfx::B2VectorContinuity)
+basegfx::tools::solveCrossovers(basegfx::B2DPolygon const&)
+basegfx::tools::yiq2rgb(basegfx::BColor const&)
+basegfx::tools::ypbpr2rgb(basegfx::BColor const&)
+basegfx::unotools::AffineMatrix2DAreEqual(com::sun::star::geometry::AffineMatrix2D const&, com::sun::star::geometry::AffineMatrix2D const&)
+basegfx::unotools::IntegerPoint2DAreEqual(com::sun::star::geometry::IntegerPoint2D const&, com::sun::star::geometry::IntegerPoint2D const&)
+basegfx::unotools::IntegerRectangle2DAreEqual(com::sun::star::geometry::IntegerRectangle2D const&, com::sun::star::geometry::IntegerRectangle2D const&)
+basegfx::unotools::IntegerSize2DAreEqual(com::sun::star::geometry::IntegerSize2D const&, com::sun::star::geometry::IntegerSize2D const&)
+basegfx::unotools::RealPoint2DAreEqual(com::sun::star::geometry::RealPoint2D const&, com::sun::star::geometry::RealPoint2D const&)
+basegfx::unotools::RealRectangle2DAreEqual(com::sun::star::geometry::RealRectangle2D const&, com::sun::star::geometry::RealRectangle2D const&)
+basegfx::unotools::RealRectangle3DAreEqual(com::sun::star::geometry::RealRectangle3D const&, com::sun::star::geometry::RealRectangle3D const&)
+basegfx::unotools::RealSize2DAreEqual(com::sun::star::geometry::RealSize2D const&, com::sun::star::geometry::RealSize2D const&)
+basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const
+basegfx::unotools::awtPointAreEqual(com::sun::star::awt::Point const&, com::sun::star::awt::Point const&)
+basegfx::unotools::awtPointFromB2IPoint(basegfx::B2IPoint const&)
+basegfx::unotools::awtRectangleAreEqual(com::sun::star::awt::Rectangle const&, com::sun::star::awt::Rectangle const&)
+basegfx::unotools::awtRectangleFromB2IRectangle(basegfx::B2IRange const&)
+basegfx::unotools::awtSizeAreEqual(com::sun::star::awt::Size const&, com::sun::star::awt::Size const&)
+basegfx::unotools::awtSizeFromB2ISize(basegfx::B2IVector const&)
+basegfx::unotools::b2DSizeFromRealSize2D(com::sun::star::geometry::RealSize2D const&)
+basegfx::unotools::b2IPointFromAwtPoint(com::sun::star::awt::Point const&)
+basegfx::unotools::b2IPointFromIntegerPoint2D(com::sun::star::geometry::IntegerPoint2D const&)
+basegfx::unotools::b2ISizeFromAwtSize(com::sun::star::awt::Size const&)
+basegfx::unotools::homMatrixFromAffineMatrix(com::sun::star::geometry::AffineMatrix2D const&)
+basegfx::unotools::integerPoint2DFromB2IPoint(basegfx::B2IPoint const&)
+basegfx::unotools::integerRectangle2DFromB2IRectangle(basegfx::B2IRange const&)
+basic::ScriptExtensionIterator::implGetScriptPackageFromPackage(com::sun::star::uno::Reference<com::sun::star::deployment::XPackage>, bool&)
+basic::vba::createDocumentsEnumeration(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
+basic::vba::getCurrentDirectory(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
+binaryurp::(anonymous namespace)::isProtocolPropertyMessage(rtl::OUString const&)
+binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr const*, unsigned short, unsigned short, unsigned short)
+binfilter::B3dEdgeEntryBucketMemArr::Replace(char const*&, unsigned short)
+binfilter::B3dEdgeEntryBucketMemArr::Replace(char const**, unsigned short, unsigned short)
+binfilter::B3dEdgeEntryBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
+binfilter::B3dEdgeListBucketMemArr::Insert(binfilter::B3dEdgeListBucketMemArr const*, unsigned short, unsigned short, unsigned short)
+binfilter::B3dEdgeListBucketMemArr::Replace(char const*&, unsigned short)
+binfilter::B3dEdgeListBucketMemArr::Replace(char const**, unsigned short, unsigned short)
+binfilter::B3dEdgeListBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
+binfilter::B3dEntityBucketMemArr::Insert(binfilter::B3dEntityBucketMemArr const*, unsigned short, unsigned short, unsigned short)
+binfilter::B3dEntityBucketMemArr::Replace(char const*&, unsigned short)
+binfilter::B3dEntityBucketMemArr::Replace(char const**, unsigned short, unsigned short)
+binfilter::B3dEntityBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
+binfilter::BasicErrorManager::GetFirstError()
+binfilter::BasicErrorManager::GetNextError()
+binfilter::BasicLibInfo::CalcRelStorageName(String const&)
+binfilter::BasicManager::ClearErrors()
+binfilter::BasicManager::HasErrors()
+binfilter::BasicManager::ImpStoreLibary(binfilter::StarBASIC*, SotStorage&) const
+binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short, unsigned short, unsigned short)
+binfilter::CharPosArray::Replace(int const&, unsigned short)
+binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short)
+binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
+binfilter::ChartModel::CleanupOld3DStorage()
+binfilter::ChartModel::PrepareAxisStorage()
+binfilter::ChartModel::PrepareOld3DStorage()
+binfilter::ContainerSorter::DoSort(unsigned long, unsigned long) const
+binfilter::DbgName_CntBoolItem()
+binfilter::DbgName_CntEnumItem()
+binfilter::DbgName_SfxEnumItemInterface()
+binfilter::DbgName_SfxFilter()
+binfilter::DbgName_SfxFrameSetDescriptor()
+binfilter::DbgName_SfxStringListItem()
+binfilter::DbgName_SvxMacroItem()
+binfilter::Dictionary::~Dictionary()
+binfilter::E3dScene::CreateLightObjectsFromLightGroup()
+binfilter::EECharAttribArray::Insert(binfilter::EECharAttrib const&, unsigned short)
+binfilter::EECharAttribArray::Insert(binfilter::EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
+binfilter::EECharAttribArray::Remove(unsigned short, unsigned short)
+binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const&, unsigned short)
+binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const*, unsigned short, unsigned short)
+binfilter::EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::EECharAttrib const&, void*), void*)
+binfilter::EditEngine::IsModified() const
+binfilter::FmFormPageImpl::write(com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream> const&) const
+binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short)
+binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short)
+binfilter::GeometryIndexValueBucketMemArr::Replace(char const**, unsigned short, unsigned short)
+binfilter::GeometryIndexValueBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
+binfilter::GetCHOBJIDName(long)
+binfilter::GetLangName(unsigned short)
+binfilter::GetPortionName(unsigned short)
+binfilter::GetPrepName(binfilter::PrepareHint)
+binfilter::ImpSvNumMultipleWriteHeader::EndEntry()
+binfilter::ImpSvNumMultipleWriteHeader::ImpSvNumMultipleWriteHeader(SvStream&, unsigned long)
+binfilter::ImpSvNumMultipleWriteHeader::StartEntry()
+binfilter::ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader()
+binfilter::ImpSvtData::~ImpSvtData()
+binfilter::InsCapOptArr::Insert(binfilter::InsCapOptArr const*, unsigned short, unsigned short)
+binfilter::InsCapOptArr::Insert(binfilter::InsCaptionOpt* const&, unsigned short&)
+binfilter::InsCapOptArr::Insert(binfilter::InsCaptionOpt* const*, unsigned short)
+binfilter::InsCapOptArr::Remove(binfilter::InsCaptionOpt* const&, unsigned short)
+binfilter::InsCapOptArr::Remove(unsigned short, unsigned short)
+binfilter::IsDbg(binfilter::SwTxtFrm const*)
+binfilter::OUStringsSort_Impl::Insert(binfilter::OUStringsSort_Impl const*, unsigned short, unsigned short)
+binfilter::OUStringsSort_Impl::Insert(rtl::OUString* const&, unsigned short&)
+binfilter::OUStringsSort_Impl::Insert(rtl::OUString* const*, unsigned short)
+binfilter::OUStringsSort_Impl::Remove(rtl::OUString* const&, unsigned short)
+binfilter::OUStringsSort_Impl::Remove(unsigned short, unsigned short)
+binfilter::Outliner::LinkStubEditEngineNotifyHdl(void*, void*)
+binfilter::OutlinerParaObject::FinishStore()
+binfilter::OutlinerParaObject::PrepareStore(binfilter::SfxStyleSheetPool*)
+binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer()
+binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize()
+binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::PCodeBuffConvertor(unsigned char*, unsigned int)
+binfilter::PaddWithBlanks_Impl(SvStream&, unsigned short)
+binfilter::ReadThroughComponent(binfilter::SvStorage*, com::sun::star::uno::Reference<com::sun::star::lang::XComponent>, char const*, char const*, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&, char const*, com::sun::star::uno::Sequence<com::sun::star::uno::Any>, rtl::OUString const&, unsigned char)
+binfilter::Registration::~Registration()
+binfilter::SaveBookmarks::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SbiCloseRecord(SvStream&, unsigned long)
+binfilter::SbiGlobals::~SbiGlobals()
+binfilter::SbiOpenRecord(SvStream&, unsigned short, unsigned short)
+binfilter::SbxFacs::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SbxValue::GetCoreString() const
+binfilter::ScAddInAsyncs::Insert(binfilter::ScAddInAsync* const&, unsigned short&)
+binfilter::ScAddInAsyncs::Insert(binfilter::ScAddInAsync* const*, unsigned short)
+binfilter::ScAddInAsyncs::Insert(binfilter::ScAddInAsyncs const*, unsigned short, unsigned short)
+binfilter::ScAddInAsyncs::Remove(binfilter::ScAddInAsync* const&, unsigned short)
+binfilter::ScAddInDocs::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::ScAddInDocs::Insert(binfilter::ScAddInDocs const*, unsigned short, unsigned short)
+binfilter::ScAddInDocs::Insert(binfilter::ScDocument* const&, unsigned short&)
+binfilter::ScAddInDocs::Insert(binfilter::ScDocument* const*, unsigned short)
+binfilter::ScAddInDocs::Remove(binfilter::ScDocument* const&, unsigned short)
+binfilter::ScBroadcastAreas::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastArea* const&, unsigned short&)
+binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastArea* const*, unsigned short)
+binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastAreas const*, unsigned short, unsigned short)
+binfilter::ScBroadcastAreas::Remove(binfilter::ScBroadcastArea* const&, unsigned short)
+binfilter::ScChangeAction::StoreCell(binfilter::ScBaseCell*, SvStream&, binfilter::ScMultipleWriteHeader&)
+binfilter::ScChangeTrack::Remove(binfilter::ScChangeAction*)
+binfilter::ScColumn::SaveNotes(SvStream&) const
+binfilter::ScConditionalFormatList::ResetUsed()
+binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormat* const&, unsigned short&)
+binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormat* const*, unsigned short)
+binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormats_Impl const*, unsigned short, unsigned short)
+binfilter::ScConditionalFormats_Impl::Remove(binfilter::ScConditionalFormat* const&, unsigned short)
+binfilter::ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
+binfilter::ScDBData::IsBeyond(unsigned short) const
+binfilter::ScDocShell::SaveXML(binfilter::SfxMedium*, binfilter::SvStorage*)
+binfilter::ScDocument::GetWeightedCount() const
+binfilter::ScDocument::ImplSaveDocOptions(SvStream&) const
+binfilter::ScDocument::ImplSaveViewOptions(SvStream&) const
+binfilter::ScDocument::SaveAreaLinks(SvStream&) const
+binfilter::ScDocument::SetConditionalUsed(unsigned long)
+binfilter::ScDocument::SetValidationUsed(unsigned long)
+binfilter::ScFieldChangerEditEngine::ConvertFields()
+binfilter::ScFieldChangerEditEngine::ScFieldChangerEditEngine(binfilter::SfxItemPool*, unsigned char)
+binfilter::ScMyContentAction::~ScMyContentAction()
+binfilter::ScMyDelAction::~ScMyDelAction()
+binfilter::ScMyMoveAction::~ScMyMoveAction()
+binfilter::ScRangeData::IsBeyond(unsigned short) const
+binfilter::ScRangeFindList::~ScRangeFindList()
+binfilter::ScStyleSheetPool::SetForceStdName(String const*)
+binfilter::ScTokenArray::ExportRecalcMode40() const
+binfilter::ScValidationDataList::ResetUsed()
+binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const&, unsigned short&)
+binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const*, unsigned short)
+binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationEntries_Impl const*, unsigned short, unsigned short)
+binfilter::ScValidationEntries_Impl::Remove(binfilter::ScValidationData* const&, unsigned short)
+binfilter::ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
+binfilter::ScViewData::ReadUserDataSequence(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
+binfilter::ScViewData::WriteUserData(String&)
+binfilter::ScXMLImportWrapper::Import(unsigned char)
+binfilter::SchXMLWrapper::Export()
+binfilter::SchXMLWrapper::SchXMLWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, binfilter::SvStorage&, unsigned char)
+binfilter::ScriptTypePosInfos::Insert(binfilter::ScriptTypePosInfos const*, unsigned short, unsigned short, unsigned short)
+binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const&, unsigned short)
+binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const*, unsigned short, unsigned short)
+binfilter::ScriptTypePosInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::ScriptTypePosInfo const&, void*), void*)
+binfilter::SdXMLFilter::SdXMLFilter(binfilter::SfxMedium&, binfilter::SdDrawDocShell&, unsigned char, binfilter::SdXMLFilterMode)
+binfilter::SdrObjSurrogate::SdrObjSurrogate(binfilter::SdrObject*, binfilter::SdrObject const*)
+binfilter::SdrPageView::IsLayer(String const&, binfilter::SetOfByte const&) const
+binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&, unsigned short&)
+binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
+binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccessArr const*, unsigned short, unsigned short)
+binfilter::SdrUnoControlAccessArr::Remove(binfilter::SdrUnoControlAccess* const&, unsigned short)
+binfilter::SfxDocumentInfo::SavePropertySet(binfilter::SvStorage*) const
+binfilter::SfxHintPoster::LinkStubDoEvent_Impl(void*, void*)
+binfilter::SfxItemModifyArr_Impl::Insert(binfilter::SfxItemModifyArr_Impl const*, unsigned short, unsigned short, unsigned short)
+binfilter::SfxItemModifyArr_Impl::Remove(unsigned short, unsigned short)
+binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const&, unsigned short)
+binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const*, unsigned short, unsigned short)
+binfilter::SfxItemModifyArr_Impl::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SfxItemModifyImpl const&, void*), void*)
+binfilter::SfxMacroConfig::LinkStubCallbackHdl_Impl(void*, void*)
+binfilter::SfxMacroConfig::LinkStubEventHdl_Impl(void*, void*)
+binfilter::SfxMultiMixRecordWriter::NewContent(unsigned short, unsigned char)
+binfilter::SfxMultiVarRecordWriter::NewContent()
+binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(SvStream*, unsigned short, unsigned char)
+binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(unsigned char, SvStream*, unsigned short, unsigned char)
+binfilter::SfxObjectShell::GetBaseURL() const
+binfilter::SfxPtrArr::Insert(unsigned short, void*)
+binfilter::SfxPtrArr::Remove(void*)
+binfilter::SfxPtrArr::Replace(void*, void*)
+binfilter::SfxSingleRecordWriter::SfxSingleRecordWriter(SvStream*, unsigned short, unsigned char)
+binfilter::SfxUINT32s::Insert(binfilter::SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
+binfilter::SfxUINT32s::Remove(unsigned short, unsigned short)
+binfilter::SfxUINT32s::Replace(unsigned int const&, unsigned short)
+binfilter::SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
+binfilter::SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
+binfilter::ShellResource::~ShellResource()
+binfilter::SmFntFmtListEntryArr::Insert(binfilter::SmFntFmtListEntryArr const*, unsigned short, unsigned short, unsigned short)
+binfilter::SmFntFmtListEntryArr::Remove(unsigned short, unsigned short)
+binfilter::SmFntFmtListEntryArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SmFntFmtListEntry const&, void*), void*)
+binfilter::SmXMLWrapper::WriteThroughComponent(binfilter::SvStorage*, com::sun::star::uno::Reference<com::sun::star::lang::XComponent>, char const*, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>&, char const*, unsigned char)
+binfilter::SoDll::~SoDll()
+binfilter::SortedPositions::Insert(binfilter::SortedPositions const*, unsigned short, unsigned short)
+binfilter::SortedPositions::Insert(unsigned int const&, unsigned short&)
+binfilter::SortedPositions::Insert(unsigned int const*, unsigned short)
+binfilter::SortedPositions::Remove(unsigned int const&, unsigned short)
+binfilter::SortedPositions::Remove(unsigned short, unsigned short)
+binfilter::SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
+binfilter::SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
+binfilter::SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
+binfilter::SvBindStatusCallback::SetProgressCallback(Link const&)
+binfilter::SvBools::Insert(binfilter::SvBools const*, unsigned short, unsigned short, unsigned short)
+binfilter::SvBools::Replace(unsigned char const&, unsigned short)
+binfilter::SvBools::Replace(unsigned char const*, unsigned short, unsigned short)
+binfilter::SvBools::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
+binfilter::SvByteStrings::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SvByteStringsSortDtor::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SvByteStringsSortDtor::Insert(ByteString* const&)
+binfilter::SvByteStringsSortDtor::Insert(ByteString* const&, unsigned short&)
+binfilter::SvByteStringsSortDtor::Insert(ByteString* const*, unsigned short)
+binfilter::SvByteStringsSortDtor::Insert(binfilter::SvByteStringsSortDtor const*, unsigned short, unsigned short)
+binfilter::SvByteStringsSortDtor::Remove(ByteString* const&, unsigned short)
+binfilter::SvByteStringsSortDtor::Remove(unsigned short, unsigned short)
+binfilter::SvBytes::Insert(binfilter::SvBytes const*, unsigned short, unsigned short, unsigned short)
+binfilter::SvBytes::Replace(unsigned char const&, unsigned short)
+binfilter::SvBytes::Replace(unsigned char const*, unsigned short, unsigned short)
+binfilter::SvBytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
+binfilter::SvDataPipe_Impl::addMark(unsigned int)
+binfilter::SvDataPipe_Impl::removeMark(unsigned int)
+binfilter::SvFactory::GetSvClass(int, SvGlobalName const&)
+binfilter::SvFactory::IsIntern31(SvGlobalName const&)
+binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const&, unsigned short&)
+binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const*, unsigned short)
+binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMap_Impl const*, unsigned short, unsigned short)
+binfilter::SvI18NMap_Impl::Remove(binfilter::SvI18NMapEntry_Impl* const&, unsigned short)
+binfilter::SvI18NMap_Impl::Remove(unsigned short, unsigned short)
+binfilter::SvLongs::Replace(long const&, unsigned short)
+binfilter::SvLongs::Replace(long const*, unsigned short, unsigned short)
+binfilter::SvLongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(long const&, void*), void*)
+binfilter::SvNumberformat::Build50Formatstring(String&) const
+binfilter::SvNumberformat::HasNewCurrency() const
+binfilter::SvObjectServerList::Remove(SvGlobalName const&)
+binfilter::SvOutPlaceObject::MakeWorkStorageWrap_Impl(binfilter::SvStorage*)
+binfilter::SvPersist::DoSaveContent(binfilter::SvStorage*, unsigned char)
+binfilter::SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
+binfilter::SvShorts::Insert(binfilter::SvShorts const*, unsigned short, unsigned short, unsigned short)
+binfilter::SvShorts::Remove(unsigned short, unsigned short)
+binfilter::SvShorts::Replace(short const&, unsigned short)
+binfilter::SvShorts::Replace(short const*, unsigned short, unsigned short)
+binfilter::SvShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(short const&, void*), void*)
+binfilter::SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SvStringsISort::Insert(String* const&)
+binfilter::SvStringsISort::Insert(String* const&, unsigned short&)
+binfilter::SvStringsISort::Insert(String* const*, unsigned short)
+binfilter::SvStringsISort::Insert(binfilter::SvStringsISort const*, unsigned short, unsigned short)
+binfilter::SvStringsISort::Remove(String* const&, unsigned short)
+binfilter::SvStringsISort::Remove(unsigned short, unsigned short)
+binfilter::SvStringsISortDtor::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SvStringsISortDtor::Insert(String* const&)
+binfilter::SvStringsISortDtor::Insert(String* const&, unsigned short&)
+binfilter::SvStringsISortDtor::Insert(String* const*, unsigned short)
+binfilter::SvStringsISortDtor::Insert(binfilter::SvStringsISortDtor const*, unsigned short, unsigned short)
+binfilter::SvStringsISortDtor::Remove(String* const&, unsigned short)
+binfilter::SvStringsISortDtor::Remove(unsigned short, unsigned short)
+binfilter::SvStringsSort::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SvStringsSort::Insert(String* const&, unsigned short&)
+binfilter::SvStringsSort::Insert(String* const*, unsigned short)
+binfilter::SvStringsSort::Insert(binfilter::SvStringsSort const*, unsigned short, unsigned short)
+binfilter::SvStringsSort::Remove(String* const&, unsigned short)
+binfilter::SvStringsSortDtor::Insert(String* const&, unsigned short&)
+binfilter::SvStringsSortDtor::Insert(String* const*, unsigned short)
+binfilter::SvStringsSortDtor::Insert(binfilter::SvStringsSortDtor const*, unsigned short, unsigned short)
+binfilter::SvStringsSortDtor::Remove(String* const&, unsigned short)
+binfilter::SvStringsSortDtor::Remove(unsigned short, unsigned short)
+binfilter::SvULongs::Replace(unsigned long const&, unsigned short)
+binfilter::SvULongs::Replace(unsigned long const*, unsigned short, unsigned short)
+binfilter::SvULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
+binfilter::SvUShorts::Replace(unsigned short const*, unsigned short, unsigned short)
+binfilter::SvUShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned short const&, void*), void*)
+binfilter::SvUShortsSort::Insert(binfilter::SvUShortsSort const*, unsigned short, unsigned short)
+binfilter::SvUShortsSort::Insert(unsigned short const*, unsigned short)
+binfilter::SvUShortsSort::Insert(unsigned short, unsigned short&)
+binfilter::SvUShortsSort::Remove(unsigned short, unsigned short)
+binfilter::SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const
+binfilter::SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*)
+binfilter::SvXMLAutoStylePoolParentsP_Impl::GetPos(binfilter::SvXMLAutoStylePoolParentP_Impl const*) const
+binfilter::SvXMLAutoStylePoolParentsP_Impl::Remove(binfilter::SvXMLAutoStylePoolParentP_Impl*)
+binfilter::SvXMLEmbeddedElementArr::Insert(binfilter::SvXMLEmbeddedElement* const&, unsigned short&)
+binfilter::SvXMLEmbeddedElementArr::Insert(binfilter::SvXMLEmbeddedElement* const*, unsigned short)
+binfilter::SvXMLEmbeddedElementArr::Insert(binfilter::SvXMLEmbeddedElementArr const*, unsigned short, unsigned short)
+binfilter::SvXMLEmbeddedElementArr::Remove(binfilter::SvXMLEmbeddedElement* const&, unsigned short)
+binfilter::SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short)
+binfilter::SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SvXMLStyleIndices_Impl::GetPos(binfilter::SvXMLStyleIndex_Impl const*) const
+binfilter::SvXMLStyleIndices_Impl::Remove(binfilter::SvXMLStyleIndex_Impl*)
+binfilter::SvXMLTokenMap_Impl::Insert(binfilter::SvXMLTokenMapEntry_Impl* const&, unsigned short&)
+binfilter::SvXMLTokenMap_Impl::Insert(binfilter::SvXMLTokenMapEntry_Impl* const*, unsigned short)
+binfilter::SvXMLTokenMap_Impl::Insert(binfilter::SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
+binfilter::SvXMLTokenMap_Impl::Remove(binfilter::SvXMLTokenMapEntry_Impl* const&, unsigned short)
+binfilter::SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
+binfilter::SvXub_StrLens::Insert(binfilter::SvXub_StrLens const*, unsigned short, unsigned short, unsigned short)
+binfilter::SvXub_StrLens::Replace(unsigned short const&, unsigned short)
+binfilter::SvXub_StrLens::Replace(unsigned short const*, unsigned short, unsigned short)
+binfilter::SvXub_StrLens::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned short const&, void*), void*)
+binfilter::SvxBulletItem::StoreFont(SvStream&, Font const&)
+binfilter::SvxTabStopArr::Insert(binfilter::SvxTabStop const&, unsigned short&)
+binfilter::SvxTabStopArr::Remove(binfilter::SvxTabStop const&, unsigned short)
+binfilter::SvxTabStopArr_SAR::Replace(binfilter::SvxTabStop const&, unsigned short)
+binfilter::SvxTabStopArr_SAR::Replace(binfilter::SvxTabStop const*, unsigned short, unsigned short)
+binfilter::SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SvxTabStop const&, void*), void*)
+binfilter::Sw3Bytes::Insert(binfilter::Sw3Bytes const*, unsigned short, unsigned short, unsigned short)
+binfilter::Sw3Bytes::Replace(unsigned char const&, unsigned short)
+binfilter::Sw3Bytes::Replace(unsigned char const*, unsigned short, unsigned short)
+binfilter::Sw3Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
+binfilter::Sw3Io::GetStorage()
+binfilter::Sw3Io::SaveStyles()
+binfilter::Sw3IoImp::CollectMarks(binfilter::SwPaM*, unsigned char)
+binfilter::Sw3IoImp::CollectRedlines(binfilter::SwPaM*, unsigned char)
+binfilter::Sw3IoImp::CollectTblLineBoxFmts40()
+binfilter::Sw3IoImp::InsertHiddenDrawObjs()
+binfilter::Sw3IoImp::OutField(binfilter::SwFmtFld const&)
+binfilter::Sw3IoImp::OutNumRules(unsigned char)
+binfilter::Sw3IoImp::OutPageDescs(unsigned char)
+binfilter::Sw3IoImp::OutRecordSizesPos(unsigned long)
+binfilter::Sw3IoImp::OutULong(SvStream&, unsigned int)
+binfilter::Sw3IoImp::RemoveHiddenDrawObjs()
+binfilter::Sw3IoImp::SaveDocContents(binfilter::SwPaM&, String const*)
+binfilter::Sw3IoImp::SaveStyleSheets(unsigned char)
+binfilter::Sw3Marks::GetPos(binfilter::Sw3Mark const*) const
+binfilter::Sw3Marks::Remove(binfilter::Sw3Mark*)
+binfilter::Sw3NumRuleInfos::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::Sw3NumRuleInfos::Insert(binfilter::Sw3NumRuleInfo* const&, unsigned short&)
+binfilter::Sw3NumRuleInfos::Insert(binfilter::Sw3NumRuleInfo* const*, unsigned short)
+binfilter::Sw3NumRuleInfos::Insert(binfilter::Sw3NumRuleInfos const*, unsigned short, unsigned short)
+binfilter::Sw3NumRuleInfos::Remove(binfilter::Sw3NumRuleInfo* const&, unsigned short)
+binfilter::Sw3SortFmts::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::Sw3SortFmts::Insert(binfilter::Sw3SortFmts const*, unsigned short, unsigned short)
+binfilter::Sw3SortFmts::Insert(binfilter::SwFmt* const&)
+binfilter::Sw3SortFmts::Insert(binfilter::SwFmt* const*, unsigned short)
+binfilter::Sw3SortFmts::Remove(binfilter::SwFmt* const&, unsigned short)
+binfilter::Sw3SortFmts::Remove(unsigned short, unsigned short)
+binfilter::Sw3ULongs::Insert(binfilter::Sw3ULongs const*, unsigned short, unsigned short, unsigned short)
+binfilter::Sw3ULongs::Replace(unsigned int const&, unsigned short)
+binfilter::Sw3ULongs::Replace(unsigned int const*, unsigned short, unsigned short)
+binfilter::Sw3ULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
+binfilter::SwBookmarks::Insert(binfilter::SwBookmark* const&, unsigned short&)
+binfilter::SwBookmarks::Insert(binfilter::SwBookmark* const*, unsigned short)
+binfilter::SwBookmarks::Insert(binfilter::SwBookmarks const*, unsigned short, unsigned short)
+binfilter::SwBookmarks::Remove(binfilter::SwBookmark* const&, unsigned short)
+binfilter::SwCache::Check()
+binfilter::SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwCrsrShell::GetCrsrDocPos(unsigned char) const
+binfilter::SwCrsrShell::GetSwCrsr(bool) const
+binfilter::SwCrsrShell::IsCrsrInTbl(unsigned char) const
+binfilter::SwCrsrShell::IsCrsrPtAtEnd() const
+binfilter::SwCrsrShell::IsMultiSelection() const
+binfilter::SwCrsrShell::IsSelOnePara() const
+binfilter::SwCrsrShell::MakeFindRange(unsigned short, unsigned short, binfilter::SwPaM*) const
+binfilter::SwCrsrShell::UnSetVisCrsr()
+binfilter::SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwCurrShells::Insert(binfilter::CurrShell* const&, unsigned short&)
+binfilter::SwCurrShells::Insert(binfilter::CurrShell* const*, unsigned short)
+binfilter::SwCurrShells::Insert(binfilter::SwCurrShells const*, unsigned short, unsigned short)
+binfilter::SwCurrShells::Remove(unsigned short, unsigned short)
+binfilter::SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwDestroyList::Insert(binfilter::SwDestroyList const*, unsigned short, unsigned short)
+binfilter::SwDestroyList::Insert(binfilter::SwSectionFrm* const&, unsigned short&)
+binfilter::SwDestroyList::Insert(binfilter::SwSectionFrm* const*, unsigned short)
+binfilter::SwDestroyList::Remove(binfilter::SwSectionFrm* const&, unsigned short)
+binfilter::SwDoc::ReadLayoutCache(SvStream&)
+binfilter::SwDoc::Replace(binfilter::SwPaM&, String const&, unsigned char)
+binfilter::SwDocShell::CalcLayoutForOLEObjects()
+binfilter::SwDocShell::RemoveOLEObjects()
+binfilter::SwFlyFrm::ConvertHoriTo40(binfilter::SwHoriOrient&, binfilter::SwRelationOrient&, long&) const
+binfilter::SwGrfNode::SaveCompleted(unsigned char)
+binfilter::SwLayoutCache::Write(SvStream&, binfilter::SwDoc const&)
+binfilter::SwLineLayout::DebugPortions(SvStream&, String const&, unsigned short)
+binfilter::SwOLELRUCache::Remove(binfilter::SwOLEObj&)
+binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const&, unsigned short&)
+binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const*, unsigned short)
+binfilter::SwOutlineNodes::Insert(binfilter::SwOutlineNodes const*, unsigned short, unsigned short)
+binfilter::SwPageIter::GetPageDesc() const
+binfilter::SwPageIter::GetPosition(binfilter::SwPosition&) const
+binfilter::SwPageIter::NextPage()
+binfilter::SwPageIter::SwPageIter(binfilter::SwDoc const&, binfilter::SwPosition const&)
+binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const&, unsigned short&)
+binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const*, unsigned short)
+binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrms const*, unsigned short, unsigned short)
+binfilter::SwPosFlyFrms::Remove(binfilter::SwPosFlyFrm* const&, unsigned short)
+binfilter::SwPosFlyFrms::Remove(unsigned short, unsigned short)
+binfilter::SwRects::Replace(binfilter::SwRect const&, unsigned short)
+binfilter::SwRects::Replace(binfilter::SwRect const*, unsigned short, unsigned short)
+binfilter::SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwRect const&, void*), void*)
+binfilter::SwRubyList::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwSelBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&)
+binfilter::SwSelBoxes::Remove(binfilter::SwTableBox* const&, unsigned short)
+binfilter::SwSortDrawObjs::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwSortDrawObjs::Insert(binfilter::SdrObject* const&, unsigned short&)
+binfilter::SwSortDrawObjs::Insert(binfilter::SdrObject* const*, unsigned short)
+binfilter::SwSortDrawObjs::Insert(binfilter::SwSortDrawObjs const*, unsigned short, unsigned short)
+binfilter::SwSortDrawObjs::Remove(unsigned short, unsigned short)
+binfilter::SwStyleSheetPool::CopyFromDoc(unsigned char)
+binfilter::SwTOXSources::Insert(binfilter::SwTOXSources const*, unsigned short, unsigned short, unsigned short)
+binfilter::SwTOXSources::Remove(unsigned short, unsigned short)
+binfilter::SwTOXSources::Replace(binfilter::SwTOXSource const&, unsigned short)
+binfilter::SwTOXSources::Replace(binfilter::SwTOXSource const*, unsigned short, unsigned short)
+binfilter::SwTOXSources::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwTOXSource const&, void*), void*)
+binfilter::SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&)
+binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const*, unsigned short)
+binfilter::SwTableSortBoxes::Insert(binfilter::SwTableSortBoxes const*, unsigned short, unsigned short)
+binfilter::SwTblBoxFormula::GetTableBox()
+binfilter::SwViewImp::Init(binfilter::SwViewOption const*)
+binfilter::SwViewImp::LinkStubRefreshScrolledHdl(void*, void*)
+binfilter::SwWrtShell::LinkStubExecFlyMac(void*, void*)
+binfilter::SwXBookmarkPortionArr::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortionArr const*, unsigned short, unsigned short)
+binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short&)
+binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const*, unsigned short)
+binfilter::SwXBookmarkPortionArr::Remove(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short)
+binfilter::SwXMLSectionList::SwXMLSectionList(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>, binfilter::SvStrings&)
+binfilter::SwXMLTableColumnsSortByWidth_Impl::GetPos(binfilter::SwXMLTableColumn_Impl const*) const
+binfilter::SwXMLTableColumnsSortByWidth_Impl::Remove(binfilter::SwXMLTableColumn_Impl*)
+binfilter::SwXMLTableColumns_Impl::Insert(binfilter::SwXMLTableColumn_Impl* const&, unsigned short&)
+binfilter::SwXMLTableColumns_Impl::Insert(binfilter::SwXMLTableColumn_Impl* const*, unsigned short)
+binfilter::SwXMLTableColumns_Impl::Insert(binfilter::SwXMLTableColumns_Impl const*, unsigned short, unsigned short)
+binfilter::SwXMLTableColumns_Impl::Remove(binfilter::SwXMLTableColumn_Impl* const&, unsigned short)
+binfilter::SwXMLTableColumns_Impl::Remove(unsigned short, unsigned short)
+binfilter::SwXRedlinePortionArr::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortionArr const*, unsigned short, unsigned short)
+binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const&, unsigned short&)
+binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const*, unsigned short)
+binfilter::SwXRedlinePortionArr::Remove(binfilter::SwXRedlinePortion_Impl* const&, unsigned short)
+binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
+binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const**, unsigned short)
+binfilter::SwpHtEnd::Insert(binfilter::SwpHtEnd const*, unsigned short, unsigned short)
+binfilter::SwpHtEnd::Remove(binfilter::SwTxtAttr const*&, unsigned short)
+binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
+binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const**, unsigned short)
+binfilter::SwpHtStart::Insert(binfilter::SwpHtStart const*, unsigned short, unsigned short)
+binfilter::SwpHtStart::Remove(binfilter::SwTxtAttr const*&, unsigned short)
+binfilter::ViewShell::Init(binfilter::SwViewOption const*)
+binfilter::W4WEndPosLst::Insert(binfilter::W4WSttEndPos&)
+binfilter::W4WSttEndPos::W4WSttEndPos(binfilter::SwTxtAttr const*, unsigned short, unsigned short)
+binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTab const*, unsigned short, unsigned short)
+binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const&, unsigned short&)
+binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const*, unsigned short)
+binfilter::W4WStyleIdTab::Remove(binfilter::W4WStyleIdTabEntry* const&, unsigned short)
+binfilter::W4WStyleIdTab::Remove(unsigned short, unsigned short)
+binfilter::WritingDirectionInfos::Insert(binfilter::WritingDirectionInfos const*, unsigned short, unsigned short, unsigned short)
+binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const&, unsigned short)
+binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const*, unsigned short, unsigned short)
+binfilter::WritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::WritingDirectionInfo const&, void*), void*)
+binfilter::XBitmapList::Remove(long)
+binfilter::XBitmapList::Replace(binfilter::XBitmapEntry*, long)
+binfilter::XBitmapTable::Remove(long)
+binfilter::XBitmapTable::Replace(long, binfilter::XBitmapEntry*)
+binfilter::XColorTable::Remove(long)
+binfilter::XDashList::Remove(long)
+binfilter::XDashList::Replace(binfilter::XDashEntry*, long)
+binfilter::XDashTable::Remove(long)
+binfilter::XDashTable::Replace(long, binfilter::XDashEntry*)
+binfilter::XGradientList::Remove(long)
+binfilter::XGradientList::Replace(binfilter::XGradientEntry*, long)
+binfilter::XGradientTable::Remove(long)
+binfilter::XGradientTable::Replace(long, binfilter::XGradientEntry*)
+binfilter::XHatchList::Remove(long)
+binfilter::XHatchList::Replace(binfilter::XHatchEntry*, long)
+binfilter::XHatchTable::Remove(long)
+binfilter::XHatchTable::Replace(long, binfilter::XHatchEntry*)
+binfilter::XLineEndList::Remove(long)
+binfilter::XLineEndList::Replace(binfilter::XLineEndEntry*, long)
+binfilter::XLineEndTable::Remove(long)
+binfilter::XLineEndTable::Replace(long, binfilter::XLineEndEntry*)
+binfilter::XMLFamilyDataList_Impl::GetPos(binfilter::XMLFamilyData_Impl const*) const
+binfilter::XMLFamilyDataList_Impl::Remove(binfilter::XMLFamilyData_Impl*)
+binfilter::XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
+binfilter::XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
+binfilter::XMLFontAutoStylePool_Impl::GetPos(binfilter::XMLFontAutoStylePoolEntry_Impl const*) const
+binfilter::XMLFontAutoStylePool_Impl::Remove(binfilter::XMLFontAutoStylePoolEntry_Impl*)
+binfilter::XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
+binfilter::XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
+binfilter::XMLTextListAutoStylePool_Impl::GetPos(binfilter::XMLTextListAutoStylePoolEntry_Impl const*) const
+binfilter::XMLTextListAutoStylePool_Impl::Remove(binfilter::XMLTextListAutoStylePoolEntry_Impl*)
+binfilter::XTextAttrSetItem::XTextAttrSetItem(binfilter::SfxItemPool*)
+binfilter::_MapTblFrmFmts::Insert(binfilter::_MapTblFrmFmts const*, unsigned short, unsigned short, unsigned short)
+binfilter::_MapTblFrmFmts::Remove(unsigned short, unsigned short)
+binfilter::_MapTblFrmFmts::Replace(binfilter::_MapTblFrmFmt const&, unsigned short)
+binfilter::_MapTblFrmFmts::Replace(binfilter::_MapTblFrmFmt const*, unsigned short, unsigned short)
+binfilter::_SetGetExpFlds::Insert(binfilter::_SetGetExpFld* const&, unsigned short&)
+binfilter::_SetGetExpFlds::Insert(binfilter::_SetGetExpFld* const*, unsigned short)
+binfilter::_SetGetExpFlds::Insert(binfilter::_SetGetExpFlds const*, unsigned short, unsigned short)
+binfilter::_SetGetExpFlds::Remove(binfilter::_SetGetExpFld* const&, unsigned short)
+binfilter::_SetGetExpFlds::Remove(unsigned short, unsigned short)
+binfilter::_Sort_CellFrms::Insert(binfilter::_Sort_CellFrms const*, unsigned short, unsigned short, unsigned short)
+binfilter::_Sort_CellFrms::Remove(unsigned short, unsigned short)
+binfilter::_Sort_CellFrms::Replace(binfilter::_Sort_CellFrm const&, unsigned short)
+binfilter::_Sort_CellFrms::Replace(binfilter::_Sort_CellFrm const*, unsigned short, unsigned short)
+binfilter::_Sort_CellFrms::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_Sort_CellFrm const&, void*), void*)
+binfilter::_SwFtnIdxs::Insert(binfilter::SwTxtFtn* const&, unsigned short&)
+binfilter::_SwFtnIdxs::Insert(binfilter::SwTxtFtn* const*, unsigned short)
+binfilter::_SwFtnIdxs::Insert(binfilter::_SwFtnIdxs const*, unsigned short, unsigned short)
+binfilter::_SwFtnIdxs::Remove(binfilter::SwTxtFtn* const&, unsigned short)
+binfilter::_SwPamRanges::Insert(binfilter::SwPamRange const&)
+binfilter::_SwPamRanges::Insert(binfilter::SwPamRange const&, unsigned short&)
+binfilter::_SwPamRanges::Insert(binfilter::SwPamRange const*, unsigned short)
+binfilter::_SwPamRanges::Insert(binfilter::_SwPamRanges const*, unsigned short, unsigned short)
+binfilter::_SwPamRanges::Remove(binfilter::SwPamRange const&, unsigned short)
+binfilter::_SwPamRanges::Remove(unsigned short, unsigned short)
+binfilter::_SwPamRanges_SAR::Replace(binfilter::SwPamRange const&, unsigned short)
+binfilter::_SwPamRanges_SAR::Replace(binfilter::SwPamRange const*, unsigned short, unsigned short)
+binfilter::_SwPamRanges_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwPamRange const&, void*), void*)
+binfilter::_SwRedlineTbl::Insert(binfilter::SwRedline* const*, unsigned short)
+binfilter::_SwRedlineTbl::Insert(binfilter::_SwRedlineTbl const*, unsigned short, unsigned short)
+binfilter::_SwRedlineTbl::Remove(binfilter::SwRedline* const&, unsigned short)
+binfilter::_W4WEndPosLst::Insert(binfilter::_W4WEndPosLst const*, unsigned short, unsigned short, unsigned short)
+binfilter::_W4WEndPosLst::Remove(unsigned short, unsigned short)
+binfilter::_W4WEndPosLst::Replace(binfilter::W4WSttEndPos const&, unsigned short)
+binfilter::_W4WEndPosLst::Replace(binfilter::W4WSttEndPos const*, unsigned short, unsigned short)
+binfilter::_W4WEndPosLst::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::W4WSttEndPos const&, void*), void*)
+binfilter::_W4WEndPosLst::_W4WEndPosLst(unsigned short, unsigned char)
+binfilter::_ZSortFlys::Insert(binfilter::_ZSortFly const&, unsigned short&)
+binfilter::_ZSortFlys::Insert(binfilter::_ZSortFly const*, unsigned short)
+binfilter::_ZSortFlys::Insert(binfilter::_ZSortFlys const*, unsigned short, unsigned short)
+binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly const&, unsigned short)
+binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
+binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned short, unsigned short)
+binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_ZSortFly const&, void*), void*)
+binfilter::bf_OfficeWrapper::impl_createInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+binfilter::frm::OBoundControlModel::connectToField(com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> const&)
+binfilter::frm::OErrorBroadcaster::onError(com::sun::star::sdbc::SQLException const&, rtl::OUString const&)
+binfilter::frm::OFilterControl::implInitFilterList()
+binfilter::frm::OImageControlModel::UpdateFromField()
+binfilter::frm::OListBoxModel::GetCurValueSeq() const
+binfilter::registerServiceProvider(rtl::OUString const&, com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::registry::XRegistryKey*)
+cairocanvas::CanvasHelper::flush() const
+cairocanvas::CanvasHelper::getPalette()
+cairocanvas::SpriteDeviceHelper::getSurface()
+cairocanvas::TextLayout::draw(_cairo*)
+canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&, basegfx::B2DPolygon const&, canvas::ParametricPolyPolygon::GradientType, com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<double> > const&, com::sun::star::uno::Sequence<double> const&)
+canvas::PropertySetHelper::PropertySetHelper(std::vector<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry, std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry> > const&)
+canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
+canvas::tools::ElapsedTime::getTimeBase() const
+canvas::tools::PriorityBooster::PriorityBooster(int)
+canvas::tools::PriorityBooster::~PriorityBooster()
+canvas::tools::appendToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&)
+canvas::tools::calcRectToRectTransform(basegfx::B2DHomMatrix&, basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DHomMatrix const&)
+canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&)
+canvas::tools::mergeViewAndRenderState(com::sun::star::rendering::ViewState&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> const&)
+canvas::tools::prependToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&)
+canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
+canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
+chart::DateHelper::GetMonthsBetweenDates(Date, Date)
+chart::EquidistantTickIter::getCurrentIndex() const
+chart::EquidistantTickIter::getMaxIndex() const
+chart::EquidistantTickIter::gotoIndex(int)
+chart::UndoContext::UndoContext(com::sun::star::uno::Reference<com::sun::star::document::XUndoManager> const&, rtl::OUString const&)
+chart::UndoContext::~UndoContext()
+chelp::Databases::getInstallPathAsSystemPath()
+codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&)
+comphelper::AccessibleEventBuffer::AccessibleEventBuffer()
+comphelper::AccessibleEventBuffer::sendEvents() const
+comphelper::AccessibleEventBuffer::~AccessibleEventBuffer()
+comphelper::AttributeList::RemoveAttribute(rtl::OUString)
+comphelper::AttributeList::SetAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
+comphelper::ChainablePropertySet::lockMutex()
+comphelper::ChainablePropertySet::unlockMutex()
+comphelper::ChainablePropertySetInfo::ChainablePropertySetInfo()
+comphelper::DocPasswordHelper::GetWordHashAsSequence(rtl::OUString const&)
+comphelper::DocPasswordRequest::isAbort() const
+comphelper::EmbeddedObjectContainer::CopyEmbeddedObject(comphelper::EmbeddedObjectContainer&, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&, rtl::OUString&)
+comphelper::EventLogger::addLogHandler(com::sun::star::uno::Reference<com::sun::star::logging::XLogHandler> const&)
+comphelper::EventLogger::getLogLevel() const
+comphelper::EventLogger::getName() const
+comphelper::EventLogger::removeLogHandler(com::sun::star::uno::Reference<com::sun::star::logging::XLogHandler> const&)
+comphelper::EventLogger::setLogLevel(int) const
+comphelper::FastPropertySetInfo::FastPropertySetInfo()
+comphelper::FastPropertySetInfo::addProperty(com::sun::star::beans::Property const&)
+comphelper::MasterPropertySet::lockMutex()
+comphelper::MasterPropertySet::unlockMutex()
+comphelper::MasterPropertySetInfo::MasterPropertySetInfo()
+comphelper::MasterPropertySetInfo::remove(rtl::OUString const&)
+comphelper::MediaDescriptor::MediaDescriptor(com::sun::star::uno::Any const&)
+comphelper::MediaDescriptor::MediaDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue> const&)
+comphelper::MediaDescriptor::PROP_CHARACTERSET()
+comphelper::MediaDescriptor::PROP_DEEPDETECTION()
+comphelper::MediaDescriptor::PROP_DETECTSERVICE()
+comphelper::MediaDescriptor::PROP_EXTENSION()
+comphelper::MediaDescriptor::PROP_FORMAT()
+comphelper::MediaDescriptor::PROP_PATTERN()
+comphelper::MediaDescriptor::PROP_POSSIZE()
+comphelper::MediaDescriptor::PROP_POSTSTRING()
+comphelper::MediaDescriptor::PROP_REPAIRPACKAGE()
+comphelper::MediaDescriptor::PROP_SILENT()
+comphelper::MediaDescriptor::PROP_TEMPLATEREGIONNAME()
+comphelper::MediaDescriptor::PROP_VIEWCONTROLLERNAME()
+comphelper::MediaDescriptor::PROP_VIEWID()
+comphelper::MimeConfigurationHelper::AddFilterNameCheckOwnFile(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
+comphelper::MimeConfigurationHelper::GetSequenceClassIDFromObjectName(rtl::OUString const&)
+comphelper::OAccessibleImplementationAccess::setForeignControlledState(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> const&, short, unsigned char)
+comphelper::OAccessibleSelectionHelper::OAccessibleSelectionHelper()
+comphelper::OAccessibleTextHelper::OAccessibleTextHelper()
+comphelper::OComposedPropertySet::OComposedPropertySet(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > const&, comphelper::IPropertySetComposerCallback const*)
+comphelper::OContainerListenerAdapter::lock()
+comphelper::OContainerListenerAdapter::unlock()
+comphelper::OInteractionRequest::clearContinuations()
+comphelper::OModuleImpl::~OModuleImpl()
+comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int)
+comphelper::OSelectionChangeListener::disposeAdapter()
+comphelper::OStreamSection::available()
+comphelper::OTruncatedTransactedFileStream::OTruncatedTransactedFileStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+comphelper::OTruncatedTransactedFileStream::OTruncatedTransactedFileStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::ucb::XSimpleFileAccess> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+comphelper::OTruncatedTransactedFileStream::OTruncatedTransactedFileStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::ucb::XSimpleFileAccess> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char)
+comphelper::OfficeResourceBundle::OfficeResourceBundle(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&)
+comphelper::PropertySetHelper::PropertySetHelper()
+comphelper::PropertySetHelper::setInfo(comphelper::PropertySetInfo*)
+comphelper::ResourceBasedEventLogger::ResourceBasedEventLogger(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&)
+comphelper::SequenceAsHashMap::getAsConstAnyList(unsigned char) const
+comphelper::ServiceInfoHelper::concatSequences(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<rtl::OUString> const&)
+comphelper::SimplePasswordRequest::isAbort() const
+comphelper::createEventAttacherManager(com::sun::star::uno::Reference<com::sun::star::beans::XIntrospection> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence<com::sun::star::beans::Property>&, rtl::OUString const&)
+comphelper::getPathToSystemRegistry()
+comphelper::getPathToUserRegistry()
+comphelper::string::searchAndReplaceAllAsciiWithAscii(rtl::OUString const&, char const*, char const*, int)
+comphelper::string::searchAndReplaceAsciiL(rtl::OUString const&, char const*, int, rtl::OUString const&, int, int*)
+connectivity::OKeyValue::OKeyValue()
+connectivity::OParseContext::setDefaultLocale(com::sun::star::lang::Locale const&)
+connectivity::ORowSetValue::setFromDouble(double const&, int)
+connectivity::OSQLInternalNode::OSQLInternalNode(unsigned short const*, connectivity::SQLNodeType, unsigned int)
+connectivity::OSQLParseNode::remove(connectivity::OSQLParseNode*)
+connectivity::OSQLParseNode::replaceAt(unsigned int, connectivity::OSQLParseNode*)
+connectivity::OSQLParseNodesContainer::empty() const
+connectivity::OSQLScanner::GetCurrentRule() const
+connectivity::OSortIndex::GetValue(int) const
+connectivity::SQLError::getSQLState(int) const
+connectivity::evoab::OCommonStatement::reset()
+connectivity::evoab::getFieldCount()
+connectivity::file::OSQLAnalyzer::clean()
+connectivity::file::OSQLAnalyzer::describeParam(rtl::Reference<connectivity::ORefVector<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > >)
+connectivity::file::OStatement_Base::reset()
+connectivity::file::OStatement_Base::setWarning(com::sun::star::sdbc::SQLWarning const&)
+connectivity::mozab::MQuery::getAddressbook() const
+connectivity::mozab::MQuery::getMaxNrOfReturns() const
+connectivity::mozab::MQuery::getQuerySubDirs() const
+connectivity::mozab::MQuery::setQuerySubDirs(unsigned char&)
+connectivity::mozab::MQueryHelper::atEnd() const
+connectivity::mozab::MQueryHelper::hasMore() const
+connectivity::mozab::MQueryHelper::next()
+connectivity::mozab::MQueryHelper::rewind()
+connectivity::mozab::MTypeConverter::asciiOUStringToNsACString(rtl::OUString const&, nsACString_internal&)
+connectivity::mozab::MTypeConverter::nsACStringToOUString(nsACString_internal const&)
+connectivity::mozab::MTypeConverter::nsStringToCCharStringAscii(nsString const&)
+connectivity::mozab::MTypeConverter::ouStringToCCharStringUtf8(rtl::OUString const&)
+connectivity::mozab::MTypeConverter::ouStringToStlString(rtl::OUString const&)
+connectivity::mozab::OCatalog::getDot()
+connectivity::mozab::OPreparedStatement::checkParameterIndex(int)
+connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue> >&, int)
+connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*, connectivity::mozab::OConnection*)
+connectivity::odbc::ODatabaseMetaDataResultSet::openTablesTypes()
+connectivity::odbc::OPreparedStatement::getDataBuf(int)
+connectivity::odbc::OPreparedStatement::getParamLength(int)
+connectivity::odbc::OPreparedStatement::getPrecision(int)
+connectivity::toString(com::sun::star::uno::Any const&)
+cppcanvas::BaseGfxFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> const&, basegfx::B2DPolyPolygon const&) const
+cppcanvas::BaseGfxFactory::createText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&) const
+cppcanvas::BaseGfxFactory::~BaseGfxFactory()
+cppcanvas::VCLFactory::createAlphaBitmap(boost::shared_ptr<cppcanvas::Canvas> const&, Size const&) const
+cppcanvas::VCLFactory::createAnimatedSprite(boost::shared_ptr<cppcanvas::SpriteCanvas> const&, Animation const&) const
+cppcanvas::VCLFactory::createBitmap(boost::shared_ptr<cppcanvas::Canvas> const&, Bitmap const&) const
+cppcanvas::VCLFactory::createBitmap(boost::shared_ptr<cppcanvas::Canvas> const&, Size const&) const
+cppcanvas::VCLFactory::createCanvas(Window const&)
+cppcanvas::VCLFactory::createFullscreenSpriteCanvas(Window const&, Size const&) const
+cppcanvas::VCLFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> const&, PolyPolygon const&) const
+cppcanvas::VCLFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> const&, Polygon const&) const
+cppcanvas::VCLFactory::createRenderer(boost::shared_ptr<cppcanvas::Canvas> const&, Graphic const&, cppcanvas::Renderer::Parameters const&) const
+cppcanvas::VCLFactory::createText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&) const
+cppcanvas::VCLFactory::~VCLFactory()
+cppcanvas::internal::EMFPBrush::~EMFPBrush()
+cppcanvas::internal::ImplRenderer::Map(basegfx::B2DPoint&)
+cppcanvas::internal::ImplRenderer::MapRectangle(double, double, double, double)
+cppcanvas::internal::ImplSprite::getGraphicDevice() const
+cppcanvas::internal::TransparencyGroupActionFactory::createTransparencyGroupAction(std::auto_ptr<GDIMetaFile>&, cppcanvas::Renderer::Parameters const&, basegfx::B2DPoint const&, basegfx::B2DVector const&, double, boost::shared_ptr<cppcanvas::Canvas> const&, cppcanvas::internal::OutDevState const&)
+cppcanvas::tools::modifyClip(com::sun::star::rendering::RenderState&, cppcanvas::internal::OutDevState const&, boost::shared_ptr<cppcanvas::Canvas> const&, Point const&, basegfx::B2DVector const*, double const*)
+cppcanvas::tools::modifyClip(com::sun::star::rendering::RenderState&, cppcanvas::internal::OutDevState const&, boost::shared_ptr<cppcanvas::Canvas> const&, basegfx::B2DHomMatrix const&)
+cppu::AccessControl::AccessControl(com::sun::star::uno::Reference<com::sun::star::security::XAccessController> const&)
+cppu::AccessControl::checkRuntimePermission(rtl::OUString const&)
+cppu::AccessControl::checkSocketPermission(rtl::OUString const&, rtl::OUString const&)
+cppu::BootstrapException::BootstrapException()
+cppu::BootstrapException::getMessage() const
+cppu::ClassDataBase::ClassDataBase()
+cppu::OMultiTypeInterfaceContainerHelper::clear()
+cppu::OMultiTypeInterfaceContainerHelperInt32::clear()
+cppu::OMultiTypeInterfaceContainerHelperInt32::getContainedTypes() const
+cppu::OPropertySetHelper::OPropertySetHelper(cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, bool)
+cppu::createFactoryProxy(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> const&)
+cppu::createOneInstanceRegistryFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
+dbaccess::ORowSetNotifier::getChangedBookmarks() const
+dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
+dbaui::LoadFormHelper::LoadFormHelper(com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> const&)
+dbaui::LoadFormHelper::WaitUntilReallyLoaded(bool)
+dbaui::LoadFormHelper::cancel()
+dbaui::OApplicationController::LinkStubOnInvalidateClipboard(void*, void*)
+dbaui::OFieldDescControl::LinkStubDelayedGrabFocus(void*, void*)
+dbaui::OTableDesignView::LinkStubSwitchHdl(void*, void*)
+dbaui::OTableEditorCtrl::LinkStubEntryNotFound(void*, void*)
+dbaui::getKeyColumns(com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, int)
+dbtools::CharsetIteratorDerefHelper::CharsetIteratorDerefHelper()
+dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&)
+dbtools::DatabaseMetaData::isConnected() const
+dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent const&)
+dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdb::SQLContext const&)
+dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdbc::SQLWarning const&)
+dbtools::StatementComposer::getDisposeComposer() const
+dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
+dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&)
+desktop::CommandLineArgs::IsEmptyOrAcceptOnly() const
+desktop::Lockfile::clean()
+dlgprov::DialogProviderImpl::createControlModel()
+dp_info::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
+dp_manager::factory::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
+drawinglayer::attribute::FillBitmapAttribute::FillBitmapAttribute()
+drawinglayer::attribute::Sdr3DLightAttribute::Sdr3DLightAttribute()
+drawinglayer::attribute::Sdr3DObjectAttribute::Sdr3DObjectAttribute()
+drawinglayer::attribute::SdrFillBitmapAttribute::getLogSize() const
+drawinglayer::attribute::SdrFillTextAttribute::isDefault() const
+drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
+drawinglayer::attribute::SdrLightingAttribute::getAmbientLight() const
+drawinglayer::attribute::SdrLineAttribute::isDashed() const
+drawinglayer::attribute::SdrLineFillShadowAttribute3D::isDefault() const
+drawinglayer::attribute::SdrSceneAttribute::getDistance() const
+drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
+drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const
+drawinglayer::primitive2d::GraphicPrimitive2D::GraphicPrimitive2D(basegfx::B2DHomMatrix const&, GraphicObject const&)
+drawinglayer::primitive2d::PolyPolygonStrokeArrowPrimitive2D::PolyPolygonStrokeArrowPrimitive2D(basegfx::B2DPolyPolygon const&, drawinglayer::attribute::LineAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&)
+drawinglayer::primitive2d::PolyPolygonStrokeArrowPrimitive2D::PolyPolygonStrokeArrowPrimitive2D(basegfx::B2DPolyPolygon const&, drawinglayer::attribute::LineAttribute const&, drawinglayer::attribute::StrokeAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&)
+drawinglayer::primitive2d::PolygonStrokeArrowPrimitive2D::PolygonStrokeArrowPrimitive2D(basegfx::B2DPolygon const&, drawinglayer::attribute::LineAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&)
+drawinglayer::primitive2d::RenderGraphicPrimitive2D::setCurrentRasterizer() const
+drawinglayer::primitive2d::RenderGraphicPrimitive2D::setCurrentRasterizer(vcl::RenderGraphicRasterizer const&) const
+drawinglayer::primitive3d::PolygonStrokePrimitive3D::PolygonStrokePrimitive3D(basegfx::B3DPolygon const&, drawinglayer::attribute::LineAttribute const&)
+drawinglayer::processor3d::CollectingProcessor3D::CollectingProcessor3D(drawinglayer::geometry::ViewInformation3D const&)
+formula::ArgInput::GetArgSelection()
+formula::ArgInput::ReplaceSelOfArg(String const&)
+formula::EditBox::EditBox(Window*, long)
+formula::FormEditData::RestoreValues()
+formula::FormulaDlg::FindFocusWin(Window*)
+formula::FormulaDlg::HighlightFunctionParas(String const&)
+formula::FormulaDlg_Impl::EditFuncParas(unsigned short)
+formula::FormulaDlg_Impl::UpdateFunctionDesc()
+formula::FormulaListBox::FormulaListBox(Window*, long)
+formula::FormulaModalDialog::CheckMatrix()
+formula::FormulaModalDialog::DoEnter(unsigned char)
+formula::FormulaModalDialog::FindFocusWin(Window*)
+formula::FormulaModalDialog::GetActiveEdit()
+formula::FormulaModalDialog::GetFormulaHelper() const
+formula::FormulaModalDialog::GetMeText() const
+formula::FormulaModalDialog::HighlightFunctionParas(String const&)
+formula::FormulaModalDialog::SetEdSelection()
+formula::FormulaModalDialog::SetMeText(String const&, unsigned short, unsigned short, unsigned char, unsigned char, unsigned char)
+formula::FormulaModalDialog::UpdateParaWin(Selection const&, String const&)
+formula::FormulaModalDialog::UpdateParaWin(Selection&)
+formula::FormulaModalDialog::disableOk()
+formula::FormulaModalDialog::getCurrentFunctionDescription() const
+formula::FormulaModalDialog::isUserMatrix() const
+formula::FormulaSubroutineToken::GetTokenArray() const
+formula::FormulaToken::IsMatrixFunction() const
+formula::FormulaTokenArray::AddName(unsigned short)
+formula::FormulaTokenArray::GetNextDBArea()
+formula::FormulaTokenIterator::First()
+formula::RefEdit::SilentGrabFocus()
+formula::ResourceManager::loadString(unsigned short, char const*, rtl::OUString const&)
+formula::StructPage::GetSelectedEntryText()
+formula::StructPage::GetSelectedToken()
+framework::AddonMenuManager::HasAddonHelpMenuElements()
+framework::AddonsOptions_Impl::GetPropertyNamesMergeMenuInstruction(rtl::OUString const&) const
+framework::AddonsToolBarManager::LinkStubHighlight(void*, void*)
+framework::BmkMenu::BmkMenu(com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, framework::BmkMenu::BmkMenuType, framework::BmkMenu*)
+framework::ConstItemContainer::ConstItemContainer(framework::RootItemContainer const&, unsigned char)
+framework::Converter::convert_DateTime2String(DateTime const&)
+framework::Converter::convert_OUStringHash2seqProp(framework::BaseHash<rtl::OUString> const&)
+framework::Converter::convert_OUStringList2seqOUString(framework::OUStringList const&)
+framework::Converter::convert_String2DateTime(rtl::OUString const&)
+framework::Converter::convert_seqAny2seqProp(com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)
+framework::Converter::convert_seqNamedVal2seqPropVal(com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue> const&)
+framework::Converter::convert_seqProp2OUStringHash(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
+framework::Converter::convert_seqProp2seqAny(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
+framework::EventsConfiguration::LoadEventsConfig(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::EventsConfig&)
+framework::EventsConfiguration::StoreEventsConfig(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::EventsConfig const&)
+framework::FwkTabWindow::LinkStubCloseHdl(void*, void*)
+framework::GetCommandURLFromKeyCode(KeyCode const&)
+framework::GetKeyCodeFromCommandURL(com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, rtl::OUString const&)
+framework::HandlerCache::exists(rtl::OUString const&) const
+framework::ImagesConfiguration::LoadImages(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::ImageListsDescriptor&)
+framework::ImagesConfiguration::StoreImages(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::ImageListsDescriptor const&)
+framework::Impl_ModelWinService::Impl_ModelWinService()
+framework::Impl_ModelWinService::getElementType()
+framework::Impl_ModelWinService::~Impl_ModelWinService()
+framework::ItemContainer::getSomething(com::sun::star::uno::Sequence<signed char> const&)
+framework::LayoutManager::impl_findElement(rtl::OUString const&)
+framework::LayoutManager::implts_setMenuBarCloser(unsigned char)
+framework::MenuConfiguration::IsPickListItemId(unsigned short)
+framework::MenuConfiguration::IsWindowListItemId(unsigned short)
+framework::MenuDispatcher::LinkStubClose_Impl(void*, void*)
+framework::ModelWinService::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+framework::OReadMenuBarHandler::getServiceFactory()
+framework::PanelManager::PanelManager(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&)
+framework::PanelManager::createPanels()
+framework::PanelManager::destroyDockingWindow(rtl::OUString const&)
+framework::PanelManager::findDockingWindow(rtl::OUString const&)
+framework::PanelManager::getPreferredSize() const
+framework::PanelManager::layoutPanels(com::sun::star::awt::Rectangle)
+framework::PanelWindow::getResourceURL() const
+framework::PanelWrapper::PanelWrapper(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+framework::RootActionTriggerContainer::GetMenu()
+framework::RootActionTriggerContainer::GetUnoTunnelId() const
+framework::RootItemContainer::RootItemContainer(framework::ConstItemContainer const&)
+framework::SetCommandURLFromKeyCode(rtl::OUString (*)(KeyCode const&))
+framework::SetKeyCodeFromCommandURL(KeyCode (*)(com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, rtl::OUString const&))
+framework::SetMenuExtensionSupplier(MenuExtensionItem (*)())
+framework::ShareableMutex::getShareableOslMutex()
+framework::StatusBarConfiguration::LoadStatusBar(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::StatusBarDescriptor&)
+framework::StatusBarConfiguration::StoreStatusBar(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::StatusBarDescriptor const&)
+framework::StatusBarDescriptor::DeleteAndDestroy(unsigned short, unsigned short)
+framework::TabWindow::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+framework::TitleHelper::impl_getSubTitle()
+framework::ToolBarManager::LinkStubHighlight(void*, void*)
+framework::ToolbarLayoutManager::implts_writeNewWindowStateData(rtl::OUString, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&)
+framework::UIConfigElementWrapperBase::dispose()
+framework::UIConfigurationManagerImpl::UIConfigurationManagerImpl(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, bool)
+framework::UIConfigurationManagerImpl::addConfigurationListener(com::sun::star::uno::Reference<com::sun::star::ui::XUIConfigurationListener> const&)
+framework::UIConfigurationManagerImpl::addEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)
+framework::UIConfigurationManagerImpl::createSettings()
+framework::UIConfigurationManagerImpl::dispose()
+framework::UIConfigurationManagerImpl::getDefaultSettings(rtl::OUString const&)
+framework::UIConfigurationManagerImpl::getEventsManager()
+framework::UIConfigurationManagerImpl::getImageManager()
+framework::UIConfigurationManagerImpl::getSettings(rtl::OUString const&, unsigned char)
+framework::UIConfigurationManagerImpl::getShortCutManager()
+framework::UIConfigurationManagerImpl::getUIElementsInfo(short)
+framework::UIConfigurationManagerImpl::hasSettings(rtl::OUString const&)
+framework::UIConfigurationManagerImpl::hasStorage()
+framework::UIConfigurationManagerImpl::initialize(com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)
+framework::UIConfigurationManagerImpl::insertSettings(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
+framework::UIConfigurationManagerImpl::isDefaultSettings(rtl::OUString const&)
+framework::UIConfigurationManagerImpl::isModified()
+framework::UIConfigurationManagerImpl::reload()
+framework::UIConfigurationManagerImpl::removeConfigurationListener(com::sun::star::uno::Reference<com::sun::star::ui::XUIConfigurationListener> const&)
+framework::UIConfigurationManagerImpl::removeEventListener(com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> const&)
+framework::UIConfigurationManagerImpl::removeSettings(rtl::OUString const&)
+framework::UIConfigurationManagerImpl::replaceSettings(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
+framework::UIConfigurationManagerImpl::reset()
+framework::UIConfigurationManagerImpl::setStorage(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&)
+framework::UIConfigurationManagerImpl::store()
+framework::UIConfigurationManagerImpl::storeToStorage(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&)
+framework::UIConfigurationManagerImpl::~UIConfigurationManagerImpl()
+framework::UIElementWrapperBase::dispose()
+framework::convertAWTToRectangle(com::sun::star::awt::Rectangle const&)
+framework::convertRectangleToAWT(Rectangle const&)
+fs::exists(fs::path const&)
+fs::remove(fs::path const&)
+fs::remove_all(fs::path const&)
+fs::rename(fs::path const&, fs::path const&)
+gcc3::RTTI::~RTTI()
+graphite2::Segment::append(graphite2::Segment const&)
+graphite2::Slot::update(int, int, graphite2::Position&)
+graphite2::TtfUtil::FontAscent(void const*)
+graphite2::TtfUtil::FontDescent(void const*)
+graphite2::TtfUtil::FontOs2Style(void const*, bool&, bool&)
+graphite2::TtfUtil::Get30EngFamilyInfo(void const*, unsigned long&, unsigned long&)
+graphite2::TtfUtil::Get30EngFullFontInfo(void const*, unsigned long&, unsigned long&)
+graphite2::TtfUtil::Get31EngFamilyInfo(void const*, unsigned long&, unsigned long&)
+graphite2::TtfUtil::Get31EngFullFontInfo(void const*, unsigned long&, unsigned long&)
+graphite2::TtfUtil::GetLangsForNames(void const*, int, int, int*, int, short*)
+graphite2::TtfUtil::GlyfBox(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int&, int&, int&, int&)
+graphite2::TtfUtil::GlyfContourCount(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, unsigned long&)
+graphite2::TtfUtil::GlyfContourEndPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int*, unsigned long)
+graphite2::TtfUtil::GlyfPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int const*, unsigned long, int*, int*, bool*, unsigned long)
+graphite2::TtfUtil::HeadTableCheckSum(void const*)
+graphite2::TtfUtil::HeadTableCreateTime(void const*, unsigned int*, unsigned int*)
+graphite2::TtfUtil::HeadTableModifyTime(void const*, unsigned int*, unsigned int*)
+graphite2::TtfUtil::IsDeepComposite(unsigned short, void const*, void const*, unsigned long, long, void const*)
+graphite2::TtfUtil::IsItalic(void const*)
+graphite2::TtfUtil::LocaGlyphCount(unsigned long, void const*)
+graphite2::TtfUtil::MaxCompositeComponentCount(void const*)
+graphite2::TtfUtil::MaxCompositeLevelCount(void const*)
+graphite2::TtfUtil::PostLookup(void const*, unsigned long, void const*, char const*)
+graphite2::TtfUtil::SwapWString(void*, unsigned long)
+graphite2::TtfUtil::TableIdTag(graphite2::TtfUtil::TableId)
+jfw_plugin::VendorBase::createInstance()
+jfw_plugin::VendorBase::getJavaExePaths(int*)
+jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
+layout::AdvancedButton::AddAdvanced(layout::Window*)
+layout::AdvancedButton::AddSimple(layout::Window*)
+layout::AdvancedButton::AdvancedButton(layout::Context*, char const*, unsigned int)
+layout::AdvancedButton::AdvancedButton(layout::Window*, ResId const&)
+layout::AdvancedButton::AdvancedButton(layout::Window*, long)
+layout::AdvancedButton::RemoveAdvanced(layout::Window*)
+layout::AdvancedButton::RemoveSimple(layout::Window*)
+layout::AdvancedButton::SetDelta(int)
+layout::ApplyButton::ApplyButton(layout::Context*, char const*, unsigned int)
+layout::ApplyButton::ApplyButton(layout::Window*, ResId const&)
+layout::ApplyButton::ApplyButton(layout::Window*, long)
+layout::Box::Add(layout::Container*, bool, bool, int)
+layout::Box::Add(layout::Window*, bool, bool, int)
+layout::Button::Button(layout::Context*, char const*, unsigned int)
+layout::Button::Button(layout::Window*, ResId const&)
+layout::Button::Button(layout::Window*, long)
+layout::Button::GetClickHdl()
+layout::Button::SetClickHdl(Link const&)
+layout::Button::SetImageAlign(ImageAlign)
+layout::Button::SetModeImage(Image const&)
+layout::Button::SetModeImage(layout::Image const&)
+layout::CancelButton::CancelButton(layout::Window*, ResId const&)
+layout::CancelButton::CancelButton(layout::Window*, long)
+layout::CheckBox::Check(bool)
+layout::CheckBox::CheckBox(layout::Context*, char const*, unsigned int)
+layout::CheckBox::CheckBox(layout::Window*, ResId const&)
+layout::CheckBox::CheckBox(layout::Window*, long)
+layout::CheckBox::IsChecked() const
+layout::ComboBox::Clear()
+layout::ComboBox::ComboBox(layout::Context*, char const*, unsigned int)
+layout::ComboBox::ComboBox(layout::Window*, ResId const&)
+layout::ComboBox::ComboBox(layout::Window*, long)
+layout::ComboBox::EnableAutocomplete(bool, bool)
+layout::ComboBox::GetEntry(unsigned short) const
+layout::ComboBox::GetEntryCount() const
+layout::ComboBox::InsertEntry(String const&, unsigned short)
+layout::ComboBox::RemoveEntry(String const&)
+layout::ComboBox::RemoveEntry(unsigned short)
+layout::ComboBox::SetClickHdl(Link const&)
+layout::ComboBox::SetSelectHdl(Link const&)
+layout::Container::Add(layout::Container*)
+layout::Container::Add(layout::Window*)
+layout::Container::Clear()
+layout::Container::Hide()
+layout::Container::Remove(layout::Container*)
+layout::Container::Remove(layout::Window*)
+layout::Container::Show()
+layout::Context::getRoot()
+layout::Context::getToplevel()
+layout::Context::setToplevel(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+layout::Control::GetGetFocusHdl()
+layout::Control::GetLoseFocusHdl()
+layout::Dialog::Close()
+layout::Dialog::Dialog(layout::Window*, char const*, char const*, unsigned int)
+layout::Dialog::Initialize(SfxChildWinInfo*)
+layout::Dialog::Notify(NotifyEvent&)
+layout::Dialog::SetText(rtl::OUString const&)
+layout::Edit::Edit(layout::Context*, char const*, unsigned int)
+layout::Edit::Edit(layout::Window*, ResId const&)
+layout::Edit::Edit(layout::Window*, long)
+layout::Edit::GetText() const
+layout::Edit::SetSelection(Selection const&)
+layout::Edit::SetText(rtl::OUString const&)
+layout::ErrorBox::ErrorBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::ErrorBox::ErrorBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::ErrorBox::ErrorBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::ErrorBox::ErrorBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::FixedImage::FixedImage(layout::Window*, ResId const&)
+layout::FixedImage::FixedImage(layout::Window*, long)
+layout::FixedImage::setImage(Image const&)
+layout::FixedInfo::FixedInfo(layout::Context*, char const*, unsigned int)
+layout::FixedInfo::FixedInfo(layout::Window*, ResId const&)
+layout::FixedInfo::FixedInfo(layout::Window*, long)
+layout::FixedLine::FixedLine(layout::Context*, char const*, unsigned int)
+layout::FixedLine::FixedLine(layout::Window*, ResId const&)
+layout::FixedLine::FixedLine(layout::Window*, long)
+layout::FixedLine::IsEnabled() const
+layout::FixedText::FixedText(layout::Window*, ResId const&)
+layout::FixedText::FixedText(layout::Window*, long)
+layout::HBox::HBox(int, bool)
+layout::HBox::HBox(layout::Context const*, char const*)
+layout::HelpButton::HelpButton(layout::Window*, ResId const&)
+layout::HelpButton::HelpButton(layout::Window*, long)
+layout::IgnoreButton::IgnoreButton(layout::Window*, ResId const&)
+layout::IgnoreButton::IgnoreButton(layout::Window*, long)
+layout::Image::Image(char const*)
+layout::Image::~Image()
+layout::ImageButton::ImageButton(layout::Context*, char const*, unsigned int)
+layout::ImageButton::ImageButton(layout::Window*, ResId const&)
+layout::ImageButton::ImageButton(layout::Window*, long)
+layout::InPlug::InPlug(Window*, char const*, char const*, unsigned int)
+layout::InPlug::InPlug(layout::Window*, char const*, char const*, unsigned int)
+layout::InfoBox::InfoBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::InfoBox::InfoBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::InfoBox::InfoBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::InfoBox::InfoBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::ListBox::Clear()
+layout::ListBox::GetClickHdl()
+layout::ListBox::GetDoubleClickHdl()
+layout::ListBox::GetEntryCount() const
+layout::ListBox::GetEntryData(unsigned short) const
+layout::ListBox::GetSelectEntry(unsigned short) const
+layout::ListBox::GetSelectEntryCount() const
+layout::ListBox::GetSelectHdl()
+layout::ListBox::InsertEntry(String const&, unsigned short)
+layout::ListBox::ListBox(layout::Context*, char const*, unsigned int)
+layout::ListBox::ListBox(layout::Window*, ResId const&)
+layout::ListBox::ListBox(layout::Window*, long)
+layout::ListBox::RemoveEntry(String const&)
+layout::ListBox::RemoveEntry(unsigned short)
+layout::ListBox::SelectEntry(String const&, bool)
+layout::ListBox::SetClickHdl(Link const&)
+layout::ListBox::SetDoubleClickHdl(Link const&)
+layout::ListBox::SetEntryData(unsigned short, void*)
+layout::ListBox::SetSelectHdl(Link const&)
+layout::LocalizedString::GetToken(unsigned short, char)
+layout::LocalizedString::LocalizedString(layout::Context*, char const*)
+layout::MetricField::MetricField(layout::Context*, char const*, unsigned int)
+layout::MetricField::MetricField(layout::Window*, long)
+layout::MetricFormatter::GetValue(FieldUnit) const
+layout::MetricFormatter::SetFirst(long, FieldUnit)
+layout::MetricFormatter::SetLast(long, FieldUnit)
+layout::MetricFormatter::SetMax(long, FieldUnit)
+layout::MetricFormatter::SetMin(long, FieldUnit)
+layout::MetricFormatter::SetSpinSize(long)
+layout::MetricFormatter::SetValue(long, FieldUnit)
+layout::MoreButton::AddWindow(layout::Window*)
+layout::MoreButton::GetLessText() const
+layout::MoreButton::GetMoreText() const
+layout::MoreButton::MoreButton(layout::Context*, char const*, unsigned int)
+layout::MoreButton::MoreButton(layout::Window*, ResId const&)
+layout::MoreButton::MoreButton(layout::Window*, long)
+layout::MoreButton::RemoveWindow(layout::Window*)
+layout::MoreButton::SetLessText(rtl::OUString const&)
+layout::MoreButton::SetMoreText(rtl::OUString const&)
+layout::MultiLineEdit::MultiLineEdit(layout::Context*, char const*, unsigned int)
+layout::MultiLineEdit::MultiLineEdit(layout::Window*, ResId const&)
+layout::MultiLineEdit::MultiLineEdit(layout::Window*, long)
+layout::MultiListBox::MultiListBox(layout::Context*, char const*, unsigned int)
+layout::MultiListBox::MultiListBox(layout::Window*, ResId const&)
+layout::MultiListBox::MultiListBox(layout::Window*, long)
+layout::NoButton::NoButton(layout::Window*, ResId const&)
+layout::NoButton::NoButton(layout::Window*, long)
+layout::NumericField::NumericField(layout::Context*, char const*, unsigned int)
+layout::NumericField::NumericField(layout::Window*, long)
+layout::NumericFormatter::GetValue() const
+layout::NumericFormatter::SetFirst(long)
+layout::NumericFormatter::SetLast(long)
+layout::NumericFormatter::SetMax(long)
+layout::NumericFormatter::SetMin(long)
+layout::NumericFormatter::SetSpinSize(long)
+layout::NumericFormatter::SetValue(long)
+layout::OKButton::OKButton(layout::Context*, char const*, unsigned int)
+layout::OKButton::OKButton(layout::Window*, ResId const&)
+layout::OKButton::OKButton(layout::Window*, long)
+layout::Plugin::Plugin(layout::Context*, char const*, Control*)
+layout::ProgressBar::GetValue()
+layout::ProgressBar::ProgressBar(layout::Context*, char const*, unsigned int)
+layout::ProgressBar::ProgressBar(layout::Window*, ResId const&)
+layout::ProgressBar::ProgressBar(layout::Window*, long)
+layout::ProgressBar::SetBackgroundColor(int)
+layout::ProgressBar::SetForegroundColor(int)
+layout::ProgressBar::SetRange(int, int)
+layout::ProgressBar::SetValue(int)
+layout::PushButton::IsChecked() const
+layout::PushButton::PushButton(layout::Context*, char const*, unsigned int)
+layout::PushButton::PushButton(layout::Window*, ResId const&)
+layout::PushButton::PushButton(layout::Window*, long)
+layout::PushButton::Toggle()
+layout::QueryBox::QueryBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::QueryBox::QueryBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::QueryBox::QueryBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::QueryBox::QueryBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::RadioButton::Check(bool)
+layout::RadioButton::GetVCLXRadioButton() const
+layout::RadioButton::IsChecked() const
+layout::RadioButton::RadioButton(layout::Context*, char const*, unsigned int)
+layout::RadioButton::RadioButton(layout::Window*, ResId const&)
+layout::RadioButton::RadioButton(layout::Window*, long)
+layout::ResetButton::ResetButton(layout::Context*, char const*, unsigned int)
+layout::ResetButton::ResetButton(layout::Window*, ResId const&)
+layout::ResetButton::ResetButton(layout::Window*, long)
+layout::RetryButton::RetryButton(layout::Window*, ResId const&)
+layout::RetryButton::RetryButton(layout::Window*, long)
+layout::SpinField::SpinField(layout::Context*, char const*, unsigned int)
+layout::SpinField::SpinField(layout::Window*, ResId const&)
+layout::SpinField::SpinField(layout::Window*, long)
+layout::TabControl::GetActivatePageHdl() const
+layout::TabControl::GetCurPageId() const
+layout::TabControl::GetDeactivatePageHdl() const
+layout::TabControl::GetPageCount() const
+layout::TabControl::GetPageId(unsigned short) const
+layout::TabControl::GetPagePos(unsigned short) const
+layout::TabControl::GetTabPage(unsigned short) const
+layout::TabControl::GetTabPageSizePixel() const
+layout::TabControl::GetVCLXTabControl() const
+layout::TabControl::InsertPage(unsigned short, rtl::OUString const&, unsigned short)
+layout::TabControl::RemovePage(unsigned short)
+layout::TabControl::SetTabPage(unsigned short, TabPage*)
+layout::TabControl::SetTabPageSizePixel(Size const&)
+layout::TabControl::TabControl(layout::Context*, char const*, unsigned int)
+layout::TabControl::TabControl(layout::Window*, ResId const&)
+layout::TabControl::TabControl(layout::Window*, long)
+layout::TabPage::TabPage(Window*, char const*, char const*, unsigned int)
+layout::TabPage::TabPage(layout::Window*, char const*, char const*, unsigned int)
+layout::Table::Add(layout::Container*, bool, bool, int, int)
+layout::Table::Add(layout::Window*, bool, bool, int, int)
+layout::Table::Table(int, int)
+layout::Table::Table(layout::Context const*, char const*)
+layout::VBox::VBox(int, bool)
+layout::VBox::VBox(layout::Context const*, char const*)
+layout::WarningBox::WarningBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::WarningBox::WarningBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::WarningBox::WarningBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::WarningBox::WarningBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::Window::Enable(bool)
+layout::Window::EnableInput(bool, bool)
+layout::Window::EnterWait()
+layout::Window::GetCtrlTextWidth(rtl::OUString const&) const
+layout::Window::GetFont() const
+layout::Window::GetHelpId() const
+layout::Window::GetPointer() const
+layout::Window::GetPosPixel() const
+layout::Window::GetSizePixel() const
+layout::Window::GetStyle()
+layout::Window::GetText() const
+layout::Window::GetTextHeight() const
+layout::Window::GrabFocus()
+layout::Window::HasChildPathFocus(bool) const
+layout::Window::HasFocus() const
+layout::Window::IsEnabled() const
+layout::Window::IsInputEnabled() const
+layout::Window::IsVisible() const
+layout::Window::IsWait() const
+layout::Window::LeaveWait()
+layout::Window::LogicToPixel(Size const&, MapMode const&) const
+layout::Window::SetFont(Font const&)
+layout::Window::SetPointer(Pointer const&)
+layout::Window::SetPosPixel(Point const&)
+layout::Window::SetPosSizePixel(Point const&, Size const&)
+layout::Window::SetSizePixel(Size const&)
+layout::Window::SetStyle(long)
+layout::Window::SetUpdateMode(bool)
+layout::YesButton::YesButton(layout::Window*, ResId const&)
+layout::YesButton::YesButton(layout::Window*, long)
+layoutimpl::LayoutRoot::addItem(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
+layoutimpl::VCLXTabControl::AddChild(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
+layoutimpl::WidgetFactory::sfx2CreateWindow(VCLXWindow**, Window*, rtl::OUString const&, long&)
+layoutimpl::getParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
+layoutimpl::prophlp::getProperty(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, rtl::OUString const&)
+libvisio::VSDXOutputElementList::addEndLayer()
+libvisio::VSDXOutputElementList::addStartLayer(WPXPropertyList const&)
+libvisio::VSDXOutputElementList::clear()
+libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&)
+libwpg::WPGDashArray::at(unsigned int) const
+libwpg::WPGDashArray::count() const
+libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat)
+libwpg::WPGraphics::parse(unsigned char const*, unsigned long, libwpg::WPGPaintInterface*, libwpg::WPGFileFormat)
+linguistic::GetLinguisticPaths(short)
+linguistic::GetTextEncoding(short)
+linguistic::IsLower(String const&, unsigned short, unsigned short, short)
+linguistic::LangSeqToLocaleSeq(com::sun::star::uno::Sequence<short> const&)
+linguistic::MergeProposals(com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives>&, com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives>&)
+linguistic::SearchFileInPaths(String const&, com::sun::star::uno::Sequence<rtl::OUString> const&)
+linguistic::SpellAlternatives::SpellAlternatives(rtl::OUString const&, short, short, rtl::OUString const&)
+linguistic::StripTrailingChars(rtl::OUString&, unsigned short)
+linguistic::ThesaurusMeaning::ThesaurusMeaning(rtl::OUString const&, rtl::OUString const&, short)
+linguistic::ToLower(unsigned short, short)
+linguistic::ToTitle(String const&, short)
+linguistic::ToUpper(String const&, short)
+linguistic::ToUpper(unsigned short, short)
+migration::AutocorrectionMigration_create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
+nullcanvas::CanvasFont::getFontMatrix() const
+nullcanvas::CanvasHelper::flush() const
+nullcanvas::CanvasHelper::getPalette()
+nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
+nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
+nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
+nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
+o3tltests::cow_wrapper_client2::queryUnmodified() const
+o3tltests::cow_wrapper_client3::queryUnmodified() const
+ooo::vba::Millimeter::get()
+ooo::vba::Millimeter::getInPoints()
+ooo::vba::Millimeter::set(double)
+ooo::vba::Millimeter::setInHundredthsOfOneMillimeter(double)
+ooo::vba::createVBAUnoAPIService(SfxObjectShell*, char const*)
+ooo::vba::excel::getViewFrame(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
+ooo::vba::excel::isInPrintPreview(SfxViewFrame*)
+ooo::vba::extractBoolFromAny(com::sun::star::uno::Any const&, bool)
+ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int)
+oox::(anonymous namespace)::GenericPropertySet::GenericPropertySet()
+oox::AttributeList::getHyperHex(int, long) const
+oox::AttributeList::getUnsignedHex(int, unsigned int) const
+oox::BinaryInputStream::readNulCharArrayUC(unsigned short)
+oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
+oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
+oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
+oox::ObjectContainer::getObject(rtl::OUString const&) const
+oox::PropertyMap::getProperty(int) const
+oox::PropertySet::getProperties(com::sun::star::uno::Sequence<com::sun::star::uno::Any>&, com::sun::star::uno::Sequence<rtl::OUString> const&) const
+oox::RelativeInputStream::RelativeInputStream(oox::BinaryInputStream&, long)
+oox::StorageBase::isRootStorage() const
+oox::TextInputStream::TextInputStream(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, unsigned short)
+oox::TextInputStream::readToChar(unsigned short, bool)
+oox::core::ContextHandler2Helper::getCurrentElementWithMce() const
+oox::core::FilterBase::getComponentFactory() const
+oox::core::FilterBase::getInteractionHandler() const
+oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
+oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
+oox::core::Relations::getExternalTargetFromFirstType(rtl::OUString const&) const
+oox::drawingml::ChartExport::GetXmlNamespace() const
+oox::drawingml::ChartExport::SetXmlNamespace(int)
+oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
+oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
+oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
+oox::drawingml::ColorPropertySet::getColor()
+oox::drawingml::ColorPropertySet::setColor(int)
+oox::drawingml::CustomShapeProperties::apply(boost::shared_ptr<oox::drawingml::CustomShapeProperties> const&)
+oox::drawingml::CustomShapeProperties::getValue(std::vector<oox::drawingml::CustomShapeGuide, std::allocator<oox::drawingml::CustomShapeGuide> > const&, unsigned int) const
+oox::drawingml::Diagram::getLayoutId() const
+oox::drawingml::GetPoint2D(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&)
+oox::drawingml::GetTextMargin(rtl::OUString const&)
+oox::drawingml::GetTextVerticalAdjust(int)
+oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
+oox::drawingml::ShapeExport::GetXmlNamespace() const
+oox::drawingml::ShapeExport::SetXmlNamespace(int)
+oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
+oox::drawingml::Theme::getEffectStyle(int) const
+oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&)
+oox::drawingml::chart::ObjectFormatter::convertAutomaticLine(oox::PropertySet&, oox::drawingml::chart::ObjectType, int)
+oox::drawingml::chart::ObjectFormatter::isAutomaticLine(oox::drawingml::chart::ModelRef<oox::drawingml::Shape> const&)
+oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&)
+oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::chart2::data::XLabeledDataSequence> > const&, rtl::OUString const&)
+oox::drawingml::lcl_getValueFromSequence(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
+oox::drawingml::table::TableProperties::apply(boost::shared_ptr<oox::drawingml::table::TableProperties> const&)
+oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
+oox::ole::VbaProject::hasDialog(rtl::OUString const&) const
+oox::ole::VbaProject::hasDialogs() const
+oox::ole::VbaProject::hasModule(rtl::OUString const&) const
+oox::ole::VbaProject::hasModules() const
+oox::ole::VbaSiteModel::isVisible() const
+oox::ppt::PPTShape::findPlaceholder(int, int, std::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&)
+oox::ppt::lclDebugSubType(int)
+oox::vml::(anonymous namespace)::lclInsertTextFrame(oox::core::XmlFilterBase const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&)
+oox::vml::(anonymous namespace)::lclSetXShapeRect(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::awt::Rectangle const&)
+oox::xls::(anonymous namespace)::lclCalcEmu(oox::xls::UnitConverter const&, long, oox::xls::Unit)
+oox::xls::(anonymous namespace)::lclGetBuiltInStyleName(rtl::OUString const&)
+oox::xls::(anonymous namespace)::lclGetBuiltinStyleId(int&, int&, rtl::OUString const&)
+oox::xls::(anonymous namespace)::lclGetThickerLine(com::sun::star::table::BorderLine2 const&, unsigned char, com::sun::star::table::BorderLine2 const&, unsigned char)
+oox::xls::AddressConverter::checkCellRangeList(oox::xls::ApiCellRangeList const&, bool, bool)
+oox::xls::ApiTokenIterator::ApiTokenIterator(oox::xls::ApiTokenIterator const&, bool)
+oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> const&)
+oox::xls::BiffDrawingBase::setSkipObj(unsigned short)
+oox::xls::BiffDrawingObjectBase::importObjBiff8(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
+oox::xls::BiffHelper::calcCodePageFromTextEncoding(unsigned short)
+oox::xls::BiffHelper::calcRkFromDouble(int&, double)
+oox::xls::BiffInputStream::resetRecord(bool, unsigned short)
+oox::xls::BiffInputStream::sizeBase() const
+oox::xls::BiffInputStream::skipByteString(bool)
+oox::xls::BiffInputStream::skipUniString()
+oox::xls::BiffObjLineModel::isVisible() const
+oox::xls::BiffObjTextModel::BiffObjTextModel()
+oox::xls::BiffObjTextModel::getHorAlign() const
+oox::xls::BiffObjTextModel::getVerAlign() const
+oox::xls::BiffObjTextModel::readObj3(oox::xls::BiffInputStream&)
+oox::xls::BiffObjTextModel::readObj5(oox::xls::BiffInputStream&)
+oox::xls::BiffObjTextModel::readTxo8(oox::xls::BiffInputStream&)
+oox::xls::BiffOutputStream::BiffOutputStream(oox::BinaryOutputStream&, unsigned short)
+oox::xls::BiffOutputStream::endRecord()
+oox::xls::BiffOutputStream::fill(unsigned char, int, unsigned long)
+oox::xls::BiffOutputStream::sizeBase() const
+oox::xls::BiffOutputStream::startRecord(unsigned short)
+oox::xls::BiffOutputStream::tellBase() const
+oox::xls::BinAddress::write(oox::xls::BiffOutputStream&, bool, bool) const
+oox::xls::BinRange::contains(oox::xls::BinAddress const&) const
+oox::xls::BinRangeList::getEnclosingRange() const
+oox::xls::BinRangeList::write(oox::xls::BiffOutputStream&, bool, bool) const
+oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
+oox::xls::CellBlock::contains(int) const
+oox::xls::CellBlock::isBefore(oox::ValueRange const&) const
+oox::xls::CellBlock::isExpandable(oox::ValueRange const&) const
+oox::xls::CellBlock::startNextRow()
+oox::xls::Color::importColorRgb(oox::SequenceInputStream&)
+oox::xls::Comment::importAnchor(bool, int, rtl::OUString const&)
+oox::xls::Dxf::importAlignment(oox::AttributeList const&)
+oox::xls::Dxf::importProtection(oox::AttributeList const&)
+oox::xls::ExternalLinkBuffer::importExternalName(oox::xls::BiffInputStream&)
+oox::xls::FormulaParser::convertNumberToHyperlink(rtl::OUString const&, double) const
+oox::xls::FormulaParser::importOleTargetLink(oox::xls::BiffInputStream&, unsigned short const*) const
+oox::xls::FormulaParserImpl::getOperandSize(unsigned long, unsigned long) const
+oox::xls::FormulaParserImpl::pushParenthesesOperand()
+oox::xls::FormulaParserImpl::removeLastOperands(unsigned long)
+oox::xls::FormulaProcessorBase::extractCellAddress(com::sun::star::table::CellAddress&, com::sun::star::uno::Sequence<com::sun::star::sheet::FormulaToken> const&, bool) const
+oox::xls::FormulaProcessorBase::generateApiAddressString(com::sun::star::table::CellAddress const&) const
+oox::xls::FunctionParamInfoIterator::getParamInfo() const
+oox::xls::FunctionProvider::getFuncInfoFromOdfFuncName(rtl::OUString const&) const
+oox::xls::OOXMLFormulaPrinterImpl::OOXMLFormulaPrinterImpl(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+oox::xls::SheetDataBuffer::XfIdRange::set(com::sun::star::table::CellAddress const&, int, int)
+oox::xls::SheetDataBuffer::XfIdRange::tryExpand(com::sun::star::table::CellAddress const&, int, int)
+oox::xls::SheetDataBuffer::XfIdRange::tryMerge(oox::xls::SheetDataBuffer::XfIdRange const&)
+oox::xls::SheetDataBuffer::XfIdRowRange::intersects(com::sun::star::table::CellRangeAddress const&) const
+oox::xls::StylesBuffer::getDxf(int) const
+oox::xls::StylesBuffer::writeStyleXfToPropertyMap(oox::PropertyMap&, int) const
+oox::xls::UnitConverter::calcOoxErrorCode(unsigned char) const
+oox::xls::WorkbookHelper::createDatabaseRangeObject(rtl::OUString&, com::sun::star::table::CellRangeAddress const&) const
+oox::xls::WorkbookHelper::getBiffFilter() const
+oox::xls::WorkbookHelper::setTextEncoding(unsigned short)
+oox::xls::WorksheetHelper::getCellAddress(com::sun::star::uno::Reference<com::sun::star::table::XCell> const&)
+oox::xls::WorksheetHelper::getColumn(int) const
+oox::xls::WorksheetHelper::getColumns(oox::ValueRange const&) const
+oox::xls::WorksheetHelper::getRangeAddress(com::sun::star::uno::Reference<com::sun::star::table::XCellRange> const&)
+oox::xls::WorksheetHelper::getRow(int) const
+oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const
+oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const
+oox::xls::Xf::hasAnyUsedFlags() const
+osl_test_file::oldtestfile::test_file_003()
+pdfi::DrawXmlEmitter::GetBreakIterator()
+pdfi::PDFIProcessor::sortDocument(bool)
+pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
+pdfparse::PDFReader::read(char const*, unsigned int)
+psp::ConverterFactory::~ConverterFactory()
+psp::GetCommandLineTokenCount(rtl::OString const&)
+psp::GlyphSet::GlyphSet()
+psp::GlyphSet::SetFont(int, unsigned char)
+psp::PPDContext::getUnconstrainedValues(psp::PPDKey const*, std::list<psp::PPDValue const*, std::allocator<psp::PPDValue const*> >&)
+psp::PPDParser::getDefaultDuplexType() const
+psp::PPDParser::getDuplex(int) const
+psp::PPDParser::getDuplexCommand(String const&) const
+psp::PPDParser::getDuplexCommand(int) const
+psp::PPDParser::getFontAttributes(String const&, String&, String&) const
+psp::PPDParser::getPaperDimension(int) const
+psp::PPDParser::getPaperDimensionCommand(String const&) const
+psp::PPDParser::getPaperDimensionCommand(int) const
+psp::PPDParser::getResolution(int, int&, int&) const
+psp::PPDParser::getResolutionCommand(int, int) const
+psp::PPDParser::getResolutions() const
+psp::PPDParser::getSlot(int) const
+psp::PPDParser::getSlotCommand(String const&) const
+psp::PPDParser::getSlotCommand(int) const
+psp::PPDParser::translateValue(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::lang::Locale const&) const
+psp::PrintFontManager::getFontFamilyType(int) const
+psp::PrintFontManager::getFontLeading(int) const
+psp::PrintFontManager::getFontListWithInfo(std::list<psp::PrintFontInfo, std::allocator<psp::PrintFontInfo> >&, psp::PPDParser const*, bool)
+psp::PrintFontManager::getGlobalFontMetric(int, bool) const
+psp::PrintFontManager::hasVerticalSubstitutions(int) const
+psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
+psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
+psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&)
+psp::PrinterGfx::GetGlyphOutline(unsigned short, unsigned short**, Point**, unsigned char**)
+psp::PrinterGfx::GetResolution(int&, int&) const
+psp::PrinterGfx::PSRMoveTo(int, int)
+psp::PrinterGfx::SetFallbackFont(int)
+psp::PrinterJob::GetDocumentHeader()
+psp::PrinterJob::GetDocumentTrailer()
+psp::PrinterJob::GetErrorCode()
+psp::appendStr(char const*, char*, int)
+psp::existsTmpDir(char const*)
+pyuno::Runtime::finalize()
+pyuno::importToGlobal(_object*, _object*, _object*)
+rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*)
+rptui::OFieldExpressionControl::LinkStubAsynchDeactivate(void*, void*)
+rptui::OReportController::LinkStubOnInvalidateClipboard(void*, void*)
+rtl_cipher::createHex(unsigned char*, unsigned int)
+salhelper::ORealDynamicLoader::acquire()
+salhelper::ORealDynamicLoader::getApi() const
+salhelper::ORealDynamicLoader::newInstance(salhelper::ORealDynamicLoader**, rtl::OUString const&, rtl::OUString const&)
+salhelper::ORealDynamicLoader::release()
+salhelper::Timer::addTime(salhelper::TTimeValue const&)
+salhelper::Timer::setAbsoluteTime(salhelper::TTimeValue const&)
+salhelper::Timer::setRemainingTime(salhelper::TTimeValue const&, salhelper::TTimeValue const&)
+sax::Converter::clearUndefinedChars(rtl::OUString&, rtl::OUString const&)
+sax::Converter::convertDouble(double&, rtl::OUString const&, short)
+sax::Converter::convertDouble(rtl::OUStringBuffer&, double, bool, short, short)
+sax::Converter::convertDuration(double&, rtl::OUString const&)
+sax::Converter::convertDuration(rtl::OUStringBuffer&, double)
+sax::Converter::convertMeasure(rtl::OUStringBuffer&, int, short, short)
+sax::Converter::convertMeasurePx(int&, rtl::OUString const&)
+sax::Converter::convertMeasurePx(rtl::OUStringBuffer&, int)
+sax::Converter::convertPercent(int&, rtl::OUString const&)
+sax::Converter::convertPercent(rtl::OUStringBuffer&, int)
+sax::Converter::decodeBase64(com::sun::star::uno::Sequence<signed char>&, rtl::OUString const&)
+sax::Converter::encodeBase64(rtl::OUStringBuffer&, com::sun::star::uno::Sequence<signed char> const&)
+sax::Converter::indexOfComma(rtl::OUString const&, int)
+sax_fastparser::FastSaxSerializer::getImplementationName_Static()
+sax_fastparser::FastSerializerHelper::endElement(char const*)
+sax_fastparser::FastSerializerHelper::singleElement(char const*, ...)
+sax_fastparser::FastSerializerHelper::singleElement(char const*, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList>)
+sax_fastparser::FastSerializerHelper::startElement(char const*, ...)
+sax_fastparser::FastSerializerHelper::write(float)
+sd::CopyDlg::LinkStubReset(void*, void*)
+sd::FuText::LinkStubSpellError(void*, void*)
+sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
+sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
+sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
+sd::UpdateLockManager::IsLocked() const
+sd::UpdateLockManager::Lock()
+sd::UpdateLockManager::Unlock()
+sd::View::LockRedraw(unsigned char)
+sd::ViewShellBase::RegisterFactory(unsigned short)
+sd::framework::ConfigurationClassifier::GetC1andC2() const
+sd::framework::ConfigurationClassifier::TraceResourceIdVector(char const*, std::vector<com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>, std::allocator<com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> > > const&) const
+sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfiguration> const&, char const*)
+sd::slidesorter::cache::BitmapCache::CacheEntry::HasMarkedPreview() const
+sd::slidesorter::cache::PageCache::ReleasePreviewBitmap(SdrPage const*)
+sd::slidesorter::controller::AnimationBezierFunction::AnimationBezierFunction(double, double, double, double)
+sd::slidesorter::controller::AnimationFunction::ApplyLocationOffsetChange(boost::shared_ptr<sd::slidesorter::model::PageDescriptor> const&, sd::slidesorter::view::SlideSorterView&, Point)
+sd::slidesorter::controller::AnimationFunction::ApplyVisualStateChange(boost::shared_ptr<sd::slidesorter::model::PageDescriptor> const&, sd::slidesorter::view::SlideSorterView&, double)
+sd::slidesorter::controller::AnimationFunction::FastInSlowOut_Root(double)
+sd::slidesorter::controller::AnimationFunction::FastInSlowOut_Sine(double)
+sd::slidesorter::controller::AnimationFunction::ScalePoint(Point const&, double)
+sd::slidesorter::controller::AnimationFunction::SlowInSlowOut_0to0_Sine(double)
+sd::slidesorter::controller::AnimationFunction::Vibrate_Sine(double)
+sd::slidesorter::controller::Animator::AddInfiniteAnimation(boost::function1<void, double> const&, double)
+sd::slidesorter::controller::Clipboard::SelectPages()
+sd::slidesorter::controller::DragAndDropContext::GetPagesFromBookmarks(std::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::DrawDocShell*, List const&) const
+sd::slidesorter::controller::DragAndDropContext::GetPagesFromSelection(std::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::slidesorter::model::PageEnumeration&) const
+sd::slidesorter::controller::FocusManager::SetFocusToToolBox()
+sd::slidesorter::controller::PageSelector::DeselectPage(SdPage const*, bool)
+sd::slidesorter::controller::Properties::SetOnlyPreviewTriggersMouseOver(bool)
+sd::slidesorter::controller::ScrollBarManager::GetLeft() const
+sd::slidesorter::controller::ScrollBarManager::GetTop() const
+sd::slidesorter::controller::SelectionCommand::AddSlide(unsigned short)
+sd::slidesorter::controller::SelectionCommand::SelectionCommand(sd::slidesorter::controller::PageSelector&, boost::shared_ptr<sd::slidesorter::controller::CurrentSlideManager> const&, sd::slidesorter::model::SlideSorterModel const&)
+sd::slidesorter::controller::SelectionFunction::EventDescriptor::SetDragMode(sd::slidesorter::controller::InsertionIndicatorHandler::Mode)
+sd::slidesorter::controller::SelectionFunction::ProcessKeyEvent(KeyEvent const&)
+sd::slidesorter::controller::SlideSorterController::IsContextMenuOpen() const
+sd::slidesorter::controller::SlotManager::ExecuteCommandAsynchronously(std::auto_ptr<sd::slidesorter::controller::Command>)
+sd::slidesorter::model::VisualState::GetCurrentVisualState() const
+sd::slidesorter::model::VisualState::GetLocationAnimationId() const
+sd::slidesorter::model::VisualState::GetOldVisualState() const
+sd::slidesorter::model::VisualState::GetStateAnimationId() const
+sd::slidesorter::model::VisualState::GetVisualStateBlend() const
+sd::slidesorter::model::VisualState::SetLocationAnimationId(int)
+sd::slidesorter::model::VisualState::SetStateAnimationId(int)
+sd::slidesorter::view::(anonymous namespace)::Blend(unsigned char, unsigned char, double)
+sd::slidesorter::view::(anonymous namespace)::CalculateColorChannel(double, double, double, double, double)
+sd::slidesorter::view::(anonymous namespace)::PageObjectRun::GetInnerBoundingBox(sd::slidesorter::view::Layouter const&, int) const
+sd::slidesorter::view::(anonymous namespace)::RectangleBackgroundTheme::RectangleBackgroundTheme(boost::shared_ptr<sd::slidesorter::view::Theme> const&, std::vector<boost::shared_ptr<sd::slidesorter::view::Button>, std::allocator<boost::shared_ptr<sd::slidesorter::view::Button> > > const&)
+sd::slidesorter::view::Button::GetIconSize() const
+sd::slidesorter::view::Button::GetState() const
+sd::slidesorter::view::ButtonBar::GetButton(bool, int) const
+sd::slidesorter::view::ButtonBar::GetButtonCount(bool) const
+sd::slidesorter::view::ButtonBar::RequestLayout()
+sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
+sd::slidesorter::view::HorizontalImplementation::HorizontalImplementation(boost::shared_ptr<sd::Window> const&, boost::shared_ptr<sd::slidesorter::view::Theme> const&)
+sd::slidesorter::view::InsertionIndicatorOverlay::SelectRepresentatives(sd::slidesorter::model::PageEnumeration&, std::vector<boost::shared_ptr<sd::slidesorter::model::PageDescriptor>, std::allocator<boost::shared_ptr<sd::slidesorter::model::PageDescriptor> > >&) const
+sd::slidesorter::view::LayeredDevice::HasPainter(int)
+sd::slidesorter::view::Layouter::GetColumn(int) const
+sd::slidesorter::view::Layouter::GetRow(int) const
+sd::slidesorter::view::Layouter::GetRowCount() const
+sd::slidesorter::view::Layouter::SetBorders(int, int, int, int)
+sd::slidesorter::view::Layouter::_SetZoom(double)
+sd::slidesorter::view::SlideSorterView::DrawLock::DrawLock(sd::slidesorter::view::SlideSorterView&, boost::shared_ptr<sd::Window> const&)
+sd::slidesorter::view::SlideSorterView::LocalModelHasChanged()
+sd::slidesorter::view::TextButton::TextButton(sd::slidesorter::SlideSorter&, rtl::OUString const&, rtl::OUString const&)
+sd::slidesorter::view::Theme::GetGradientBrightnessOverride(sd::slidesorter::view::Theme::GradientColorType)
+sd::slidesorter::view::Theme::GetGradientOffset(sd::slidesorter::view::Theme::GradientColorType, sd::slidesorter::view::Theme::GradientColorClass)
+sd::slidesorter::view::Theme::GetGradientSaturationOverride(sd::slidesorter::view::Theme::GradientColorType)
+sd::slidesorter::view::Theme::SetColor(sd::slidesorter::view::Theme::ColorType, unsigned int)
+sd::slidesorter::view::Theme::SetGradientBrightnessOverride(sd::slidesorter::view::Theme::GradientColorType, int)
+sd::slidesorter::view::Theme::SetGradientSaturationOverride(sd::slidesorter::view::Theme::GradientColorType, int)
+sd::slidesorter::view::Theme::SetIntegerValue(sd::slidesorter::view::Theme::IntegerValueType, int)
+sd::slidesorter::view::ToolTip::ShowDefaultHelpText(rtl::OUString const&)
+sd::slidesorter::view::VerticalImplementation::VerticalImplementation(boost::shared_ptr<sd::Window> const&, boost::shared_ptr<sd::slidesorter::view::Theme> const&)
+sdext::presenter::(anonymous namespace)::Element::SetEnabledState(bool)
+sdext::presenter::(anonymous namespace)::ModeChangeAnimationStarter::ModeChangeAnimationStarter(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas> const&, boost::shared_ptr<sdext::presenter::PresenterAnimator> const&)
+sdext::presenter::(anonymous namespace)::ProgressLabel::ProgressLabel(rtl::Reference<sdext::presenter::PresenterToolBar> const&)
+sdext::presenter::CreateMoveInFromBottomAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
+sdext::presenter::CreateTransparentOverlay(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
+sdext::presenter::CreateUnfoldInCenterAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
+sdext::presenter::PresenterAccessible::IsAccessibilityActive() const
+sdext::presenter::PresenterAnimation::AddStartCallback(boost::function<void ()> const&)
+sdext::presenter::PresenterClockTimer::GetTimeDifference(_oslDateTime const&, _oslDateTime const&)
+sdext::presenter::PresenterConfigurationAccess::FillList(com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> const&, rtl::OUString const&, std::vector<rtl::OUString, std::allocator<rtl::OUString> >&)
+sdext::presenter::PresenterConfigurationAccess::GetNodeProperties(rtl::OUString const&)
+sdext::presenter::PresenterConfigurationAccess::GetValue(rtl::OUString const&)
+sdext::presenter::PresenterController::GetAccessible() const
+sdext::presenter::PresenterController::IsViewVisible(rtl::OUString const&) const
+sdext::presenter::PresenterFrameworkObserver::False()
+sdext::presenter::PresenterFrameworkObserver::RunOnResourceActivation(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> const&, com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, boost::function<void (bool)> const&)
+sdext::presenter::PresenterHorizontalScrollBar::PresenterHorizontalScrollBar(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, boost::shared_ptr<sdext::presenter::PresenterPaintManager> const&, boost::function<void (double)> const&)
+sdext::presenter::PresenterPaneBase::GetTextViewForTitle()
+sdext::presenter::PresenterPaneBorderPainter::HasTheme() const
+sdext::presenter::PresenterScrollBar::GetTotalSize() const
+sdext::presenter::PresenterSprite::GetAlpha() const
+sdext::presenter::PresenterSprite::GetPriority() const
+sdext::presenter::PresenterSprite::GetTransform() const
+sdext::presenter::PresenterSprite::IsVisible() const
+sdext::presenter::PresenterTextParagraph::GetCharacterOffset() const
+sdext::presenter::PresenterTextParagraph::GetParagraphIndex() const
+sdext::presenter::PresenterTextParagraph::Line::GetLength() const
+sdext::presenter::PresenterTextView::GetCharacterOffset(int) const
+sdext::presenter::PresenterTheme::FontDescriptor::FontDescriptor()
+sdext::presenter::PresenterTheme::GetThemeName() const
+sdext::presenter::PresenterTheme::disposing()
+sdext::presenter::PresenterTimer::ScheduleSingleTaskRelative(boost::function<void (TimeValue const&)> const&, long)
+sdext::presenter::PresenterToolBar::GetSize()
+sdext::presenter::PresenterToolBar::GetWindow() const
+sdext::presenter::PresenterToolBarView::ThrowIfDisposed() const
+sdext::presenter::PresenterWindowManager::GetLayoutMode() const
+sdext::presenter::PresenterWindowManager::IsHelpViewActive() const
+sdext::presenter::PresenterWindowManager::IsSlideSorterActive() const
+sdext::presenter::PresenterWindowManager::LayoutUnknownMode()
+sdext::presenter::PresenterWindowManager::NotifyPaneCreation(boost::shared_ptr<sdext::presenter::PresenterPaneContainer::PaneDescriptor> const&)
+sdext::presenter::PresenterWindowManager::SetPanePosSizeRelative(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, double, double, double, double)
+sdr::Comment::Comment(unsigned int, Date, rtl::OUString const&, rtl::OUString const&, basegfx::B2DPoint const&)
+sdr::Comment::SetCreationDate(Date)
+sdr::Comment::SetPosition(basegfx::B2DPoint const&)
+sdr::Comment::SetText(rtl::OUString const&)
+sdr::Comment::SetUserName(rtl::OUString const&)
+sdr::animation::Scheduler::Reset(unsigned int)
+sdr::contact::ViewContactOfE3d::impCreateFallbackLineAttribute(basegfx::BColor const&) const
+sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
+sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const
+sdr::overlay::OverlayAnimatedBitmapEx::setBitmapEx1(BitmapEx const&)
+sdr::overlay::OverlayAnimatedBitmapEx::setBitmapEx2(BitmapEx const&)
+sdr::overlay::OverlayAnimatedBitmapEx::setBlinkTime(unsigned int)
+sdr::overlay::OverlayAnimatedBitmapEx::setCenterXY1(unsigned short, unsigned short)
+sdr::overlay::OverlayAnimatedBitmapEx::setCenterXY2(unsigned short, unsigned short)
+sdr::overlay::OverlayBitmapEx::setBitmapEx(BitmapEx const&)
+sdr::overlay::OverlayBitmapEx::setCenterXY(unsigned short, unsigned short)
+sdr::overlay::OverlayHatchRect::setSecondPosition(basegfx::B2DPoint const&)
+sdr::overlay::OverlayLineStriped::setSecondPosition(basegfx::B2DPoint const&)
+sdr::overlay::OverlayManagerBuffered::SetRefreshWithPreRendering(bool)
+sdr::overlay::OverlayObjectList::remove(sdr::overlay::OverlayObject&)
+sdr::overlay::OverlayPolyPolygonStriped::setPolyPolygon(basegfx::B2DPolyPolygon const&)
+sdr::overlay::OverlayRollingRectangleStriped::setExtendedLines(bool)
+sdr::overlay::OverlayRollingRectangleStriped::setShowBounds(bool)
+sdr::overlay::OverlayTriangle::setSecondPosition(basegfx::B2DPoint const&)
+sdr::overlay::OverlayTriangle::setThirdPosition(basegfx::B2DPoint const&)
+sdr::table::CellEditSource::CellEditSource(rtl::Reference<sdr::table::Cell> const&)
+sdr::table::CellEditSource::CellEditSource(rtl::Reference<sdr::table::Cell> const&, SdrView&, Window const&)
+sdr::table::CellEditSource::ChangeModel(SdrModel*)
+sdr::table::CellEditSource::lock()
+sdr::table::CellEditSource::unlock()
+sdr::table::CellEditSourceImpl::UpdateOutliner()
+sdr::table::SdrTableObj::DeleteColumns(int, int)
+sdr::table::SdrTableObj::DeleteRows(int, int)
+sdr::table::SdrTableObj::FitFrameToTextSize()
+sdr::table::SdrTableObj::GetCellTextEditOutliner(sdr::table::CellPos const&) const
+sdr::table::SdrTableObj::InsertColumns(int, int)
+sdr::table::SdrTableObj::InsertRows(int, int)
+sdr::table::SdrTableObj::getColumnCount() const
+sdr::table::SdrTableObj::getRowCount() const
+sdr::table::SdrTableObjImpl::GetCellItem(sdr::table::CellPos const&, unsigned short) const
+sdr::table::SvxTableController::DeleteTable()
+sdr::table::SvxTableController::getSelectionCursor()
+sdr::table::TableLayouter::getColumnStart(int) const
+sdr::table::TableLayouter::getRowStart(int) const
+sdr::table::TableLayouter::setColumnWidth(int, int)
+sdr::table::TableLayouter::setRowHeight(int, int)
+sfx2::FileDialogHelper::FileDialogHelper(long, String const&, short, unsigned long, unsigned long)
+sfx2::IFrameWindow_Impl::SetBorder(unsigned char)
+sfx2::LinkManager::InsertFileLink(sfx2::SvBaseLink&)
+sfx2::ModuleTaskPane::ModuleHasToolPanels(rtl::OUString const&)
+sfx2::SvBaseLink::GetName() const
+sfx2::TaskPaneController::SetDefaultTitle(String const&)
+sfx2::TaskPaneWrapper::GetChildWindowId()
+sfx2::TitledDockingWindow::GetTitle() const
+sfx::EditWrapper::EditWrapper(Edit&)
+sfx::ItemConnectionBase::Activate(bool)
+slideshow::internal::AnimatedSprite::getPixelOffset() const
+slideshow::internal::AnimatedSprite::setPriority(double)
+slideshow::internal::DrawShapeSubsetting::DrawShapeSubsetting(boost::shared_ptr<GDIMetaFile> const&)
+slideshow::internal::EffectRewinder::skipSomeMainSequenceEffects(int)
+slideshow::internal::EventMultiplexer::addShapeCursorHandler(boost::shared_ptr<slideshow::internal::ShapeCursorEventHandler> const&)
+slideshow::internal::EventMultiplexer::removeShapeCursorHandler(boost::shared_ptr<slideshow::internal::ShapeCursorEventHandler> const&)
+slideshow::internal::EventMultiplexer::removeUserPaintHandler(boost::shared_ptr<slideshow::internal::UserPaintEventHandler> const&)
+slideshow::internal::ExpressionNodeFactory::createComposedExpression(boost::shared_ptr<slideshow::internal::ExpressionNode> const&, boost::shared_ptr<slideshow::internal::ExpressionNode> const&)
+slideshow::internal::HSLColor::HSLColor(unsigned int)
+slideshow::internal::Layer::viewChanged(boost::shared_ptr<slideshow::internal::View> const&)
+slideshow::internal::Layer::viewsChanged()
+slideshow::internal::LayerManager::removeShape(boost::shared_ptr<slideshow::internal::Shape> const&)
+slideshow::internal::SlideChangeBase::getLeavingSlideSizePixel(boost::shared_ptr<slideshow::internal::UnoView> const&) const
+slideshow::internal::UnoViewContainer::removeView(boost::shared_ptr<slideshow::internal::UnoView> const&)
+slideshow::internal::UserEventQueue::isEmpty() const
+slideshow::internal::UserEventQueue::registerDoubleClickEvent(boost::shared_ptr<slideshow::internal::Event> const&)
+slideshow::internal::UserEventQueue::registerSlideEndEvent(boost::shared_ptr<slideshow::internal::Event> const&)
+slideshow::internal::UserEventQueue::registerSlideStartEvent(boost::shared_ptr<slideshow::internal::Event> const&)
+slideshow::internal::UserPaintOverlay::update_settings(bool, slideshow::internal::RGBColor const&, double)
+slideshow::internal::getNodeType(short&, com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue> const&)
+slideshow::internal::removeTextActions(GDIMetaFile&)
+svgi::(anonymous namespace)::appendChar(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char)
+svgi::getTokenName(int)
+svt::ContextMenuHelper::create(rtl::OUString const&)
+svt::ContextMenuHelper::createAndExecute(Point const&, rtl::OUString const&)
+svt::ControlDependencyManager::enableOnCheckMark(CheckBox&, Window&, Window&, Window&)
+svt::ControlDependencyManager::enableOnCheckMark(CheckBox&, Window&, Window&, Window&, Window&, Window&)
+svt::ControlDependencyManager::enableOnCheckMark(CheckBox&, Window&, Window&, Window&, Window&, Window&, Window&)
+svt::ControlDependencyManager::enableOnRadioCheck(RadioButton&, Window&, Window&)
+svt::ControlDependencyManager::enableOnRadioCheck(RadioButton&, Window&, Window&, Window&, Window&)
+svt::ControlDependencyManager::enableOnRadioCheck(RadioButton&, Window&, Window&, Window&, Window&, Window&, Window&)
+svt::DialogClosedListener::DialogClosedListener(Link const&)
+svt::EditCellController::EditCellController(svt::MultiLineTextCell*)
+svt::EmbeddedObjectRef::GetMapUnit() const
+svt::EmbeddedObjectRef::GetPersistName() const
+svt::EmbeddedObjectRef::ObjectIsModified(com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&)
+svt::EmbeddedObjectRef::TryRunningState()
+svt::FileURLBox::FileURLBox(Window*)
+svt::FileURLBox::FileURLBox(Window*, ResId const&)
+svt::FrameStatusListener::getFrameInterface() const
+svt::FrameStatusListener::getServiceManager() const
+svt::FrameStatusListener::statusChanged(com::sun::star::frame::FeatureStateEvent const&)
+svt::HyperLabel::GetLabel()
+svt::HyperLabel::GetLogicWidth()
+svt::HyperLabel::HyperLabel(Window*, ResId const&)
+svt::OFileURLControl::OFileURLControl(Window*)
+svt::OGenericUnoDialog::getImplementationId()
+svt::ORoadmap::ORoadmap(Window*, ResId const&)
+svt::OWizardMachine::calcRightHelpOffset(unsigned int)
+svt::OWizardMachine::getTitleBase() const
+svt::OWizardPage::OWizardPage(Window*, long)
+svt::RoadmapItem::GetClickHdl() const
+svt::RoadmapItem::SetLabel(rtl::OUString const&)
+svt::RoadmapItem::SetZOrder(svt::RoadmapItem*, unsigned short)
+svt::RoadmapWizard::GetRoadmapBitmap() const
+svt::RoadmapWizard::GetRoadmapHelpId() const
+svt::RoadmapWizard::IsRoadmapInteractive()
+svt::RoadmapWizard::SetRoadmapBitmap(BitmapEx const&)
+svt::SelectableFixedText::SelectableFixedText(Window*, long)
+svt::StatusbarController::getLayoutManager() const
+svt::StatusbarController::getServiceManager() const
+svt::StatusbarController::isBound() const
+svt::StatusbarController::removeStatusListener(rtl::OUString const&)
+svt::StatusbarController::unbindListener()
+svt::StatusbarController::updateStatus()
+svt::StatusbarController::updateStatus(rtl::OUString)
+svt::TabDeckLayouter::FocusPanelItem(unsigned long)
+svt::TabDeckLayouter::GetFocusedPanelItem() const
+svt::TabDeckLayouter::GetItemScreenRect(unsigned long) const
+svt::TabDeckLayouter::IsPanelSelectorEnabled() const
+svt::TabDeckLayouter::IsPanelSelectorVisible() const
+svt::TemplateContent::TemplateContent()
+svt::TemplateContent::TemplateContent(INetURLObject const&, com::sun::star::util::DateTime const&)
+svt::table::GridTableRenderer::getCurrentRow() const
+svt::table::TableControl::GetSelectHdl() const
+svt::table::TableControl::GetTopRow() const
+svt::table::TableControl::SetSelectHdl(Link const&)
+svt::table::TableControl::SetTopRow(int)
+svt::table::TableDataWindow::SetBackground()
+svtools::AsynchronLink::ForcePendingCall()
+svtools::EditableExtendedColorConfig::GetColorValue(rtl::OUString const&, rtl::OUString const&) const
+svtools::EditableExtendedColorConfig::GetComponentDisplayName(rtl::OUString const&) const
+svtools::EditableExtendedColorConfig::GetCurrentSchemeName() const
+svtools::EditableExtendedColorConfig::GetSchemeNames() const
+svtools::ODocumentInfoPreview::InsertEntry(String const&, String const&)
+svtools::ToolTipListBox::ToolTipListBox(Window*, ResId const&)
+svtools::ToolTipListBox::ToolTipListBox(Window*, long)
+svtools::ToolTipMultiListBox::ToolTipMultiListBox(Window*, long)
+svtools::ToolbarMenu::GetFrame() const
+svtools::ToolbarMenu::GetSelectHdl() const
+svtools::ToolbarMenu::RemoveStatusListener(rtl::OUString const&)
+svtools::ToolbarMenu::UpdateStatus(rtl::OUString const&)
+svtools::ToolbarMenu::appendEntry(int, Image const&, unsigned short)
+svtools::ToolbarMenu::getEntryImage(int) const
+svtools::ToolbarMenu::getEntryText(int) const
+svtools::ToolbarMenu::isEntryChecked(int) const
+svtools::ToolbarMenu::isEntryEnabled(int) const
+svtools::ToolbarMenuEntryAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
+svx::ControllerFeatures::ControllerFeatures(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::form::XForm> const&, svx::IControllerFeatureInvalidation*)
+svx::DialControl::DialControl(Window*, Size const&, Font const&, long)
+svx::DialControl::DialControl(Window*, Size const&, long)
+svx::DialControl::GetLinkedField() const
+svx::DialControl::GetModifyHdl() const
+svx::DialControl::SetModifyHdl(Link const&)
+svx::DocRecovery::PluginProgress::getPlugWindow()
+svx::DocRecovery::RecoveryDialog::impl_refreshDocList()
+svx::FeatureSlotTranslation::getControllerFeatureURLForSlotId(int)
+svx::FeatureSlotTranslation::isFeatureURL(rtl::OUString const&)
+svx::FontWorkGalleryDialog::changeText(SdrTextObj*)
+svx::FormControllerHelper::moveLeft() const
+svx::FormControllerHelper::moveRight() const
+svx::FrameBorder::MergeClickAreaToPolyPolygon(PolyPolygon&) const
+svx::FrameDirectionListBox::FrameDirectionListBox(Window*, long)
+svx::NamespaceMap_createInstance(unsigned short*, SfxItemPool*, SfxItemPool*)
+svx::OComponentTransferable::extractComponentDescriptor(TransferableDataHelper const&, unsigned char, rtl::OUString&, com::sun::star::uno::Reference<com::sun::star::ucb::XContent>&)
+svx::ODataAccessDescriptor::createAnySequence()
+svx::ODataAccessDescriptor::createPropertySet()
+svx::ODataAccessDescriptor::initializeFrom(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, unsigned char)
+svx::OMultiColumnTransferable::push_back(svx::ODataAccessDescriptor&)
+svx::OSingleFeatureDispatcher::dispose()
+svx::OXFormsTransferable::getDescriptorFormatId()
+svx::OrientationHelper::OrientationHelper(svx::DialControl&, CheckBox&)
+svx::SearchToolbarControllersManager::~SearchToolbarControllersManager()
+svx::SvxShowCharSetItem::~SvxShowCharSetItem()
+svx::ToolboxButtonColorUpdater::DrawChar(VirtualDevice&, Color const&)
+svx::WrapField::WrapField(Window*, long)
+svx::frame::(anonymous namespace)::lclCreatePolygon(Point const&, Point const&, Point const&, Point const&)
+svx::frame::Array::Array(unsigned long, unsigned long)
+svx::frame::Array::Clear()
+svx::frame::Array::DrawCell(OutputDevice&, unsigned long, unsigned long, Color const*) const
+svx::frame::Array::GetColFromIndex(unsigned long) const
+svx::frame::Array::GetColWidth(unsigned long) const
+svx::frame::Array::GetMergedSize(unsigned long&, unsigned long&, unsigned long, unsigned long) const
+svx::frame::Array::GetRowFromIndex(unsigned long) const
+svx::frame::Array::GetRowHeight(unsigned long) const
+svx::frame::Array::GetUseDiagDoubleClipping() const
+svx::frame::Array::IsInClipRange(unsigned long, unsigned long) const
+svx::frame::Array::IsMergedOrigin(unsigned long, unsigned long) const
+svx::frame::Array::IsMergedOverlapped(unsigned long, unsigned long) const
+svx::frame::Array::IsMergedOverlappedBottom(unsigned long, unsigned long) const
+svx::frame::Array::IsMergedOverlappedTop(unsigned long, unsigned long) const
+svx::frame::Array::MirrorSelfY(bool, bool)
+svx::frame::Array::RemoveClipRange()
+svx::frame::Array::RemoveMergedRange(unsigned long, unsigned long)
+svx::frame::ArrayImpl::GetMergedOriginCellAcc(unsigned long, unsigned long)
+svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, Color const*)
+svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, Color const*)
+svx::frame::DrawVerFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, Color const*)
+svx::frame::DrawVerFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, Color const*)
+svx::frame::Style::Scale(double, unsigned short) const
+svxform::DataNavigatorManager::GetChildWindowId()
+svxform::FmFilterNavigator::Clear()
+svxform::FmFilterNavigatorWinMgr::GetChildWindowId()
+svxform::FmSearchParams::setIgnoreWidthCJK(unsigned char)
+svxform::NavigatorFrameManager::GetChildWindowId()
+svxform::NavigatorTree::IsDeleteAllowed()
+svxform::NavigatorTreeModel::CheckEntry(FmEntryData*)
+svxform::NavigatorTreeModel::GetSdrObj(FmControlData*)
+svxform::NavigatorTreeModel::IsNameAlreadyDefined(rtl::OUString const&, FmFormData*)
+svxform::OStaticDataAccessTools::canDelete(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&) const
+svxform::OStaticDataAccessTools::getFieldNamesByCommandDescriptor(com::sun::star::uno::Reference<com::sun::star::sdbc::XConnection> const&, int, rtl::OUString const&, dbtools::SQLExceptionInfo*)
+svxform::OStaticDataAccessTools::prependContextInfo(com::sun::star::sdbc::SQLException&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, rtl::OUString const&, rtl::OUString const&) const
+svxform::OSystemParseContext::getNumDecimalSep() const
+svxform::OSystemParseContext::getNumThousandSep() const
+svxform::SvLBoxEntrySortedArray::DeleteAndDestroy(unsigned short, unsigned short)
+svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const&, unsigned short&)
+svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short)
+svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray const*, unsigned short, unsigned short)
+svxform::SvLBoxEntrySortedArray::Remove(SvLBoxEntry* const&, unsigned short)
+svxform::isModelShapeMarked(FmEntryData*, std::map<com::sun::star::uno::Reference<com::sun::star::uno::XInterface>, SdrObject*, comphelper::OInterfaceCompare<com::sun::star::uno::XInterface>, std::allocator<std::pair<com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const, SdrObject*> > > const&, SdrMarkView*)
+sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const&, unsigned short&)
+sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const*, unsigned short)
+sw::util::AuthorInfos::Insert(sw::util::AuthorInfos const*, unsigned short, unsigned short)
+sw::util::AuthorInfos::Remove(sw::util::AuthorInfo* const&, unsigned short)
+sw::util::AuthorInfos::Remove(unsigned short, unsigned short)
+test::OfficeConnection::OfficeConnection()
+test::OfficeConnection::getComponentContext() const
+test::OfficeConnection::setUp()
+test::OfficeConnection::tearDown()
+test::OfficeConnection::~OfficeConnection()
+test::getTestArgument(rtl::OUString const&, rtl::OUString*)
+toolkit::registerServices(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, char const*, char const*, char const*)
+tools::SolarMutex::GetSolarMutex()
+ucbhelper::CommandEnvironmentProxy::CommandEnvironmentProxy(com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&)
+ucbhelper::Content::Content(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&)
+ucbhelper::Content::abortCommand()
+ucbhelper::Content::create(com::sun::star::uno::Reference<com::sun::star::ucb::XContent> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, ucbhelper::Content&)
+ucbhelper::Content::create(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, ucbhelper::Content&)
+ucbhelper::Content::createCursor(com::sun::star::uno::Sequence<int> const&, ucbhelper::ResultSetInclude)
+ucbhelper::Content::createSortedCursor(com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
+ucbhelper::Content::createSortedDynamicCursor(com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
+ucbhelper::Content::createSortedDynamicCursor(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
+ucbhelper::Content::executeCommand(int, com::sun::star::uno::Any const&)
+ucbhelper::Content::getPropertyValue(int)
+ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, ucbhelper::Content&)
+ucbhelper::Content::setPropertyValue(int, com::sun::star::uno::Any const&)
+ucbhelper::ContentBroker::initialize(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
+ucbhelper::ContentImplHelper::notifyCommandInfoChange(com::sun::star::ucb::CommandInfoChangeEvent const&) const
+ucbhelper::PropertyValueSet::PropertyValueSet(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
+ucbhelper::PropertyValueSet::appendArray(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XArray> const&)
+ucbhelper::PropertyValueSet::appendBinaryStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&)
+ucbhelper::PropertyValueSet::appendBlob(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XBlob> const&)
+ucbhelper::PropertyValueSet::appendByte(rtl::OUString const&, signed char)
+ucbhelper::PropertyValueSet::appendBytes(rtl::OUString const&, com::sun::star::uno::Sequence<signed char> const&)
+ucbhelper::PropertyValueSet::appendCharacterStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&)
+ucbhelper::PropertyValueSet::appendClob(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XClob> const&)
+ucbhelper::PropertyValueSet::appendDate(rtl::OUString const&, com::sun::star::util::Date const&)
+ucbhelper::PropertyValueSet::appendDouble(rtl::OUString const&, double)
+ucbhelper::PropertyValueSet::appendFloat(rtl::OUString const&, float)
+ucbhelper::PropertyValueSet::appendInt(rtl::OUString const&, int)
+ucbhelper::PropertyValueSet::appendRef(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XRef> const&)
+ucbhelper::PropertyValueSet::appendShort(rtl::OUString const&, short)
+ucbhelper::PropertyValueSet::appendTime(rtl::OUString const&, com::sun::star::util::Time const&)
+ucbhelper::PropertyValueSet::getLength() const
+ucbhelper::ResultSetImplHelper::ResultSetImplHelper(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+ucbhelper::SimpleAuthenticationRequest::SimpleAuthenticationRequest(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
+ucbhelper::SimpleAuthenticationRequest::SimpleAuthenticationRequest(rtl::OUString const&, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, unsigned char, unsigned char)
+ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleAuthenticationRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
+ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleCertificateValidationRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
+ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleInteractionRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
+unicode::getCharType(unsigned short)
+unicode::isBase(unsigned short)
+unicode::isPunctuation(unsigned short)
+unicode::isTitle(unsigned short)
+unicode::isUnicodeScriptType(unsigned short, short)
+unnamed_svl_inettype::Registration::~Registration()
+unographic::GraphicDescriptor::isValid() const
+utl::AccessibleStateSetHelper::Compare(utl::AccessibleStateSetHelper const&, utl::AccessibleStateSetHelper&, utl::AccessibleStateSetHelper&)
+utl::AtomClient::AtomClient(com::sun::star::uno::Reference<com::sun::star::util::XAtomServer> const&)
+utl::AtomClient::getAtom(int, rtl::OUString const&, unsigned char)
+utl::AtomClient::getString(int, int)
+utl::AtomClient::updateAtomClasses(com::sun::star::uno::Sequence<int> const&)
+utl::AtomClient::~AtomClient()
+utl::AtomServer::AtomServer()
+utl::Bootstrap::checkBootstrapStatus(rtl::OUString&)
+utl::Bootstrap::getAllUsersValue(rtl::OUString const&)
+utl::ConfigItem::ConfigItem(utl::ConfigManager&, rtl::OUString)
+utl::ConfigItem::LockTree()
+utl::ConfigItem::UnlockTree()
+utl::ConfigManager::ConfigManager(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>)
+utl::MultiAtomProvider::insertAtomClass(int)
+utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
+utl::OConfigurationTreeRoot::OConfigurationTreeRoot(com::sun::star::uno::Reference<com::sun::star::util::XChangesBatch> const&)
+utl::OConfigurationTreeRoot::OConfigurationTreeRoot(comphelper::ComponentContext const&, char const*, bool)
+utl::OConfigurationValueContainer::OConfigurationValueContainer(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, osl::Mutex&, rtl::OUString const&, unsigned short, int)
+utl::OConfigurationValueContainer::getServiceFactory() const
+utl::OConfigurationValueContainer::registerNullValueExchangeLocation(char const*, com::sun::star::uno::Any*)
+utl::PropertySetHelper::PropertySetHelper(utl::PropertySetInfo*)
+utl::PropertySetInfo::PropertySetInfo()
+utl::PropertySetInfo::add(utl::PropertyMapEntry*)
+utl::PropertySetInfo::remove(rtl::OUString const&)
+utl::RegOptions::allowMenu() const
+utl::RegOptions::removeReminder()
+utl::TransliterationWrapper::compareSubstring(String const&, int, int, String const&, int, int) const
+utl::UCBContentHelper::CanMakeFolder(String const&)
+utl::UCBContentHelper::CopyTo(String const&, String const&)
+utl::UCBContentHelper::FindInPath(String const&, String const&, String&, char, unsigned char)
+utl::UCBContentHelper::GetResultSet(String const&)
+utl::UCBContentHelper::HasParentFolder(String const&)
+utl::UCBContentHelper::MoveTo(String const&, String const&, int)
+utl::UcbLockBytes::getStream()
+utl::typeConvert(Time const&, com::sun::star::util::Time&)
+utl::typeConvert(com::sun::star::util::Time const&, Time&)
+vbahelper::CollectionBase::CollectionBase(com::sun::star::uno::Type const&)
+vbahelper::CollectionBase::getAnyItemOrThis(com::sun::star::uno::Any const&)
+vbahelper::CollectionBase::initElements(std::vector<com::sun::star::beans::NamedValue, std::allocator<com::sun::star::beans::NamedValue> > const&, vbahelper::CollectionBase::ContainerType)
+vbahelper::CollectionBase::initElements(std::vector<com::sun::star::uno::Reference<com::sun::star::container::XNamed>, std::allocator<com::sun::star::uno::Reference<com::sun::star::container::XNamed> > > const&, vbahelper::CollectionBase::ContainerType)
+vcl::(anonymous namespace)::unzoomBy(long, Fraction const&)
+vcl::Clipboard_getSupportedServiceNames()
+vcl::I18NStatus::addChoice(String const&, void*)
+vcl::I18NStatus::clearChoices()
+vcl::I18NStatus::getStatusText() const
+vcl::I18NStatus::toTop() const
+vcl::I18nHelper::GetDate(Date const&) const
+vcl::I18nHelper::getLocale() const
+vcl::LabeledElement::setLabel(boost::shared_ptr<vcl::WindowArranger> const&)
+vcl::MatrixArranger::addChild(boost::shared_ptr<vcl::WindowArranger> const&, unsigned int, unsigned int, int)
+vcl::MatrixArranger::addWindow(Window*, unsigned int, unsigned int, int, Size const&)
+vcl::MatrixArranger::remove(Window*)
+vcl::MatrixArranger::remove(boost::shared_ptr<vcl::WindowArranger> const&)
+vcl::PDFExtOutDevData::EndGroup()
+vcl::PDFExtOutDevData::GetFormsFormat() const
+vcl::PDFExtOutDevData::SetAutoAdvanceTime(unsigned int, int)
+vcl::PDFExtOutDevData::SetOutlineItemDest(int, int)
+vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
+vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const&)
+vcl::PDFWriter::BeginPattern(Rectangle const&)
+vcl::PDFWriter::DrawBitmap(Point const&, Bitmap const&)
+vcl::PDFWriter::DrawBitmap(Point const&, Size const&, Point const&, Size const&, Bitmap const&)
+vcl::PDFWriter::DrawBitmapEx(Point const&, BitmapEx const&)
+vcl::PDFWriter::DrawBitmapEx(Point const&, Size const&, Point const&, Size const&, BitmapEx const&)
+vcl::PDFWriter::DrawGradient(PolyPolygon const&, Gradient const&)
+vcl::PDFWriter::DrawGradient(Rectangle const&, Gradient const&)
+vcl::PDFWriter::DrawMask(Point const&, Bitmap const&, Color const&)
+vcl::PDFWriter::DrawMask(Point const&, Size const&, Bitmap const&, Color const&)
+vcl::PDFWriter::DrawMask(Point const&, Size const&, Point const&, Size const&, Bitmap const&, Color const&)
+vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
+vcl::PDFWriter::DrawPolyPolygon(PolyPolygon const&, int, bool)
+vcl::PDFWriter::EndPattern(SvtGraphicFill::Transform const&)
+vcl::PDFWriter::EndTransparencyGroup(Rectangle const&, Bitmap const&)
+vcl::PDFWriter::GetCurrentStructureElement()
+vcl::PDFWriter::GetVersion() const
+vcl::PDFWriter::SetAntialiasing(unsigned short)
+vcl::PDFWriter::SetMapMode()
+vcl::PDFWriterImpl::beginControlAppearance(int)
+vcl::PDFWriterImpl::drawWaveLine(Point const&, Point const&, int, int)
+vcl::PDFWriterImpl::endControlAppearance(vcl::PDFWriter::WidgetState)
+vcl::PrintDialog::getCopyCount()
+vcl::PrinterController::PrinterController()
+vcl::PrinterController::enableUIOption(rtl::OUString const&, bool)
+vcl::PrinterController::getValues(com::sun::star::uno::Sequence<rtl::OUString> const&) const
+vcl::PrinterOptionsHelper::hasProperty(rtl::OUString const&) const
+vcl::PrinterOptionsHelper::setValue(rtl::OUString const&, com::sun::star::uno::Any const&)
+vcl::RenderGraphic::RenderGraphic(boost::shared_array<unsigned char> const&, unsigned int, rtl::OUString const&)
+vcl::RowOrColumn::remove(Window*)
+vcl::RowOrColumn::remove(boost::shared_ptr<vcl::WindowArranger> const&)
+vcl::ThreadExecutor::ThreadExecutor()
+vcl::ThreadExecutor::execute()
+vcl::WindowPropertySet::WindowPropertySet(Window*, bool)
+vcl::WindowPropertySet::getPropertySet() const
+vcl::WindowPropertySet::~WindowPropertySet()
+vcl::unotools::b2IPointFromPoint(Point const&)
+vcl::unotools::b2IRectangleFromRectangle(Rectangle const&)
+vcl::unotools::b2ISizeFromSize(Size const&)
+vcl::unotools::colorToStdColorSpaceSequence(Color const&)
+vcl::unotools::integerPoint2DFromPoint(Point const&)
+vcl::unotools::integerRectangle2DFromRectangle(Rectangle const&)
+vcl::unotools::point2DFromPoint(Point const&)
+vcl::unotools::polyPolygonFromBezier2DSequenceSequence(com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<com::sun::star::geometry::RealBezierSegment2D> > const&)
+vcl::unotools::polyPolygonFromPoint2DSequenceSequence(com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<com::sun::star::geometry::RealPoint2D> > const&)
+vcl::unotools::polygonFromBezier2DSequence(com::sun::star::uno::Sequence<com::sun::star::geometry::RealBezierSegment2D> const&)
+vcl::unotools::rectangle2DFromRectangle(Rectangle const&)
+vcl::unotools::rectangleFromRealRectangle2D(com::sun::star::geometry::RealRectangle2D const&)
+vcl::unotools::sizeFromB2ISize(basegfx::B2IVector const&)
+void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&)
+webdav_ucp::ContentProperties::addProperties(std::vector<webdav_ucp::DAVPropertyValue, std::allocator<webdav_ucp::DAVPropertyValue> > const&)
+webdav_ucp::ContentProperties::addProperties(webdav_ucp::ContentProperties const&)
+writerfilter::LoggedResourcesHelper::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+writerfilter::LoggedResourcesHelper::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)
+writerfilter::LoggedResourcesHelper::chars(rtl::OUString const&)
+writerfilter::LoggedResourcesHelper::chars(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+writerfilter::LoggedResourcesHelper::endElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+writerfilter::LoggedResourcesHelper::setPrefix(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+writerfilter::LoggedResourcesHelper::startElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+writerfilter::TagLogger::element(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+writerfilter::TagLogger::propertySet(boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >, boost::shared_ptr<writerfilter::IdToString>)
+writerfilter::TagLogger::setFileName(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
+writerfilter::TagLogger::startDocument()
+writerfilter::TagLogger::unoPropertySet(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
+writerfilter::TagLogger::~TagLogger()
+writerfilter::XPathLogger::XPathLogger()
+writerfilter::XPathLogger::endElement()
+writerfilter::XPathLogger::getXPath() const
+writerfilter::XPathLogger::startElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
+writerfilter::dmapper::FFDataHandler::getDropDownDefault() const
+writerfilter::dmapper::FFDataHandler::getEnabled() const
+writerfilter::dmapper::FFDataHandler::getTextType() const
+writerfilter::dmapper::FFDataHandler::setCalcOnExit(bool)
+writerfilter::dmapper::FFDataHandler::setCheckboxAutoHeight(bool)
+writerfilter::dmapper::FFDataHandler::setCheckboxChecked(bool)
+writerfilter::dmapper::FFDataHandler::setCheckboxDefault(bool)
+writerfilter::dmapper::FFDataHandler::setCheckboxHeight(unsigned int)
+writerfilter::dmapper::FFDataHandler::setDropDownDefault(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setDropDownEntries(std::vector<rtl::OUString, std::allocator<rtl::OUString> > const&)
+writerfilter::dmapper::FFDataHandler::setDropDownResult(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setEnabled(bool)
+writerfilter::dmapper::FFDataHandler::setEntryMacro(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setExitMacro(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setHelpText(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setHelpTextType(unsigned int)
+writerfilter::dmapper::FFDataHandler::setName(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setStatusText(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setStatusTextType(unsigned int)
+writerfilter::dmapper::FFDataHandler::setTextDefault(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setTextFormat(rtl::OUString const&)
+writerfilter::dmapper::FFDataHandler::setTextMaxLength(unsigned int)
+writerfilter::dmapper::FFDataHandler::setTextType(unsigned int)
+writerfilter::dmapper::FIB::GetData(unsigned int)
+writerfilter::dmapper::MeasureHandler::isAutoWidth() const
+writerfilter::dmapper::SectionPropertyMap::GetPageStyleName(bool)
+writerfilter::dmapper::SectionPropertyMap::SetPageStyleName(bool, rtl::OUString const&)
+writerfilter::dmapper::StyleSheetTable::resolveSprmProps(writerfilter::Sprm&)
+writerfilter::doctok::WW8StructBase::getBit(unsigned int, unsigned short) const
+writerfilter::doctok::WW8StructBase::getNibble(unsigned int, unsigned short) const
+writerfilter::doctok::WW8Sttbf::getExtraData(unsigned int)
+writerfilter::doctok::WW8StyleSheet::calcSize()
+writerfilter::doctok::WW8sprmPChgTabsPapx::calcSize()
+writerfilter::doctok::WW8sprmTCellBottomColor::calcSize()
+writerfilter::doctok::WW8sprmTCellLeftColor::calcSize()
+writerfilter::doctok::WW8sprmTCellRightColor::calcSize()
+writerfilter::doctok::WW8sprmTCellShadow::calcSize()
+writerfilter::doctok::WW8sprmTCellShd::calcSize()
+writerfilter::doctok::WW8sprmTCellTopColor::calcSize()
+writerfilter::doctok::WW8sprmTDefTableShd::calcSize()
+writerfilter::doctok::WW8sprmTGridLineProps::calcSize()
+writerfilter::doctoktest::ScannerTestService_supportsService(rtl::OUString const&)
+writerfilter::ooxml::OOXMLFastContextHandler::getResourceString() const
+writerfilter::ooxmltest::ScannerTestService_supportsService(rtl::OUString const&)
+writerfilter::resourcemodel::Fraction::Fraction(writerfilter::resourcemodel::Fraction const&, writerfilter::resourcemodel::Fraction const&)
+writerfilter::rtftok::lcl_RtfToString(writerfilter::rtftok::RTFKeyword)
+ww8::CellInfo::toString() const
+ww8::WW8Struct::getString(unsigned int, unsigned int)
+ww8::WW8TableCellGrid::toString()
+ww8::WW8TableNodeInfo::getRect() const
+ww8::WW8TableNodeInfo::getTable() const
+ww8::WW8TableNodeInfo::isEndOfCell() const
+ww8::WW8TableNodeInfo::isEndOfLine() const
+xmloff::OControlStyleContext::OControlStyleContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, SvXMLStylesContext&, unsigned short, unsigned char)
+xmloff::OFormLayerXMLExport::exportControlNumberStyles()
+xmloff::OFormLayerXMLExport::initialize()
+xmloff::OFormLayerXMLImport::seekPage(com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> const&)
+xmloff::chart::ColorPropertySet::getColor()
+xmloff::chart::ColorPropertySet::setColor(int)