[Libreoffice-commits] .: Branch 'feature/gnumake4' - 208 commits - autogen.sh configure.in distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeDragonFly.conf distro-configs/LibreOfficeOpenBSD.conf git-hooks/pre-commit instsetoo_native/util Makefile.in ooo.lst.in README.cross RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk scp2/inc scp2/prj scp2/source scp2/util set_soenv.in soldep/bootstrp soldep/inc solenv/bin solenv/gbuild solenv/inc solenv/src solenv/wntgcci soltools/mkdepend soltools/util tail_build/prj unusedcode.easy
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Thu Jul 21 10:03:03 PDT 2011
Makefile.in | 67
README.cross | 55
Repository.mk | 2
RepositoryFixes.mk | 52
RepositoryModule_ooo.mk | 3
autogen.sh | 14
configure.in | 6962 +++++++++++------------
distro-configs/LibreOfficeAndroid.conf | 1
distro-configs/LibreOfficeDragonFly.conf | 1
distro-configs/LibreOfficeOpenBSD.conf | 5
git-hooks/pre-commit | 142
instsetoo_native/util/makefile.mk | 17
instsetoo_native/util/openoffice.lst | 98
ooo.lst.in | 7
scp2/inc/macros.inc | 8
scp2/prj/build.lst | 2
scp2/source/binfilter/file_binfilter.scp | 21
scp2/source/binfilter/module_binfilter.scp | 32
scp2/source/canvas/makefile.mk | 6
scp2/source/ooo/common_brand.scp | 14
scp2/source/ooo/file_library_ooo.scp | 14
scp2/source/ooo/file_ooo.scp | 9
scp2/source/ooo/file_resource_ooo.scp | 2
scp2/source/ooo/makefile.mk | 20
scp2/source/ooo/module_hidden_ooo.scp | 1
scp2/source/ooo/module_lang_template.scp | 1
scp2/util/makefile.mk | 9
set_soenv.in | 25
soldep/bootstrp/command.cxx | 681 --
soldep/inc/soldep/command.hxx | 160
solenv/bin/add-modelines | 8
solenv/bin/build.pl | 25
solenv/bin/build_client.pl | 6
solenv/bin/deliver.pl | 6
solenv/bin/gccinstlib.pl | 23
solenv/bin/getcompver.awk | 4
solenv/bin/linkoo | 32
solenv/bin/modules/installer/control.pm | 10
solenv/bin/modules/installer/download.pm | 12
solenv/bin/modules/installer/scriptitems.pm | 11
solenv/bin/modules/installer/windows/feature.pm | 39
solenv/bin/modules/installer/windows/msp.pm | 9
solenv/bin/modules/installer/windows/property.pm | 3
solenv/bin/modules/installer/worker.pm | 3
solenv/bin/modules/installer/ziplist.pm | 3
solenv/bin/modules/packager/work.pm | 11
solenv/gbuild/AllLangResTarget.mk | 6
solenv/gbuild/CppunitTest.mk | 3
solenv/gbuild/Deliver.mk | 20
solenv/gbuild/Executable.mk | 3
solenv/gbuild/Library.mk | 3
solenv/gbuild/LinkTarget.mk | 11
solenv/gbuild/Package.mk | 8
solenv/gbuild/SdiTarget.mk | 2
solenv/gbuild/StaticLibrary.mk | 3
solenv/gbuild/TargetLocations.mk | 12
solenv/gbuild/UnoApiTarget.mk | 210
solenv/gbuild/gbuild.mk | 10
solenv/gbuild/platform/android.mk | 24
solenv/gbuild/platform/dragonfly.mk | 20
solenv/gbuild/platform/freebsd.mk | 20
solenv/gbuild/platform/ios.mk | 57
solenv/gbuild/platform/linux-ARM.mk | 2
solenv/gbuild/platform/linux-AXP.mk | 2
solenv/gbuild/platform/linux-GODSON.mk | 2
solenv/gbuild/platform/linux-HPPA.mk | 2
solenv/gbuild/platform/linux-M68K.mk | 2
solenv/gbuild/platform/linux-POWERPC.mk | 2
solenv/gbuild/platform/linux.mk | 22
solenv/gbuild/platform/macosx.mk | 25
solenv/gbuild/platform/netbsd.mk | 20
solenv/gbuild/platform/openbsd.mk | 20
solenv/gbuild/platform/solaris.mk | 23
solenv/gbuild/platform/unxgcc.mk | 9
solenv/gbuild/platform/windows.mk | 34
solenv/gbuild/platform/winmingw.mk | 218
solenv/inc/_tg_app.mk | 80
solenv/inc/_tg_def.mk | 720 +-
solenv/inc/_tg_shl.mk | 210
solenv/inc/installationtest.mk | 4
solenv/inc/libs.mk | 66
solenv/inc/minor.mk | 4
solenv/inc/productversion.mk | 2
solenv/inc/pstrules.mk | 4
solenv/inc/rules.mk | 4
solenv/inc/settings.mk | 33
solenv/inc/target.mk | 6
solenv/inc/tg_app.mk | 8
solenv/inc/tg_compv.mk | 11
solenv/inc/tg_def.mk | 72
solenv/inc/tg_shl.mk | 21
solenv/inc/unitools.mk | 7
solenv/inc/unxgcc.mk | 3
solenv/inc/unxiosr.mk | 8
solenv/inc/wnt.mk | 6
solenv/src/component.map | 1
solenv/src/reg-component.map | 1
solenv/src/unloadablecomponent.map | 1
solenv/wntgcci/inc/sehandler.hxx | 128
soltools/mkdepend/main.c | 5
soltools/util/makefile.pmk | 2
tail_build/prj/build.lst | 2
unusedcode.easy | 4738 +++++++++++++++
103 files changed, 10074 insertions(+), 5504 deletions(-)
New commits:
commit cbb4c3ef2cf531eb0cd99c153d37536da534e5e0
Merge: 407206b... f04a96d...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:27:57 2011 +0200
resyncing to master
diff --cc Repository.mk
index bf8df09,5f4586d..a296b46
--- a/Repository.mk
+++ b/Repository.mk
@@@ -139,9 -134,19 +140,10 @@@ $(eval $(call gb_Helper_register_librar
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
test \
+ cairo \
cppunit \
- crypto \
fileacc \
icui18n \
- icule \
- icuuc \
- icule \
- graphite2_off \
- cppunit \
- rdf \
- ssl \
- xslt \
))
diff --cc RepositoryFixes.mk
index bf75dee,ee89377..b6c7108
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@@ -36,31 -37,14 +37,19 @@@ gb_Library_FILENAMES := $(patsubst cppu
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),SOLARIS)
+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 ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(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))
+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,40 -54,30 +61,44 @@@ gb_Library_FILENAMES := $(patsubst xml2
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))
+
+
+# handle libraries in msvc format that don't use an "i" prefix for their import library
+# 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))
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+else #ifneq ($(USE_MINGW),)
-else
+ 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))
@@@ -146,9 -131,68 +139,24 @@@ gb_Library_DLLFILENAMES := $(patsubst i
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-endif
+endif # ifneq ($(USE_MINGW),)
-endif
-
-ifeq ($(OS),SOLARIS)
-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 ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(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))
-#$(info libnames: $(gb_Library_FILENAMES))
-
-endif
+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
+
-gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
-
-# we do not require a known rule for these, when using system libs
+
+ ifeq ($(SYSTEM_CAIRO),YES)
+ gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+ endif
-ifeq ($(SYSTEM_LIBXML),YES)
-gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_REDLAND),YES)
-gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_ICU),YES)
-gb_Library_TARGETS := $(filter-out icudata,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icui18n,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuio,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icule,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out iculx,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icutu,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_CPPUNIT),YES)
-gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
-endif
-
# vim: set noet sw=4 ts=4:
diff --cc configure.in
index 3926aa2,fa6ef65..1afc045
--- a/configure.in
+++ b/configure.in
@@@ -6237,10 -6390,7 +6293,10 @@@ 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
dnl ===================================================================
dnl Zip must be a specific type for different build types.
@@@ -6389,71 -6539,14 +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 ===================================================================
diff --cc scp2/source/canvas/makefile.mk
index 4c38d16,8e59d77..c5e1f13
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@@ -41,10 -41,15 +41,14 @@@ SCP_PRODUCT_TYPE=os
PARFILES= canvascommons.par \
vclcanvas.par \
- mtfrenderer.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 --cc scp2/source/ooo/file_library_ooo.scp
index 9474eb4,bebfafe..98d25ec
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@@ -898,6 -909,14 +900,8 @@@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft
STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
-
-STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
-
-STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
-
+ STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
+
#ifdef WNT
#if defined(_gcc3)
diff --cc scp2/util/makefile.mk
index af4861d,8e1c8f2..ff2037f
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@@ -205,10 -205,14 +205,13 @@@ SCP1FILES +=
SCP1FILES += \
vclcanvas.par \
- mtfrenderer.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
diff --cc set_soenv.in
index 5ea6bbf,9ff4b03..99a4ffb
--- a/set_soenv.in
+++ b/set_soenv.in
@@@ -1547,8 -1549,6 +1549,7 @@@ ToFile( "GTHREAD_CFLAGS", "@GTHREAD_
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" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
diff --cc solenv/bin/build_client.pl
index 1dbf126,5483a13..cd97795
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@@ -357,11 -357,7 +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 $ENV{SOLARSRC};
print "\nplatform: $ENV{INPATH} $^O";
print "\ndir: $job_hash{job_dir}\n";
diff --cc solenv/gbuild/Deliver.mk
index 42707c0,cbf840b..ab97350
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@@ -43,8 -46,17 +46,17 @@@ $(if $(gb_LOWRESTIME),.LOW_RESOLUTION_T
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
+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)
endef
else
diff --cc solenv/gbuild/Executable.mk
index 283d39d,077c0ac..a0baf9b
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@@ -81,24 -75,17 +81,25 @@@ $(eval $(foreach method,
add_noexception_objects \
add_generated_cxxobjects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
diff --cc solenv/gbuild/Library.mk
index 9e6d543,cd508de..3667a35
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@@ -116,24 -117,17 +116,25 @@@ $(eval $(foreach method,
add_noexception_objects \
add_generated_cxxobjects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
+ add_ldflags \
set_ldflags \
+ add_libs \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
+ use_external \
+ use_externals \
add_package_headers \
add_sdi_headers \
add_precompiled_header \
diff --cc solenv/gbuild/LinkTarget.mk
index f1f696e,9f32df5..2a58568
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@@ -596,19 -549,21 +596,30 @@@ endi
endef
+define gb_LinkTarget_add_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
+endef
+
+# real use in RepositoryExternal.mk
define gb_LinkTarget_set_ldflags
-$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
+endef
+
+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 --cc solenv/gbuild/TargetLocations.mk
index bcca63f,11b2b28..f66e91a
mode 100755,100644..100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@@ -28,9 -28,8 +28,9 @@@
# outdir target pattern
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 \
@@@ -99,9 -94,11 +100,13 @@@ gb_SrsPartTarget_get_target = $(WORKDIR
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
define gb_Library_get_external_headers_target
$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
@@@ -137,8 -134,7 +142,9 @@@ $(eval $(call gb_Helper_make_clean_targ
SrsTemplateTarget \
CppunitTest \
CustomTarget \
- WinResTarget \
+ UnoApiTarget \
++ WinResTarget \
+ Zip \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
@@@ -157,7 -153,10 +164,8 @@@ $(eval $(call gb_Helper_make_dep_target
LinkTarget \
SrsPartTarget \
SrsTarget \
+ UnoApiTarget \
))
-# needs to use same dep target because we use gb_CxxObject__command
-gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)
# other getters
diff --cc solenv/gbuild/gbuild.mk
index 0214f14,702c7bb..220e0e3
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@@ -285,7 -293,7 +294,8 @@@ include $(foreach class,
JavaClassSet \
JunitTest \
Module \
+ UnoApiTarget \
+ Zip \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
diff --cc solenv/gbuild/platform/macosx.mk
index 5f11ede,b74a4bd..280df58
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@@ -472,6 -483,19 +480,19 @@@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_P
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 --cc solenv/gbuild/platform/solaris.mk
index e0547b8,b1076eb..b78ab48
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@@ -391,6 -398,18 +400,18 @@@ gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PAT
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 --cc solenv/gbuild/platform/unxgcc.mk
index 59c3a4e,19fbb67..9083d4c
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@@ -262,8 -266,7 +266,8 @@@ $(call gb_Helper_abbreviate_dirs,
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(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
diff --cc solenv/gbuild/platform/windows.mk
index 5e322b1,b7db476..fb244c4
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@@ -383,11 -386,10 +394,13 @@@ gb_Library_get_rpath :
gb_Library_SYSPRE := i
gb_Library_PLAINEXT := .lib
+ gb_Library_win32_OLDNAMES := oldnames
+
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
@@@ -702,6 -702,18 +715,19 @@@ gb_XSLTPROCPRECOMMAND :
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/ \
+ # 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 --cc solenv/gbuild/platform/winmingw.mk
index a8e9814,dd93e79..1bf1182
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@@ -222,9 -231,9 +233,9 @@@ ende
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+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)) \
@@@ -382,49 -416,34 +393,36 @@@ define gb_LinkTarget__command_dynamicli
$(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) \
- $(LDFLAGS) \
+ $(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) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
- --enable-auto-image-base \
- -e _DllMainCRTStartup at 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
@@@ -482,7 -518,9 +500,9 @@@ gb_Library_PLAINLIBS_NONE +=
user32 \
uuid \
uwinapi \
+ winmm \
+ version \
+ winspool \
- z \
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@@ -682,6 -727,18 +709,19 @@@ gb_XSLTPROCPRECOMMAND := $(gb_Helper_se
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 --cc solenv/inc/libs.mk
index 0d1a7b0,8159386..baa8473
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@@ -69,14 -65,9 +66,9 @@@ LDAPBERLIB=-lldapbe
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=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+UCBHELPERLIB=-lucbhelper4$(COMID)
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)
OPENSSLLIBST=$(STATIC) $(OPENSSL_LIBS) $(DYNAMIC)
commit f04a96daec93c27d6d0a57e0304892d6384a2e91
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 17:43:23 2011 +0300
Propagate DISABLE_ACTIVEX also in the WNTGCC case
diff --git a/set_soenv.in b/set_soenv.in
index 9a185df..9ff4b03 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1682,6 +1682,7 @@ 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" );
}
commit 49560f7436169e141ce55e7d7222127338229f24
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jul 21 15:46:00 2011 +0200
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index e973292..bdb3567 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -225,12 +225,8 @@ Dialog::Dialog(Window*, ResId const&)
Dialog::ImplCenterDialog()
Dialog::IsStartedModal() const
DicEntry::DicEntry()
-Dir::Dir()
-Dir::Dir(DirEntry const&, int, int, ...)
-DirEntry::CutExtension(char)
DirEntry::GetDevice() const
DirEntry::GetPathStyle()
-DirEntry::NameCompare(DirEntry const&) const
DisclosureButton::DisclosureButton(Window*, long)
DlgEdObj::LinkStubOnCreate(void*, void*)
DockingWindow::GetMaxOutputSizePixel() const
@@ -604,8 +600,6 @@ MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Referenc
MachineSettings::CopyData()
MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
MaskSet::MaskSet(SvxBmpMask*, long)
-Matrix3d::Inverse() const
-Matrix3d::Matrix3d()
Menu::ConvertPoint(Point&, Window*) const
Menu::GetAccessibleDescription(unsigned short) const
Menu::GetDisplayItemId(long) const
@@ -1546,50 +1540,6 @@ 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)
-SvIconView::AdjustAtGrid(SvLBoxEntry*)
-SvIconView::CalcScrollOffsets(Point const&, long&, long&, unsigned char, unsigned short)
-SvIconView::DisconnectFromModel()
-SvIconView::EnableInplaceEditing(unsigned char)
-SvIconView::EndTracking()
-SvIconView::GetCollapsedEntryBmp(SvLBoxEntry*) const
-SvIconView::GetCurParent() const
-SvIconView::GetEntryFromLogicPos(Point const&) const
-SvIconView::GetEntryPosition(SvLBoxEntry*) const
-SvIconView::GetExpandedEntryBmp(SvLBoxEntry*) const
-SvIconView::GetFocusRect(SvLBoxEntry*)
-SvIconView::GetNextEntry(Point const&, SvLBoxEntry*, unsigned char) const
-SvIconView::GetPrevEntry(Point const&, SvLBoxEntry*, unsigned char) const
-SvIconView::GetTextMode(SvLBoxEntry const*) const
-SvIconView::HideDDIcon()
-SvIconView::HideShowDDIcon(SvLBoxEntry*, Point const&)
-SvIconView::InsertEntry(String const&, Image const&, Image const&, SvLBoxEntry*, unsigned char, unsigned long)
-SvIconView::InvalidateEntry(SvLBoxEntry*)
-SvIconView::IsEntryPosLocked(SvLBoxEntry const*) const
-SvIconView::LockEntryPos(SvLBoxEntry*, unsigned char)
-SvIconView::SelectRect(Rectangle const&, unsigned char, SvPtrarr*, short)
-SvIconView::SetCollapsedEntryBmp(SvLBoxEntry*, Image const&)
-SvIconView::SetCurParent(SvLBoxEntry*)
-SvIconView::SetEntryPosition(SvLBoxEntry*, Point const&)
-SvIconView::SetEntryPosition(SvLBoxEntry*, Point const&, unsigned char)
-SvIconView::SetEntryText(SvLBoxEntry*, String const&)
-SvIconView::SetExpandedEntryBmp(SvLBoxEntry*, Image const&)
-SvIconView::SetGrid(long, long)
-SvIconView::SetModel(SvLBoxTreeList*)
-SvIconView::SetSpaceBetweenEntries(long, long)
-SvIconView::SetTextMode(SvIconViewTextMode, SvLBoxEntry*)
-SvIconView::ShowDDIcon(SvLBoxEntry*, Point const&)
-SvIconView::ShowFocusRect(SvLBoxEntry const*)
-SvIconView::SvIconView(Window*, ResId const&)
-SvIconView::SvIconView(Window*, long)
-SvImpIconView::CollapsingEntry(SvLBoxEntry*)
-SvImpIconView::EntryCollapsed(SvLBoxEntry*)
-SvImpIconView::EntryExpanded(SvLBoxEntry*)
-SvImpIconView::GetEntryTextModeSmart(SvLBoxEntry const*, SvIcnVwDataEntry const*) const
-SvImpIconView::InvalidateBoundingRect(SvLBoxEntry*)
-SvImpIconView::IsEntryInView(SvLBoxEntry*)
-SvImpIconView::RepaintSelectionItems()
-SvImpIconView::SetNoSelection()
-SvImpIconView::UpdateBoundingRects()
SvImpLBox::IndentChanged(short)
SvImpLBox::RepaintSelectionItems()
SvInplaceEdit::StopEditing(unsigned char)
commit d753134a369fa3da0d0a6fe12c604086095c6be1
Author: Marc-Andre Laverdiere <marc-andre at atc.tcs.com / marcandre.laverdiere at tcs.com>
Date: Thu Jul 21 15:56:15 2011 +0530
Removed some entries
- Some were already removed but this file wasn't updated
- Some have been removed in writerfilter's commit #3096f3
diff --git a/unusedcode.easy b/unusedcode.easy
index 2b95c48..e973292 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2309,19 +2309,6 @@ WPXPropertyList::Iter::last()
WPXPropertyListVector::Iter::last()
WPXString::Iter::last()
WPXSubDocument::WPXSubDocument()
-WW8Bytes::Replace(unsigned char const&, unsigned short)
-WW8Bytes::Replace(unsigned char const*, unsigned short, unsigned short)
-WW8Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
-WW8OleMaps::Insert(WW8OleMap* const&, unsigned short&)
-WW8OleMaps::Insert(WW8OleMap* const*, unsigned short)
-WW8OleMaps::Insert(WW8OleMaps const*, unsigned short, unsigned short)
-WW8OleMaps::Remove(WW8OleMap* const&, unsigned short)
-WW8OleMaps::Remove(unsigned short, unsigned short)
-WW8_WrSepInfoPtrs::Insert(WW8_WrSepInfoPtrs const*, unsigned short, unsigned short, unsigned short)
-WW8_WrSepInfoPtrs::Remove(unsigned short, unsigned short)
-WW8_WrSepInfoPtrs::Replace(WW8_SepInfo const&, unsigned short)
-WW8_WrSepInfoPtrs::Replace(WW8_SepInfo const*, unsigned short, unsigned short)
-WW8_WrSepInfoPtrs::_ForEach(unsigned short, unsigned short, unsigned char (*)(WW8_SepInfo const&, void*), void*)
WinMtfOutput::DrawLine(Point const&, Point const&)
WinMtfOutput::GetTextLayoutMode() const
WinMtfOutput::SetFont(Font const&)
@@ -4768,23 +4755,6 @@ 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::DffOPT::get_extraoffset_count()
-writerfilter::doctok::WW8BinaryObjReference::WW8BinaryObjReference(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int)
-writerfilter::doctok::WW8BinaryObjReference::WW8BinaryObjReference(writerfilter::doctok::WW8StructBase&, unsigned int, unsigned int)
-writerfilter::doctok::WW8DocumentImpl::getAnnotation(unsigned int)
-writerfilter::doctok::WW8DocumentImpl::getAnnotationCount() const
-writerfilter::doctok::WW8DocumentImpl::getCpAndFc(writerfilter::doctok::Fc const&, writerfilter::doctok::PropertyType) const
-writerfilter::doctok::WW8DocumentImpl::getEndnote(unsigned int)
-writerfilter::doctok::WW8DocumentImpl::getEndnoteCount() const
-writerfilter::doctok::WW8DocumentImpl::getFootnote(unsigned int)
-writerfilter::doctok::WW8DocumentImpl::getFootnoteCount() const
-writerfilter::doctok::WW8DocumentImpl::getPicLocation() const
-writerfilter::doctok::WW8DocumentImpl::getTextboxEndCp() const
-writerfilter::doctok::WW8DocumentImpl::getTextboxHeaderEndCp() const
-writerfilter::doctok::WW8DocumentIteratorImpl::getSED() const
-writerfilter::doctok::WW8PropertyImpl::WW8PropertyImpl(writerfilter::doctok::WW8Stream&, unsigned int, unsigned int)
-writerfilter::doctok::WW8PropertyImpl::WW8PropertyImpl(writerfilter::doctok::WW8StructBase*, unsigned int, unsigned int)
-writerfilter::doctok::WW8PropertyImpl::getParamOffset() const
writerfilter::doctok::WW8StructBase::getBit(unsigned int, unsigned short) const
writerfilter::doctok::WW8StructBase::getNibble(unsigned int, unsigned short) const
writerfilter::doctok::WW8Sttbf::getExtraData(unsigned int)
commit 9694760b7f5e9e57e0853365ea058481fe392dec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 21 09:24:17 2011 +0100
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index 9d0ec81..2b95c48 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,5 @@
(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()
@@ -413,7 +414,10 @@ 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()
@@ -639,6 +643,7 @@ 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&)
@@ -951,6 +956,8 @@ 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()
@@ -1772,7 +1779,6 @@ SvtIconChoiceCtrl::Flush()
SvtIconChoiceCtrl::GetEntryTextMode(SvxIconChoiceCtrlEntry const*) const
SvtIconChoiceCtrl::GetLogicPos(Point const&) const
SvtIconChoiceCtrl::GetNextEntry(Point const&, SvxIconChoiceCtrlEntry*, unsigned char) const
-SvtIconChoiceCtrl::GetPrevEntry(Point const&, SvxIconChoiceCtrlEntry*, unsigned char) const
SvtIconChoiceCtrl::HandleShortCutKey(KeyEvent const&)
SvtIconChoiceCtrl::InsertEntry(unsigned long, Point const*, unsigned short)
SvtIconChoiceCtrl::SetUpdateMode(unsigned char)
commit 8efe663e2096c79223c2725897841ffac55f707e
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jul 21 10:24:57 2011 +0100
gtk3: don't package the filepicker if we have gtk3 enabled
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index eb49a0c..bebfafe 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;
commit 69a8c16f0643be9fc5f6af2e5978cc7b978355e0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 09:49:26 2011 +0300
Update sample autogen.lastrun for MinGW cross-compilation
diff --git a/README.cross b/README.cross
index 291eaf6..095a419 100644
--- a/README.cross
+++ b/README.cross
@@ -98,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
@@ -117,6 +119,7 @@ CXX_FOR_BUILD=ccache g++
--with-system-altlinuxhyph
--with-system-boost
--with-system-cairo
+--with-system-cppunit
--with-system-curl
--with-system-db
--with-system-expat
@@ -134,7 +137,6 @@ CXX_FOR_BUILD=ccache g++
--with-system-neon
--with-system-openssl
--with-system-redland
---with-system-zlib
--with-vendor=no
commit a7325bf690cd827a9b584bfda7a5552dd600d04f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 20 22:42:29 2011 +0200
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index a72ef52..9d0ec81 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -8,14 +8,6 @@ AlphaMask::Rotate(long, unsigned char)
AlphaMask::Scale(Size const&, unsigned long)
AlphaMask::Scale(double const&, double const&, unsigned long)
Application::PostUserEvent(unsigned long, void*)
-B3dTransformationSet::GetInvMatFromWorldToView()
-B3dTransformationSet::GetInvProjection()
-B3dTransformationSet::GetInvTransObjectToEye()
-B3dTransformationSet::GetMatFromWorldToView()
-B3dTransformationSet::GetObjectToDevice()
-B3dTransformationSet::PostSetTexture()
-B3dTransformationSet::SetBackClippingPlane(double)
-B3dTransformationSet::SetFrontClippingPlane(double)
BasicError::BasicError()
BasicIDEDLL::Exit()
BasicIDEShell::LinkStubAccelSelectHdl(void*, void*)
commit b5f103ef092bf0c03a9fbf0dfa9a50872adb1834
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Jul 20 20:21:11 2011 +0300
We do build oodma_lib with WNTGCC
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 15d9677..8159386 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -34,8 +34,9 @@ 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
commit 4fda3d9fc4027e0b1d8c7f75cee750563ad8907c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Jul 20 19:06:43 2011 +0300
Don't run cppunittester when cross-compiling to Windows
Maybe we should just bypass it in general for all platforms when
cross-compiling in CppunitTest.mk, instead of separately for each
platform that is a potential cros--compilation target?
On the other hand, we might want to in some cases run unit tests using
some emulator like wine or QEMU, using some remote execution
mechanism, or whatever?
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 8626d4b..dd93e79 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -629,7 +629,11 @@ gb_Executable_Executable_platform =
# CppunitTest class
+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)
commit 7492ef6f3a05e4e49d3f80eafc70e198eb83400f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jul 20 11:43:53 2011 +0200
update unusedcode.easy
diff --git a/unusedcode.easy b/unusedcode.easy
index 8fe2e5e..a72ef52 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,24 +1,4 @@
-(anonymous namespace)::DumpObjectList(std::vector<tools::WeakReference<SdrObject>, std::allocator<tools::WeakReference<SdrObject> > > const&)
(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
-(anonymous namespace)::lcl_SkipNPages(SwWrtShell*, unsigned short)
-(anonymous namespace)::lcl_getAxesHoldingCategoriesFromDiagram(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&)
-(anonymous namespace)::lcl_getCategoriesFromTable(SchXMLTable const&, bool)
-(anonymous namespace)::lcl_getSwappedArray(com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<double> > const&)
-(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
-Accelerator::Call(KeyCode const&, unsigned short)
-Accelerator::Clear()
-Accelerator::EnableItem(KeyCode, unsigned char)
-Accelerator::EnableItem(unsigned short, unsigned char)
-Accelerator::GetAccel(KeyCode) const
-Accelerator::GetItemId(KeyCode const&) const
-Accelerator::GetItemKeyCode(unsigned short) const
-Accelerator::IsIdValid(unsigned short) const
-Accelerator::IsItemEnabled(KeyCode) const
-Accelerator::IsItemEnabled(unsigned short) const
-Accelerator::RemoveItem(KeyCode)
-Accelerator::RemoveItem(unsigned short)
-Accelerator::SetAccel(KeyCode, Accelerator*)
-Accelerator::SetAccel(unsigned short, Accelerator*)
AlphaMask::Crop(Rectangle const&)
AlphaMask::Expand(unsigned long, unsigned long, unsigned char*)
AlphaMask::Invert()
@@ -27,20 +7,7 @@ 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)
-Animation::Dither(unsigned long)
-Animation::IsEqual(Animation const&) const
-Application::AddHotKey(KeyCode const&, Link const&, void*)
-Application::CallEvent(NotifyEvent&)
-Application::CallPreNotify(NotifyEvent&)
-Application::FlushAccel()
-Application::GetDialogScaleX()
-Application::InitAppRes(ResId const&)
-Application::IsAccessibilityEnabled()
-Application::IsShutDown()
-Application::IsUserActive(unsigned short)
Application::PostUserEvent(unsigned long, void*)
-Application::RemoveHotKey(unsigned long)
-Application::SetFontPath(String const&)
B3dTransformationSet::GetInvMatFromWorldToView()
B3dTransformationSet::GetInvProjection()
B3dTransformationSet::GetInvTransObjectToEye()
@@ -60,7 +27,6 @@ BasicManager::BasicManager()
BasicManager::ClearErrors()
BasicManager::SetFlagToAllLibs(short, unsigned char) const
BasicPrinter::BasicPrinter()
-BigInt::DivMod(BigInt const&, BigInt&)
BitSet::BitSet(Range const&)
BitSet::BitSet(unsigned short*, unsigned short)
Bitmap::GetSourceSizePixel() const
@@ -81,18 +47,6 @@ BreakpointWindow::FindBreakpoint(Point const&)
BreakpointWindow::FindBreakpoint(unsigned int)
BreakpointWindow::Reset()
BreakpointWindow::SetMarkerPos(unsigned int, bool)
-BrowseBox::GetEventWindow() const
-BrowseBox::GetHeaderBar() const
-BrowseBox::GoToRowAndDoNotModifySelection(long)
-BrowseBox::InsertDataColumn(unsigned short, Image const&, String const&, long, unsigned short, unsigned short, String const*)
-BrowseBox::InsertDataColumn(unsigned short, Image const&, long, unsigned short, unsigned short)
-BrowseBox::IsAllSelected() const
-BrowseBox::IsInCommandEvent() const
-BrowseBox::NextSelectedColumn() const
-BrowseBox::PrevSelectedRow()
-BrowseBox::ScrollPages(long)
-BrowseBox::SetColumnMode(unsigned short, int)
-BrowseBox::SetSelection(MultiSelection const&)
BufferNode::childAt(int) const
Button::Button(Window*, ResId const&)
Button::Button(Window*, long)
commit 01cb566029ca4a419b515cda4b8bbd7578d34aa9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 22:37:29 2011 +0100
throw out a few more
diff --git a/unusedcode.easy b/unusedcode.easy
index 14ccc9f..8fe2e5e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1238,7 +1238,6 @@ SfxApplication::InitializeDde()
SfxApplication::LeaveAsynchronCall_Impl()
SfxApplication::Main()
SfxApplication::SaveAll_Impl(unsigned char, unsigned char)
-SfxBaseModel::NotifyStorageListeners_Impl()
SfxBaseModel::impl_change()
SfxBaseModel::impl_getObjectShell() const
SfxBasicManagerHolder::isAnyContainerModified() const
@@ -1254,15 +1253,6 @@ SfxChildWindowContext::GetAlignment() const
SfxColumnDateTimeItem::SfxColumnDateTimeItem(SfxDateTimeItem const&)
SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short)
SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short, DateTime const&)
-SfxContentHelper::CopyTo(String const&, String const&)
-SfxContentHelper::Exists(String const&)
-SfxContentHelper::Find(String const&, String const&, String&)
-SfxContentHelper::GetFolderContentProperties(String const&, unsigned char)
-SfxContentHelper::GetFolderContents(String const&, unsigned char, unsigned char)
-SfxContentHelper::GetTitle(String const&, String&)
-SfxContentHelper::IsFolder(String const&)
-SfxContentHelper::MakeFolder(String const&)
-SfxContentHelper::MoveTo(String const&, String const&, int)
SfxControllerItem::GetCoreMetric() const
SfxControllerItem::UpdateSlot()
SfxDispatcher::DebugOutput_Impl() const
@@ -1315,9 +1305,6 @@ SfxFrameHTMLWriter::CreateURL(SfxFrame*)
SfxFrameProperties::SfxFrameProperties(SfxFrameDescriptor const*)
SfxFrameWindow_Impl::LinkStubCloserHdl(void*, void*)
SfxHTMLParser::FileDownloadDone(SfxHTMLParser*, void*)
-SfxHelpWindow_Impl::splitHelpURL(rtl::OUString const&, rtl::OUString&, rtl::OUString&, rtl::OUString&)
-SfxHelp_Impl::HasModule(rtl::OUString const&)
-SfxHelp_Impl::IsHelpInstalled()
SfxHintPoster::SfxHintPoster()
SfxImageItem::GetURL() const
SfxImageItem::SfxImageItem(unsigned short, String const&)
@@ -2432,10 +2419,6 @@ XBitmapList::Replace(XBitmapEntry*, long)
XBitmapTable::Remove(long)
XBitmapTable::Replace(long, XBitmapEntry*)
XBitmapTable::XBitmapTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
-XColorList::GetColor(long) const
-XColorList::Remove(long)
-XColorList::Replace(XColorEntry*, long)
-XColorList::XColorList(String const&, XOutdevItemPool*)
XDashTable::Remove(long)
XDashTable::Replace(long, XDashEntry*)
XDashTable::XDashTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
commit a8ffa36ad4026fcc36f41b3df86008f702fcee92
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 22:18:48 2011 +0100
remove unused ByteString using methods
diff --git a/unusedcode.easy b/unusedcode.easy
index 1903dc1..14ccc9f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -234,7 +234,6 @@ 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)
-CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket(ByteString, unsigned long, unsigned char)
Config::Config()
Config::EnterLock()
Config::GetLineEnd() const
@@ -1502,8 +1501,6 @@ SfxWhichIter::LastWhich()
SimpleResMgr::FreeBlob(void*)
SimpleResMgr::GetLocale() const
SimpleResMgr::ReadBlob(unsigned int, void**)
-SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket(ByteString, unsigned long, unsigned char)
-SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket(unsigned char)
Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
Slider::Slider(Window*, ResId const&)
commit 41d9a2763dfb5e51dd9bea97f0324497878b93e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 00:11:56 2011 +0100
remove freshly unused methods
diff --git a/unusedcode.easy b/unusedcode.easy
index de27902..1903dc1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -349,7 +349,6 @@ EditView::UnindentBlock()
ElementCollector::isAbleToNotify() const
ElementCollector::setSecurityId(int)
EnhWMFReader::ReadGDIComment()
-EntryList_Impl::EntryList_Impl(SvxIconChoiceCtrl_Impl*, unsigned short, unsigned short, unsigned short)
ErrorHandler::ForwCreateString(ErrorInfo const*, String&, unsigned short&) const
ExtraKernInfo::HasKernPairs() const
ExtraPortionInfo::DestroyOrgDXArray()
@@ -672,7 +671,6 @@ MenuBar::AddMenuBarButton(Image const&, Link const&, unsigned short)
MenuBar::ShowFloatButton(unsigned char)
MenuBar::ShowHideButton(unsigned char)
MenuItemList::GetCharClass() const
-MergeData::InsertEntry(ByteString const&)
MergeData::~MergeData()
MergeDataFile::Dump()
MessBox::GetModeImage() const
@@ -3084,8 +3082,6 @@ binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const*, u
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::SfxMedium::GetHdl()
-binfilter::SfxMedium::ReOpen()
binfilter::SfxMultiMixRecordWriter::NewContent(unsigned short, unsigned char)
binfilter::SfxMultiVarRecordWriter::NewContent()
binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(SvStream*, unsigned short, unsigned char)
@@ -3514,7 +3510,6 @@ comphelper::OInteractionRequest::clearContinuations()
comphelper::OModuleImpl::~OModuleImpl()
comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int)
comphelper::OSelectionChangeListener::disposeAdapter()
-comphelper::OStorageHelper::GetTemporaryStorageOfFormat(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
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&)
commit 070e53d4fd77262413434a77430a5e12cadcff50
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Mon Jul 18 14:31:00 2011 +0200
use internal cppunit with STL debug enabled
http://lists.freedesktop.org/archives/libreoffice/2011-July/014970.html
diff --git a/configure.in b/configure.in
index 88f09bb..fa6ef65 100755
--- a/configure.in
+++ b/configure.in
@@ -4238,7 +4238,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
commit ee45de3dc308081a29223e56fff8e2434d1f84ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 18 01:13:52 2011 +0100
drop vcl::unotools::getTunnelIdentifier
diff --git a/unusedcode.easy b/unusedcode.easy
index 82271b9..de27902 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4784,7 +4784,6 @@ vcl::unotools::b2IPointFromPoint(Point const&)
vcl::unotools::b2IRectangleFromRectangle(Rectangle const&)
vcl::unotools::b2ISizeFromSize(Size const&)
vcl::unotools::colorToStdColorSpaceSequence(Color const&)
-vcl::unotools::getTunnelIdentifier(vcl::unotools::TunnelIdentifierType)
vcl::unotools::integerPoint2DFromPoint(Point const&)
vcl::unotools::integerRectangle2DFromRectangle(Rectangle const&)
vcl::unotools::point2DFromPoint(Point const&)
commit 025faa524a314a9389a1384251ad7f1ae4530749
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 15 22:20:11 2011 +0100
remove more unused
diff --git a/unusedcode.easy b/unusedcode.easy
index f39d82c..82271b9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -478,7 +478,6 @@ HttpRequest::Abort()
HttpRequest::GetStatus()
HttpRequest::~HttpRequest()
IMapWindow::GetSdrObj(IMapObject const*) const
-INetMIMEMessage::SetContentDescription(String const&)
INetURLObject::hasPassword() const
IconChoiceDialog::RemoveResetButton()
IconChoiceDialog::RemoveTabPage(unsigned short)
@@ -535,8 +534,6 @@ ImplImageList::GetImageCount() const
ImplListBox::GetEntryFlags(unsigned short) const
ImplRegionBand::IsInside(long, long)
ImplRegionBand::IsOver(long, long)
-ImplTBDragMgr::EndCustomizeMode()
-ImplTBDragMgr::StartCustomizeMode()
ImplTaskBarFloat::ImplTaskBarFloat(TaskBar*)
ImplWin::GetModeImage() const
ImplWin::SetModeImage(Image const&)
@@ -844,7 +841,6 @@ Polygon::IsControl(unsigned short) const
Polygon::IsSmooth(unsigned short) const
Polygon::Remove(unsigned short, unsigned short)
PopupMenu::SetSelectedEntry(unsigned short)
-Printer::LinkStubImplDestroyPrinterAsync(void*, void*)
PropBrwMgr::GetChildWindowId()
ProposalList::Remove(rtl::OUString const&)
PushButton::GetSymbolAlign() const
@@ -2127,7 +2123,6 @@ SvxShapeText::SvxShapeText()
SvxShowCharSet::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
SvxSimpleTable::ClearAll()
SvxSimpleTable::TableToTop()
-SvxSimpleTable::getPreferredContainerSize() const
SvxSimpleTableContainer::SvxSimpleTableContainer(Window*, long)
SvxStringArray::GetStringByType(long) const
SvxStringArray::GetValueByStr(String const&) const
@@ -3080,7 +3075,6 @@ binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&
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::SfxConfigManager::GetConfigurationStorage(SotStorage*)
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)
@@ -3088,8 +3082,6 @@ 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::SfxItemPool::IsInStoringRange(unsigned short) const
-binfilter::SfxItemPool::StoreSurrogate(SvStream&, binfilter::SfxPoolItem const*) const
binfilter::SfxMacroConfig::LinkStubCallbackHdl_Impl(void*, void*)
binfilter::SfxMacroConfig::LinkStubEventHdl_Impl(void*, void*)
binfilter::SfxMedium::GetHdl()
@@ -3098,9 +3090,7 @@ 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::AddXMLAsZipToTheStorage(binfilter::SvStorage&)
binfilter::SfxObjectShell::GetBaseURL() const
-binfilter::SfxObjectShell::SaveInfoAndConfig_Impl(binfilter::SvStorageRef)
binfilter::SfxPtrArr::Insert(unsigned short, void*)
binfilter::SfxPtrArr::Remove(void*)
binfilter::SfxPtrArr::Replace(void*, void*)
@@ -4652,7 +4642,6 @@ 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()
-transex::File::File(rtl::OUString)
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()
commit 7ecba0415ac6dfacaa322a32df24671a96e0b26f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 15 22:00:00 2011 +0100
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index 5690924..f39d82c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -535,6 +535,8 @@ ImplImageList::GetImageCount() const
ImplListBox::GetEntryFlags(unsigned short) const
ImplRegionBand::IsInside(long, long)
ImplRegionBand::IsOver(long, long)
+ImplTBDragMgr::EndCustomizeMode()
+ImplTBDragMgr::StartCustomizeMode()
ImplTaskBarFloat::ImplTaskBarFloat(TaskBar*)
ImplWin::GetModeImage() const
ImplWin::SetModeImage(Image const&)
@@ -673,6 +675,7 @@ MenuBar::AddMenuBarButton(Image const&, Link const&, unsigned short)
MenuBar::ShowFloatButton(unsigned char)
MenuBar::ShowHideButton(unsigned char)
MenuItemList::GetCharClass() const
+MergeData::InsertEntry(ByteString const&)
MergeData::~MergeData()
MergeDataFile::Dump()
MessBox::GetModeImage() const
@@ -841,12 +844,7 @@ Polygon::IsControl(unsigned short) const
Polygon::IsSmooth(unsigned short) const
Polygon::Remove(unsigned short, unsigned short)
PopupMenu::SetSelectedEntry(unsigned short)
-Printer::AbortJob()
-Printer::DrawGradientEx(OutputDevice*, PolyPolygon const&, Gradient const&)
-Printer::GetDuplexMode() const
-Printer::ImplEndPrint()
-Printer::Printer(Window const*)
-PrinterSetupDialog::GetOptionsHdl() const
+Printer::LinkStubImplDestroyPrinterAsync(void*, void*)
PropBrwMgr::GetChildWindowId()
ProposalList::Remove(rtl::OUString const&)
PushButton::GetSymbolAlign() const
@@ -1569,10 +1567,12 @@ 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)
@@ -2126,8 +2126,8 @@ SvxShapePolyPolygonBezier::GetPolygonKind() const
SvxShapeText::SvxShapeText()
SvxShowCharSet::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
SvxSimpleTable::ClearAll()
-SvxSimpleTable::GetOutputSizePixel() const
SvxSimpleTable::TableToTop()
+SvxSimpleTable::getPreferredContainerSize() const
SvxSimpleTableContainer::SvxSimpleTableContainer(Window*, long)
SvxStringArray::GetStringByType(long) const
SvxStringArray::GetValueByStr(String const&) const
@@ -2297,10 +2297,6 @@ 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*)
-SystemChildWindow::IsEraseBackgroundEnabled()
-SystemWindow::GetRepresentedURL() const
-SystemWindow::GetZLevel() const
-SystemWindow::SetZLevel(unsigned char)
TB::NeedsPositioning()
TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned short)
TESortedPositions::Insert(unsigned long const&, unsigned short&)
@@ -2317,78 +2313,13 @@ TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char
TPGalleryThemeProperties::LinkStubClickCloseBrowserHdl(void*, void*)
TTProfiler::Dec(unsigned long)
TTProperties::Img(Bitmap*)
-TabBar::EnablePage(unsigned short, unsigned char)
-TabBar::GetMinSize() const
-TabBar::GetSelectPage(unsigned short) const
-TabBar::SelectPageRange(unsigned char, unsigned short, unsigned short)
-TabBar::SetHelpId(unsigned short, rtl::OString const&)
-TabBar::SetHelpText(unsigned short, String const&)
-TabBar::SetSelectColor()
-TabBar::SetSelectColor(Color const&)
-TabBar::SetSelectTextColor()
-TabBar::SetSelectTextColor(Color const&)
-TabControl::GetPageImage(unsigned short) const
-TabControl::GetTabPageResId(unsigned short) const
-TabControl::SetHelpId(unsigned short, rtl::OString const&)
-Table::GetUniqueKey(unsigned long) const
-TaskBar::EnableAutoHide(unsigned char)
-TaskBar::HideStatusText()
-TaskBar::SetLines(unsigned short)
-TaskBar::ShowStatusText(String const&)
-TaskPaneList::FindNextPane(Window*, unsigned char)
-TaskStatusBar::AddStatusFieldItem(unsigned short, TaskStatusFieldItem const&, unsigned short)
-TaskStatusBar::GetStatusFieldItem(unsigned short, TaskStatusFieldItem&) const
-TaskStatusBar::ModifyStatusFieldItem(unsigned short, TaskStatusFieldItem const&)
-TaskStatusBar::RemoveStatusFieldItem(unsigned short)
-TaskStatusBar::SetFieldFlags(unsigned short)
-TaskStatusFieldItem::TaskStatusFieldItem(ITaskStatusNotify*, Image const&, String const&, String const&, unsigned short)
-TempFile::SetTempNameBaseDirectory(String const&)
+TaskStatusBar::ImplGetFieldItem(unsigned short) const
+TaskStatusFieldItem::TaskStatusFieldItem()
+TempFile::IsValid() const
TestToolObj::TestToolObj(String, String)
-TextAttrib::Clone() const
-TextAttrib::SetFont(Font&) const
-TextAttribHyperLink::TextAttribHyperLink(String const&)
-TextAttribHyperLink::TextAttribHyperLink(String const&, String const&)
-TextCharAttribList::DbgCheckAttribs()
-TextEngine::DoesKeyMoveCursor(KeyEvent const&)
-TextEngine::SetDefTab(unsigned short)
-TextEngine::SetUpdateMode(unsigned char, TextView*, unsigned char)
TextObj::TextObj(TextObj&)
TextObj::Write(SvStream*)
-TextUndoSetAttribs::TextUndoSetAttribs(TextEngine*, TextSelection const&)
-TextView::CursorLeft(TextPaM const&, unsigned char)
-TextView::CursorRight(TextPaM const&, unsigned char)
-TextView::IsAutoIndentMode() const
-TextView::IsHighlightSelection() const
-TextView::IsPaintSelection() const
-TextView::SetHighlightSelection(unsigned char)
-TextView::Write(SvStream&)
-ToolBox::CopyItems(ToolBox const&)
-ToolBox::EndCustomizeMode()
-ToolBox::GetDisplayItemId(long) const
-ToolBox::GetItemDropDownRect(unsigned short) const
-ToolBox::GetItemHighImage(unsigned short) const
-ToolBox::GetItemImageAngle(unsigned short) const
-ToolBox::GetItemImageMirrorMode(unsigned short) const
-ToolBox::GetMenuButtonHdl() const
-ToolBox::GetMenubuttonRect() const
-ToolBox::GetPageScroll()
-ToolBox::GetTextCount() const
-ToolBox::GetTextStartEnd(long) const
-ToolBox::ImplGetLastValidItem(unsigned short)
-ToolBox::IsCustomizeMode()
-ToolBox::IsItemDown(unsigned short) const
-ToolBox::MoveItem(unsigned short, unsigned short)
-ToolBox::RecalcItems()
-ToolBox::SetCustomizeMode(unsigned char)
-ToolBox::SetItemHighImage(unsigned short, Image const&)
-ToolBox::SetToolArrowClipregion(ToolBox*, long, long, unsigned char, unsigned char, long)
-ToolBox::StartCustomize(Rectangle const&, void*)
-ToolBox::StartCustomizeMode()
-TransferDataContainer::ClearData()
-TransferableDataHelper::GetInterface(unsigned long, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
-TransferableHelper::SetFileList(FileList const&, com::sun::star::datatransfer::DataFlavor const&)
-TransferableHelper::SetInterface(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::datatransfer::DataFlavor const&)
-Type1Emitter::Type1Emitter(char const*, bool)
+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>&)
@@ -2462,9 +2393,6 @@ WW8_WrSepInfoPtrs::Remove(unsigned short, unsigned short)
WW8_WrSepInfoPtrs::Replace(WW8_SepInfo const&, unsigned short)
WW8_WrSepInfoPtrs::Replace(WW8_SepInfo const*, unsigned short, unsigned short)
WW8_WrSepInfoPtrs::_ForEach(unsigned short, unsigned short, unsigned char (*)(WW8_SepInfo const&, void*), void*)
-Wallpaper::SetBitmap()
-Wallpaper::SetGradient()
-Wallpaper::SetRect()
WinMtfOutput::DrawLine(Point const&, Point const&)
WinMtfOutput::GetTextLayoutMode() const
WinMtfOutput::SetFont(Font const&)
@@ -3063,8 +2991,6 @@ binfilter::ImpSvNumMultipleWriteHeader::ImpSvNumMultipleWriteHeader(SvStream&, u
binfilter::ImpSvNumMultipleWriteHeader::StartEntry()
binfilter::ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader()
binfilter::ImpSvtData::~ImpSvtData()
-binfilter::ImplRenderPaintProc::IsPrintable(binfilter::SdrObject const*) const
-binfilter::ImplRenderPaintProc::IsVisible(binfilter::SdrObject const*) const
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)
@@ -3148,11 +3074,13 @@ binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const*, unsi
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::SfxConfigManager::GetConfigurationStorage(SotStorage*)
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)
@@ -3160,6 +3088,8 @@ 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::SfxItemPool::IsInStoringRange(unsigned short) const
+binfilter::SfxItemPool::StoreSurrogate(SvStream&, binfilter::SfxPoolItem const*) const
binfilter::SfxMacroConfig::LinkStubCallbackHdl_Impl(void*, void*)
binfilter::SfxMacroConfig::LinkStubEventHdl_Impl(void*, void*)
binfilter::SfxMedium::GetHdl()
@@ -3168,7 +3098,9 @@ 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::AddXMLAsZipToTheStorage(binfilter::SvStorage&)
binfilter::SfxObjectShell::GetBaseURL() const
+binfilter::SfxObjectShell::SaveInfoAndConfig_Impl(binfilter::SvStorageRef)
binfilter::SfxPtrArr::Insert(unsigned short, void*)
binfilter::SfxPtrArr::Remove(void*)
binfilter::SfxPtrArr::Replace(void*, void*)
@@ -4720,6 +4652,7 @@ 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()
+transex::File::File(rtl::OUString)
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()
commit 6bce39ba89a4a2e1605e62dffbca8a85533da067
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 22:05:15 2011 +0100
drop some more unused methods
diff --git a/unusedcode.easy b/unusedcode.easy
index eb451a7..5690924 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,4 @@
(anonymous namespace)::DumpObjectList(std::vector<tools::WeakReference<SdrObject>, std::allocator<tools::WeakReference<SdrObject> > > const&)
-(anonymous namespace)::checkDoubleForDateFormat(double, int, com::sun::star::uno::Reference<com::sun::star::util::XNumberFormatter> const&)
(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
(anonymous namespace)::lcl_SkipNPages(SwWrtShell*, unsigned short)
(anonymous namespace)::lcl_getAxesHoldingCategoriesFromDiagram(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&)
@@ -674,7 +673,6 @@ MenuBar::AddMenuBarButton(Image const&, Link const&, unsigned short)
MenuBar::ShowFloatButton(unsigned char)
MenuBar::ShowHideButton(unsigned char)
MenuItemList::GetCharClass() const
-MergeData::InsertEntry(ByteString const&)
MergeData::~MergeData()
MergeDataFile::Dump()
MessBox::GetModeImage() const
@@ -1191,7 +1189,6 @@ SdrPaintView::SetAllLayersVisible(unsigned char)
SdrPaintView::getColorConfig() const
SdrPaintWindow::HideOverlay(Region const&)
SdrPolyEditView::ShutMarkedObjects()
-SdrRectObj::PaintNeedsXPoly(long) const
SdrRectObj::SdrRectObj(SdrObjKind, Rectangle const&, SvStream&, String const&, unsigned short)
SdrSnapView::SnapRect(Rectangle const&, SdrPageView const*, long&, long&) const
SdrTextObj::CreateDrawOutliner()
@@ -1266,7 +1263,6 @@ SfxChildWindowContext::GetAlignment() const
SfxColumnDateTimeItem::SfxColumnDateTimeItem(SfxDateTimeItem const&)
SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short)
SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short, DateTime const&)
-SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(unsigned short)
SfxContentHelper::CopyTo(String const&, String const&)
SfxContentHelper::Exists(String const&)
SfxContentHelper::Find(String const&, String const&, String&)
@@ -1276,7 +1272,6 @@ SfxContentHelper::GetTitle(String const&, String&)
SfxContentHelper::IsFolder(String const&)
SfxContentHelper::MakeFolder(String const&)
SfxContentHelper::MoveTo(String const&, String const&, int)
-SfxContentHelper::QueryDiskSpace(String const&, long&)
SfxControllerItem::GetCoreMetric() const
SfxControllerItem::UpdateSlot()
SfxDispatcher::DebugOutput_Impl() const
@@ -1284,7 +1279,6 @@ SfxDispatcher::Execute(SfxExecuteItem const&)
SfxDispatcher::ExecutePopup(unsigned short, Window*, Point const*, SfxPoolItem const*, ...)
SfxDispatcher::GetSlotId(String const&)
SfxDispatcher::HasSlot_Impl(unsigned short)
-SfxDispatcher::InsertShell_Impl(SfxShell&, unsigned short)
SfxDispatcher::ResetObjectBars_Impl()
SfxDispatcher::SetModalMode_Impl(unsigned char)
SfxDispatcher::_Execute(SfxSlotServer const&)
@@ -1513,23 +1507,9 @@ SfxVirtualMenu::GetPopupMenu(unsigned short) const
SfxVirtualMenu::SetHelpIds(ResMgr*)
SfxVirtualMenu::UpdateImages()
SfxWhichIter::LastWhich()
-SfxWorkWindow::AlignChild_Impl(Window&, Size const&, SfxChildAlignment)
-SfxWorkWindow::ChangeWindow_Impl(Window*)
-SfxWorkWindow::Close_Impl()
-SfxWorkWindow::CreateDispatch(String const&)
-SfxWorkWindow::GetActiveChild_Impl()
-SfxWorkWindow::GetObjectBar_Impl(unsigned short, unsigned int)
-SfxWorkWindow::GetTopWindow() const
-SfxWorkWindow::HasNextObjectBar_Impl(unsigned short, String*)
-SfxWorkWindow::NextObjectBar_Impl(unsigned short)
-SfxWorkWindow::SaveStatus_Impl()
-SfxWorkWindow::SetObjectBarCustomizeMode_Impl(unsigned char)
-SfxWorkWindow::SetTempStatusBar_Impl(unsigned char)
SimpleResMgr::FreeBlob(void*)
SimpleResMgr::GetLocale() const
SimpleResMgr::ReadBlob(unsigned int, void**)
-SimpleTokenizer_Impl::getFullTokenStr(TokenTypes, unsigned short const*, unsigned short const*)
-SimpleTokenizer_Impl::getTokStr(unsigned short const*, unsigned short const*)
SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket(ByteString, unsigned long, unsigned char)
SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket(unsigned char)
Slider::SetRangeMax(long)
@@ -2000,8 +1980,6 @@ SvxAutocorrWordList::Remove(SvxAutocorrWord* const&, unsigned short)
SvxAutocorrWordList::Remove(unsigned short, unsigned short)
SvxB3DVectorItem::SvxB3DVectorItem(unsigned short, SvStream&)
SvxBmpMask::ImpMask(BitmapEx const&)
-SvxBrushItem::CreateCntWallpaperItem() const
-SvxBrushItem::PurgeGraphic() const
SvxBulletItem::GetBitmap() const
SvxBulletItem::SetBitmap(Bitmap const&)
SvxBulletItem::SvxBulletItem(Bitmap const&, unsigned short)
@@ -2416,7 +2394,6 @@ 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*)
-URIHelper::queryFSysStyle(String const&, bool)
UShortCont::Sort()
UniqueIdContainer::CreateFreeId(unsigned long)
UniqueIdContainer::CreateIdProt(unsigned long)
@@ -2495,7 +2472,6 @@ 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::HasCompoundControlFocus() const
Window::ImplCalcChildOverlapToTop(ImplCalcToTopData*)
Window::ImplFrameToOutput(Rectangle&)
Window::ImplGetCurrentBackgroundColor(Color&)
@@ -3177,7 +3153,6 @@ binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&
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::SfxConfigManager::GetConfigurationStorage(SotStorage*)
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)
@@ -3185,8 +3160,6 @@ 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::SfxItemPool::SetStoringRange(unsigned short, unsigned short)
-binfilter::SfxItemPool::StoreItem(SvStream&, binfilter::SfxPoolItem const&, bool) const
binfilter::SfxMacroConfig::LinkStubCallbackHdl_Impl(void*, void*)
binfilter::SfxMacroConfig::LinkStubEventHdl_Impl(void*, void*)
binfilter::SfxMedium::GetHdl()
@@ -3195,10 +3168,7 @@ 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::AddXMLAsZipToTheStorage(binfilter::SvStorage&)
binfilter::SfxObjectShell::GetBaseURL() const
-binfilter::SfxObjectShell::SaveInfoAndConfig_Impl(binfilter::SvStorageRef)
-binfilter::SfxPoolItem::writeUnicodeString(SvStream&, String const&)
binfilter::SfxPtrArr::Insert(unsigned short, void*)
binfilter::SfxPtrArr::Remove(void*)
binfilter::SfxPtrArr::Replace(void*, void*)
@@ -3239,8 +3209,6 @@ binfilter::SvBytes::Insert(binfilter::SvBytes const*, unsigned short, unsigned s
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::SvContainerEnvironment::SetDocToolFramePixel(SvBorder const&)
-binfilter::SvContainerEnvironment::SetTopToolFramePixel(SvBorder const&)
binfilter::SvDataPipe_Impl::addMark(unsigned int)
binfilter::SvDataPipe_Impl::removeMark(unsigned int)
binfilter::SvFactory::GetSvClass(int, SvGlobalName const&)
@@ -3435,10 +3403,6 @@ binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortionArr const*
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::SwXMLExport::setBlockMode()
-binfilter::SwXMLImport::setBlockMode()
-binfilter::SwXMLImport::setOrganizerMode()
-binfilter::SwXMLImport::setStyleInsertMode(unsigned short, unsigned char)
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*)
@@ -4748,7 +4712,6 @@ 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)
-sw::util::FontMapExport::HasDistinctSecondary() const
test::OfficeConnection::OfficeConnection()
test::OfficeConnection::getComponentContext() const
test::OfficeConnection::setUp()
@@ -4757,8 +4720,6 @@ 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()
-transex3::SourceTreeLocalizer::MergeSingleFile(ByteString const&, ByteString const&, ByteString const&)
-transex::File::File(rtl::OUString)
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()
@@ -4801,7 +4762,6 @@ unicode::isBase(unsigned short)
unicode::isPunctuation(unsigned short)
unicode::isTitle(unsigned short)
unicode::isUnicodeScriptType(unsigned short, short)
-unnamed_svl_inettype::Registration::GetExtension(String const&)
unnamed_svl_inettype::Registration::~Registration()
unographic::GraphicDescriptor::isValid() const
utl::AccessibleStateSetHelper::Compare(utl::AccessibleStateSetHelper const&, utl::AccessibleStateSetHelper&, utl::AccessibleStateSetHelper&)
commit 15a58ad3169ee4b9e84ea9c944e237a2a73893a9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 21:17:43 2011 +0100
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index 33dc4b8..eb451a7 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -42,6 +42,14 @@ Application::IsUserActive(unsigned short)
Application::PostUserEvent(unsigned long, void*)
Application::RemoveHotKey(unsigned long)
Application::SetFontPath(String const&)
+B3dTransformationSet::GetInvMatFromWorldToView()
+B3dTransformationSet::GetInvProjection()
+B3dTransformationSet::GetInvTransObjectToEye()
+B3dTransformationSet::GetMatFromWorldToView()
+B3dTransformationSet::GetObjectToDevice()
+B3dTransformationSet::PostSetTexture()
+B3dTransformationSet::SetBackClippingPlane(double)
+B3dTransformationSet::SetFrontClippingPlane(double)
BasicError::BasicError()
BasicIDEDLL::Exit()
BasicIDEShell::LinkStubAccelSelectHdl(void*, void*)
@@ -272,7 +280,6 @@ Dialog::Dialog(Window*, ResId const&)
Dialog::ImplCenterDialog()
Dialog::IsStartedModal() const
DicEntry::DicEntry()
-DictionaryNeo_CreateInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
Dir::Dir()
Dir::Dir(DirEntry const&, int, int, ...)
DirEntry::CutExtension(char)
@@ -389,9 +396,7 @@ 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&)
-FmXFilterCell_CreateInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
FmXFormShell::clearFilter()
-FmXGridPeer_CreateInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
FontCharMap::GetLastChar() const
FontInfo::IsDeviceFont() const
FontInfo::SupportsCJK() const
@@ -427,9 +432,6 @@ GalleryExplorer::GetVCDrawModel(FmFormModel&) const
GalleryExplorer::InsertGraphicObj(unsigned long, Graphic const&)
GalleryExplorer::InsertSdrObj(unsigned long, FmFormModel&)
GalleryTheme::ImplRead()
-GetDistance(std::vector<com::sun::star::beans::PropertyValue, std::allocator<com::sun::star::beans::PropertyValue> >&, rtl::OUString const&, xmloff::EnhancedCustomShapeToken::EnhancedCustomShapeTokenEnum)
-GetInt32(SdrCustomShapeGeometryItem&, rtl::OUString const&, int)
-GetPoint(SdrCustomShapeGeometryItem&, rtl::OUString const&, com::sun::star::awt::Point const&)
GlobalEventConfig::EstablishFrameCallback(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&)
GlobalEventConfig_Impl::getEvents()
GlyphCache::CalcByteCount() const
@@ -463,7 +465,6 @@ 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)
-HasDocumentValidSignature(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
Hatch::SetStyle(HatchStyle)
HatchingLB::HatchingLB(Window*, long, unsigned char)
HatchingLB::SelectEntryByList(XHatchList const*, String const&, XHatch const&, unsigned short)
@@ -504,8 +505,6 @@ ImpSvMEdit::SetInsertMode(unsigned char)
ImpSvMEdit::SetTextWindowOffset(Point const&)
ImpSvlData::~ImpSvlData()
ImpSvtData::~ImpSvtData()
-Imp_SkipDoubleAndSpacesAndCommas(rtl::OUString const&, int&, int)
-Imp_SkipNumberAndSpacesAndCommas(rtl::OUString const&, int&, int)
ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&)
ImplBorderWindow::SetHelpButton(unsigned char)
ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
@@ -563,7 +562,6 @@ KeyEvent::InitKeyEvent(com::sun::star::awt::KeyEvent&) const
KeyEvent::KeyEvent(com::sun::star::awt::KeyEvent const&)
KeyboardSettings::CopyData()
LWPFilterImportFilter::getSupportedServiceNames_Static()
-LWPFilterImportFilter_CreateInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
Line::Enum(Link const&)
Line::NearestPoint(Point const&) const
LineInfo::isDashDotOrFatLineUsed() const
@@ -679,7 +677,6 @@ MenuItemList::GetCharClass() const
MergeData::InsertEntry(ByteString const&)
MergeData::~MergeData()
MergeDataFile::Dump()
-MergeDataFile::WriteError(ByteString const&)
MessBox::GetModeImage() const
MessBox::MessBox(unsigned short)
MessBox::SetDefaultCheckBoxText()
@@ -702,7 +699,6 @@ MultiLineEditSyntaxHighlight::IsBracketHilight()
MultiPropertySetHelper::MultiPropertySetHelper(rtl::OUString const*)
MultiSelection::Append(long)
NameNode::IsOrderTree() const
-NameTranslator_Impl::NameTranslator_Impl()
NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const&, short) const
NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const&)
NfCurrencyEntry::IsEuro() const
@@ -717,9 +713,7 @@ NumericBox::GetValuePos(long) const
NumericBox::RemoveValue(long)
NumericFormatter::ConvertToFraction(long)
NumericFormatter::ConvertToLong(Fraction const&)
-OEMToOUString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
OLEObjCache::SetSize(unsigned long)
-ONSSInitializer_createInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ORegKey::acquireKey(void*)
OUStringsSort_Impl::DeleteAndDestroy(unsigned short, unsigned short)
OUStringsSort_Impl::Insert(OUStringsSort_Impl const*, unsigned short, unsigned short)
@@ -874,7 +868,6 @@ Ruler::GetMargin1Style() const
Ruler::GetMargin2Style() const
Ruler::GetPageWidth() const
Ruler::SetArrows(unsigned short, RulerArrow const*)
-SVGDialog_createInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
SVGExport::GetGlyphPlacement() const
SVGExport::IsUseGradient() const
SVGExport::popClip()
@@ -1608,7 +1601,6 @@ StgEntry::GetTime(StgEntryTime) const
StgEntry::SetTime(StgEntryTime, int*)
StgHeader::SetClassId(ClsId const&)
StorageStream::ValidateMode(unsigned short, StgDirEntry*) const
-StoragesOfUnknownMediaTypeAreCopied_Impl(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&)
String::CompareIgnoreCaseToAscii(unsigned short const*, unsigned short) const
String::CompareTo(unsigned short const*, unsigned short) const
String::Equals(unsigned short const*) const
@@ -2053,7 +2045,6 @@ SvxFontPrevWindow::SetNoLines(unsigned char)
SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char)
SvxFontPrevWindow::SvxFontPrevWindow(Window*)
SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
-SvxGetNumRule(com::sun::star::uno::Reference<com::sun::star::container::XIndexReplace>, SvxNumRule&)
SvxGrafToolBoxControl::RegisterControl(unsigned short, SfxModule*)
SvxGraphCtrlAccessibleContext::checkChildIndex(long)
SvxGraphCtrlAccessibleContext::setDescription(rtl::OUString const&)
@@ -2093,6 +2084,7 @@ 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
@@ -2131,7 +2123,7 @@ SvxRectCtlAccessibleContext::setDescription(rtl::OUString const&)
SvxRectCtlAccessibleContext::setName(rtl::OUString const&)
SvxRedlinTable::IsValidCalcEntry(String const&, RedlinData*)
SvxRedlinTable::IsValidWriterEntry(String const&, RedlinData*)
-SvxRedlinTable::SvxRedlinTable(Window*, long)
+SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer&, ResId const&)
SvxRelativeField::SvxRelativeField(Window*, long)
SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
SvxRubyChildWindow::GetChildWindowId()
@@ -2157,8 +2149,8 @@ SvxShapeText::SvxShapeText()
SvxShowCharSet::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
SvxSimpleTable::ClearAll()
SvxSimpleTable::GetOutputSizePixel() const
-SvxSimpleTable::SetPosSize(Point const&, Size const&)
SvxSimpleTable::TableToTop()
+SvxSimpleTableContainer::SvxSimpleTableContainer(Window*, long)
SvxStringArray::GetStringByType(long) const
SvxStringArray::GetValueByStr(String const&) const
SvxSuperContourDlg::DoAutoCreate()
@@ -2448,7 +2440,6 @@ VCLUnoHelper::CreatePointer()
VCLXDevice::IsCreatedWithToolkit() const
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
-ValidateIccProfile(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, icValidateStatus&)
ValueSet::CopyItems(ValueSet const&)
ValueSet::GetHighlightHdl() const
ValueSet::GetItemBits(unsigned short) const
@@ -2534,7 +2525,6 @@ Window::removeWindow(Window*, Window*)
Window::setIdentifier(rtl::OUString const&)
WizardDialog::IsButtonFixedLineVisible()
WordArr::Remove(short)
-WriteStartTag(std::basic_ofstream<char, std::char_traits<char> >&, char const*, int)
Writer::OutHex(SvStream&, unsigned long, unsigned char)
WrongRanges::Insert(WrongRanges const*, unsigned short, unsigned short, unsigned short)
WrongRanges::Replace(WrongRange const&, unsigned short)
@@ -2663,6 +2653,7 @@ 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*)
@@ -2695,7 +2686,6 @@ XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*)
XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list