diff options
40 files changed, 14 insertions, 1591 deletions
diff --git a/.gitmodules b/.gitmodules index 2bba7a262000..f432476e24cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "binfilter"] - path = binfilter - url = git://gerrit.libreoffice.org/binfilter - branch = . [submodule "dictionaries"] path = dictionaries url = git://gerrit.libreoffice.org/dictionaries diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 99f9c60ba459..c5482a865f5b 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -169,7 +169,6 @@ add_wrapper loffice soffice "" "libreoffice" "" add_wrapper unopkg unopkg "" "unopkg" "" "gid_Module_Root_Brand" # there are two more desktop files for optional filters -test -f $DESTDIR/gid_Module_Optional_Binfilter && echo "$PREFIXDIR/share/applications/libreoffice-binfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Binfilter" test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo "$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples" # $PREFIXDIR/bin/ooffice symlink is necessary by java UNO components to find diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index e1f9b6e74766..eca4d3551e2b 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -133,8 +133,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then if test "$SPLIT_OPT_FEATURES" = "YES" ; then if test "z$OOO_VENDOR" = "zMandriva" ; then - merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/filter-binfilter_list.txt - merge_flists gid_Module_Langpack_Binfilter_en_US $FILELISTSDIR/filter-binfilter_list.txt merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt @@ -142,7 +140,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt else - merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/filters_list.txt merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/filters_list.txt @@ -151,8 +148,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt fi else - merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/common_list.txt - merge_flists gid_Module_Langpack_Binfilter $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt @@ -174,7 +169,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then test -f gid_Module_Langpack_Calc_$lang && lang_lists="$lang_lists gid_Module_Langpack_Calc_$lang" || : test -f gid_Module_Langpack_Base_$lang && lang_lists="$lang_lists gid_Module_Langpack_Base_$lang" || : test -f gid_Module_Langpack_Writer_$lang && lang_lists="$lang_lists gid_Module_Langpack_Writer_$lang" || : - test -f gid_Module_Langpack_Binfilter_$lang && lang_lists="$lang_lists gid_Module_Langpack_Binfilter_$lang" || : # Place helps on dedicated packages. test -f gid_Module_Helppack_Help_$lang && sort -u gid_Module_Helppack_Help_$lang > $FILELISTSDIR/help_${lang}_list.txt || : else @@ -187,7 +181,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then test -f gid_Module_Langpack_Calc_$lang && lang_lists="$lang_lists gid_Module_Langpack_Calc_$lang" || : test -f gid_Module_Langpack_Base_$lang && lang_lists="$lang_lists gid_Module_Langpack_Base_$lang" || : test -f gid_Module_Langpack_Writer_$lang && lang_lists="$lang_lists gid_Module_Langpack_Writer_$lang" || : - test -f gid_Module_Langpack_Binfilter_$lang && lang_lists="$lang_lists gid_Module_Langpack_Binfilter_$lang" || : test -f gid_Module_Helppack_Help_$lang && lang_lists="$lang_lists gid_Module_Helppack_Help_$lang" || : fi if test -n "$lang_lists" ; then @@ -320,9 +313,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/program/classes.*" mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/share/Scripts/java.*" - mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/aportisdoc.jar - mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/pocketword.jar - mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/program/classes/pexcel.jar mv_file_between_flists java_common_list.txt writer_list.txt $INSTALLDIR/program/classes/writer2latex.jar # Move arch-dependent/dup files from common to core @@ -409,9 +399,6 @@ else create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common create_package_directory gid_Module_Optional_Javafilter pkg/libreoffice-common - if [ -f gid_Module_Optional_Binfilter ]; then - create_package_directory gid_Module_Optional_Binfilter pkg/libreoffice-filter-binfilter - fi create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math @@ -455,13 +442,7 @@ else create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g` pkg/libreoffice-help-$l - if [ -f gid_Module_Optional_Binfilter ]; then - if [ "$l" = "en-US" ]; then - create_package_directory gid_Module_Langpack_Binfilter_en_US pkg/libreoffice-filter-binfilter - else - create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l - fi - fi + # some help files are in _Langpack_{Writer,Impress,...}_<lang> # move them from -l10n to -help if [ "$l" = "en-US" ]; then d=en; else d=$l; fi diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat index 4135b8b9a33d..81aa700fcbfe 100755 --- a/bin/lo-commit-stat +++ b/bin/lo-commit-stat @@ -8,7 +8,7 @@ use LWP::UserAgent; use utf8; my $main_repo="core"; -my @pieces=("binfilter", "dictionaries", "help", "translations"); +my @pieces=("dictionaries", "help", "translations"); my %bugzillas = ( fdo => "https://bugs.freedesktop.org/show_bug.cgi?id=", diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources index 7df4a0f058d2..d04d5c95a9a0 100755 --- a/bin/lo-pack-sources +++ b/bin/lo-pack-sources @@ -340,7 +340,7 @@ my $lo_core_tempdir; my $force; my $verbose=1; my $is_lo_core_dir=0; -my @pieces=("binfilter", "dictionaries", "help", "translations"); +my @pieces=("dictionaries", "help", "translations"); my %piece_tarball_name; ################### diff --git a/config_host.mk.in b/config_host.mk.in index 3ffaee0ce7e8..b1bc535fb16f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -673,7 +673,6 @@ export WINEGCC=@WINEGCC@ export WITHOUT_AFMS=@WITHOUT_AFMS@ export WITHOUT_PPDS=@WITHOUT_PPDS@ #export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@ -export WITH_BINFILTER=@WITH_BINFILTER@ export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@ export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@ export WITH_EXTRA_EXTENSIONS=@WITH_EXTRA_EXTENSIONS@ diff --git a/configure.ac b/configure.ac index e3054449ab6c..2439053cfd54 100644 --- a/configure.ac +++ b/configure.ac @@ -943,12 +943,6 @@ AC_ARG_ENABLE(unix-qstart-libpng, enabling this is a good idea (ie. for Linux Distro packaging).]), ,enable_unix_qstart_libpng=yes) -AC_ARG_ENABLE(binfilter, - AS_HELP_STRING([--enable-binfilter], - [Enable legacy binary file formats filters build.]), -,enable_binfilter=no -) - AC_ARG_ENABLE(rpath, AS_HELP_STRING([--disable-rpath], [Disable the use of relative paths in shared libraries.]), @@ -4351,21 +4345,6 @@ else fi AC_SUBST(DO_FETCH_TARBALLS) - -dnl Disable legacy binary file formats filters -dnl =================================================================== -AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)]) -if test "$enable_binfilter" = "no"; then - WITH_BINFILTER="NO" - AC_MSG_RESULT([no]) -else - WITH_BINFILTER="YES" - BUILD_TYPE="$BUILD_TYPE BINFILTER" - GIT_NEEDED_SUBMODULES="binfilter $GIT_NEEDED_SUBMODULES" - AC_MSG_RESULT([yes]) -fi -AC_SUBST(WITH_BINFILTER) - AC_MSG_CHECKING([whether to build help]) if test "$with_help" != "no" -a $_os != iOS -a $_os != Android; then AC_MSG_RESULT([yes]) @@ -12358,16 +12337,11 @@ fi AC_MSG_CHECKING([whether to create huge library]) MERGELIBS= if test "$enable_mergelibs" = "yes" ; then - if test $WITH_BINFILTER = YES; then - add_warning "--enable-mergelibs conflicts with --enable-binfilter. Disabling mergelibs." - AC_MSG_RESULT([no]) - else - if test $_os != Linux -a $_os != Android -a $_os != WINNT; then - add_warning "--enable-mergelibs is not tested for this platform" - fi - MERGELIBS="TRUE" - AC_MSG_RESULT([yes]) + if test $_os != Linux -a $_os != Android -a $_os != WINNT; then + add_warning "--enable-mergelibs is not tested for this platform" fi + MERGELIBS="TRUE" + AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) fi diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 8ac9eddf1cac..bc56887922b4 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -37,7 +37,6 @@ --enable-ext-pdfimport --enable-ext-nlpsolver --enable-epm ---enable-binfilter --enable-python=internal --enable-online-update --disable-unix-qstart-libpng diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index ab0fa362c1a0..19f12b236e20 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -1,6 +1,5 @@ --with-vendor=The Document Foundation --enable-epm ---enable-binfilter --with-java-target-version=1.5 --enable-scripting-beanshell --enable-scripting-javascript diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index 642dcc975e4c..9ffade5b8fe0 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -22,7 +22,6 @@ --without-junit --without-myspell-dicts --disable-activex ---disable-binfilter --disable-cairo-canvas --disable-build-mozilla --disable-directx diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index bcc5291ee411..f06eef64ebaf 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -10,7 +10,6 @@ --disable-opengl --disable-randr-link --disable-unix-qstart-libpng ---enable-binfilter --enable-gstreamer-0-10 --enable-lockdown --enable-ext-presenter-minimizer diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 4ebd45931f22..36351d76fc90 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -7,7 +7,6 @@ --enable-extension-integration --with-java-target-version=1.5 --disable-gtk ---enable-binfilter --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-wiki-publisher diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 2be6a5d5add7..dfbc99eb44f8 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -5,7 +5,6 @@ --with-intro-progressbar-size=430,5 --with-intro-progressbar-position=5,210 --with-intro-progressbar-frame-color=138,156,190 ---enable-binfilter --enable-vba --enable-mozilla --enable-build-mozilla diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index 5cc637c03a66..43106a9dd124 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -2,7 +2,6 @@ --with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png ---enable-binfilter --enable-vba --disable-build-mozilla --disable-symbols diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 05c14fc189d3..5b41bdac1b3e 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -929,193 +929,4 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.xcu,filt UOF_presentation \ ) -### binfilter ### - -ifneq ($(WITH_BINFILTER),NO) - -# fcfg_writer_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_bf_types.xcu,filter/source/config/fragments/types,\ - writer_StarWriter_10 \ - writer_StarWriter_20 \ - writer_StarWriter_30 \ - writer_StarWriter_30_VorlageTemplate \ - writer_StarWriter_40 \ - writer_StarWriter_40_VorlageTemplate \ - writer_StarWriter_50 \ - writer_StarWriter_50_VorlageTemplate \ - writer_StarWriter_DOS \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarWriter_1_0 \ - StarWriter_2_0 \ - StarWriter_3_0 \ - StarWriter_3_0_Vorlage_Template \ - StarWriter_4_0 \ - StarWriter_4_0_Vorlage_Template \ - StarWriter_5_0 \ - StarWriter_5_0_Vorlage_Template \ - StarWriter_DOS \ -) - -$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\ - StarWriter_3_0_Vorlage_Template_ui \ - StarWriter_4_0_Vorlage_Template_ui \ - StarWriter_5_0_Vorlage_Template_ui \ -) - -# fcfg_web_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_web_bf_types.xcu,filter/source/config/fragments/types,\ - writer_StarWriter_30 \ - writer_StarWriter_40 \ - writer_StarWriter_50 \ - writer_web_StarWriterWeb_40_VorlageTemplate \ - writer_web_StarWriterWeb_50_VorlageTemplate \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_web_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarWriter_3_0__StarWriter_Web_ \ - StarWriter_4_0__StarWriter_Web_ \ - StarWriter_5_0__StarWriter_Web_ \ - StarWriter_Web_4_0_Vorlage_Template \ - StarWriter_Web_5_0_Vorlage_Template \ -) - -$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\ - StarWriter_Web_4_0_Vorlage_Template_ui \ - StarWriter_Web_5_0_Vorlage_Template_ui \ -) - -# fcfg_global_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_bf_types.xcu,filter/source/config/fragments/types,\ - writer_StarWriter_30 \ - writer_StarWriter_40 \ - writer_globaldocument_StarWriter_40GlobalDocument \ - writer_StarWriter_50 \ - writer_globaldocument_StarWriter_50GlobalDocument \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_global_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarWriter_3_0__StarWriter_GlobalDocument_ \ - StarWriter_4_0__StarWriter_GlobalDocument_ \ - StarWriter_4_0_GlobalDocument \ - StarWriter_5_0__StarWriter_GlobalDocument_ \ - StarWriter_5_0_GlobalDocument \ -) - -$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\ - StarWriter_4_0_GlobalDocument_ui \ - StarWriter_5_0_GlobalDocument_ui \ -) - -# fcfg_calc_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_bf_types.xcu,filter/source/config/fragments/types,\ - calc_StarCalc_10 \ - calc_StarCalc_30 \ - calc_StarCalc_30_VorlageTemplate \ - calc_StarCalc_40 \ - calc_StarCalc_40_VorlageTemplate \ - calc_StarCalc_50 \ - calc_StarCalc_50_VorlageTemplate \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarCalc_1_0 \ - StarCalc_3_0 \ - StarCalc_3_0_Vorlage_Template \ - StarCalc_4_0 \ - StarCalc_4_0_Vorlage_Template \ - StarCalc_5_0 \ - StarCalc_5_0_Vorlage_Template \ -) - -$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\ - StarCalc_3_0_Vorlage_Template_ui \ - StarCalc_4_0_Vorlage_Template_ui \ - StarCalc_5_0_Vorlage_Template_ui \ -) - -# fcfg_draw_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_bf_types.xcu,filter/source/config/fragments/types,\ - draw_StarDraw_30 \ - draw_StarDraw_30_Vorlage \ - draw_StarDraw_50 \ - draw_StarDraw_50_Vorlage \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarDraw_3_0 \ - StarDraw_3_0_Vorlage \ - StarDraw_5_0 \ - StarDraw_5_0_Vorlage \ -) - -$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\ - StarDraw_3_0_Vorlage_ui \ - StarDraw_5_0_Vorlage_ui \ -) - -# fcfg_impress_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_bf_types.xcu,filter/source/config/fragments/types,\ - draw_StarDraw_30 \ - draw_StarDraw_30_Vorlage \ - draw_StarDraw_50 \ - draw_StarDraw_50_Vorlage \ - impress_StarImpress_40 \ - impress_StarImpress_40_Vorlage \ - impress_StarImpress_50 \ - impress_StarImpress_50_Vorlage \ - impress_StarImpress_50_packed \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarDraw_3_0_Vorlage__StarImpress_ \ - StarDraw_3_0__StarImpress_ \ - StarDraw_5_0_Vorlage__StarImpress_ \ - StarDraw_5_0__StarImpress_ \ - StarImpress_4_0 \ - StarImpress_4_0_Vorlage \ - StarImpress_5_0 \ - StarImpress_5_0_Vorlage \ - StarImpress_5_0__packed_ \ -) - -$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\ - StarDraw_3_0_Vorlage__StarImpress__ui \ - StarDraw_5_0_Vorlage__StarImpress__ui \ - StarImpress_4_0_Vorlage_ui \ - StarImpress_5_0_Vorlage_ui \ - StarImpress_5_0__packed__ui \ -) - -# fcfg_chart_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_chart_bf_types.xcu,filter/source/config/fragments/types,\ - chart_StarChart_30 \ - chart_StarChart_40 \ - chart_StarChart_50 \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_chart_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarChart_3_0 \ - StarChart_4_0 \ - StarChart_5_0 \ -) - -# fcfg_math_bf -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_math_bf_types.xcu,filter/source/config/fragments/types,\ - math_StarMath_20 \ - math_StarMath_30 \ - math_StarMath_40 \ - math_StarMath_50 \ -) - -$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_math_bf_filters.xcu,filter/source/config/fragments/filters,\ - StarMath_2_0 \ - StarMath_3_0 \ - StarMath_4_0 \ - StarMath_5_0 \ -) - -endif # WITH_BINFILTER - # vim: set noet sw=4 ts=4: @@ -7,7 +7,7 @@ if [ -n "$g_debug" ] ; then set -x fi -SUBMODULES_ALL="binfilter dictionaries helpcontent2 translations" +SUBMODULES_ALL="dictionaries helpcontent2 translations" pushd $(dirname $0) > /dev/null COREDIR=$(pwd) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index d8e43bf271a6..269bf5863f8a 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -307,12 +307,6 @@ my_components += \ component/wizards/com/sun/star/wizards/web/web .END -.IF "$(WITH_BINFILTER)" != "NO" -my_components += \ - bf_migratefilter \ - bindet -.END - .IF "$(WITH_MOZILLA)" != "NO" my_components += component/extensions/source/plugin/pl .END diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 9a8b33067fd8..b0f000180890 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -430,28 +430,6 @@ MY_FILES_xsltfilter = \ $(MY_MOD)/fcfg_xslt_filters.xcu \ $(MY_MOD)/fcfg_xslt_types.xcu -.IF "$(WITH_BINFILTER)" != "NO" -MY_XCDS += $(MISC)/binfilter.xcd -MY_DEPS_binfilter = main -MY_FILES_binfilter = \ - $(MY_MOD)/fcfg_chart_bf_filters.xcu \ - $(MY_MOD)/fcfg_chart_bf_types.xcu \ - $(MY_MOD)/fcfg_calc_bf_filters.xcu \ - $(MY_MOD)/fcfg_calc_bf_types.xcu \ - $(MY_MOD)/fcfg_draw_bf_filters.xcu \ - $(MY_MOD)/fcfg_draw_bf_types.xcu \ - $(MY_MOD)/fcfg_global_bf_filters.xcu \ - $(MY_MOD)/fcfg_global_bf_types.xcu \ - $(MY_MOD)/fcfg_impress_bf_filters.xcu \ - $(MY_MOD)/fcfg_impress_bf_types.xcu \ - $(MY_MOD)/fcfg_math_bf_filters.xcu \ - $(MY_MOD)/fcfg_math_bf_types.xcu \ - $(MY_MOD)/fcfg_web_bf_filters.xcu \ - $(MY_MOD)/fcfg_web_bf_types.xcu \ - $(MY_MOD)/fcfg_writer_bf_filters.xcu \ - $(MY_MOD)/fcfg_writer_bf_types.xcu -.END - .IF "$(BUILD_POSTGRESQL_SDBC)" == "YES" MY_XCDS += $(MISC)/postgresqlsdbc.xcd MY_DEPS_postgresqlsdbc = main diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 7353c6c68060..6048cd82804d 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL +po postprocess :: CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL diff --git a/scp2/InstallModule_binfilter.mk b/scp2/InstallModule_binfilter.mk deleted file mode 100644 index c6ee85cff875..000000000000 --- a/scp2/InstallModule_binfilter.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_InstallModule_InstallModule,scp2/binfilter)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/binfilter,\ - scp2/source/binfilter/file_binfilter \ -)) - -$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/binfilter,\ - scp2/source/binfilter/module_binfilter \ - $(if $(filter WNT,$(GUI)),\ - scp2/source/binfilter/registryitem_binfilter \ - ) \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index cbe59b470497..dd9a4d023879 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -49,9 +49,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ scp2/winexplorerext \ ) \ ) \ - $(if $(filter YES,$(WITH_BINFILTER)),\ - scp2/binfilter \ - ) \ $(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\ scp2/crashrep \ ) \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 95b1df2ce429..c4f8145d7e60 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -58,9 +58,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_winexplorerext \ ) \ ) \ - $(if $(filter YES,$(WITH_BINFILTER)),\ - InstallModule_binfilter \ - ) \ $(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\ InstallModule_crashrep \ ) \ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 8f0a08b05a4d..c10a136e915a 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -131,14 +131,6 @@ Styles = (PACKED); \ End -#define BINFILTER_RES_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT3(name,en-US,.res)); \ - Dir = gid_Dir_Resource; \ - Styles = (PACKED); \ - End - #define STD_FILTER_FILE(id,name) \ File id \ PACKED_LIB_FILE_BODY; \ diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp deleted file mode 100644 index 538d1a25e318..000000000000 --- a/scp2/source/binfilter/file_binfilter.scp +++ /dev/null @@ -1,73 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "macros.inc" - -File gid_File_Share_Registry_Binfilter_Xcd - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry; - Name = "binfilter.xcd"; -End - -File gid_Starregistry_Legacy_Binfilters_Rdb - TXT_FILE_BODY; - Name = "legacy_binfilters.rdb"; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -End - - - -STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go) -STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch) -STD_LIB_FILE( gid_File_Lib_Bf_Xo, bf_xo) -STD_LIB_FILE( gid_File_Lib_Bf_Svx, bf_svx) -STD_LIB_FILE( gid_File_Lib_Bf_Svt, bf_svt) -STD_LIB_FILE( gid_File_Lib_Bf_Frm, bf_frm) -STD_LIB_FILE( gid_File_Lib_Bf_Ofa, bf_ofa) -STD_LIB_FILE( gid_File_Lib_Bf_Sb, bf_sb) -STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc) -STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd) -STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm) -STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw) -STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper) -STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters) -STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so) -STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter) -STD_LIB_FILE( gid_File_Lib_Bindet, bindet) - -BINFILTER_RES_FILE( gid_File_Res_Bf_Sch, bf_sch ) -BINFILTER_RES_FILE( gid_File_Res_Bf_Svx, bf_svx ) -BINFILTER_RES_FILE( gid_File_Res_Bf_Svt, bf_svt ) -BINFILTER_RES_FILE( gid_File_Res_Bf_Frm, bf_frm ) -BINFILTER_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa ) -BINFILTER_RES_FILE( gid_File_Res_Bf_Sc, bf_sc ) -BINFILTER_RES_FILE( gid_File_Res_Bf_Sd, bf_sd ) -BINFILTER_RES_FILE( gid_File_Res_Bf_Sm, bf_sm) -BINFILTER_RES_FILE( gid_File_Res_Bf_Sw, bf_sw ) diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp deleted file mode 100644 index 873652e6e16a..000000000000 --- a/scp2/source/binfilter/module_binfilter.scp +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -Module gid_Module_Optional_Binfilter - PackageInfo = "packinfo_office.txt"; - MOD_NAME_DESC ( MODULE_OPTIONAL_BINFILTER ); - Sortkey = "700"; - InstallOrder = "1100"; - ParentID = gid_Module_Optional; - Default = NO; - Files = (gid_File_Share_Registry_Binfilter_Xcd, - gid_Starregistry_Legacy_Binfilters_Rdb, - gid_File_Lib_Bf_Go, - gid_File_Lib_Bf_Sch, - gid_File_Lib_Bf_Lng, - gid_File_Lib_Bf_Xo, - gid_File_Lib_Bf_Svx, - gid_File_Lib_Bf_Svt, - gid_File_Lib_Bf_Frm, - gid_File_Lib_Bf_Ofa, - gid_File_Lib_Bf_Sb, - gid_File_Lib_Bf_Sc, - gid_File_Lib_Bf_Sd, - gid_File_Lib_Bf_Sm, - gid_File_Lib_Bf_So, - gid_File_Lib_Bf_Sw, - gid_File_Lib_Bf_Wrapper, - gid_File_Lib_Legacy_Binfilters, - gid_File_Lib_Bf_Migratefilter, - gid_File_Lib_Bindet, - gid_File_Res_Bf_Sch, - gid_File_Res_Bf_Svx, - gid_File_Res_Bf_Svt, - gid_File_Res_Bf_Frm, - gid_File_Res_Bf_Ofa, - gid_File_Res_Bf_Sc, - gid_File_Res_Bf_Sd, - gid_File_Res_Bf_Sm, - gid_File_Res_Bf_Sw, - gid_File_Res_Bf_Sfx); -End diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf deleted file mode 100644 index c72f682cbe05..000000000000 --- a/scp2/source/binfilter/module_binfilter.ulf +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -[STR_NAME_MODULE_OPTIONAL_BINFILTER] -en-US = "Legacy Filters" - -[STR_DESC_MODULE_OPTIONAL_BINFILTER] -en-US = "Legacy filters, e.g. StarOffice 5.2 binary file formats." diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp deleted file mode 100644 index a1e884e14f86..000000000000 --- a/scp2/source/binfilter/registryitem_binfilter.scp +++ /dev/null @@ -1,931 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -RegistryItem gid_Regitem_Sdw_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdw"; - Name = "Content Type"; - Value = "application/vnd.stardivision.writer"; -End - -RegistryItem gid_Regitem_Sdw_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer"; - Name = "Extension"; - Value = ".sdw"; -End - -RegistryItem gid_Regitem_Sdw_So4_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/x-starwriter"; - Name = "Extension"; - Value = ".sdw"; -End - -RegistryItem gid_Regitem_Sgl_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sgl"; - Name = "Content Type"; - Value = "application/vnd.stardivision.writer-global"; -End - -RegistryItem gid_Regitem_Sgl_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer-global"; - Name = "Extension"; - Value = ".sgl"; -End - -RegistryItem gid_Regitem__Sdw - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdw"; - Value = "soffice.StarWriterDocument.5"; -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdw - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".sdw"; - Value = "soffice.StarWriterDocument.5"; - Styles = (); -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sgl - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".sgl"; - Value = "soffice.StarWriterGlobalDocument.5"; - Styles = (); -End - -RegistryItem gid_Regitem__Sgl - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sgl"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "soffice.StarWriterGlobalDocument.5"; -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterDocument.5"; - ModuleID = gid_Module_Optional_Binfilter; - REG_VALUE_LNG(SO52_TEXT_OOO) -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarWriterDocument.5\DefaultIcon"; - Value = "<progpath>\program\soffice.bin,1"; -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarWriterDocument.5\shell"; - Value = "open"; -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarWriterDocument.5\shell\new"; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarWriterDocument.5\shell\new\command"; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarWriterDocument.5\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarWriterDocument.5\shell\print\command"; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarWriterDocument.5\shell\printto\command"; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5"; - ModuleID = gid_Module_Optional_Binfilter; - REG_VALUE_LNG(SO51_MASTERDOC_OOO) -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "<progpath>\program\soffice.bin,9"; -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5\shell"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "open"; -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5\shell\new"; - ModuleID = gid_Module_Optional_Binfilter; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5\shell\new\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5\shell\open\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5\shell\print\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarWriterGlobalDocument.5\shell\printto\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -// calc - -RegistryItem gid_Regitem_Sdc_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdc"; - Name = "Content Type"; - Value = "application/vnd.stardivision.calc"; -End - -RegistryItem gid_Regitem_Sdc_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.calc"; - Name = "Extension"; - Value = ".sdc"; -End - -RegistryItem gid_Regitem_Sdc_So4_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/x-starcalc"; - Name = "Extension"; - Value = ".sdc"; -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5"; - REG_VALUE_LNG(SO51_SPREADSHEET_OOO) -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5\DefaultIcon"; - Value = "<progpath>\program\soffice.bin,3"; -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5\shell"; - Value = "open"; -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5\shell\new"; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5\shell\new\command"; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5\shell\print\command"; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarCalcDocument.5\shell\printto\command"; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -RegistryItem gid_Regitem__Sdc - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdc"; - Value = "soffice.StarCalcDocument.5"; -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdc - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".sdc"; - Value = "soffice.StarCalcDocument.5"; - Styles = (); -End - -// impress -RegistryItem gid_Regitem_Sdd_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdd"; - Name = "Content Type"; - Value = "application/vnd.stardivision.impress"; -End - -RegistryItem gid_Regitem_Sdd_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress"; - Name = "Extension"; - Value = ".sdd"; -End - -RegistryItem gid_Regitem_Sdd_So4_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/x-starimpress"; - Name = "Extension"; - Value = ".sdd"; -End - -RegistryItem gid_Regitem_Sdp_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdp"; - Name = "Content Type"; - Value = "application/vnd.stardivision.impress-packed"; -End - -RegistryItem gid_Regitem_Sdp_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress-packed"; - Name = "Extension"; - Value = ".sdp"; -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5"; - REG_VALUE_LNG(SO51_PRESENT_OOO) -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5\DefaultIcon"; - Value = "<progpath>\program\soffice.bin,7"; -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5\shell"; - Value = "open"; -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5\shell\new"; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5\shell\new\command"; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5\shell\print\command"; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarImpressDocument.5\shell\printto\command"; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -RegistryItem gid_Regitem__Sdd - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdd"; - Value = "soffice.StarImpressDocument.5"; -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdd - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".sdd"; - Value = "soffice.StarImpressDocument.5"; - Styles = (); -End - -RegistryItem gid_Regitem__Sdp - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sdp"; - Value = "soffice.StarStorageDocument.5"; -End - -// .sdp no longer supported -// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdp -// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; -// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; -// ModuleID = gid_Module_Optional_Binfilter; -// Name = ".sdp"; -// Value = "soffice.StarStorageDocument.5"; -// Styles = (); -// End - -// draw - -RegistryItem gid_Regitem_Sda_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sda"; - Name = "Content Type"; - Value = "application/vnd.stardivision.draw"; -End - -RegistryItem gid_Regitem_Sda_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.draw"; - Name = "Extension"; - Value = ".sda"; -End - -RegistryItem gid_Regitem_Sda_So4_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/x-stardraw"; - Name = "Extension"; - Value = ".sda"; -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5"; - REG_VALUE_LNG(SO51_DRAWING_OOO) -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5\DefaultIcon"; - Value = "<progpath>\program\soffice.bin,5"; -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5\shell"; - Value = "open"; -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5\shell\new"; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5\shell\new\command"; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5\shell\print\command"; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarDrawDocument.5\shell\printto\command"; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -RegistryItem gid_Regitem__Sda - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sda"; - Value = "soffice.StarDrawDocument.5"; -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sda - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".sda"; - Value = "soffice.StarDrawDocument.5"; - Styles = (); -End - -// chart -RegistryItem gid_Regitem_Sds_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".sds"; - Name = "Content Type"; - Value = "application/vnd.stardivision.chart"; -End - -RegistryItem gid_Regitem_Sds_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.chart"; - Name = "Extension"; - Value = ".sds"; -End - -RegistryItem gid_Regitem_Sds_So4_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/x-starchart"; - Name = "Extension"; - Value = ".sds"; -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5"; - ModuleID = gid_Module_Optional_Binfilter; - REG_VALUE_LNG(SO52_CHART_OOO) -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5\DefaultIcon"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "<progpath>\program\soffice.bin,0"; -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5\shell"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "open"; -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5\shell\new"; - ModuleID = gid_Module_Optional_Binfilter; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5\shell\new\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5\shell\open\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5\shell\print\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument.5\shell\printto\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starchartdocument_Curver - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarChartDocument\CurVer"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "soffice.StarChartDocument.5"; -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5"; - ModuleID = gid_Module_Optional_Binfilter; - REG_VALUE_LNG(SO50_TEMPLATE_OOO) -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "<progpath>\program\soffice.bin,10"; -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5\shell"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "new"; -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5\shell\new"; - ModuleID = gid_Module_Optional_Binfilter; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5\shell\new\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5\shell\open\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5\shell\print\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = "soffice.StarOfficeTemplate.5\shell\printto\command"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -RegistryItem gid_Regitem__Sds - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sds"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "soffice.StarChartDocument.5"; -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sds - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".sds"; - Value = "soffice.StarChartDocument.5"; - Styles = (); -End - -RegistryItem gid_Regitem__Vor - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".vor"; - ModuleID = gid_Module_Optional_Binfilter; - Value = "soffice.StarOfficeTemplate.5"; -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_vor - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".vor"; - Value = "soffice.StarOfficeTemplate.5"; - Styles = (); -End - -// StarMath -RegistryItem gid_Regitem_Smf_Contenttype - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".smf"; - Name = "Content Type"; - Value = "application/vnd.stardivision.math"; -End - -RegistryItem gid_Regitem_Smf_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/vnd.stardivision.math"; - Name = "Extension"; - Value = ".smf"; -End - -RegistryItem gid_Regitem_Smf_So4_Mime_Database - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "MIME\Database\Content Type\application/x-starmath"; - Name = "Extension"; - Value = ".smf"; -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5"; - REG_VALUE_LNG(SO51_FORMULA_OOO) -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5\DefaultIcon"; - Value = "<progpath>\program\soffice.bin,12"; -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5\shell"; - Value = "open"; -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5\shell\new"; - REG_VALUE_LNG(NEW) -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5\shell\new\command"; - Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Open_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Print_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5\shell\print\command"; - Value = "\"<progpath>\program\soffice.exe\" -p \"%1\""; -End - -RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Printto_Command - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = "soffice.StarMathDocument.5\shell\printto\command"; - Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; -End - -RegistryItem gid_Regitem__Smf - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Binfilter; - Subkey = ".smf"; - Value = "soffice.StarMathDocument.5"; -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_smf - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Optional_Binfilter; - Name = ".smf"; - Value = "soffice.StarMathDocument.5"; - Styles = (); -End - - -// .SDW -RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sdw\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarWriterDocument.5"; - Value = " "; -End - -// .VOR -RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".vor\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarWriterDocument.5"; - Value = " "; -End - -// .SGL -RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sgl\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarWriterGlobalDocument.5"; - Value = " "; -End - -// .SDC -RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sdc\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarCalcDocument.5"; - Value = " "; -End - -// .VOR -RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".vor\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarCalcDocument.5"; - Value = " "; -End - -// .SDD -RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sdd\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarImpressDocument.5"; - Value = " "; -End - -// .SDP -RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sdp\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarImpressDocument.5"; - Value = " "; -End - -// .SDA -RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sda\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarImpressDocument.5"; - Value = " "; -End - -// .VOR -RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".vor\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarImpressDocument.5"; - Value = " "; -End - -// .SDA -RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sda\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarDrawDocument.5"; - Value = " "; -End - -// .SDD -RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".sdd\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarDrawDocument.5"; - Value = " "; -End - -// .VOR -RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".vor\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarDrawDocument.5"; - Value = " "; -End - -// .SMF -RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".smf\OpenWithProgIDs"; - ModuleID = gid_Module_Optional_Binfilter; - Name = "soffice.StarMathDocument.5"; - Value = " "; -End - - diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf deleted file mode 100644 index 610b36969a2c..000000000000 --- a/scp2/source/binfilter/registryitem_binfilter.ulf +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -[STR_REG_VAL_NEW] -en-US = "&New" - -[STR_REG_VAL_SO52_TEXT_OOO] -en-US = "StarOffice 5.0 Text Document" - -[STR_REG_VAL_SO51_MASTERDOC_OOO] -en-US = "StarOffice 5.0 Master Document" - -[STR_REG_VAL_SO51_SPREADSHEET_OOO] -en-US = "StarOffice 5.0 Spreadsheet" - -[STR_REG_VAL_SO51_PRESENT_OOO] -en-US = "StarOffice 5.0 Presentation" - -[STR_REG_VAL_SO51_DRAWING_OOO] -en-US = "StarOffice 5.0 Drawing" - -[STR_REG_VAL_SO51_FORMULA_OOO] -en-US = "StarOffice 5.0 Formula" - -[STR_REG_VAL_SO52_CHART_OOO] -en-US = "StarOffice 5.0 Chart" - -[STR_REG_VAL_SO50_TEMPLATE_OOO] -en-US = "StarOffice 5.0 Template" diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 390d5c4d3989..6617e4ad9570 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -84,7 +84,6 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Registry_O5oo_Xcd, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, - gid_Brand_File_Share_Xdg_BinFilter, gid_Brand_File_Share_Xdg_Calc, gid_Brand_File_Share_Xdg_Draw, gid_Brand_File_Share_Xdg_Extension, @@ -765,15 +764,6 @@ End #endif #if defined UNX && ! defined MACOSX -File gid_Brand_File_Share_Xdg_BinFilter - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Name = "binfilter.desktop"; - Styles = (PACKED,SCPZIP_REPLACE); -End -#endif - -#if defined UNX && ! defined MACOSX File gid_Brand_File_Share_Xdg_XsltFilter TXT_FILE_BODY; Dir = gid_Brand_Dir_Share_Xdg; diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index 03f8377b7d45..79cbb0d0312d 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -12,5 +12,5 @@ fi omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q" ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \ --languages=-HTML,Java,JavaScript \ - -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=binfilter --exclude=solver \ + -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=solver \ --exclude=clone --exclude=install --totals=yes --sort=foldcase * diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 2720144ed79b..d6c7f9e40905 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -244,24 +244,6 @@ REDLANDLIB=$(REDLAND_LIBS) REDLANDLIB=-lrdf .ENDIF -# #110743# -# For BinFilters, some libs were added. -# - -BFSVXLIB=-lbf_svx$(DLLPOSTFIX) -BFSCHLIB=-lbf_ysch -BFSMLIB=-lbf_ysm -BFSCLIB=-lbf_sclib -BFSDLIB=-lbf_sdlib -BFSWLIB=-lbf_swlib -BFOFALIB=-lbf_ofa$(DLLPOSTFIX) -LEGACYSMGRLIB=-llegacy_binfilters$(DLLPOSTFIX) -BFXMLOFFLIB=-lbf_xo$(DLLPOSTFIX) -BFGOODIESLIB=-lbf_go$(DLLPOSTFIX) -BFBASICLIB=-lbf_sb$(DLLPOSTFIX) -BFSO3LIB=-lbf_so$(DLLPOSTFIX) -BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX) - # # USED_%NAME%_LIBS # Variablen, in denen in gueltiger Reihenfolge ALLE Libraries, @@ -476,24 +458,6 @@ REDLANDLIB = librdf.lib JVMFWKLIB = ijvmfwk.lib -# #110743# -# For BinFilters, some libs were added. -# - -BFSVXLIB=bf_svx.lib -BFSCHLIB=bf_ysch.lib -BFSMLIB=bf_ysm.lib -BFSCLIB=bf_sclib.lib -BFSDLIB=bf_sdlib.lib -BFSWLIB=bf_swlib.lib -BFOFALIB=bf_ofa.lib -BFXMLOFFLIB=ibf_xo.lib -BFGOODIESLIB=bf_go.lib -BFBASICLIB=bf_sb.lib -BFSO3LIB=bf_so.lib -LEGACYSMGRLIB=ilegacy_binfilters.lib -BFSVTOOLLIB=bf_svt.lib - APP3RDLIB= $(LIBPRE) app.lib SAMPLE3RDLIB= $(LIBPRE) sample.lib HNJLIB*=libhnj.lib diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 3741647c3015..f87822dc3298 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -196,7 +196,7 @@ CFLAGSWERRCC=-WX -DLIBO_WERROR # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := binfilter +MODULES_WITH_WARNINGS := CDEFS+=-DWIN32 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 .IF "$(COMEX)" == "11" diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 33fb03028283..012799069fea 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -43,10 +43,7 @@ typedef short StorageMode; class SvStorage; -namespace binfilter -{ - class SvStorage; -} + /************************************************************************* *************************************************************************/ @@ -101,7 +98,6 @@ class SOT_DLLPUBLIC SotStorage : virtual public SotObject { friend class SotStorageStream; friend class SvStorage; -friend class ::binfilter::SvStorage; BaseStorage * m_pTmpStg; // Temp-Storage fuer Transacted, nur auf diesem schreiben! ??? Useless ??? BaseStorage * m_pOwnStg; // Zielstorage diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 2dfa0598277f..8f670d5b8c91 100755 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -386,7 +386,6 @@ done /usr/share/applications/%unixfilename-writer.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/applications/%unixfilename-javafilter.desktop -/usr/share/applications/%unixfilename-binfilter.desktop /usr/share/applications/%unixfilename-xsltfilter.desktop /usr/share/icons/gnome/*/apps/*png /usr/share/icons/gnome/*/mimetypes/*png diff --git a/sysui/desktop/menus/binfilter.desktop b/sysui/desktop/menus/binfilter.desktop deleted file mode 100644 index bfad37fb5f9c..000000000000 --- a/sysui/desktop/menus/binfilter.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Terminal=false -Type=Application -Exec=${UNIXBASISROOTNAME} %U -MimeType=application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.draw;application/vnd.stardivision.impress;application/vnd.stardivision.math;application/vnd.stardivision.writer; -Name=%PRODUCTNAME Legacy StarOffice 5 Binary Format Importer -GenericName=Legacy StarOffice 5 Binary Format Importer -NoDisplay=true diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf index 09ccf8dc2722..492bdf534130 100644 --- a/sysui/desktop/share/launcher_genericname.ulf +++ b/sysui/desktop/share/launcher_genericname.ulf @@ -16,14 +16,11 @@ en-US = "Formula Editor" [draw] en-US = "Drawing Program" -[startcenter] +[startcenter] en-US = "Office" [javafilter] en-US = "Small Device Format Importer" -[binfilter] -en-US = "Legacy StarOffice 5 Binary Format Importer" - [xsltfilter] en-US = "XSLT based filters" diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 84bf9952144c..ca23618f665c 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -54,7 +54,7 @@ ULFFILES= \ launcher_name.ulf LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter -LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter xsltfilter +LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter xsltfilter LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 05242a3eb820..891fa63140c4 100755 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -357,7 +357,6 @@ done /usr/share/applications/%unixfilename-printeradmin.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/applications/%unixfilename-javafilter.desktop -/usr/share/applications/%unixfilename-binfilter.desktop /usr/share/applications/%unixfilename-xsltfilter.desktop /opt/gnome/share/mime-info/*.keys /opt/gnome/share/mime-info/*.mime diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx index 92ea214a2625..e956d6592898 100644 --- a/tools/inc/tools/debug.hxx +++ b/tools/inc/tools/debug.hxx @@ -410,13 +410,6 @@ public: #define DBG_ASSERT( sCon, aError ) \ SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", aError) -#ifdef DBG_BINFILTER -#define DBG_BF_ASSERT( sCon, aError ) \ - SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.binfilter", aError) -#else -#define DBG_BF_ASSERT( sCon, aError ) ((void)0) -#endif - #define DBG_WARNING( aWarning ) \ SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning) #define DBG_WARNING1( aWarning, x1 ) \ diff --git a/unusedcode.easy b/unusedcode.easy index 24cd7d65e90b..e805913aabb5 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -32,44 +32,6 @@ apitest::XPropertySet::testAddVetoableChangeListener() apitest::XPropertySet::testRemovePropertyChangeListener() apitest::XPropertySet::testRemoveVetoableChangeListener() apitest::XSpreadsheetDocument::testGetSheets() -binfilter::ImpSvtData::~ImpSvtData() -binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer() -binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize() -binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::PCodeBuffConvertor(unsigned char*, unsigned int) -binfilter::Registration::~Registration() -binfilter::SaveBookmarks::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SbiGlobals::~SbiGlobals() -binfilter::SbxFacs::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::ScAddInDocs::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::ScBroadcastAreas::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::ScMyContentAction::~ScMyContentAction() -binfilter::ScMyDelAction::~ScMyDelAction() -binfilter::ScMyMoveAction::~ScMyMoveAction() -binfilter::ScMySharedData::~ScMySharedData() -binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::ShellResource::~ShellResource() -binfilter::SoDll::~SoDll() -binfilter::SvObjectServerList::Remove(SvGlobalName const&) -binfilter::SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SvStringsISort::Seek_Entry(binfilter::String*, unsigned short*) const -binfilter::SvStringsISortDtor::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SvStringsISortDtor::Seek_Entry(binfilter::String*, unsigned short*) const -binfilter::SvStringsSort::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::Sw3Marks::Seek_Entry(binfilter::Sw3Mark const*, unsigned long*) const -binfilter::Sw3NumRuleInfos::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::Sw3SortFmts::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwChartLines::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwDestroyList::Seek_Entry(binfilter::SwSectionFrm*, unsigned short*) const -binfilter::SwRects::SwRects(unsigned short, unsigned char) -binfilter::SwRubyList::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwSortDrawObjs::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwXBookmarkPortionArr::DeleteAndDestroy(unsigned short, unsigned short) -binfilter::SwXRedlinePortionArr::DeleteAndDestroy(unsigned short, unsigned short) cairocanvas::CanvasHelper::flush() const cairocanvas::CanvasHelper::getPalette() cairocanvas::SpriteDeviceHelper::getSurface() |