diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
| commit | 393382f1bbbecd85d58378571a91e6cf3108ca4c (patch) | |
| tree | dc9e4f538714b1c4f86344a17f27c6cda37bda2d | |
| parent | f92271ee18b11a7bcd424f0583ae3f36954ffb7f (diff) | |
| parent | 34dfbf55a3363739f588aae68229cbead0c38d93 (diff) | |
ause110: update to DEV300_m74
570 files changed, 6781 insertions, 9486 deletions
diff --git a/configure b/configure index a3fbc233ae91..09ad0891473a 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -940,9 +940,7 @@ Optional Features: assertions, object counting, etc. Larger build. Independent from --enable-debug - --enable-crashdump[=yes|TRUE|STATIC|no] - Enable (disable) the crashdump feature code. - [default=no] + --enable-crashdump Enable the crashdump feature code. --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing standard compiler. ( This just disavles optimization @@ -1010,6 +1008,10 @@ Optional Features: --disable-randr-link disable linking with libXrandr, instead dynamically open it at runtime + --enable-mysql-connector enables the build of the MySQL Connector/OOo extension. + This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with + either the --with-system-mysql or --with-libmysql-path option. + --enable-presenter-extra-ui enables extra functionality during slideshow, e.g. selecting pen color, erasing drawings etc. @@ -1173,6 +1175,15 @@ Optional Packages: --with-lucene-core-jar=JARFILE Specify path to jarfile manually --with-lucene-analyzers-jar=JARFILE Specify path to jarfile manually + --with-system-mysql Use MySQL libraries already on system, for building the MySQL Connector/OOo extension. + Requires MYSQLCONFIG to point to the mysql_config executable. + + --with-libmysql-path Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension. + + Usage: --with-libmysql-path=<absolute path to your Connector/C installation> + + --with-system-mysql-cppconn Use MySQL C++ Connector libraries already on system + --with-system-hsqldb Use hsqldb already on system --with-hsqldb-jar=JARFILE Specify path to jarfile manually @@ -2105,8 +2116,6 @@ fi; if test "${enable_crashdump+set}" = set; then enableval="$enable_crashdump" -else - enable_crashdump=no fi; # Check whether --enable-cl-standard or --disable-cl-standard was given. if test "${enable_cl_standard+set}" = set; then @@ -2402,6 +2411,31 @@ if test "${with_lucene_analyzers_jar+set}" = set; then LUCENE_ANALYZERS_JAR="$withval" fi; +# Check whether --enable-mysql-connector or --disable-mysql-connector was given. +if test "${enable_mysql_connector+set}" = set; then + enableval="$enable_mysql_connector" + +fi; + +# Check whether --with-system-mysql or --without-system-mysql was given. +if test "${with_system_mysql+set}" = set; then + withval="$with_system_mysql" + +else + with_system_mysql="no" +fi; + +# Check whether --with-libmysql-path or --without-libmysql-path was given. +if test "${with_libmysql_path+set}" = set; then + withval="$with_libmysql_path" + +fi; + +# Check whether --with-system-mysql-cppconn or --without-system-mysql-cppconn was given. +if test "${with_system_mysql_cppconn+set}" = set; then + withval="$with_system_mysql_cppconn" + +fi; # Check whether --with-system-hsqldb or --without-system-hsqldb was given. if test "${with_system_hsqldb+set}" = set; then @@ -3445,28 +3479,15 @@ esac echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6 -if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then +if test "$enable_crashdump" = "yes"; then ENABLE_CRASHDUMP="TRUE" + BUILD_TYPE="$BUILD_TYPE CRASHREP" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - BUILD_TYPE="$BUILD_TYPE CRASHREP" else - if test "$enable_crashdump" = "STATIC"; then - ENABLE_CRASHDUMP="STATIC" - echo "$as_me:$LINENO: result: yes, STATIC" >&5 -echo "${ECHO_T}yes, STATIC" >&6 - BUILD_TYPE="$BUILD_TYPE CRASHREP" - else - if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then - ENABLE_CRASHDUMP="" - echo "$as_me:$LINENO: result: no" >&5 + ENABLE_CRASHDUMP="" + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - else - { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5 -echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;} - { (exit 1); exit 1; }; } - fi - fi fi @@ -14979,6 +15000,467 @@ fi +echo "$as_me:$LINENO: checking whether to build the MySQL Connector extension" >&5 +echo $ECHO_N "checking whether to build the MySQL Connector extension... $ECHO_C" >&6 +if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + ENABLE_MYSQLC=YES + echo "$as_me:$LINENO: checking for mysqlc module" >&5 +echo $ECHO_N "checking for mysqlc module... $ECHO_C" >&6 + if test -d mysqlc; then + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 + else + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } + fi + BUILD_TYPE="$BUILD_TYPE MYSQLC" +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ENABLE_MYSQLC=NO +fi + + +if test "$ENABLE_MYSQLC" = "YES"; then +echo "$as_me:$LINENO: checking for mysql pre-requisites" >&5 +echo $ECHO_N "checking for mysql pre-requisites... $ECHO_C" >&6 +if test -n "$with_system_mysql" -o -n "$with_system_libs" && \ + test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then + echo "$as_me:$LINENO: result: external MySQL" >&5 +echo "${ECHO_T}external MySQL" >&6 + SYSTEM_MYSQL=YES + # Extract the first word of "mysql_config", so it can be a program name with args. +set dummy mysql_config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MYSQLCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_MYSQLCONFIG="$MYSQLCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MYSQLCONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +MYSQLCONFIG=$ac_cv_path_MYSQLCONFIG + +if test -n "$MYSQLCONFIG"; then + echo "$as_me:$LINENO: result: $MYSQLCONFIG" >&5 +echo "${ECHO_T}$MYSQLCONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + echo "$as_me:$LINENO: checking MySQL version" >&5 +echo $ECHO_N "checking MySQL version... $ECHO_C" >&6 + MYSQL_VERSION=`$MYSQLCONFIG --version` + MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1` + if test "$MYSQL_MAJOR" -ge "5"; then + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 + else + { { echo "$as_me:$LINENO: error: too old, use 5.0.x or 5.1.x" >&5 +echo "$as_me: error: too old, use 5.0.x or 5.1.x" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: checking for MySQL Client library" >&5 +echo $ECHO_N "checking for MySQL Client library... $ECHO_C" >&6 + MYSQL_INC=`$MYSQLCONFIG --include` + MYSQL_LIB=`$MYSQLCONFIG --libs` + MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,` + echo "$as_me:$LINENO: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5 +echo "${ECHO_T}includes $MYSQL_INC, libraries $MYSQL_LIB" >&6 +else + SYSTEM_MYSQL=NO + if test -n "$with_libmysql_path"; then + echo "$as_me:$LINENO: result: external Connector/C (libmysql)" >&5 +echo "${ECHO_T}external Connector/C (libmysql)" >&6 + LIBMYSQL=libmysql.so + if test "$_os" = "Darwin"; then + LIBMYSQL=libmysql.dylib + elif test "$_os" = "WINNT"; then + LIBMYSQL=libmysql.dll + fi + echo "$as_me:$LINENO: checking for $LIBMYSQL" >&5 +echo $ECHO_N "checking for $LIBMYSQL... $ECHO_C" >&6 + if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then + echo "$as_me:$LINENO: result: found." >&5 +echo "${ECHO_T}found." >&6 + LIBMYSQL_PATH=$with_libmysql_path + else + { { echo "$as_me:$LINENO: error: not found. Please specify proper path in --with-libmysql-path." >&5 +echo "$as_me: error: not found. Please specify proper path in --with-libmysql-path." >&2;} + { (exit 1); exit 1; }; } + fi + else + { { echo "$as_me:$LINENO: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&5 +echo "$as_me: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&2;} + { (exit 1); exit 1; }; } + fi +fi + + + + + + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +# FIXME! +# who thought this too-generic cppconn dir was a good idea? +echo "$as_me:$LINENO: checking MySQL Connector/C++" >&5 +echo $ECHO_N "checking MySQL Connector/C++... $ECHO_C" >&6 +if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \ + test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 + SYSTEM_MYSQL_CPPCONN=YES + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + if test "${ac_cv_header_mysql_driver_h+set}" = set; then + echo "$as_me:$LINENO: checking for mysql_driver.h" >&5 +echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6 +if test "${ac_cv_header_mysql_driver_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5 +echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking mysql_driver.h usability" >&5 +echo $ECHO_N "checking mysql_driver.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <mysql_driver.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking mysql_driver.h presence" >&5 +echo $ECHO_N "checking mysql_driver.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <mysql_driver.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: mysql_driver.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: mysql_driver.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mysql_driver.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: mysql_driver.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: mysql_driver.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for mysql_driver.h" >&5 +echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6 +if test "${ac_cv_header_mysql_driver_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_mysql_driver_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5 +echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6 + +fi +if test $ac_cv_header_mysql_driver_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&5 +echo "$as_me: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&2;} + { (exit 1); exit 1; }; } +fi + + + +echo "$as_me:$LINENO: checking for main in -lmysqlcppconn" >&5 +echo $ECHO_N "checking for main in -lmysqlcppconn... $ECHO_C" >&6 +if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmysqlcppconn $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mysqlcppconn_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mysqlcppconn_main=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlcppconn_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mysqlcppconn_main" >&6 +if test $ac_cv_lib_mysqlcppconn_main = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBMYSQLCPPCONN 1 +_ACEOF + + LIBS="-lmysqlcppconn $LIBS" + +else + { { echo "$as_me:$LINENO: error: MySQL C++ Connectivity lib not found or functional" >&5 +echo "$as_me: error: MySQL C++ Connectivity lib not found or functional" >&2;} + { (exit 1); exit 1; }; } +fi + + echo "$as_me:$LINENO: checking version" >&5 +echo $ECHO_N "checking version... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <mysql_driver.h> + +int main(int argc, char **argv) { + sql::Driver *driver; + driver = get_driver_instance(); + if (driver->getMajorVersion() > 1 || \ + (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \ + (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6)) + return 0; + else + return 1; +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: not suitable, we need >= 1.0.6" >&5 +echo "$as_me: error: not suitable, we need >= 1.0.6" >&2;} + { (exit 1); exit 1; }; } +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + echo "$as_me:$LINENO: checking STL compatibility" >&5 +echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6 + if test "$WITH_STLPORT" != "no"; then + { { echo "$as_me:$LINENO: error: to use system mysqlcppconn you need to use --without-stlport" >&5 +echo "$as_me: error: to use system mysqlcppconn you need to use --without-stlport" >&2;} + { (exit 1); exit 1; }; } + else + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 + fi + +else + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 + echo "$as_me:$LINENO: checking for mysqlcppconn module" >&5 +echo $ECHO_N "checking for mysqlcppconn module... $ECHO_C" >&6 + if test -d mysqlcppconn; then + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 + else + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } + fi + BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN" + SYSTEM_MYSQL_CPPCONN=NO +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi + echo "$as_me:$LINENO: checking which hsqldb to use" >&5 echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ @@ -15311,13 +15793,13 @@ echo "$as_me: error: install curl to run this script" >&2;} fi # check curl version - echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5 -echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking whether curl is >= 7.13.1" >&5 +echo $ECHO_N "checking whether curl is >= 7.13.1... $ECHO_C" >&6 if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \ - "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \ - "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then - { { echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5 -echo "$as_me: error: no, you need at least curl 7.9,8" >&2;} + "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \ + "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then + { { echo "$as_me:$LINENO: error: no, you need at least curl 7.13,1" >&5 +echo "$as_me: error: no, you need at least curl 7.13,1" >&2;} { (exit 1); exit 1; }; } else echo "$as_me:$LINENO: result: yes" >&5 @@ -29053,6 +29535,14 @@ s,@DB_JAR@,$DB_JAR,;t t s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t +s,@ENABLE_MYSQLC@,$ENABLE_MYSQLC,;t t +s,@MYSQLCONFIG@,$MYSQLCONFIG,;t t +s,@SYSTEM_MYSQL@,$SYSTEM_MYSQL,;t t +s,@MYSQL_INC@,$MYSQL_INC,;t t +s,@MYSQL_LIB@,$MYSQL_LIB,;t t +s,@MYSQL_DEFINES@,$MYSQL_DEFINES,;t t +s,@LIBMYSQL_PATH@,$LIBMYSQL_PATH,;t t +s,@SYSTEM_MYSQL_CPPCONN@,$SYSTEM_MYSQL_CPPCONN,;t t s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t diff --git a/configure.in b/configure.in index 0abc5937682d..dab96e0a3f5f 100644 --- a/configure.in +++ b/configure.in @@ -190,10 +190,8 @@ AC_ARG_ENABLE(dbgutil, Independent from --enable-debug ],,) AC_ARG_ENABLE(crashdump, -[[ --enable-crashdump[=yes|TRUE|STATIC|no] - Enable (disable) the crashdump feature code. - [default=no] -]],,enable_crashdump=no) +[ --enable-crashdump Enable the crashdump feature code. +],,) AC_ARG_ENABLE(cl-standard, [ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing standard compiler. ( This just disavles optimization @@ -375,6 +373,23 @@ AC_ARG_WITH(lucene-analyzers-jar, [ --with-lucene-analyzers-jar=JARFILE Specify path to jarfile manually ], [ LUCENE_ANALYZERS_JAR="$withval" ]) +AC_ARG_ENABLE(mysql-connector, +[ --enable-mysql-connector enables the build of the MySQL Connector/OOo extension. + This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with + either the --with-system-mysql or --with-libmysql-path option. +],,) +AC_ARG_WITH(system-mysql, +[ --with-system-mysql Use MySQL libraries already on system, for building the MySQL Connector/OOo extension. + Requires MYSQLCONFIG to point to the mysql_config executable. +],,with_system_mysql="no") +AC_ARG_WITH(libmysql-path, +[ --with-libmysql-path Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension. + + Usage: --with-libmysql-path=<absolute path to your Connector/C installation> +],,) +AC_ARG_WITH(system-mysql-cppconn, +[ --with-system-mysql-cppconn Use MySQL C++ Connector libraries already on system +],,) AC_ARG_WITH(system-hsqldb, [ --with-system-hsqldb Use hsqldb already on system ],,) @@ -1037,23 +1052,13 @@ dnl =================================================================== dnl Set the ENABLE_CRASHDUMP variable. dnl =================================================================== AC_MSG_CHECKING([whether to enable crashdump feature]) -if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then +if test "$enable_crashdump" = "yes"; then ENABLE_CRASHDUMP="TRUE" - AC_MSG_RESULT([yes]) BUILD_TYPE="$BUILD_TYPE CRASHREP" + AC_MSG_RESULT([yes]) else - if test "$enable_crashdump" = "STATIC"; then - ENABLE_CRASHDUMP="STATIC" - AC_MSG_RESULT([yes, STATIC]) - BUILD_TYPE="$BUILD_TYPE CRASHREP" - else - if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then - ENABLE_CRASHDUMP="" - AC_MSG_RESULT([no]) - else - AC_MSG_ERROR([--enable-crashdump only accepts yes, no, TRUE or STATIC as parameter.]) - fi - fi + ENABLE_CRASHDUMP="" + AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_CRASHDUMP) @@ -3855,6 +3860,128 @@ AC_SUBST(SYSTEM_LUCENE) AC_SUBST(LUCENE_CORE_JAR) AC_SUBST(LUCENE_ANALYZERS_JAR) +AC_MSG_CHECKING([whether to build the MySQL Connector extension]) +if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then + AC_MSG_RESULT([yes]) + ENABLE_MYSQLC=YES + AC_MSG_CHECKING([for mysqlc module]) + if test -d mysqlc; then + AC_MSG_RESULT([OK]) + else + AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) + fi + BUILD_TYPE="$BUILD_TYPE MYSQLC" +else + AC_MSG_RESULT([no]) + ENABLE_MYSQLC=NO +fi +AC_SUBST(ENABLE_MYSQLC) + +if test "$ENABLE_MYSQLC" = "YES"; then +dnl =================================================================== +dnl Check for system MySQL +dnl =================================================================== +AC_MSG_CHECKING([for mysql pre-requisites]) +if test -n "$with_system_mysql" -o -n "$with_system_libs" && \ + test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then + AC_MSG_RESULT([external MySQL]) + SYSTEM_MYSQL=YES + AC_PATH_PROG( MYSQLCONFIG, mysql_config) + AC_MSG_CHECKING([MySQL version]) + MYSQL_VERSION=`$MYSQLCONFIG --version` + MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1` + if test "$MYSQL_MAJOR" -ge "5"; then + AC_MSG_RESULT([OK]) + else + AC_MSG_ERROR([too old, use 5.0.x or 5.1.x]) + fi + AC_MSG_CHECKING([for MySQL Client library]) + MYSQL_INC=`$MYSQLCONFIG --include` + MYSQL_LIB=`$MYSQLCONFIG --libs` + MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,` + AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB]) +else + SYSTEM_MYSQL=NO + if test -n "$with_libmysql_path"; then + AC_MSG_RESULT([external Connector/C (libmysql)]) + LIBMYSQL=libmysql.so + if test "$_os" = "Darwin"; then + LIBMYSQL=libmysql.dylib + elif test "$_os" = "WINNT"; then + LIBMYSQL=libmysql.dll + fi + AC_MSG_CHECKING([for $LIBMYSQL]) + if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then + AC_MSG_RESULT([found.]) + LIBMYSQL_PATH=$with_libmysql_path + else + AC_MSG_ERROR([not found. Please specify proper path in --with-libmysql-path.]) + fi + else + AC_MSG_ERROR([not given. Please specify either --with-system-mysql or --with-libmysql-path]) + fi +fi +AC_SUBST(SYSTEM_MYSQL) +AC_SUBST(MYSQL_INC) +AC_SUBST(MYSQL_LIB) +AC_SUBST(MYSQL_DEFINES) +AC_SUBST(LIBMYSQL_PATH) + +AC_LANG_PUSH([C++]) +dnl =================================================================== +dnl Check for system MySQL C++ Connector +dnl =================================================================== +# FIXME! +# who thought this too-generic cppconn dir was a good idea? +AC_MSG_CHECKING([MySQL Connector/C++]) +if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \ + test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_MYSQL_CPPCONN=YES + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER(mysql_driver.h, [], + [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], []) + AC_CHECK_LIB(mysqlcppconn, main, [], + [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], []) + AC_MSG_CHECKING([version]) + AC_TRY_RUN([ +#include <mysql_driver.h> + +int main(int argc, char **argv) { + sql::Driver *driver; + driver = get_driver_instance(); + if (driver->getMajorVersion() > 1 || \ + (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \ + (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6)) + return 0; + else + return 1; +} + ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, we need >= 1.0.6])]) + AC_LANG_POP([C++]) + + AC_MSG_CHECKING([STL compatibility]) + if test "$WITH_STLPORT" != "no"; then + AC_MSG_ERROR([to use system mysqlcppconn you need to use --without-stlport]) + else + AC_MSG_RESULT([OK]) + fi + +else + AC_MSG_RESULT([internal]) + AC_MSG_CHECKING([for mysqlcppconn module]) + if test -d mysqlcppconn; then + AC_MSG_RESULT([OK]) + else + AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) + fi + BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN" + SYSTEM_MYSQL_CPPCONN=NO +fi +AC_LANG_POP([C++]) +AC_SUBST(SYSTEM_MYSQL_CPPCONN) +fi + dnl =================================================================== dnl Check for system hsqldb dnl =================================================================== @@ -3986,11 +4113,11 @@ if test -n "$with_system_curl" -o -n "$with_system_libs" && \ fi # check curl version - AC_MSG_CHECKING([whether curl is >= 7.9.8]) + AC_MSG_CHECKING([whether curl is >= 7.13.1]) if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \ - "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \ - "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then - AC_MSG_ERROR([no, you need at least curl 7.9,8]) + "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \ + "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then + AC_MSG_ERROR([no, you need at least curl 7.13,1]) else AC_MSG_RESULT([yes]) fi diff --git a/dmake/Makefile.am b/dmake/Makefile.am index 672f688c9ff0..801ee2967c47 100755 --- a/dmake/Makefile.am +++ b/dmake/Makefile.am @@ -1,35 +1,27 @@ #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# $RCSfile: Makefile.am,v $ +# OpenOffice.org - a multi-platform office productivity suite # -# $Revision: 1.12 $ +# This file is part of OpenOffice.org. # -# last change: $Author: kz $ $Date: 2008-03-05 18:26:19 $ +# 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. # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 2.1. +# 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). # -# -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library 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 for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# 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. # #************************************************************************* diff --git a/dmake/Makefile.in b/dmake/Makefile.in index ed78925f6bfc..c25cc18ef247 100755 --- a/dmake/Makefile.in +++ b/dmake/Makefile.in @@ -16,36 +16,28 @@ #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# $RCSfile: Makefile.in,v $ +# OpenOffice.org - a multi-platform office productivity suite # -# $Revision: 1.15 $ +# This file is part of OpenOffice.org. # -# last change: $Author: kz $ $Date: 2008-03-05 18:26:33 $ +# 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. # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 2.1. +# 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). # -# -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library 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 for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# 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. # #************************************************************************* diff --git a/guw/guw.cc b/guw/guw.cc index e7748a908ff1..ea7c84d5cf4e 100644 --- a/guw/guw.cc +++ b/guw/guw.cc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: guw.cc,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt index becf435a74b0..50fcb25b92d2 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt @@ -33,35 +33,120 @@ multiwestern = "{D53F8583-419E-440E-AC00-40E9AB31EEBF}" multiasia = "{C0D08A10-A266-46DC-8EF4-BE0E5928129D}" [UPGRADECODE] -en-US = "{8B909084-2220-49AC-A421-142180519088}" -pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}" -ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}" +af = "{3E85B9F2-0AC3-4E57-8072-260A6FE05D02}" +ar = "{DF297699-3040-48E0-B0E6-B54385D76018}" +as-IN = "{62E2F6A6-4521-4E36-A751-46E91A58CFB5}" +be-BY = "{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974}" +bo = "{5F9461CD-2937-4EE0-AF03-24E72987244E}" +bg = "{29FF0FAA-B831-4398-BE3F-FC13949D1CAE}" +br = "{6E4658DD-79B0-4707-93C2-B022D66157A1}" +brx = "{6DD492EA-45CD-483E-8563-23355FD37E28}" +bn = "{4D1449E7-D10B-44D8-AAB0-257D6930B0C2}" +bn-BD = "{3195C77E-8462-45DA-BEFC-37F1299D889E}" +bn-IN = "{763F5343-47FC-4909-8C18-D9E0CEED533A}" +bs = "{DCC737A4-531E-4DCD-A3C4-376DA4C76D00}" +by = "{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E}" +ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}" +cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}" +cy = "{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3}" +da = "{4E7025EF-909F-4609-97BA-304684C4833D}" +de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}" +dgo = "{205ADC32-F775-476A-B68E-949F85D0B0E3}" +dz = "{3D391D0A-66D3-4141-8554-65DECA138208}" el = "{39772F91-1D37-4866-BBA4-900AB53590B0}" -nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}" -fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}" +en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}" +en-US = "{8B909084-2220-49AC-A421-142180519088}" +en-ZA = "{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93}" +eo = "{A256340D-4065-4B6F-AC1D-EB0D5127EBCE}" es = "{01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}" +et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}" +eu = "{A73CB85E-760B-4E5D-AB26-7DF091C25F16}" +fa = "{12D1FE4A-95E1-4BED-B377-2E8EA93B2461}" fi = "{481B0FE0-8313-442E-8A53-7C5139ADA3DC}" +fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}" +ga = "{39B343FE-EC1F-451E-930A-47D85E96DE67}" +gd = "{DE408221-68E9-418D-9B20-10BE458268F2}" +gl = "{38616841-D0DB-4768-B9B8-27D61A91FB47}" +gu = "{382A0F08-CF86-45C4-8119-67C87E275EFE}" +gu-IN = "{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B}" +he = "{13484272-CE60-4867-B494-D56F9049B95A}" +hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}" +hi-IN = "{DDAB0849-CC63-475C-AC87-388B93579A28}" +hr = "{0750A25E-7492-4681-8DFD-E04E89E45C0A}" hu = "{5981EE94-6763-40AD-A8A0-EEB01CCA153C}" -ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}" +is = "{ED6D0C4C-2746-40A9-A672-4D9950C421C0}" it = "{50087605-A504-441B-B514-67F13A284C10}" -cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}" -sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}" -en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}" -da = "{4E7025EF-909F-4609-97BA-304684C4833D}" -sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}" +ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}" +kid = "{1A4DA798-78EB-46B8-A5CE-4E32F883314C}" +ky = "{3110031F-1B5D-4457-BB5C-F6A330F15419}" +ka = "{08E10841-B5EF-4BF9-9688-AE25573E6DA7}" +kk = "{1527983C-2953-45B4-87A5-C7D67A1F6C60}" +km = "{B4E6E1AC-C45E-48BB-A038-073C32693B65}" +kn = "{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11}" +ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}" +kok = "{CC3129BA-331A-42CC-8569-93F9E05B6400}" +ks = "{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC}" +ku = "{2C5FB742-9A33-410D-AC5C-A376D4967D69}" +lo = "{3968BFB2-35F7-4BBC-9E3E-C640BF09587D}" +lt = "{3526DA6A-7EA6-471C-973E-C0461DE85909}" +lv = "{BC085A1A-38A6-462A-889F-6E7CA442D9D8}" +mai = "{BE522738-E05A-431A-B535-29349EBF86AE}" +mk = "{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8}" +mn = "{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E}" +mni = "{3CBD068D-E6AE-4C02-8091-DD4F2866336A}" +ms = "{F300CABB-ED67-468E-A336-87DEC6E22CFC}" +ml-IN = "{F2F04B66-9996-425D-A026-0AE99F5DB878}" +mr-IN = "{4B87A651-94B3-48DF-800C-9458C3A93179}" +my = "{E1C174A0-8126-43A8-B696-9F9DE676E1ED}" +ne = "{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C}" +nb = "{6E732530-FCDD-484C-A575-1289731020FD}" +nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}" +nn = "{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5}" no = "{00C1656C-6386-42ED-BE8C-5D6C553EF125}" +nr = "{0E64C806-9EB2-4651-BB94-B8D9814FD9E5}" +ns = "{5142883F-6084-4723-907B-EFD4A5097817}" +om = "{8D6EE539-9E74-41C0-8DED-807F91D68467}" +oc = "{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB}" +or-IN = "{11771BE2-44D3-4ACD-882B-26C4947237C5}" +pap = "{C4AC769D-F356-4D1A-A3A4-62E6729CF403}" +pa-IN = "{1869854A-30BE-40EF-B72C-AF0CCA1A5A91}" pl = "{9C92258E-9A41-4A03-AA5C-FD8EF15189BA}" -de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}" +ps = "{277B630B-64D9-4105-A542-6F279A31A72C}" +pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}" pt-BR = "{7364F154-089D-400B-B275-751AAB9A6122}" +ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}" +rw = "{D1D013B7-9570-4165-8421-BBDC97842260}" +sat = "{233A2442-D417-458E-A67F-4C3E58B54387}" +sa-IN = "{180CEB68-8F15-4533-B2C2-43D47DED7ABB}" +si = "{6CFE884D-10C2-42F7-A60F-52A8284E8D45}" +sc = "{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183}" +sd = "{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75}" +sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}" +sl = "{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD}" +sh = "{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4}" +sr = "{49A004A2-3B8B-4029-B403-89919CB52355}" +ss = "{5B0E4353-AB4E-497E-B38F-2E784C7B1F35}" +st = "{FC92FF2C-0E4B-4EB1-A962-682861EE4C33}" +sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}" +sw = "{90672FAA-14CA-4F63-8FE9-40E572A3969A}" +sw-TZ = "{905F971E-91FC-4F85-90D6-F6217A4FF01A}" +te-IN = "{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7}" +ti-ER = "{1FEF45BC-1315-46F4-B89B-6660226758DE}" +ta-IN = "{76D5C227-D097-4B4E-B4C7-B2370B4F7932}" th = "{1F9BC074-55AA-496A-9EC5-05E65CF64AE6}" -et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}" -ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}" -ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}" +tn = "{685C3085-DCD2-40F6-85C9-5084402D7E0F}" +tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}" +ts = "{AC285965-9D0F-4D55-8885-0F0A9B9888B1}" +tg = "{6C238E70-72FA-45FA-BC58-C508CD3AF6FC}" +ug = "{57836D3D-879A-4288-8C47-691ECC4EECBE}" +ur-IN = "{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD}" +uk = "{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0}" +uz = "{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D}" +ve = "{95AD70B2-CE4A-4362-975E-6C48DC70179C}" +vi = "{9B664C3A-CD48-4717-A40D-3B02475D7E20}" +xh = "{1BCF7835-9CD6-454E-9530-64222CCF29E7}" zh-CN = "{5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}" zh-TW = "{08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}" -tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}" -hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}" -ar = "{DF297699-3040-48E0-B0E6-B54385D76018}" -he = "{13484272-CE60-4867-B494-D56F9049B95A}" +zu = "{924D7527-25C6-4B95-95C7-7B68DABEC93E}" multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}" multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}" diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt index 073fad35d282..f4bd9e6fbbec 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt @@ -33,35 +33,120 @@ multiwestern = "{E404F8D3-5FC2-44BF-97F9-901A24DF6A3E}" multiasia = "{714181AC-7DE5-49D3-AF09-292EB90DB750}" [UPGRADECODE] -en-US = "{5A5BF785-994C-44D0-A2D2-7C757C1E87B2}" -pt = "{C62DBDBB-F1B6-4ACA-A0C6-D0B164A945CD}" -ru = "{E1475570-6060-4EF8-834A-A241969A2061}" +af = "{0FB73E2F-AB13-46C2-BA45-245A3F3A4750}" +ar = "{2E0EFF99-3023-4734-9D56-4E7400898182}" +as-IN = "{3A400267-1BAE-4912-9800-8C26FDD547DE}" +be-BY = "{01CD6DF5-A3D9-4D76-B39D-02FEC0C439E5}" +bo = "{18DE4A08-BD3A-433A-91B1-85998EA033F5}" +bg = "{2DFA49FA-A3B6-44CA-A2BB-01DF463186D7}" +br = "{77851653-0428-4A45-AE05-076D7D58E9B0}" +brx = "{F2BC3BEC-6634-4F9E-B878-5008EC622E5C}" +bn = "{C85CC50B-AD2E-4462-8517-36E499DF7CED}" +bn-BD = "{3D4B1DA5-3846-49B0-8BEC-05869EF3F587}" +bn-IN = "{2F8A7B29-EDC9-4681-B5B5-0DED9EA7E563}" +bs = "{2AB403D8-19E9-46FD-A514-40FE49FFDD7C}" +by = "{BFB3DBFA-B114-41D0-9C78-6BB85161A555}" +ca = "{5032D03F-55BB-4CF5-ABDA-6AAB4002D12C}" +cs = "{842F16E3-E4FA-4B23-AFA0-4DF9DE8CA4F8}" +cy = "{EC0B288E-7A19-4CC3-9B5F-FA63413226B1}" +da = "{3E8FFADF-A50E-4412-8613-5CFD55864FA3}" +de = "{63512266-4861-42F3-9269-3FBCFB9F60B2}" +dgo = "{69F5D053-0E5D-4260-A787-DBB78397D51D}" +dz = "{EC70E449-B165-43DD-A4ED-34F07C8C1E12}" el = "{8404A6EF-7E40-4B4C-86BC-450C51CFC8DA}" -nl = "{6D3E7570-BA59-492D-A83D-9C3D7B457EE6}" -fr = "{8374FA3E-5454-4060-AD5C-4D9978850194}" +en-GB = "{DD5DD115-63B5-4C5A-984A-423C4A22F9AB}" +en-US = "{5A5BF785-994C-44D0-A2D2-7C757C1E87B2}" +en-ZA = "{83C0A05D-611C-4EEC-A80B-030F9F93C693}" +eo = "{B891DEBE-300A-4CD5-8828-BE68529DE62E}" es = "{D30FCA19-CD1F-4052-9D84-BB45C1C7C0DD}" +et = "{60E1242E-CF22-4ABF-8ED4-F15BFAE31C72}" +eu = "{A1662F7D-BF01-4F7C-83FB-BAB1B9B5D081}" +fa = "{09F1B354-A2C1-434A-93ED-A8C0E480BE23}" fi = "{071D642E-D898-4224-9EB5-353FC79EB6B5}" +fr = "{8374FA3E-5454-4060-AD5C-4D9978850194}" +ga = "{4AE98AD0-7D79-48E6-A819-75F7323261D5}" +gd = "{2D44F336-E62D-41A1-A88B-0A8023217B19}" +gl = "{97F43DDB-E046-4AC5-81BB-F64707098EE3}" +gu = "{1FABFA47-C362-4AB1-9E26-C65B4511CF5A}" +gu-IN = "{DB97DBBB-CC40-405A-A774-CC3F40C935A9}" +he = "{A657505A-2A57-453B-8B47-F8D605A8AFE0}" +hi = "{C0B220D1-2548-4E2C-BD7B-B7A14FE1C977}" +hi-IN = "{EA2CB52A-E5AA-45E7-80C6-DE7EB76A1E5D}" +hr = "{764043CA-CF26-4862-80BF-29E3AAD9E144}" hu = "{03CBE5BA-E9C4-4CF3-8B36-7BEDB31F256A}" -ca = "{5032D03F-55BB-4CF5-ABDA-6AAB4002D12C}" +is = "{DF95762B-5307-4B85-B4C5-B144BB02C5FB}" it = "{3F22750A-31C1-4C86-BD57-4A928A7F657E}" -cs = "{842F16E3-E4FA-4B23-AFA0-4DF9DE8CA4F8}" -sk = "{9AB7EEDB-11F5-4088-B581-FE711EDE6DCB}" -en-GB = "{DD5DD115-63B5-4C5A-984A-423C4A22F9AB}" -da = "{3E8FFADF-A50E-4412-8613-5CFD55864FA3}" -sv = "{FD2E4280-BCFC-4109-A431-EC720C44A392}" +ja = "{52E22B79-3C25-4BFF-BC5B-FC37EE5020DC}" +kid = "{704FAB24-F8F9-4245-8BA7-1931B3176951}" +ky = "{568D4A30-A1EC-4060-A8EE-41277EF3985C}" +ka = "{C196B961-1F5F-438E-B764-73F91C6CAEA5}" +kk = "{B63AD05D-90E5-45B5-B3FA-B69C47380E86}" +km = "{3A469632-5FB9-4F99-AC5D-744B5D17C6D8}" +kn = "{D62D8785-CAF0-4650-8EA1-D713D61CC299}" +ko = "{02FDC794-9AE9-4D64-9312-FF2DE0EF3104}" +kok = "{6D72F5E0-D1D1-4BF4-8357-E5DC50CC1067}" +ks = "{4ED85F09-A3C9-4C63-A34B-A2AF16098825}" +ku = "{D89A3F76-2161-44AA-8FD7-755E3033AC02}" +lo = "{28FD3AC9-0676-46E6-97E7-5E06B0A3CF0C}" +lt = "{4E8F4857-EB42-4D96-94AD-0058C817B5F2}" +lv = "{6BF5ADF5-F75C-4E0A-8E16-9829D3B194FD}" +mai = "{4D9B6646-80B7-48D1-BB19-684152EB3DA3}" +mk = "{99F82176-F642-42A7-B0DF-052E7096A4F8}" +mn = "{7ED4CD40-F9C3-4787-AFBD-FB42F1F9223D}" +mni = "{031C2836-62D6-481F-B9D9-C0B3340280EC}" +ms = "{FC4C1B4A-6571-4674-B5B2-6D42860D4DF6}" +ml-IN = "{D3936188-9845-4AFD-A484-D6D634103917}" +mr-IN = "{E5ADEAB5-42A1-41D6-AD58-92C17CAE411D}" +my = "{5EB48BA3-4CFF-48CC-9301-DF5A99E901C8}" +ne = "{384BCFE4-EDD0-4897-9924-82CB51E80381}" +nb = "{DF312B1B-93E3-4903-8467-6DF2786F0009}" +nl = "{6D3E7570-BA59-492D-A83D-9C3D7B457EE6}" +nn = "{CB24EBA2-28FA-4EFF-9DD6-890D376F036A}" no = "{A890155F-9333-4869-8816-D32720841A01}" +nr = "{D6FACDDF-EF17-4773-A9A8-9B84A2E7E62C}" +ns = "{16FE7611-2139-4D83-81DF-F6ED5A322F06}" +om = "{CE5F3BEC-D59B-45CD-A451-A08E9F7018EA}" +oc = "{A485C6CB-34A7-4969-A0AC-78241D417C95}" +or-IN = "{2B3F3A48-231B-4AB6-B1CB-7FA173F704DB}" +pap = "{DA0E5FD9-1C4D-4AB6-BA11-B34DFBB3FA17}" +pa-IN = "{4FF51E79-A1C5-4D60-AE8D-A880483F4182}" pl = "{F5019C24-CC86-4E86-84A5-53FF98539D04}" -de = "{63512266-4861-42F3-9269-3FBCFB9F60B2}" +ps = "{7AA8672E-9811-4ECD-828D-EB694373C72C}" +pt = "{C62DBDBB-F1B6-4ACA-A0C6-D0B164A945CD}" pt-BR = "{F7F75CB1-2123-4B5B-BC00-11440725B71B}" +ru = "{E1475570-6060-4EF8-834A-A241969A2061}" +rw = "{35BAFF73-3654-4E74-8E44-0F74842785DF}" +sat = "{E34A52B2-ADAA-4C58-AC3B-9FD91C135BC2}" +sa-IN = "{6732C0EC-1DC7-428C-BC7B-E1B752AD23E5}" +si = "{E3F62111-0A68-4268-8850-C49B830A1E57}" +sc = "{F585A19E-3AB9-496C-B06A-0CE6690148C8}" +sd = "{43252725-3200-45AF-A99B-913F532BD9DF}" +sk = "{9AB7EEDB-11F5-4088-B581-FE711EDE6DCB}" +sl = "{E3363531-F96D-4756-88E8-240E9BFBD3B7}" +sh = "{8E722E7F-6100-41F6-BCF2-0E8AF1405BF0}" +sr = "{CB0957AD-996F-4B67-90C7-36E6288EEAB8}" +ss = "{BF227916-E342-4307-91DB-97D72DE31233}" +st = "{7B38DA39-FE10-43EC-A9B4-34470BD44252}" +sv = "{FD2E4280-BCFC-4109-A431-EC720C44A392}" +sw = "{D3689B53-4B06-443F-8A2B-7937E7514BC4}" +sw-TZ = "{462A874C-20D9-45B5-970A-B93C922CFCD5}" +te-IN = "{8916B89F-7763-4112-9820-B58BFF350D9B}" +ti-ER = "{47D18328-E629-4E6E-9E64-BE6C37C89098}" +ta-IN = "{DF4D12DF-EB5D-44C8-8E41-60DFEFF1E623}" th = "{8A51A028-CFBE-4B1F-8C20-94E4A6D53675}" -et = "{60E1242E-CF22-4ABF-8ED4-F15BFAE31C72}" -ja = "{52E22B79-3C25-4BFF-BC5B-FC37EE5020DC}" -ko = "{02FDC794-9AE9-4D64-9312-FF2DE0EF3104}" +tn = "{BF0EB46F-05D8-4349-BEE8-57A0BFFE809E}" +tr = "{6D6315EA-4B6F-4A62-AE4B-7197F6C00106}" +ts = "{6824A943-F895-4F67-812C-0062BEF03E38}" +tg = "{8AFD7661-482B-48DC-A103-5542A0D54B94}" +ug = "{7C8A4BC9-0288-4CD2-B721-C43A283F5E52}" +ur-IN = "{2E261973-B842-4C33-8FEE-1C2EC8D45451}" +uk = "{AE29A49E-45F0-4BB4-82C9-77FFCA6394E3}" +uz = "{CF6C8A15-A742-437F-9669-F8BE198873DF}" +ve = "{C633A368-E04A-44EA-AFAF-15ADEDD8BF91}" +vi = "{71643076-66F2-47E8-9826-0D378956568E}" +xh = "{56F23458-B7E6-4D97-89F2-A5A56E605A6C}" zh-CN = "{14D843EF-5A1D-4EE4-9BAB-EC0A7A6F96D0}" zh-TW = "{98E66873-0C3E-4399-8676-A9D720071672}" -tr = "{6D6315EA-4B6F-4A62-AE4B-7197F6C00106}" -hi = "{C0B220D1-2548-4E2C-BD7B-B7A14FE1C977}" -ar = "{2E0EFF99-3023-4734-9D56-4E7400898182}" -he = "{A657505A-2A57-453B-8B47-F8D605A8AFE0}" +zu = "{E317CFA7-4C92-4B3E-8528-8D44B2081C00}" multiwestern = "{157A7FB6-A116-455C-AF18-3A46D8273B8D}" multiiasia = "{E4C656E5-8F10-4A3A-B3A6-35C894DE637C}" diff --git a/instsetoo_native/inc_openoffice/unix/makefile.mk b/instsetoo_native/inc_openoffice/unix/makefile.mk index af3ecd87f62e..3dec2ab1a09e 100644 --- a/instsetoo_native/inc_openoffice/unix/makefile.mk +++ b/instsetoo_native/inc_openoffice/unix/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk index 48c18bf9bc38..df3cd544890e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index e3bb73b9ed90..80514fd1904b 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -3,36 +3,121 @@ s72 i2 S64 S255 CustomAction Action ISInitAllUsers 307 ALLUSERS 1 DontRemoveProducts 51 OLDPRODUCTS {} -DontRemoveLpEnusProducts 51 O2LPENUS {} -DontRemoveLpptProducts 51 O2LPPT {} -DontRemoveLpruProducts 51 O2LPRU {} +DontRemoveLpafProducts 51 O2LPAF {} +DontRemoveLparProducts 51 O2LPAR {} +DontRemoveLpasinProducts 51 O2LPASIN {} +DontRemoveLpbebyProducts 51 O2LPBEBY {} +DontRemoveLpboProducts 51 O2LPBO {} +DontRemoveLpbgProducts 51 O2LPBG {} +DontRemoveLpbrProducts 51 O2LPBR {} +DontRemoveLpbrxProducts 51 O2LPBRX {} +DontRemoveLpbnProducts 51 O2LPBN {} +DontRemoveLpbnbdProducts 51 O2LPBNBD {} +DontRemoveLpbninProducts 51 O2LPBNIN {} +DontRemoveLpbsProducts 51 O2LPBS {} +DontRemoveLpbyProducts 51 O2LPBY {} +DontRemoveLpcaProducts 51 O2LPCA {} +DontRemoveLpcsProducts 51 O2LPCS {} +DontRemoveLpcyProducts 51 O2LPCY {} +DontRemoveLpdaProducts 51 O2LPDA {} +DontRemoveLpdeProducts 51 O2LPDE {} +DontRemoveLpdgoProducts 51 O2LPDGO {} +DontRemoveLpdzProducts 51 O2LPDZ {} DontRemoveLpelProducts 51 O2LPEL {} -DontRemoveLpnlProducts 51 O2LPNL {} -DontRemoveLpfrProducts 51 O2LPFR {} +DontRemoveLpengbProducts 51 O2LPENGB {} +DontRemoveLpenusProducts 51 O2LPENUS {} +DontRemoveLpenzaProducts 51 O2LPENZA {} +DontRemoveLpeoProducts 51 O2LPEO {} DontRemoveLpesProducts 51 O2LPES {} +DontRemoveLpetProducts 51 O2LPET {} +DontRemoveLpeuProducts 51 O2LPEU {} +DontRemoveLpfaProducts 51 O2LPFA {} DontRemoveLpfiProducts 51 O2LPFI {} +DontRemoveLpfrProducts 51 O2LPFR {} +DontRemoveLpgaProducts 51 O2LPGA {} +DontRemoveLpgdProducts 51 O2LPGD {} +DontRemoveLpglProducts 51 O2LPGL {} +DontRemoveLpguProducts 51 O2LPGU {} +DontRemoveLpguinProducts 51 O2LPGUIN {} +DontRemoveLpheProducts 51 O2LPHE {} +DontRemoveLphiProducts 51 O2LPHI {} +DontRemoveLphiinProducts 51 O2LPHIIN {} +DontRemoveLphrProducts 51 O2LPHR {} DontRemoveLphuProducts 51 O2LPHU {} -DontRemoveLpcaProducts 51 O2LPCA {} +DontRemoveLpisProducts 51 O2LPIS {} DontRemoveLpitProducts 51 O2LPIT {} -DontRemoveLpcsProducts 51 O2LPCS {} -DontRemoveLpskProducts 51 O2LPSK {} -DontRemoveLpengbProducts 51 O2LPENGB {} -DontRemoveLpdaProducts 51 O2LPDA {} -DontRemoveLpsvProducts 51 O2LPSV {} +DontRemoveLpjaProducts 51 O2LPJA {} +DontRemoveLpkidProducts 51 O2LPKID {} +DontRemoveLpkyProducts 51 O2LPKY {} +DontRemoveLpkaProducts 51 O2LPKA {} +DontRemoveLpkkProducts 51 O2LPKK {} +DontRemoveLpkmProducts 51 O2LPKM {} +DontRemoveLpknProducts 51 O2LPKN {} +DontRemoveLpkoProducts 51 O2LPKO {} +DontRemoveLpkokProducts 51 O2LPKOK {} +DontRemoveLpksProducts 51 O2LPKS {} +DontRemoveLpkuProducts 51 O2LPKU {} +DontRemoveLploProducts 51 O2LPLO {} +DontRemoveLpltProducts 51 O2LPLT {} +DontRemoveLplvProducts 51 O2LPLV {} +DontRemoveLpmaiProducts 51 O2LPMAI {} +DontRemoveLpmkProducts 51 O2LPMK {} +DontRemoveLpmnProducts 51 O2LPMN {} +DontRemoveLpmniProducts 51 O2LPMNI {} +DontRemoveLpmsProducts 51 O2LPMS {} +DontRemoveLpmlinProducts 51 O2LPMLIN {} +DontRemoveLpmrinProducts 51 O2LPMRIN {} +DontRemoveLpmyProducts 51 O2LPMY {} +DontRemoveLpneProducts 51 O2LPNE {} +DontRemoveLpnbProducts 51 O2LPNB {} +DontRemoveLpnlProducts 51 O2LPNL {} +DontRemoveLpnnProducts 51 O2LPNN {} DontRemoveLpnoProducts 51 O2LPNO {} +DontRemoveLpnrProducts 51 O2LPNR {} +DontRemoveLpnsProducts 51 O2LPNS {} +DontRemoveLpomProducts 51 O2LPOM {} +DontRemoveLpocProducts 51 O2LPOC {} +DontRemoveLporinProducts 51 O2LPORIN {} +DontRemoveLppapProducts 51 O2LPPAP {} +DontRemoveLppainProducts 51 O2LPPAIN {} DontRemoveLpplProducts 51 O2LPPL {} -DontRemoveLpdeProducts 51 O2LPDE {} +DontRemoveLppsProducts 51 O2LPPS {} +DontRemoveLpptProducts 51 O2LPPT {} DontRemoveLpptbrProducts 51 O2LPPTBR {} +DontRemoveLpruProducts 51 O2LPRU {} +DontRemoveLprwProducts 51 O2LPRW {} +DontRemoveLpsatProducts 51 O2LPSAT {} +DontRemoveLpsainProducts 51 O2LPSAIN {} +DontRemoveLpsiProducts 51 O2LPSI {} +DontRemoveLpscProducts 51 O2LPSC {} +DontRemoveLpsdProducts 51 O2LPSD {} +DontRemoveLpskProducts 51 O2LPSK {} +DontRemoveLpslProducts 51 O2LPSL {} +DontRemoveLpshProducts 51 O2LPSH {} +DontRemoveLpsrProducts 51 O2LPSR {} +DontRemoveLpssProducts 51 O2LPSS {} +DontRemoveLpstProducts 51 O2LPST {} +DontRemoveLpsvProducts 51 O2LPSV {} +DontRemoveLpswProducts 51 O2LPSW {} +DontRemoveLpswtzProducts 51 O2LPSWTZ {} +DontRemoveLpteinProducts 51 O2LPTEIN {} +DontRemoveLptierProducts 51 O2LPTIER {} +DontRemoveLptainProducts 51 O2LPTAIN {} DontRemoveLpthProducts 51 O2LPTH {} -DontRemoveLpetProducts 51 O2LPET {} -DontRemoveLpjaProducts 51 O2LPJA {} -DontRemoveLpkoProducts 51 O2LPKO {} +DontRemoveLptnProducts 51 O2LPTN {} +DontRemoveLptrProducts 51 O2LPTR {} +DontRemoveLptsProducts 51 O2LPTS {} +DontRemoveLptgProducts 51 O2LPTG {} +DontRemoveLpugProducts 51 O2LPUG {} +DontRemoveLpurinProducts 51 O2LPURIN {} +DontRemoveLpukProducts 51 O2LPUK {} +DontRemoveLpuzProducts 51 O2LPUZ {} +DontRemoveLpveProducts 51 O2LPVE {} +DontRemoveLpviProducts 51 O2LPVI {} +DontRemoveLpxhProducts 51 O2LPXH {} DontRemoveLpzhcnProducts 51 O2LPZHCN {} DontRemoveLpzhtwProducts 51 O2LPZHTW {} -DontRemoveLptrProducts 51 O2LPTR {} -DontRemoveLphiProducts 51 O2LPHI {} -DontRemoveLparProducts 51 O2LPAR {} -DontRemoveLpheProducts 51 O2LPHE {} +DontRemoveLpzuProducts 51 O2LPZU {} setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE] SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users setUserProfileNT 51 USERPROFILE [%USERPROFILE] diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 9459e79e283d..11f97a0bb797 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -11,36 +11,121 @@ CreateFolders 1850 CreateShortcuts 2150 DeleteServices VersionNT 1000 DontRemoveProducts REMOVEOLDPRODUCTS<>"1" 155 -DontRemoveLpEnusProducts REMOVEOLDPRODUCTS<>"1" 157 -DontRemoveLpptProducts REMOVEOLDPRODUCTS<>"1" 158 -DontRemoveLpruProducts REMOVEOLDPRODUCTS<>"1" 159 +DontRemoveLpafProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLparProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpasinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbebyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpboProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbgProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbrxProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbnbdProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbninProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpbyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpcaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpcsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpcyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdeProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdgoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpdzProducts REMOVEOLDPRODUCTS<>"1" 160 DontRemoveLpelProducts REMOVEOLDPRODUCTS<>"1" 160 -DontRemoveLpnlProducts REMOVEOLDPRODUCTS<>"1" 161 -DontRemoveLpfrProducts REMOVEOLDPRODUCTS<>"1" 162 -DontRemoveLpesProducts REMOVEOLDPRODUCTS<>"1" 163 -DontRemoveLpfiProducts REMOVEOLDPRODUCTS<>"1" 164 -DontRemoveLphuProducts REMOVEOLDPRODUCTS<>"1" 165 -DontRemoveLpcaProducts REMOVEOLDPRODUCTS<>"1" 166 -DontRemoveLpitProducts REMOVEOLDPRODUCTS<>"1" 167 -DontRemoveLpcsProducts REMOVEOLDPRODUCTS<>"1" 168 -DontRemoveLpskProducts REMOVEOLDPRODUCTS<>"1" 169 -DontRemoveLpengbProducts REMOVEOLDPRODUCTS<>"1" 170 -DontRemoveLpdaProducts REMOVEOLDPRODUCTS<>"1" 171 -DontRemoveLpsvProducts REMOVEOLDPRODUCTS<>"1" 172 -DontRemoveLpnoProducts REMOVEOLDPRODUCTS<>"1" 173 -DontRemoveLpplProducts REMOVEOLDPRODUCTS<>"1" 174 -DontRemoveLpdeProducts REMOVEOLDPRODUCTS<>"1" 175 -DontRemoveLpptbrProducts REMOVEOLDPRODUCTS<>"1" 176 -DontRemoveLpthProducts REMOVEOLDPRODUCTS<>"1" 177 -DontRemoveLpetProducts REMOVEOLDPRODUCTS<>"1" 178 -DontRemoveLpjaProducts REMOVEOLDPRODUCTS<>"1" 179 -DontRemoveLpkoProducts REMOVEOLDPRODUCTS<>"1" 180 -DontRemoveLpzhcnProducts REMOVEOLDPRODUCTS<>"1" 181 -DontRemoveLpzhtwProducts REMOVEOLDPRODUCTS<>"1" 182 -DontRemoveLptrProducts REMOVEOLDPRODUCTS<>"1" 183 -DontRemoveLphiProducts REMOVEOLDPRODUCTS<>"1" 184 -DontRemoveLparProducts REMOVEOLDPRODUCTS<>"1" 185 -DontRemoveLpheProducts REMOVEOLDPRODUCTS<>"1" 186 +DontRemoveLpengbProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpenusProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpenzaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpeoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpesProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpetProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpeuProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpfaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpfiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpfrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpgaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpgdProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpglProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpguProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpguinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpheProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphiinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLphuProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpisProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpitProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpjaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkidProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkaProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkkProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkmProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpknProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkokProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpksProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpkuProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLploProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpltProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLplvProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmaiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmkProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmniProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmlinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmrinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpmyProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpneProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnbProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnlProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnoProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpnsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpomProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpocProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLporinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLppapProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLppainProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpplProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLppsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpptProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpptbrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpruProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLprwProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsatProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsainProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsiProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpscProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsdProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpskProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpslProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpshProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpssProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpstProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpsvProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpswProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpswtzProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpteinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptierProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptainProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpthProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptrProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptsProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLptgProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpugProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpurinProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpukProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpuzProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpveProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpviProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpxhProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpzhcnProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpzhtwProducts REMOVEOLDPRODUCTS<>"1" 160 +DontRemoveLpzuProducts REMOVEOLDPRODUCTS<>"1" 160 DuplicateFiles 2050 FileCost 400 FindRelatedProducts NOT ISSETUPDRIVEN 100 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt index dfa79a346674..5f26cbd5d04c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt @@ -4,33 +4,118 @@ # s38 S20 S20 S255 i4 S255 s72 # Upgrade UpgradeCode VersionMin VersionMax Language Attributes -{8B909084-2220-49AC-A421-142180519088} 3.0.0 0 O2LPENUS -{CBFA6A61-D310-4A90-8F49-C7BE2735D58D} 3.0.0 0 O2LPPT -{DF67ADAA-4755-4184-9E32-1020F40DDA81} 3.0.0 0 O2LPRU +{3E85B9F2-0AC3-4E57-8072-260A6FE05D02} 3.0.0 0 O2LPAF +{DF297699-3040-48E0-B0E6-B54385D76018} 3.0.0 0 O2LPAR +{62E2F6A6-4521-4E36-A751-46E91A58CFB5} 3.0.0 0 O2LPASIN +{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974} 3.0.0 0 O2LPBEBY +{5F9461CD-2937-4EE0-AF03-24E72987244E} 3.0.0 0 O2LPBO +{29FF0FAA-B831-4398-BE3F-FC13949D1CAE} 3.0.0 0 O2LPBG +{6E4658DD-79B0-4707-93C2-B022D66157A1} 3.0.0 0 O2LPBR +{6DD492EA-45CD-483E-8563-23355FD37E28} 3.0.0 0 O2LPBRX +{4D1449E7-D10B-44D8-AAB0-257D6930B0C2} 3.0.0 0 O2LPBN +{3195C77E-8462-45DA-BEFC-37F1299D889E} 3.0.0 0 O2LPBNBD +{763F5343-47FC-4909-8C18-D9E0CEED533A} 3.0.0 0 O2LPBNIN +{DCC737A4-531E-4DCD-A3C4-376DA4C76D00} 3.0.0 0 O2LPBS +{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E} 3.0.0 0 O2LPBY +{8EEC9A45-3BD3-431F-81D0-394F41185BD9} 3.0.0 0 O2LPCA +{DBA607B3-0805-4A18-A45D-769C70D90AB7} 3.0.0 0 O2LPCS +{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3} 3.0.0 0 O2LPCY +{4E7025EF-909F-4609-97BA-304684C4833D} 3.0.0 0 O2LPDA +{481E648E-D8AD-478A-A3F6-68FC563FFD8F} 3.0.0 0 O2LPDE +{205ADC32-F775-476A-B68E-949F85D0B0E3} 3.0.0 0 O2LPDGO +{3D391D0A-66D3-4141-8554-65DECA138208} 3.0.0 0 O2LPDZ {39772F91-1D37-4866-BBA4-900AB53590B0} 3.0.0 0 O2LPEL -{7D14314D-DAF7-4A97-A6EE-97C475080A73} 3.0.0 0 O2LPNL -{B0FDE9B8-D066-4FB2-885D-615A6D58E02F} 3.0.0 0 O2LPFR +{E60BC5AC-2513-40AF-A41B-64118A287662} 3.0.0 0 O2LPENGB +{8B909084-2220-49AC-A421-142180519088} 3.0.0 0 O2LPENUS +{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93} 3.0.0 0 O2LPENZA +{A256340D-4065-4B6F-AC1D-EB0D5127EBCE} 3.0.0 0 O2LPEO {01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A} 3.0.0 0 O2LPES +{34FBD5D3-3F88-4C91-8B9B-A10AE833250F} 3.0.0 0 O2LPET +{A73CB85E-760B-4E5D-AB26-7DF091C25F16} 3.0.0 0 O2LPEU +{12D1FE4A-95E1-4BED-B377-2E8EA93B2461} 3.0.0 0 O2LPFA {481B0FE0-8313-442E-8A53-7C5139ADA3DC} 3.0.0 0 O2LPFI +{B0FDE9B8-D066-4FB2-885D-615A6D58E02F} 3.0.0 0 O2LPFR +{39B343FE-EC1F-451E-930A-47D85E96DE67} 3.0.0 0 O2LPGA +{DE408221-68E9-418D-9B20-10BE458268F2} 3.0.0 0 O2LPGD +{38616841-D0DB-4768-B9B8-27D61A91FB47} 3.0.0 0 O2LPGL +{382A0F08-CF86-45C4-8119-67C87E275EFE} 3.0.0 0 O2LPGU +{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B} 3.0.0 0 O2LPGUIN +{13484272-CE60-4867-B494-D56F9049B95A} 3.0.0 0 O2LPHE +{2C70F320-6771-42D6-B3F5-97678C822B20} 3.0.0 0 O2LPHI +{DDAB0849-CC63-475C-AC87-388B93579A28} 3.0.0 0 O2LPHIIN +{0750A25E-7492-4681-8DFD-E04E89E45C0A} 3.0.0 0 O2LPHR {5981EE94-6763-40AD-A8A0-EEB01CCA153C} 3.0.0 0 O2LPHU -{8EEC9A45-3BD3-431F-81D0-394F41185BD9} 3.0.0 0 O2LPCA +{ED6D0C4C-2746-40A9-A672-4D9950C421C0} 3.0.0 0 O2LPIS {50087605-A504-441B-B514-67F13A284C10} 3.0.0 0 O2LPIT -{DBA607B3-0805-4A18-A45D-769C70D90AB7} 3.0.0 0 O2LPCS -{19B49960-B58C-48A7-9761-F0B325E00C31} 3.0.0 0 O2LPSK -{E60BC5AC-2513-40AF-A41B-64118A287662} 3.0.0 0 O2LPENGB -{4E7025EF-909F-4609-97BA-304684C4833D} 3.0.0 0 O2LPDA -{5E751B0D-FE96-4D0E-BAC1-5E7501294940} 3.0.0 0 O2LPSV +{74F683CC-8356-4BF7-9098-B85AAB7C1A0C} 3.0.0 0 O2LPJA +{1A4DA798-78EB-46B8-A5CE-4E32F883314C} 3.0.0 0 O2LPKID +{3110031F-1B5D-4457-BB5C-F6A330F15419} 3.0.0 0 O2LPKY +{08E10841-B5EF-4BF9-9688-AE25573E6DA7} 3.0.0 0 O2LPKA +{1527983C-2953-45B4-87A5-C7D67A1F6C60} 3.0.0 0 O2LPKK +{B4E6E1AC-C45E-48BB-A038-073C32693B65} 3.0.0 0 O2LPKM +{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11} 3.0.0 0 O2LPKN +{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB} 3.0.0 0 O2LPKO +{CC3129BA-331A-42CC-8569-93F9E05B6400} 3.0.0 0 O2LPKOK +{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC} 3.0.0 0 O2LPKS +{2C5FB742-9A33-410D-AC5C-A376D4967D69} 3.0.0 0 O2LPKU +{3968BFB2-35F7-4BBC-9E3E-C640BF09587D} 3.0.0 0 O2LPLO +{3526DA6A-7EA6-471C-973E-C0461DE85909} 3.0.0 0 O2LPLT +{BC085A1A-38A6-462A-889F-6E7CA442D9D8} 3.0.0 0 O2LPLV +{BE522738-E05A-431A-B535-29349EBF86AE} 3.0.0 0 O2LPMAI +{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8} 3.0.0 0 O2LPMK +{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E} 3.0.0 0 O2LPMN +{3CBD068D-E6AE-4C02-8091-DD4F2866336A} 3.0.0 0 O2LPMNI +{F300CABB-ED67-468E-A336-87DEC6E22CFC} 3.0.0 0 O2LPMS +{F2F04B66-9996-425D-A026-0AE99F5DB878} 3.0.0 0 O2LPMLIN +{4B87A651-94B3-48DF-800C-9458C3A93179} 3.0.0 0 O2LPMRIN +{E1C174A0-8126-43A8-B696-9F9DE676E1ED} 3.0.0 0 O2LPMY +{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C} 3.0.0 0 O2LPNE +{6E732530-FCDD-484C-A575-1289731020FD} 3.0.0 0 O2LPNB +{7D14314D-DAF7-4A97-A6EE-97C475080A73} 3.0.0 0 O2LPNL +{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5} 3.0.0 0 O2LPNN {00C1656C-6386-42ED-BE8C-5D6C553EF125} 3.0.0 0 O2LPNO +{0E64C806-9EB2-4651-BB94-B8D9814FD9E5} 3.0.0 0 O2LPNR +{5142883F-6084-4723-907B-EFD4A5097817} 3.0.0 0 O2LPNS +{8D6EE539-9E74-41C0-8DED-807F91D68467} 3.0.0 0 O2LPOM +{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB} 3.0.0 0 O2LPOC +{11771BE2-44D3-4ACD-882B-26C4947237C5} 3.0.0 0 O2LPORIN +{C4AC769D-F356-4D1A-A3A4-62E6729CF403} 3.0.0 0 O2LPPAP +{1869854A-30BE-40EF-B72C-AF0CCA1A5A91} 3.0.0 0 O2LPPAIN {9C92258E-9A41-4A03-AA5C-FD8EF15189BA} 3.0.0 0 O2LPPL -{481E648E-D8AD-478A-A3F6-68FC563FFD8F} 3.0.0 0 O2LPDE +{277B630B-64D9-4105-A542-6F279A31A72C} 3.0.0 0 O2LPPS +{CBFA6A61-D310-4A90-8F49-C7BE2735D58D} 3.0.0 0 O2LPPT {7364F154-089D-400B-B275-751AAB9A6122} 3.0.0 0 O2LPPTBR +{DF67ADAA-4755-4184-9E32-1020F40DDA81} 3.0.0 0 O2LPRU +{D1D013B7-9570-4165-8421-BBDC97842260} 3.0.0 0 O2LPRW +{233A2442-D417-458E-A67F-4C3E58B54387} 3.0.0 0 O2LPSAT +{180CEB68-8F15-4533-B2C2-43D47DED7ABB} 3.0.0 0 O2LPSAIN +{6CFE884D-10C2-42F7-A60F-52A8284E8D45} 3.0.0 0 O2LPSI +{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183} 3.0.0 0 O2LPSC +{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75} 3.0.0 0 O2LPSD +{19B49960-B58C-48A7-9761-F0B325E00C31} 3.0.0 0 O2LPSK +{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD} 3.0.0 0 O2LPSL +{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4} 3.0.0 0 O2LPSH +{49A004A2-3B8B-4029-B403-89919CB52355} 3.0.0 0 O2LPSR +{5B0E4353-AB4E-497E-B38F-2E784C7B1F35} 3.0.0 0 O2LPSS +{FC92FF2C-0E4B-4EB1-A962-682861EE4C33} 3.0.0 0 O2LPST +{5E751B0D-FE96-4D0E-BAC1-5E7501294940} 3.0.0 0 O2LPSV +{90672FAA-14CA-4F63-8FE9-40E572A3969A} 3.0.0 0 O2LPSW +{905F971E-91FC-4F85-90D6-F6217A4FF01A} 3.0.0 0 O2LPSWTZ +{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7} 3.0.0 0 O2LPTEIN +{1FEF45BC-1315-46F4-B89B-6660226758DE} 3.0.0 0 O2LPTIER +{76D5C227-D097-4B4E-B4C7-B2370B4F7932} 3.0.0 0 O2LPTAIN {1F9BC074-55AA-496A-9EC5-05E65CF64AE6} 3.0.0 0 O2LPTH -{34FBD5D3-3F88-4C91-8B9B-A10AE833250F} 3.0.0 0 O2LPET -{74F683CC-8356-4BF7-9098-B85AAB7C1A0C} 3.0.0 0 O2LPJA -{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB} 3.0.0 0 O2LPKO +{685C3085-DCD2-40F6-85C9-5084402D7E0F} 3.0.0 0 O2LPTN +{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D} 3.0.0 0 O2LPTR +{AC285965-9D0F-4D55-8885-0F0A9B9888B1} 3.0.0 0 O2LPTS +{6C238E70-72FA-45FA-BC58-C508CD3AF6FC} 3.0.0 0 O2LPTG +{57836D3D-879A-4288-8C47-691ECC4EECBE} 3.0.0 0 O2LPUG +{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD} 3.0.0 0 O2LPURIN +{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0} 3.0.0 0 O2LPUK +{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D} 3.0.0 0 O2LPUZ +{95AD70B2-CE4A-4362-975E-6C48DC70179C} 3.0.0 0 O2LPVE +{9B664C3A-CD48-4717-A40D-3B02475D7E20} 3.0.0 0 O2LPVI +{1BCF7835-9CD6-454E-9530-64222CCF29E7} 3.0.0 0 O2LPXH {5B45DC72-0755-4EC2-BB12-65A1FEADDDE7} 3.0.0 0 O2LPZHCN {08B2CED3-CFB5-491F-ADC4-FD0CD2366C60} 3.0.0 0 O2LPZHTW -{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D} 3.0.0 0 O2LPTR -{2C70F320-6771-42D6-B3F5-97678C822B20} 3.0.0 0 O2LPHI -{DF297699-3040-48E0-B0E6-B54385D76018} 3.0.0 0 O2LPAR -{13484272-CE60-4867-B494-D56F9049B95A} 3.0.0 0 O2LPHE +{924D7527-25C6-4B95-95C7-7B68DABEC93E} 3.0.0 0 O2LPZU diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript index eecd968e0003..3c302ab2daad 100644 --- a/instsetoo_native/macosx/application/PostInstall.applescript +++ b/instsetoo_native/macosx/application/PostInstall.applescript @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: PostInstall.applescript,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/macosx/application/main.applescript b/instsetoo_native/macosx/application/main.applescript index b85021ed98f1..c5c100004ac8 100644 --- a/instsetoo_native/macosx/application/main.applescript +++ b/instsetoo_native/macosx/application/main.applescript @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: main.applescript,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/macosx/make_versioned.sh b/instsetoo_native/macosx/make_versioned.sh index 4d9c0e9c29ec..04dbfb062d58 100755 --- a/instsetoo_native/macosx/make_versioned.sh +++ b/instsetoo_native/macosx/make_versioned.sh @@ -4,14 +4,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: make_versioned.sh,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/macosx/makefile.mk b/instsetoo_native/macosx/makefile.mk index 0fc0a1329c62..66b558d1038e 100644 --- a/instsetoo_native/macosx/makefile.mk +++ b/instsetoo_native/macosx/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index e9347074b73f..2ef67e564fd5 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.91 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index f316b44d3b4d..7897327d8de8 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -300,7 +300,7 @@ OpenOffice_SDK PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK - DATABASENAME openofficeorg32sdk + DATABASENAME openofficeorg33sdk NO_README_IN_ROOTDIR 1 LICENSENAME LGPL IGNOREDIRECTORYLAYER 1 @@ -349,7 +349,7 @@ OpenOffice_Dev_SDK PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK - DATABASENAME openofficeorg32devsdk + DATABASENAME openofficeorg33devsdk NO_README_IN_ROOTDIR 1 LICENSENAME LGPL IGNOREDIRECTORYLAYER 1 diff --git a/makefile.rc b/makefile.rc index 46206795dd5b..ebe41042d92f 100644 --- a/makefile.rc +++ b/makefile.rc @@ -2,13 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.rc,v $ -# $Revision: 1.54 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +35,7 @@ http://hg.services.openoffice.org/binaries 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -7a776ce208f321700d8fb0f92a133069-curl-7.12.2.tar.gz +ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar 8ea307d71d11140574bfb9fcc2487e33-libbase.zip 9f18d97ca99b4f095f5ff18139df59c3-cppunit-1.8.0.tar.gz diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 27ef93479d36..4d8f0b3903be 100644..100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -520,6 +520,19 @@ End // --------------------------------------- +#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ + RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; \ + ComponentCondition = "VersionNT >= 600"; \ + Styles = (X64); \ + Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ + Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ + Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ + End + +// --------------------------------------- + #if defined WNT #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin #define SCP2_URE_DL_NORMAL(n) n ".dll" diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 53bf047d9e98..d9d1420bdc73 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: macro.pl,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -64,6 +60,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG(); write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ(); write_DIR_IDENT_ALL_LANG(); write_EXTRA_ALL_LANG(); +write_EXTRA_ALL_LANG_BUT_EN_US(); write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(); write_EXTRA_IDENT_ALL_LANG(); write_RESFILE_ALL_LANG(); @@ -138,14 +135,29 @@ sub write_DIR_IDENT_ALL_LANG sub write_EXTRA_ALL_LANG { - print OUTFILE "#define EXTRA_ALL_LANG(name) "; + print OUTFILE "#define EXTRA_ALL_LANG(name,ext) "; foreach $lang (@completelangiso) { - print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)"; + print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)"; print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]); } print OUTFILE "\n\n"; } +sub write_EXTRA_ALL_LANG_BUT_EN_US +{ + print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) "; + my $first = 1; + foreach $lang (@completelangiso) { + if ($lang ne "en-US") { + print OUTFILE "; " unless $first; + $first = 0; + print OUTFILE + "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)"; + } + } + print OUTFILE "\n\n"; +} + sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG { my $first = 1; diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk index c9930631755e..d36f25efabd3 100644 --- a/scp2/macros/makefile.mk +++ b/scp2/macros/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.13 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index 5f257af2e1b8..574657b5b441 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_activex.scp,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk index 86097032f455..fb4342e4a891 100644 --- a/scp2/source/activex/makefile.mk +++ b/scp2/source/activex/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 4d39208f5d14..808afa874992 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_activex.scp,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf index 60af356828d9..fb7e101da95d 100644 --- a/scp2/source/activex/module_activex.ulf +++ b/scp2/source/activex/module_activex.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_activex.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 0f34c3ad358d..3d209912479c 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_base.scp,v $ - * $Revision: 1.28 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -82,38 +79,9 @@ File gid_File_Help_Sdatabase_Zip Patchfiles = (); End -File gid_File_Registry_Spool_Oo_Setup_Base_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-base.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Base_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-base.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu +File gid_File_Share_Registry_Base_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_database_types.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "base.xcd"; End - -File gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_database_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc; - Name = "/registry/spool/fcfg_database_others.xcu"; -End - diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index ca7a012009bb..c678e7424cd7 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_base.scp,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/base/folderitem_base.ulf b/scp2/source/base/folderitem_base.ulf index 495c3f747353..3bea2fd724dc 100644 --- a/scp2/source/base/folderitem_base.ulf +++ b/scp2/source/base/folderitem_base.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_base.ulf,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk index 53d1f0a89666..ead15b19776c 100644 --- a/scp2/source/base/makefile.mk +++ b/scp2/source/base/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index 27617b9d8eb5..dc4d76fcf5d1 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_base.scp,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,10 +43,7 @@ Module gid_Module_Prg_Base_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = ( - gid_File_Registry_Spool_Oo_Setup_Base_Xcu,gid_File_Registry_Spool_Oo_Common_Base_Xcu - ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu - ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu - ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu + gid_File_Share_Registry_Base_Xcd ,gid_File_Lib_Abp ,gid_File_Lib_Dbp ,gid_File_Lib_Dbu diff --git a/scp2/source/base/module_base.ulf b/scp2/source/base/module_base.ulf index b2b9e4718ff1..1cd8b2e77a80 100644 --- a/scp2/source/base/module_base.ulf +++ b/scp2/source/base/module_base.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_base.ulf,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp index 616084e9b967..833ed3905241 100644..100755 --- a/scp2/source/base/registryitem_base.scp +++ b/scp2/source/base/registryitem_base.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_base.scp,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -97,6 +94,14 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,13"; End +RegistryItem gid_Regitem_odb_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.DatabaseDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.DatabaseDocument.1\shell"; @@ -152,3 +157,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbas Name = "Path"; Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odb ) diff --git a/scp2/source/base/registryitem_base.ulf b/scp2/source/base/registryitem_base.ulf index bf18083e8566..bf6942ecf261 100644 --- a/scp2/source/base/registryitem_base.ulf +++ b/scp2/source/base/registryitem_base.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_base.ulf,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp index 7de57837fd0c..be66b907a25d 100644 --- a/scp2/source/binfilter/file_binfilter.scp +++ b/scp2/source/binfilter/file_binfilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_binfilter.scp,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,127 +28,13 @@ #include "macros.inc" - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_chart_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_chart_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_calc_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_calc_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_draw_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_draw_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_global_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_global_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_impress_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_impress_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu +File gid_File_Share_Registry_Binfilter_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_math_bf_types.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "binfilter.xcd"; End -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_math_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_web_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_web_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_writer_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_writer_bf_filters.xcu"; -End - - File gid_Starregistry_Legacy_Binfilters_Rdb TXT_FILE_BODY; Name = "legacy_binfilters.rdb"; diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk index 09d88c4690c8..f7882a3041b1 100644 --- a/scp2/source/binfilter/makefile.mk +++ b/scp2/source/binfilter/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp index 41039a84281c..d7cba78f6101 100644 --- a/scp2/source/binfilter/module_binfilter.scp +++ b/scp2/source/binfilter/module_binfilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_binfilter.scp,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,22 +34,7 @@ Module gid_Module_Optional_Binfilter InstallOrder = "1100"; ParentID = gid_Module_Optional; Default = YES; - Files = (gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu, + Files = (gid_File_Share_Registry_Binfilter_Xcd, gid_Starregistry_Legacy_Binfilters_Rdb, gid_File_Lib_Bf_Go, gid_File_Lib_Bf_Sch, diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf index 2369831767bd..9b7fc77e9236 100644 --- a/scp2/source/binfilter/module_binfilter.ulf +++ b/scp2/source/binfilter/module_binfilter.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_binfilter.ulf,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp index 3c828d0042e4..7640e83ec20a 100644 --- a/scp2/source/binfilter/registryitem_binfilter.scp +++ b/scp2/source/binfilter/registryitem_binfilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_binfilter.scp,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf index 1372ee893ff4..6af0f0e02d73 100644 --- a/scp2/source/binfilter/registryitem_binfilter.ulf +++ b/scp2/source/binfilter/registryitem_binfilter.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_binfilter.ulf,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 3917d5f3e92f..7b392f173378 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_calc.scp,v $ - * $Revision: 1.43.204.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -41,12 +38,13 @@ End STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis) -File gid_File_Oo_Office_Dataaccess_Calc_Xcu +File gid_File_Share_Registry_Calc_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/calc.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "calc.xcd"; End + STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc) STD_UNO_LIB_FILE( gid_File_Lib_Date, date) @@ -59,8 +57,6 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd) -STD_LIB_FILE( gid_File_Lib_Tfu, tfu) - STD_RES_FILE( gid_File_Res_Solver, solver) STD_RES_FILE( gid_File_Res_Analysis, analysis) @@ -69,15 +65,6 @@ STD_RES_FILE( gid_File_Res_Date, date) STD_RES_FILE( gid_File_Res_Sc, sc ) -STD_RES_FILE( gid_File_Res_Tfu, tfu ) - -File gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-calc.xcu"; -End - File gid_File_Help_Scalc_Zip Dir = gid_Dir_Help_Isolanguage; ARCHIVE_TXT_FILE_BODY; @@ -94,69 +81,6 @@ File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml Name = "/uiconfig/scalc/menubar/menubar.xml"; End */ -File gid_File_Oo_Office_Ui_Calccommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Calccommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/CalcCommands.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-calc.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_calc_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_calc_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-calc.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-calc.xcu"; -End - -File gid_File_Oo_Office_Ui_Calcwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Calcwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu"; -End - File gid_File_Exe_Scalc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index bff71957bd0e..36cd965cb53b 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_calc.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/calc/folderitem_calc.ulf b/scp2/source/calc/folderitem_calc.ulf index 6ac55f58416f..e4919fbee29c 100644 --- a/scp2/source/calc/folderitem_calc.ulf +++ b/scp2/source/calc/folderitem_calc.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_calc.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk index 2ccfd5dd22c1..e049057f7335 100644 --- a/scp2/source/calc/makefile.mk +++ b/scp2/source/calc/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 939b2cd81ac1..84ab326814ee 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_calc.scp,v $ - * $Revision: 1.26 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -45,11 +42,9 @@ Module gid_Module_Prg_Calc_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml, + Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml, gid_File_Lib_Solver,gid_File_Lib_Lpsolve, - gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs, - gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu, - gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf); + gid_File_Tmp_Userinstall_Calc_Inf); End // Module gid_Module_Prg_Calc_Help diff --git a/scp2/source/calc/module_calc.ulf b/scp2/source/calc/module_calc.ulf index ab0bbdfa6d76..dbbf3227aa0b 100644 --- a/scp2/source/calc/module_calc.ulf +++ b/scp2/source/calc/module_calc.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_calc.ulf,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 4a30287e6fce..31742152cee1 100644..100755 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_calc.scp,v $ - * $Revision: 1.15.122.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -499,6 +496,14 @@ RegistryItem gid_Regitem_Stc_Contenttype Value = "application/vnd.sun.xml.calc.template"; End +RegistryItem gid_Regitem_stc_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarCalcTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxc_Contenttype ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; @@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxc_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarCalcDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new ods file extension @@ -582,7 +595,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_ods ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = "application/vnd.oasis.opendocument.spreadsheet"; Value = "opendocument.CalcDocument.1"; Styles = (); @@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,3"; End +RegistryItem gid_Regitem_ods_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.CalcDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; @@ -783,6 +804,14 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,4"; End +RegistryItem gid_Regitem_ots_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.Calctemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.CalcTemplate.1\shell"; @@ -1076,6 +1105,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scal Value = "<progpath>"; End +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ods ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ots ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxc ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc ) + +// registering the mso file types + CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_Bin, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf index 088adcd46e20..2f6e1e8eda9a 100644 --- a/scp2/source/calc/registryitem_calc.ulf +++ b/scp2/source/calc/registryitem_calc.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_calc.ulf,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index f3251634c53d..435cef4304f8 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: cairocanvas.scp,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index 67e374e6d584..f095eff9f23e 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: canvascommons.scp,v $ - * $Revision: 1.11.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,19 +27,6 @@ #include "macros.inc" -File gid_File_Oo_Office_Canvas_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Canvas.xcs"; -End -File gid_File_Oo_Office_Canvas_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Canvas.xcu"; -End - STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas) STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index f8be02db0e02..febdb8428c8b 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: directxcanvas.scp,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk index 9bfc24d7a297..f89e1c685b08 100644 --- a/scp2/source/canvas/makefile.mk +++ b/scp2/source/canvas/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp index 04d0db1f74dd..5f69de34fee9 100644 --- a/scp2/source/canvas/vclcanvas.scp +++ b/scp2/source/canvas/vclcanvas.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: vclcanvas.scp,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/crashrep/file_crashrep_dynamic.scp b/scp2/source/crashrep/file_crashrep.scp index 21710ccbd2f8..f92f93f0b1d8 100644 --- a/scp2/source/crashrep/file_crashrep_dynamic.scp +++ b/scp2/source/crashrep/file_crashrep.scp @@ -2,7 +2,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * diff --git a/scp2/source/crashrep/file_crashrep_static.scp b/scp2/source/crashrep/file_crashrep_static.scp deleted file mode 100644 index 8bd76e80edb4..000000000000 --- a/scp2/source/crashrep/file_crashrep_static.scp +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: file_crashrep_static.scp,v $ - * $Revision: 1.3 $ - * - * 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" - -// crashreporter files -// crash_report_with_gtk.bin is statically built -// it exists only for Unix - -#ifndef MACOSX - -File gid_File_Bin_Crashreport_With_Gtk - BIN_FILE_BODY; - Name = "crash_report_with_gtk.bin"; - Dir = gid_Dir_Program; - Styles = (PACKED); -End - -#endif - -#ifndef MACOSX - -File gid_File_Aliases_Pangox - TXT_FILE_BODY; - Name = "pangox.aliases"; - Dir = gid_Dir_Program; - Styles = (PACKED); -End - -#endif diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk index b58ced3b18ea..5e8101488270 100644 --- a/scp2/source/crashrep/makefile.mk +++ b/scp2/source/crashrep/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,7 +42,7 @@ TARGETTYPE=CUI SCP_PRODUCT_TYPE=osl PARFILES = \ - file_crashrep_dynamic.par + file_crashrep.par .ENDIF # "$(ENABLE_CRASHDUMP)" != "" diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp index b613f62ad97f..357e01f3cc00 100644 --- a/scp2/source/draw/file_draw.scp +++ b/scp2/source/draw/file_draw.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_draw.scp,v $ - * $Revision: 1.28 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,11 +27,11 @@ #include "macros.inc" -File gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu +File gid_File_Share_Registry_Draw_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-draw.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "draw.xcd"; End File gid_File_Help_Sdraw_Zip @@ -65,53 +62,3 @@ File gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml Name = "/uiconfig/sdraw/menubar/menubar.xml"; End */ - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-draw.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_draw_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_draw_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Draw_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-draw.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Draw_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-draw.xcu"; -End - -File gid_File_Oo_Office_Ui_Drawwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Drawwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu"; -End - diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index 598884b60e13..4a73948ced39 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_draw.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/draw/folderitem_draw.ulf b/scp2/source/draw/folderitem_draw.ulf index aa800caeea70..5eea77b3e739 100644 --- a/scp2/source/draw/folderitem_draw.ulf +++ b/scp2/source/draw/folderitem_draw.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_draw.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk index 373de268b8d9..605300dad7ca 100644 --- a/scp2/source/draw/makefile.mk +++ b/scp2/source/draw/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp index b5f8c89624a4..3226e08ea559 100644 --- a/scp2/source/draw/module_draw.scp +++ b/scp2/source/draw/module_draw.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_draw.scp,v $ - * $Revision: 1.20 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,10 +43,8 @@ Module gid_Module_Prg_Draw_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml, - gid_File_Registry_Spool_Oo_Common_Draw_Xcu,gid_File_Registry_Spool_Oo_Setup_Draw_Xcu, - gid_File_Oo_Office_Ui_Drawwindowstate_Xcs,gid_File_Oo_Office_Ui_Drawwindowstate_Xcu, - gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu, gid_File_Tmp_Userinstall_Draw_Inf); + gid_File_Share_Registry_Draw_Xcd, + gid_File_Tmp_Userinstall_Draw_Inf); End // Module gid_Module_Prg_Draw_Help diff --git a/scp2/source/draw/module_draw.ulf b/scp2/source/draw/module_draw.ulf index f61b12960423..2d8bc0c38a16 100644 --- a/scp2/source/draw/module_draw.ulf +++ b/scp2/source/draw/module_draw.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_draw.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index b06ca6430fe4..013f2cfaa9b9 100644..100755 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_draw.scp,v $ - * $Revision: 1.16.122.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -473,6 +470,14 @@ RegistryItem gid_Regitem_Std_Contenttype Value = "application/vnd.sun.xml.draw.template"; End +RegistryItem gid_Regitem_std_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarDrawTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxd_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; @@ -533,6 +538,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxd_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarDrawDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odg file extension RegistryItem gid_Regitem_Odg_PersistentHandler @@ -598,7 +611,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odg ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Draw_Bin; Name = "application/vnd.oasis.opendocument.graphics"; Value = "opendocument.DrawDocument.1"; Styles = (); @@ -640,6 +653,14 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,5"; End +RegistryItem gid_Regitem_odg_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.DrawDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; @@ -783,6 +804,14 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,6"; End +RegistryItem gid_Regitem_otg_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.DrawTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.DrawTemplate.1\shell"; @@ -895,3 +924,10 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdra Name = "Path"; Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odg ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otg ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxd ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( std ) diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf index 852c93618811..46224625dfb8 100644 --- a/scp2/source/draw/registryitem_draw.ulf +++ b/scp2/source/draw/registryitem_draw.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_draw.ulf,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index a7fdf1196ac3..9d10261843d2 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_gnome.scp,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -51,6 +48,15 @@ File gid_File_Lib_Gnomevfs End #endif +#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO +File gid_File_Share_Registry_Gnome_Xcd + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry; + Name = "gnome.xcd"; +End +#endif + #ifdef ENABLE_GCONF File gid_File_Lib_Gconfbe TXT_FILE_BODY; diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk index ffbcc719144f..185915353a5a 100644 --- a/scp2/source/gnome/makefile.mk +++ b/scp2/source/gnome/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -49,6 +45,10 @@ SCP_PRODUCT_TYPE=osl SCPDEFS+=-DENABLE_GCONF .ENDIF +.IF "$(ENABLE_LOCKDOWN)" == "YES" +SCPDEFS+=-DENABLE_LOCKDOWN +.ENDIF + .IF "$(ENABLE_GNOMEVFS)" != "" SCPDEFS+=-DENABLE_GNOMEVFS .ENDIF diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 739609ce74bd..f9df5c8969a1 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_gnome.scp,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,15 +27,6 @@ #include "macros.inc" -#ifdef ENABLE_GIO -File gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration; - Name = "/registry/spool/org/openoffice/ucb/Configuration-gio.xcu"; - Styles = (PACKED,SCPZIP_REPLACE); -End -#endif - Module gid_Module_Optional_Gnome ParentID = gid_Module_Optional; Default = YES; @@ -57,11 +45,14 @@ Module gid_Module_Optional_Gnome gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application, #endif #ifdef ENABLE_GIO - gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu + gid_File_Lib_GIO, #endif #ifdef ENABLE_GCONF gid_File_Lib_Gconfbe #endif +#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO + gid_File_Share_Registry_Gnome_Xcd +#endif ); End diff --git a/scp2/source/gnome/module_gnome.ulf b/scp2/source/gnome/module_gnome.ulf index e1d3e9314412..e39d1c626cb4 100644 --- a/scp2/source/gnome/module_gnome.ulf +++ b/scp2/source/gnome/module_gnome.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_gnome.ulf,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index ea92bdac8c86..2cd0f53f9e56 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_graphicfilter.scp,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,32 +27,11 @@ #include "macros.inc" -File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_impressgraphics_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_impressgraphics_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_drawgraphics_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu +File gid_File_Share_Registry_Graphicfilter_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_drawgraphics_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "graphicfilter.xcd"; End STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash ) diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk index 38e2d67eb8ee..522a22d36b28 100644 --- a/scp2/source/graphicfilter/makefile.mk +++ b/scp2/source/graphicfilter/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index c55a253774ab..d5d99969fd64 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_graphicfilter.scp,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,6 +34,5 @@ Module gid_Module_Optional_Grfflt ParentID = gid_Module_Optional; Default = YES; Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, - gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu); + gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/scp2/source/graphicfilter/module_graphicfilter.ulf b/scp2/source/graphicfilter/module_graphicfilter.ulf index ae748f9d2102..f152392a941e 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.ulf +++ b/scp2/source/graphicfilter/module_graphicfilter.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_graphicfilter.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index 5b8475e8cc9f..00dde2ca9162 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_impress.scp,v $ - * $Revision: 1.34 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,11 +37,11 @@ File gid_File_Lib_Animcore PACKED_UNO_LIB_FILE_BODY; End -File gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu +File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-impress.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "impress.xcd"; End File gid_File_Help_Simpress_Zip @@ -77,55 +74,6 @@ File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml End */ -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-impress.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_impress_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_impress_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-impress.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-impress.xcu"; -End - -File gid_File_Oo_Office_Ui_Impresswindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Impresswindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu"; -End - // configuration files for custom animation effects File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml @@ -141,17 +89,3 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml Dir = gid_Dir_Share_Config_Sofficecfg_Simpress; Name = "transitions.xml"; End - -File gid_File_Oo_Office_Ui_Effects_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Effects.xcs"; -End - -File gid_File_Oo_Office_Ui_Effects_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/Effects.xcu"; -End diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 16d78cc8b18e..db7b0c3794dd 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_impress.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/impress/folderitem_impress.ulf b/scp2/source/impress/folderitem_impress.ulf index 7a3c1cd4a3e1..d633e57593fb 100644 --- a/scp2/source/impress/folderitem_impress.ulf +++ b/scp2/source/impress/folderitem_impress.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_impress.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk index a2036f5a3a8c..0a6e4c37ef1c 100644 --- a/scp2/source/impress/makefile.mk +++ b/scp2/source/impress/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index dce65fe05170..7f8bcb7c44f7 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_impress.scp,v $ - * $Revision: 1.21 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,11 +43,9 @@ Module gid_Module_Prg_Impress_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware, - gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu, - gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu, + gid_File_Share_Registry_Impress_Xcd, gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, - gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf); + gid_File_Tmp_Userinstall_Impress_Inf); End // Module gid_Module_Prg_Impress_Help diff --git a/scp2/source/impress/module_impress.ulf b/scp2/source/impress/module_impress.ulf index dbb8b86b7084..6d795644a06e 100644 --- a/scp2/source/impress/module_impress.ulf +++ b/scp2/source/impress/module_impress.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_impress.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 18425e88033a..06fbb4bfcc1a 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_impress.scp,v $ - * $Revision: 1.21 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,7 +31,7 @@ Module gid_Module_Optional_OGLTrans PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS); ParentID = gid_Module_Optional; - Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu ); + Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd ); Minimal = NO; Default = NO; End @@ -58,9 +55,9 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml Name = "transitions-ogl.xml"; End -File gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu +File gid_File_Share_Registry_Ogltrans_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Impress; - Name = "registry/spool/org/openoffice/Office/Impress-ogltrans.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "ogltrans.xcd"; End diff --git a/scp2/source/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf index 8faa064a5466..555e88a0fae4 100644 --- a/scp2/source/impress/module_ogltrans.ulf +++ b/scp2/source/impress/module_ogltrans.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_impress.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index cb23b879fc37..cf4ba3ccbcb6 100644..100755 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_impress.scp,v $ - * $Revision: 1.15.122.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -487,6 +484,14 @@ RegistryItem gid_Regitem_Sti_Contenttype Value = "application/vnd.sun.xml.impress.template"; End +RegistryItem gid_Regitem_sti_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarImpressTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxi_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; @@ -547,6 +552,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxi_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarImpressDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odp file extension RegistryItem gid_Regitem_Odp_PersistentHandler @@ -596,7 +609,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odp ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Impress_Bin; Name = "application/vnd.oasis.opendocument.presentation"; Value = "opendocument.ImpressDocument.1"; Styles = (); @@ -655,6 +668,14 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,7"; End +RegistryItem gid_Regitem_odp_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.ImpressDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; @@ -812,6 +833,14 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,8"; End +RegistryItem gid_Regitem_otp_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.ImpressTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.ImpressTemplate.1\shell"; @@ -944,6 +973,15 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simp Value = "<progpath>"; End +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odp ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otp ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxi ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti ) + +// registering the mso file types + CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_Bin, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_Bin, pps, PPS, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress ) @@ -951,4 +989,3 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM CONDITIONAL_REGISTER_DOC_EXTENSION( Pot, gid_Module_Prg_Impress_Bin, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) - diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf index 2aaa99102691..2b49957ea470 100644 --- a/scp2/source/impress/registryitem_impress.ulf +++ b/scp2/source/impress/registryitem_impress.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_impress.ulf,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp index 3cd33ece0b26..d7a902dbf00f 100644 --- a/scp2/source/javafilter/file_javafilter.scp +++ b/scp2/source/javafilter/file_javafilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_javafilter.scp,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -52,46 +49,25 @@ End #endif -File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_palm_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_palm_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_pocketword_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu +File gid_File_Share_Registry_Palm_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_pocketword_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "palm.xcd"; End -File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu +File gid_File_Share_Registry_Pocketexcel_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_pocketexcel_types.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "pocketexcel.xcd"; End -File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu +File gid_File_Share_Registry_Pocketword_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_pocketexcel_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "pocketword.xcd"; End #ifdef SOLAR_JAVA diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk index 3e34a40e8c1a..49f50ab16162 100644 --- a/scp2/source/javafilter/makefile.mk +++ b/scp2/source/javafilter/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp index f256472a67de..dd69d014caf7 100644 --- a/scp2/source/javafilter/module_javafilter.scp +++ b/scp2/source/javafilter/module_javafilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_javafilter.scp,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -63,7 +60,7 @@ End Module gid_Module_Optional_Javafilter_Palm_Aportisdoc MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC); ParentID = gid_Module_Optional_Javafilter_Palm; - Files = ( gid_File_Jar_Aportisdoc, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu ); + Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd ); Sortkey = "100"; Minimal = NO; Default = NO; @@ -99,7 +96,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD); ParentID = gid_Module_Optional_Javafilter_Pocketpc; Sortkey = "100"; - Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcword_Inf ); + Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf ); Minimal = NO; Default = NO; Styles (en-US) = (); @@ -114,7 +111,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL); ParentID = gid_Module_Optional_Javafilter_Pocketpc; Sortkey = "200"; - Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf ); + Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf ); Minimal = NO; Default = NO; Styles (en-US) = (); diff --git a/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf index 1e0762d0cc4a..64ae9c420367 100644 --- a/scp2/source/javafilter/module_javafilter.ulf +++ b/scp2/source/javafilter/module_javafilter.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_javafilter.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp index 14c3ac59200d..593c6177edad 100644 --- a/scp2/source/javafilter/registryitem_javafilter.scp +++ b/scp2/source/javafilter/registryitem_javafilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_javafilter.scp,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf index 5c0bf9d2dfb5..fb2478dd8dda 100644 --- a/scp2/source/javafilter/registryitem_javafilter.ulf +++ b/scp2/source/javafilter/registryitem_javafilter.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_javafilter.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp index 4cd9de0b240c..0e0b3d1b73bb 100644 --- a/scp2/source/kde/file_kde.scp +++ b/scp2/source/kde/file_kde.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_kde.scp,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk index 6ddb30108ce6..32d713812ee9 100644 --- a/scp2/source/kde/makefile.mk +++ b/scp2/source/kde/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 28dacbef0583..55180c57bad8 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_kde.scp,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/kde/module_kde.ulf b/scp2/source/kde/module_kde.ulf index 1c9aa414b9e9..3d9be78ef898 100644 --- a/scp2/source/kde/module_kde.ulf +++ b/scp2/source/kde/module_kde.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_kde.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp index 0bb9d19ec2ab..c801808a444b 100644 --- a/scp2/source/layout/layout.scp +++ b/scp2/source/layout/layout.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: layout.scp,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk index eb923ceb7cae..55fddf86e915 100644 --- a/scp2/source/layout/makefile.mk +++ b/scp2/source/layout/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 5bd506f7432b..4da9f1a23bbc 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_math.scp,v $ - * $Revision: 1.38 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,11 +43,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd) STD_RES_FILE( gid_File_Res_Sm, sm ) -File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu +File gid_File_Share_Registry_Math_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-math.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "math.xcd"; End File gid_File_Help_Smath_Zip @@ -81,67 +78,3 @@ File gid_File_Share_Config_Sofficecfg_Math_Menubar_Xml Name = "/uiconfig/smath/menubar/menubar.xml"; End */ - -File gid_File_Oo_Office_Ui_Mathcommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/MathCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Mathcommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/MathCommands.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-math.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_math_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_math_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Math_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-math.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Math_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-math.xcu"; -End - -File gid_File_Oo_Office_Ui_Mathwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Mathwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/MathWindowState.xcu"; -End - diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index cf6564e414a1..2decfb20811c 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_math.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/math/folderitem_math.ulf b/scp2/source/math/folderitem_math.ulf index 3e0372b8b1aa..4458d7115aed 100644 --- a/scp2/source/math/folderitem_math.ulf +++ b/scp2/source/math/folderitem_math.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_math.ulf,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk index 6237dc67c09d..b622097ee65d 100644 --- a/scp2/source/math/makefile.mk +++ b/scp2/source/math/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index 08ab1725ed1e..e9c084ba928d 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_math.scp,v $ - * $Revision: 1.22 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,10 +43,8 @@ Module gid_Module_Prg_Math_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, - gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs - gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu, - gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu, gid_File_Tmp_Userinstall_Math_Inf); + gid_File_Share_Registry_Math_Xcd, + gid_File_Tmp_Userinstall_Math_Inf); End // Module gid_Module_Prg_Math_Help diff --git a/scp2/source/math/module_math.ulf b/scp2/source/math/module_math.ulf index b830e39735c9..25fd59018858 100644 --- a/scp2/source/math/module_math.ulf +++ b/scp2/source/math/module_math.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_math.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp index cc50981da023..a1c71702fc42 100644..100755 --- a/scp2/source/math/registryitem_math.scp +++ b/scp2/source/math/registryitem_math.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_math.scp,v $ - * $Revision: 1.15.122.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -433,6 +430,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxm_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarMathDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odf file extension RegistryItem gid_Regitem_Odf_PersistentHandler @@ -498,7 +503,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odf ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Math_Bin; Name = "application/vnd.oasis.opendocument.formula"; Value = "opendocument.MathDocument.1"; Styles = (); @@ -532,6 +537,14 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,14"; End +RegistryItem gid_Regitem_odf_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.MathDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Math_Bin; @@ -668,3 +681,8 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smat Name = "Path"; Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odf ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxm ) diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf index d94c2e3f2331..cee55d76d3c8 100644 --- a/scp2/source/math/registryitem_math.ulf +++ b/scp2/source/math/registryitem_math.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_math.ulf,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 470b69eb9030..e33eb6fa35c7 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_onlineupdate.scp,v $ - * $Revision: 1.7.116.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,18 +29,11 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno ) -File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Addons; - Name = "/registry/spool/org/openoffice/Office/Addons/Addons-onlineupdate.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu +File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs; - Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "onlineupdate.xcd"; End #if defined LINUX || defined SOLARIS diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk index 19d62c5549c5..4b3ce930483f 100644 --- a/scp2/source/onlineupdate/makefile.mk +++ b/scp2/source/onlineupdate/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index cb6d6e267b98..6685450774f2 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_onlineupdate.scp,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,6 +34,5 @@ Module gid_Module_Optional_Onlineupdate ParentID = gid_Module_Optional; Default = YES; Styles = (DONTSHOWINUSERINSTALL); - Files = (gid_File_Lib_Updchk, gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu, gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu, gid_File_Bin_UnpackUpdate); - Dirs = (gid_Dir_Share_Registry_Modules_Oo_Office_Addons, gid_Dir_Share_Registry_Modules_Oo_Office_Jobs); + Files = (gid_File_Lib_Updchk, gid_File_Share_Registry_Onlineupdate_Xcd, gid_File_Bin_UnpackUpdate); End diff --git a/scp2/source/onlineupdate/module_onlineupdate.ulf b/scp2/source/onlineupdate/module_onlineupdate.ulf index c0620c9c548b..be6d799de65b 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.ulf +++ b/scp2/source/onlineupdate/module_onlineupdate.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_onlineupdate.ulf,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index bfb171387aa3..c96313ddb834 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1,14 +1,11 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: common_brand.scp,v $ - * $Revision: 1.21 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -50,20 +47,6 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, - gid_Brand_Dir_Share_Registry_Data, - gid_Brand_Dir_Share_Registry_Data_Org, - gid_Brand_Dir_Share_Registry_Data_Org_Openoffice, - gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office, - gid_Brand_Dir_Share_Registry_Modules, - gid_Brand_Dir_Share_Registry_Modules_Org, - gid_Brand_Dir_Share_Registry_Modules_Oo, - gid_Brand_Dir_Share_Registry_Modules_Oo_Inet, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer, - gid_Brand_Dir_Share_Registry_Modules_Oo_Setup, gid_Brand_Dir_Share_Xdg); Files = (gid_Brand_File_BasisLink, gid_Brand_File_Bin_Crashreport, @@ -100,12 +83,8 @@ Module gid_Module_Root_Brand gid_Brand_File_Msvcm80crt_Manifest, gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, - gid_Brand_File_Oo_Office_Compatibility_Xcu, - gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu, + gid_Brand_File_Share_Registry_Brand_Xcd, gid_Brand_File_Script_Unopkg, - gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration, gid_Brand_File_Share_Xdg_Base, gid_Brand_File_Share_Xdg_Calc, gid_Brand_File_Share_Xdg_Draw, @@ -148,9 +127,8 @@ Module gid_Module_Langpack_Brand_Template gid_Brand_File_License_License_Html, gid_Brand_File_Readme_Readme, gid_Brand_File_Readme_Readme_Html, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu, + gid_Brand_File_Share_Registry_Cjk_Xcd, + gid_Brand_File_Share_Registry_Korea_Xcd, gid_Brand_File_Txt_License, gid_Brand_File_Txt_License_Html, gid_Brand_File_Txt_Readme, @@ -253,71 +231,6 @@ Directory gid_Brand_Dir_Share_Registry DosName = "registry"; End -Directory gid_Brand_Dir_Share_Registry_Data - ParentID = gid_Brand_Dir_Share_Registry; - HostName = "data"; -End - -Directory gid_Brand_Dir_Share_Registry_Data_Org - ParentID = gid_Brand_Dir_Share_Registry_Data; - HostName = "org"; -End - -Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice - ParentID = gid_Brand_Dir_Share_Registry_Data_Org; - HostName = "openoffice"; -End - -Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office - ParentID = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules - ParentID = gid_Brand_Dir_Share_Registry; - HostName = "modules"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Org - ParentID = gid_Brand_Dir_Share_Registry_Modules; - HostName = "org"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo - ParentID = gid_Brand_Dir_Share_Registry_Modules_Org; - HostName = "openoffice"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Inet - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Inet"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Office"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Common"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "UI"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Writer"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Setup - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Setup"; -End - #if defined UNX && ! defined MACOSX Directory gid_Brand_Dir_Share_Xdg ParentID = gid_Brand_Dir_Share; @@ -554,59 +467,28 @@ File gid_Brand_File_Images_Brand_Zip Styles = (PACKED); End -File gid_Brand_File_Oo_Office_Compatibility_Xcu +File gid_Brand_File_Share_Registry_Brand_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Compatibility.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name = "brand.xcd"; End -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-brand.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu +File gid_Brand_File_Share_Registry_Cjk_Xcd TXT_FILE_BODY; Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (ja) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (ko) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (zh-CN) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (zh-TW) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name (ja) = "cjk.xcd"; + Name (ko) = "cjk.xcd"; + Name (zh-CN) = "cjk.xcd"; + Name (zh-TW) = "cjk.xcd"; End -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu +File gid_Brand_File_Share_Registry_Korea_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (ko) = "/registry/spool/org/openoffice/Office/Common-korea.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui; - Name = "/registry/spool/org/openoffice/Office/UI-brand.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu - TXT_FILE_BODY; - Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer; - Name (ja) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (ko) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (zh-CN) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (zh-TW) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-brand.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name (ko) = "korea.xcd"; End #if defined UNX && ! defined MACOSX @@ -881,7 +763,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall #else Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; #endif - StandaloneValue = "$ORIGIN/.."; End ProfileItem gid_Brand_Profileitem_Soffice_UreBootstrap @@ -1331,22 +1212,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Install End #endif -#ifdef ENABLE_SVCTAGS - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Jobs"; -End - -File gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs; - Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-registration.xcu"; -End - -#endif - //TODO: This actually belongs into a module of its own: #if !defined SYSTEM_PYTHON File gid_Brand_File_Bin_Python diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp index ba10f087fb2e..dea9145a000e 100644 --- a/scp2/source/ooo/common_brand_readme.scp +++ b/scp2/source/ooo/common_brand_readme.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: common_brand_readme.scp,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/datacarrier_ooo.scp index 5d6398c984be..89bfef1e5626 100644 --- a/scp2/source/ooo/datacarrier_ooo.scp +++ b/scp2/source/ooo/datacarrier_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: datacarrier_ooo.scp,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index ce9fd987d038..cc805f9e8288 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -1,14 +1,11 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: directory_ooo.scp,v $ - * $Revision: 1.55.66.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -177,56 +174,6 @@ Directory gid_Dir_User DosName = "presets"; End -Directory gid_Dir_User_Registry - ParentID = gid_Dir_User; - DosName = "registry"; -End - -Directory gid_Dir_User_Registry_Data - ParentID = gid_Dir_User_Registry; - DosName = "data"; -End - -Directory gid_Dir_User_Registry_Data_Org - ParentID = gid_Dir_User_Registry_Data; - DosName = "org"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice - ParentID = gid_Dir_User_Registry_Data_Org; - DosName = "openoffice"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice; - DosName = "Office"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; - DosName = "UI"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; - DosName = "OOoImprovement"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Ucb - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice; - DosName = "ucb"; -End - -Directory gid_Dir_User_Registry_Cache - ParentID = gid_Dir_User_Registry; - DosName = "cache"; -End - Directory gid_Dir_User_Xslt ParentID = gid_Dir_User; DosName = "xslt"; @@ -727,256 +674,11 @@ Directory gid_Dir_Share_Registry DosName = "registry"; End -Directory gid_Dir_Share_Registry_Schema - ParentID = gid_Dir_Share_Registry; - HostName = "schema"; -End - -Directory gid_Dir_Share_Registry_Schema_Org - ParentID = gid_Dir_Share_Registry_Schema; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice - ParentID = gid_Dir_Share_Registry_Schema_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - HostName = "UI"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - HostName = "OOoImprovement"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice; - HostName = "TypeDetection"; -End - -Directory gid_Dir_Share_Registry_Ldap - ParentID = gid_Dir_Share_Registry; - HostName = "ldap"; -End - -Directory gid_Dir_Share_Registry_Data - ParentID = gid_Dir_Share_Registry; - HostName = "data"; -End - -Directory gid_Dir_Share_Registry_Data_Org - ParentID = gid_Dir_Share_Registry_Data; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice - ParentID = gid_Dir_Share_Registry_Data_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - HostName = "UI"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "TypeDetection"; -End - Directory gid_Dir_Share_Registry_Res ParentID = gid_Dir_Share_Registry; HostName = "res"; End -Directory gid_Dir_Share_Registry_Res_Lang - ParentID = gid_Dir_Share_Registry_Res; - DIR_ISOLANGUAGE_ALL_LANG_2; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org - ParentID = gid_Dir_Share_Registry_Res_Lang; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice - ParentID = gid_Dir_Share_Registry_Res_Lang_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Office - ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Ucb - ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Modules - ParentID = gid_Dir_Share_Registry; - HostName = "modules"; -End - -Directory gid_Dir_Share_Registry_Modules_Org - ParentID = gid_Dir_Share_Registry_Modules; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo - ParentID = gid_Dir_Share_Registry_Modules_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "TypeDetection"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "UISort"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Ucb - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration - ParentID = gid_Dir_Share_Registry_Modules_Oo_Ucb; - HostName = "Configuration"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Setup - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "Setup"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Accelerators"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Paths - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Paths"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Common"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Writer - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Writer"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Impress - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Impress"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Linguistic"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Logging - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Logging"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Embedding - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Embedding"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Scripting"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Addons"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Jobs - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Jobs"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "Filter"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "GraphicFilter"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "Types"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "Misc"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess; - HostName = "Drivers"; -End - Directory gid_Dir_Autotext ParentID = gid_Dir_Share; DosName = "autotext"; diff --git a/scp2/source/ooo/directory_ooo.ulf b/scp2/source/ooo/directory_ooo.ulf index 9c8604922589..6102bc4cf497 100644 --- a/scp2/source/ooo/directory_ooo.ulf +++ b/scp2/source/ooo/directory_ooo.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: directory_ooo.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp index 6bff77e6f355..9cd00117dcbf 100755 --- a/scp2/source/ooo/directory_ooo_macosx.scp +++ b/scp2/source/ooo/directory_ooo_macosx.scp @@ -1,14 +1,11 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: directory_ooo_macosx.scp,v $ - * $Revision: 1.55.66.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index b2789c3087d7..dbea12eee10c 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_extra_ooo.scp,v $ - * $Revision: 1.31 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -41,7 +38,7 @@ File gid_File_Extra_Autotextshare_Lang Dir = gid_Dir_Autotext_Language; USER_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(autotextshare); + EXTRA_ALL_LANG(autotextshare,zip); End File gid_File_Extra_Autotextuser @@ -308,7 +305,7 @@ File gid_File_Extra_Palettes_Lang Dir = gid_Dir_User_Config; USER_FILE_BODY; Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - EXTRA_ALL_LANG(palettes); + EXTRA_ALL_LANG(palettes,zip); End File gid_File_Extra_Poll_Asp @@ -357,14 +354,14 @@ File gid_File_Extra_Tpllayoutimpr_Lang Dir = gid_Dir_Template_Layout; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tpllayoutimpr); + EXTRA_ALL_LANG(tpllayoutimpr,zip); End File gid_File_Extra_Tplpresntimpr_Lang Dir = gid_Dir_Template_Presnt; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplpresntimpr); + EXTRA_ALL_LANG(tplpresntimpr,zip); End File gid_File_Extra_Tplwizbitmap @@ -378,7 +375,7 @@ File gid_File_Extra_Tplwizdesktop_Lang Dir = gid_Dir_Template_Internal; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizdesktop); + EXTRA_ALL_LANG(tplwizdesktop,zip); End File gid_File_Extra_Tplwizletter @@ -390,35 +387,35 @@ End File gid_File_Extra_Tplwizletter_Lang Dir = gid_Dir_Template_Wizard_Letter; ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(tplwizletter); + EXTRA_ALL_LANG(tplwizletter,zip); End File gid_File_Extra_Tplwizfax_Lang Dir = gid_Dir_Template_Wizard_Fax; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizfax); + EXTRA_ALL_LANG(tplwizfax,zip); End File gid_File_Extra_Tplwizagenda_Lang Dir = gid_Dir_Template_Wizard_Agenda; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizagenda); + EXTRA_ALL_LANG(tplwizagenda,zip); End File gid_File_Extra_Tplwizreport_Lang Dir = gid_Dir_Template_Wizard_Report; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizreport); + EXTRA_ALL_LANG(tplwizreport,zip); End File gid_File_Extra_Tplwizstyles_Lang Dir = gid_Dir_Template_Wizard_Styles; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizstyles); + EXTRA_ALL_LANG(tplwizstyles,zip); End File gid_File_Extra_Webcast_Asp @@ -444,5 +441,5 @@ File gid_File_Extra_Wordbook_Lang Dir = gid_Dir_Wordbook_Language; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(wordbook); + EXTRA_ALL_LANG(wordbook,zip); End diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 59d829b29830..f26339fe8b1d 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_font_ooo.scp,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp index 67ec89b15963..224d26de6a0d 100644 --- a/scp2/source/ooo/file_improvement.scp +++ b/scp2/source/ooo/file_improvement.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_jre_ooo.scp,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,20 +28,11 @@ #include "macros.inc" #if defined(BUILD_SPECIAL) -File gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Logging; - Name = "/registry/spool/org/openoffice/Office/Logging/Logging-oooimprovement.xcu"; -End -#endif - -#if defined(BUILD_SPECIAL) -File gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement +File gid_File_Share_Registry_Oooimprovement_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs; - Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-oooimprovement.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "oooimprovement.xcd"; End #endif diff --git a/scp2/source/ooo/file_jre_ooo.scp b/scp2/source/ooo/file_jre_ooo.scp index 45985d8c9290..8800db4c6065 100644 --- a/scp2/source/ooo/file_jre_ooo.scp +++ b/scp2/source/ooo/file_jre_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_jre_ooo.scp,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f9c247bd6157..4a39b5da4978 100644..100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -2,12 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_library_ooo.scp,v $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -38,22 +36,10 @@ End #endif #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) ) STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas) -File gid_File_Oo_Office_Dataaccess_Adabas_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/adabas.xcu"; -End #endif #if defined(WNT) STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado) -File gid_File_Oo_Office_Dataaccess_Ado_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/ado.xcu"; -End #endif STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl) @@ -70,55 +56,35 @@ File gid_File_Lib_Basprov #endif End -STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib) - -File gid_File_Lib_Cached1 +#ifdef ENABLE_VBA +File gid_File_Lib_Vbaevent TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX - Name = STRING(CONCAT2(libcached1,UNXSUFFIX)); + Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX)); #else - Name = "cached1.dll"; + Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll)); #endif End +#endif // ENABLE_VBA -File gid_File_Lib_Configmgr2 - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX)); - #else - Name = "configmgr2.uno.dll"; - #endif -End +STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib) -File gid_File_Lib_Sysmgr1 +File gid_File_Lib_Cached1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX - Name = STRING(CONCAT2(sysmgr1.uno,UNXSUFFIX)); + Name = STRING(CONCAT2(libcached1,UNXSUFFIX)); #else - Name = "sysmgr1.uno.dll"; + Name = "cached1.dll"; #endif End -File gid_File_Lib_Behelper - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(behelper.uno,UNXSUFFIX)); - #else - Name = "behelper.uno.dll"; - #endif -End +SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr) #ifdef WITH_LDAP File gid_File_Lib_Ldapbe2 @@ -219,13 +185,13 @@ File gid_File_Lib_Curl Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX - Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX)); + Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX)); #else - Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3)); + Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4)); #endif #else #ifdef _gcc3 - Name = "libcurl-3.dll"; + Name = "libcurl-4.dll"; #else Name = "libcurl.dll"; #endif @@ -278,12 +244,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm) STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase ) -File gid_File_Oo_Office_Dataaccess_Dbase_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/dbase.xcu"; -End STD_LIB_FILE( gid_File_Lib_Dbfile , file) STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) @@ -486,12 +446,6 @@ End #ifdef UNX #ifdef ENABLE_KAB -File gid_File_Oo_Office_Dataaccess_Kab_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/kab.xcu"; -End File gid_File_Lib_Kab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -510,12 +464,6 @@ End #endif #ifdef MACOSX -File gid_File_Oo_Office_Dataaccess_Macab_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/macab.xcu"; -End File gid_File_Lib_Macab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -534,12 +482,6 @@ End #endif // #ifdef ENABLE_KAB #ifdef ENABLE_EVOAB2 -File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/evoab2.xcu"; -End STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab) @@ -569,12 +511,6 @@ File gid_File_Lib_Filterconfig1 Name = SPECIAL_NAME(filterconfig1); End -File gid_File_Oo_Office_Dataaccess_Flat_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/flat.xcu"; -End STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat) #ifdef WNT @@ -735,14 +671,6 @@ File gid_File_Lib_Gdiplus End #endif -File gid_File_Lib_Go - Name = LIBNAME(go); - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; -End - SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno ) STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker) @@ -855,22 +783,10 @@ End #ifdef SOLAR_JAVA STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) -File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/jdbc.xcu"; -End #endif #ifdef SOLAR_JAVA -File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/hsqldb.xcu"; -End File gid_File_Lib_Hsqldb_2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -1000,17 +916,6 @@ End #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX) // #i91209# -File gid_File_Oo_Office_Dataaccess_Mozab_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; -#ifdef WNT - Name = "/registry/spool/DataAccess/mozab.xcu"; -#else - Name = "/registry/spool/DataAccess/mozab2.xcu"; -#endif -End - STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab) STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) @@ -1144,25 +1049,7 @@ End #endif STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) -File gid_File_Oo_Office_Dataaccess_Mysql_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/mysql.xcu"; -End STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc) -File gid_File_Oo_Office_Dataaccess_Odbc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/odbc.xcu"; -End - -File gid_File_Registry_Drivers_Zip - Dir = gid_Dir_Share_Registry_Res_Lang; - ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(fcfg_drivers); -End // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) @@ -1499,6 +1386,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt ) STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx) STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) +STD_LIB_FILE( gid_File_Lib_Editeng, editeng) STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 5a280328e66a..d21afbc07c5a 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_ooo.scp,v $ - * $Revision: 1.257.18.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -1147,969 +1144,25 @@ End #endif -File gid_File_Oo_Inet_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/Inet.xcs"; -End - -File gid_File_Oo_Inet_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/Inet.xcu"; -End - -File gid_File_Oo_Office_Addons_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Addons.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidecommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidecommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Windowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Bibliographycommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Bibliographycommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs"; -End - -/* -File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BibliographyWindowState.xcu"; -End -*/ -File gid_File_Oo_Office_Calc_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Calc.xcs"; -End - -File gid_File_Oo_Office_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Calc.xcu"; -End - -File gid_File_Oo_Office_CalcAddIns_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/CalcAddIns.xcs"; -End - -File gid_File_Oo_Office_Chart_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Chart.xcs"; -End - -File gid_File_Oo_Office_Ui_Chartcommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Chartcommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/ChartCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Chartwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Chartwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu"; -End - -File gid_File_Oo_Office_Commands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Commands.xcs"; -End - -File gid_File_Oo_Office_Ui_Commands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Commands.xcs"; -End - -File gid_File_Oo_Office_Ui_Category_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Category.xcs"; -End - -File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Genericcategories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs"; -End - -File gid_File_Oo_Office_Ui_Genericcategories_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/GenericCategories.xcu"; -End - -File gid_File_Oo_Office_Common_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Common.xcs"; -End - -File gid_File_Oo_Office_Histories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Histories.xcs"; -End - -File gid_File_Oo_Office_Ui_WindowContentFactories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs"; -End - -File gid_File_Oo_Office_Extendedcolorscheme_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs"; -End - -File gid_File_Oo_Office_Paths_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Paths.xcs"; -End - -File gid_File_Oo_Office_Logging_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Logging.xcs"; -End - -File gid_File_Oo_Office_OOoImprovement_Settings_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement; - Name = "/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs"; -End - -File gid_File_Oo_Office_OptionsDialog_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/OptionsDialog.xcs"; -End - -File gid_File_Oo_Office_Recovery_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Recovery.xcs"; -End - -File gid_File_Oo_Office_Histories_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Histories.xcu"; -End - -File gid_File_Oo_Office_Common_Xcu - TXT_FILE_BODY; - Styles = (PACKED,SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Common.xcu"; -End - -File gid_File_Oo_Office_Accelerators_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Accelerators.xcs"; -End - -File gid_File_Oo_Office_Accelerators_Xcu +File gid_File_Share_Registry_Main_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Accelerators.xcu"; -End - -File gid_File_Oo_Office_Paths_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Paths.xcu"; -End - -File gid_File_Oo_Office_Logging_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Logging.xcu"; -End - -File gid_File_Oo_Office_Views_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Views.xcu"; -End - -File gid_File_Oo_Office_Compatibility_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Compatibility.xcs"; -End - -File gid_File_Oo_Office_Ui_Controller_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Controller.xcs"; -End - -File gid_File_Oo_Office_Ui_Controller_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/Controller.xcu"; -End - -File gid_File_Oo_Office_Dataaccess_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/DataAccess.xcs"; -End - -File gid_File_Oo_Office_Dataaccess_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/DataAccess.xcu"; -End - -File gid_File_Oo_Office_Dataaccess_Drivers_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess; - Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbucommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbucommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbuCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Basewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Basewindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu"; -End - - -File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu"; -End - - -File gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu"; -End - -File gid_File_Oo_Office_Draw_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Draw.xcs"; -End - -File gid_File_Oo_Office_Events_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Events.xcs"; -End - -File gid_File_Oo_Office_ExtensionManager_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/ExtensionManager.xcs"; -End - -File gid_File_Oo_Office_ExtensionManager_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/ExtensionManager.xcu"; -End - -File gid_File_Oo_Office_Ui_Factories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Factories.xcs"; -End - -File gid_File_Oo_Office_Ui_Factories_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/Factories.xcu"; -End - -File gid_File_Oo_Office_Embedding_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Embedding.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-chart.xcu"; -End - -File gid_File_Oo_Office_Ui_Genericcommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Genericcommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_GlobalSettings_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs"; -End - -File gid_File_Oo_Office_Impress_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Impress.xcs"; -End - -File gid_File_Oo_Office_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Impress.xcu"; -End - -File gid_File_Oo_Office_Java_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Java.xcs"; -End - -File gid_File_Oo_Office_Jobs_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Jobs.xcs"; -End - -File gid_File_Oo_Office_Jobs_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Jobs.xcu"; -End - -File gid_File_Oo_Office_Labels_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Labels.xcs"; -End - -File gid_File_Oo_Office_Labels_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Labels.xcu"; -End - -File gid_File_Oo_Office_Linguistic_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs"; -End - -File gid_File_Oo_Office_Math_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Math.xcs"; -End - -File gid_File_Oo_Office_Math_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Math.xcu"; -End - -File gid_File_Oo_Office_TabBrowse_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/TabBrowse.xcs"; -End - -File gid_File_Oo_Office_Protocolhandler_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/ProtocolHandler.xcs"; -End - -File gid_File_Oo_Office_Protocolhandler_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/ProtocolHandler.xcu"; -End - -File gid_File_Oo_Office_Scripting_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Scripting.xcs"; -End - -File gid_File_Oo_Office_Scripting_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Scripting.xcu"; -End - -File gid_File_Oo_Office_Security_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Security.xcs"; -End - -File gid_File_Oo_Office_Security_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Security.xcu"; -End - -File gid_File_Oo_Office_Sfx_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/SFX.xcs"; -End - -File gid_File_Oo_Office_Sfx_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/SFX.xcu"; -End - -File gid_File_Oo_Office_Ui_Startmodulecommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Startmodulecommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu"; -End - -File gid_File_Oo_Office_Substitution_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Substitution.xcs"; -End - -File gid_File_Oo_Office_Ui_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/UI.xcs"; -End - -File gid_File_Oo_Office_Ui_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/UI.xcu"; -End - -File gid_File_Oo_Office_Views_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Views.xcs"; -End - -File gid_File_Oo_Office_Writer_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Writer.xcs"; -End - -File gid_File_Oo_Office_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Writer.xcu"; -End - -File gid_File_Oo_Office_WebWizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/WebWizard.xcs"; -End - -File gid_File_Oo_Office_WebWizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/WebWizard.xcu"; -End - -File gid_File_Oo_Office_FormWizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/FormWizard.xcs"; -End - -File gid_File_Oo_Office_FormWizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/FormWizard.xcu"; -End - - -File gid_File_Oo_Office_TableWizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/TableWizard.xcs"; -End - -File gid_File_Oo_Office_TableWizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/TableWizard.xcu"; -End - - -File gid_File_Oo_Office_Writerweb_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/WriterWeb.xcs"; -End - -File gid_File_Oo_Office_TypeDetection_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/TypeDetection.xcs"; -End - -File gid_File_Oo_Office_Embedding_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Embedding.xcs"; -End - -File gid_File_Oo_Setup_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/Setup.xcs"; -End - -File gid_File_Oo_Setup_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/Setup.xcu"; -End - -File gid_File_Oo_Setup_Start_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-start.xcu"; -End - -File gid_File_Oo_Firststartwizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/FirstStartWizard.xcs"; -End - -File gid_File_Oo_Firststartwizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/FirstStartWizard.xcu"; -End - -File gid_File_Oo_System_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/System.xcs"; -End - -File gid_File_Oo_Typedetection_Filter_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/Filter.xcs"; -End - -File gid_File_Oo_Typedetection_Graphicfilter_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs"; -End - -File gid_File_Oo_Typedetection_Misc_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/Misc.xcs"; -End - -File gid_File_Oo_Typedetection_Types_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/Types.xcs"; -End - -File gid_File_Oo_Typedetection_UISort_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/UISort.xcs"; -End - -File gid_File_Oo_TypeDetection_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection; - Name = "/registry/data/org/openoffice/TypeDetection/UISort.xcu"; -End - -File gid_File_Oo_Ucb_Configuration_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/Configuration.xcs"; -End - -File gid_File_Oo_Ucb_InteractionHandler_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/InteractionHandler.xcs"; -End - -File gid_File_Oo_Ucb_Configuration_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb; - Name = "/registry/data/org/openoffice/ucb/Configuration.xcu"; -End - -File gid_File_Oo_Ucb_Hierarchy_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/Hierarchy.xcs"; -End - -File gid_File_Oo_Ucb_Store_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/Store.xcs"; -End - -File gid_File_Oo_Userprofile_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/UserProfile.xcs"; + Dir = gid_Dir_Share_Registry; + Name = "main.xcd"; End -File gid_File_Oo_Userprofile_Xcu +File gid_File_Oo_Ldap_Xcd_Sample TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/UserProfile.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "oo-ldap.xcd.sample"; End -File gid_File_Oo_Vcl_Xcs +File gid_File_Oo_Ad_Ldap_Xcd_Sample TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/VCL.xcs"; -End - -File gid_File_Oo_Vcl_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/VCL.xcu"; -End - -File gid_File_Oo_Ldap_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/LDAP.xcs"; -End - - -File gid_File_Oo_Ldap_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/LDAP.xcu.sample"; -End - -File gid_File_Oo_Ldap_Attr_Map - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Ldap; - Name = "/registry/schema/oo-ldap-attr.map"; -End - -File gid_File_Oo_AD_Ldap_Attr_Map - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Ldap; - Name = "/registry/schema/oo-ad-ldap-attr.map"; + Dir = gid_Dir_Share_Registry; + Name = "oo-ad-ldap.xcd.sample"; End File gid_File_Rdb_Offapi @@ -2138,141 +1191,43 @@ End #endif File gid_File_Registry_Lang - Dir = gid_Dir_Share_Registry_Res_Lang; - ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(registry); -End - -File gid_File_Registry_Filter_Zip - Dir = gid_Dir_Share_Registry_Res_Lang; - ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(fcfg_langpack); -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_base_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_base_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc; - Name = "/registry/spool/fcfg_base_others.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu + Dir = gid_Dir_Share_Registry_Res; TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_chart_types.xcu"; + EXTRA_ALL_LANG_BUT_EN_US(registry,xcd); End -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_chart_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc; - Name = "/registry/spool/fcfg_chart_others.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu +File gid_File_Registry_Filter_Zip + Dir = gid_Dir_Share_Registry_Res; TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_internalgraphics_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter; - Name = "/registry/spool/fcfg_internalgraphics_filters.xcu"; + EXTRA_ALL_LANG(fcfg_langpack,xcd); End File gid_File_Registry_Spool_Langpack_Lang TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - FILE_ALL_LANG_LETTER(/registry/spool/Langpack-,xcu); + Dir = gid_Dir_Share_Registry; + FILE_ALL_LANG_LETTER(Langpack-,xcd); End -File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators; -#ifdef QUARTZ - Name = "/registry/spool/org/openoffice/Office/Accelerators-macosx.xcu"; -#else - Name = "/registry/spool/org/openoffice/Office/Accelerators-unxwnt.xcu"; -#endif -End - -File gid_File_Oo_Office_Paths_System_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Paths; -#ifdef MACOSX - Name = "/registry/spool/org/openoffice/Office/Paths-macosx.xcu"; -#else - Name = "/registry/spool/org/openoffice/Office/Paths-unxwnt.xcu"; -#endif -End - -File gid_File_Registry_Spool_Oo_Common_System_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; -#ifdef WNT - Name = "/registry/spool/org/openoffice/Office/Common-wnt.xcu"; -#elif defined QUARTZ - Name = "/registry/spool/org/openoffice/Office/Common-macosx.xcu"; -#else - Name = "/registry/spool/org/openoffice/Office/Common-unx.xcu"; -#endif -End - -File gid_File_Registry_Spool_Oo_Common_Ctl_Xcu +File gid_File_Share_Registry_Ctl_Xcd TXT_FILE_BODY; Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (th) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (hi-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (pa-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ta-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ar) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (he) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (lo) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (dz) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (km) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (or) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ne) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (fa) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (my) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Writer; - Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu"; - Styles = (PACKED); + Dir = gid_Dir_Share_Registry; + Name (th) = "ctl.xcd"; + Name (hi-IN) = "ctl.xcd"; + Name (pa-IN) = "ctl.xcd"; + Name (ta-IN) = "ctl.xcd"; + Name (gu-IN) = "ctl.xcd"; + Name (ar) = "ctl.xcd"; + Name (he) = "ctl.xcd"; + Name (lo) = "ctl.xcd"; + Name (dz) = "ctl.xcd"; + Name (km) = "ctl.xcd"; + Name (gu-IN) = "ctl.xcd"; + Name (or) = "ctl.xcd"; + Name (ne) = "ctl.xcd"; + Name (fa) = "ctl.xcd"; + Name (my) = "ctl.xcd"; End File gid_File_Scripts_Beanshell @@ -2722,28 +1677,6 @@ File gid_Starregistry_Services_Rdb JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/"; End -#if defined(UNX) && !defined(QUARTZ) - -File gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-UseOOoFileDialogs.xcu"; - Styles = (PACKED,SCPZIP_REPLACE); -End - -#endif - -#ifdef WNT - -File gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/spool/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu"; - Styles = (PACKED,SCPZIP_REPLACE,SET_OFFICE_LANGUAGE); -End - -#endif - #ifdef LINUX File gid_File_Dat_Root3 TXT_FILE_BODY; @@ -2820,7 +1753,7 @@ File gid_File_InfoPlist_Lang Dir = gid_Dir_Bundle_Contents_Resources_Lang; ARCHIVE_TXT_FILE_BODY; Styles = (ARCHIVE); - EXTRA_ALL_LANG(InfoPlist); + EXTRA_ALL_LANG(InfoPlist,zip); End #endif @@ -2927,25 +1860,11 @@ File gid_File_ImagesClassic8_Zip Styles = (PACKED); End -File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu +File gid_File_Share_Registry_Lingucomponent_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "lingucomponent.xcd"; End // Dictionary extensions diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 010a3ec5efd6..5e4a2b0ff089 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_resource_ooo.scp,v $ - * $Revision: 1.66.96.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -104,6 +101,7 @@ STD_RES_FILE( gid_File_Res_Svt, svt ) STD_RES_FILE_ONLY( gid_File_Res_Svp, svp ) STD_RES_FILE( gid_File_Res_Svx, svx ) +STD_RES_FILE( gid_File_Res_Editeng, editeng ) STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs ) STD_RES_FILE( gid_File_Res_Cui, cui ) diff --git a/scp2/source/ooo/folder_ooo.scp b/scp2/source/ooo/folder_ooo.scp index a8335061fcf0..88e40629661e 100644 --- a/scp2/source/ooo/folder_ooo.scp +++ b/scp2/source/ooo/folder_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folder_ooo.scp,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index ef6cd70d1eb5..b6ef81eff36d 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_ooo.scp,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf index dfa22d09132c..25443ea9253d 100644 --- a/scp2/source/ooo/folderitem_ooo.ulf +++ b/scp2/source/ooo/folderitem_ooo.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_ooo.ulf,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp index 22bdbce84de3..8b045bb440c2 100644 --- a/scp2/source/ooo/installation_ooo.scp +++ b/scp2/source/ooo/installation_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: installation_ooo.scp,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index aa8c3178c9fd..0777febdc869 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.77.16.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -45,10 +41,6 @@ TARGETTYPE=CUI SCPDEFS+=-D_MSC .ENDIF -.IF "$(ENABLE_CRASHDUMP)"!="" -SCPDEFS+=-DENABLE_CRASHDUMP -.ENDIF - .IF "$(BUILD_SPECIAL)"!="" SCPDEFS+=-DBUILD_SPECIAL .ENDIF diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp index ca4cf0d0f68c..f88cce4d2314 100755 --- a/scp2/source/ooo/mergemodules_ooo.scp +++ b/scp2/source/ooo/mergemodules_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: mergemodules_ooo.scp,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_headless.scp b/scp2/source/ooo/module_headless.scp index 024d3d3a079a..bb77b0e2fbcb 100644 --- a/scp2/source/ooo/module_headless.scp +++ b/scp2/source/ooo/module_headless.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_headless.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_headless.ulf b/scp2/source/ooo/module_headless.ulf index 33839fcc58c4..e64185dfb1a8 100644 --- a/scp2/source/ooo/module_headless.ulf +++ b/scp2/source/ooo/module_headless.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_headless.ulf,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index f1c647a5bb91..1393eb36f6e5 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -1,14 +1,11 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_hidden_ooo.scp,v $ - * $Revision: 1.123 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -173,12 +170,11 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Dba, gid_File_Lib_Dbacfg, gid_File_Lib_Dbase2, - gid_File_Oo_Office_Dataaccess_Dbase_Xcu, gid_File_Lib_Dbaxml, gid_File_Lib_Dbt, gid_File_Lib_Dbfile, gid_File_Lib_Drawinglayer, - gid_File_Oo_Office_Dataaccess_Flat_Xcu, + gid_File_Lib_Editeng, gid_File_Lib_Flat, gid_File_Lib_For, gid_File_Lib_Forui, @@ -272,16 +268,13 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Index_Data, gid_File_Lib_Textconv_Dict, gid_File_Lib_Basprov, - gid_File_Lib_Behelper, - gid_File_Lib_Configmgr2, + gid_File_Lib_Configmgr, gid_File_Lib_Crypto, gid_File_Lib_Dlgprov, gid_File_Lib_Stringresource, gid_File_Lib_Ldapbe2, gid_File_Lib_Comphelper2, - gid_File_Lib_Sysmgr1, gid_File_Lib_Adabas, - gid_File_Oo_Office_Dataaccess_Adabas_Xcu, gid_File_Lib_Cached1, gid_File_Lib_Curl, gid_File_Lib_Db, @@ -289,11 +282,8 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, gid_File_Lib_Evoab_2, - gid_File_Oo_Office_Dataaccess_Evoab_Xcu, gid_File_Lib_Kab_1, - gid_File_Oo_Office_Dataaccess_Kab_Xcu, gid_File_Lib_Kab_Drv_1, - gid_File_Oo_Office_Dataaccess_Macab_Xcu, gid_File_Lib_Macab_1, gid_File_Lib_Macab_Drv_1, gid_File_Lib_Evtatt, @@ -315,19 +305,14 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Localedata_Es, gid_File_Lib_Localedata_Euro, gid_File_Lib_Localedata_Others, - gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu, gid_File_Lib_Hsqldb_2, gid_File_Lib_Jdbc, - gid_File_Oo_Office_Dataaccess_Jdbc_Xcu, gid_File_Lib_Mcnttype, - gid_File_Oo_Office_Dataaccess_Mozab_Xcu, gid_File_Lib_Mozab_2, gid_File_Lib_Mozabdrv, gid_File_Lib_Mozbootstrap, gid_File_Lib_Mysql, - gid_File_Oo_Office_Dataaccess_Mysql_Xcu, gid_File_Lib_Odbc, - gid_File_Oo_Office_Dataaccess_Odbc_Xcu, gid_File_Lib_Officebean, gid_File_Lib_Openssl, gid_File_Lib_Package2, @@ -388,7 +373,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Stdc_5, gid_File_Lib_Accessbridge, gid_File_Lib_Ado, - gid_File_Oo_Office_Dataaccess_Ado_Xcu, gid_File_Lib_Dl, gid_File_Lib_Dnd, gid_File_Lib_Dtrans, @@ -636,150 +620,9 @@ Module gid_Module_Root_Files_6 gid_File_Mod_Style, gid_File_Mod_Table, gid_File_Mod_Text, - gid_File_Oo_Ldap_Attr_Map, - gid_File_Oo_AD_Ldap_Attr_Map, - gid_File_Oo_Inet_Xcs, - gid_File_Oo_Inet_Xcu, - gid_File_Oo_Office_Addons_Xcs, - gid_File_Oo_Office_OOoImprovement_Settings_Xcs, - gid_File_Oo_Office_Ui_Basicidecommands_Xcs, - gid_File_Oo_Office_Ui_Basicidecommands_Xcu, - gid_File_Oo_Office_Ui_Windowstate_Xcs, - gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs, - gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu, - gid_File_Oo_Office_Ui_Bibliographycommands_Xcs, - gid_File_Oo_Office_Ui_Bibliographycommands_Xcu, - gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs, - gid_File_Oo_Office_Calc_Xcs, - gid_File_Oo_Office_Calc_Xcu, - gid_File_Oo_Office_CalcAddIns_Xcs, - gid_File_Oo_Office_Chart_Xcs, - gid_File_Oo_Office_Ui_Chartcommands_Xcs, - gid_File_Oo_Office_Ui_Chartcommands_Xcu, - gid_File_Oo_Office_Ui_Chartwindowstate_Xcs, - gid_File_Oo_Office_Ui_Chartwindowstate_Xcu, - gid_File_Oo_Office_Commands_Xcs, - gid_File_Oo_Office_Ui_Commands_Xcs, - gid_File_Oo_Office_Ui_Category_Xcs, - gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs, - gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu, - gid_File_Oo_Office_Ui_Genericcategories_Xcs, - gid_File_Oo_Office_Ui_Genericcategories_Xcu, - gid_File_Oo_Office_Common_Xcs, - gid_File_Oo_Office_Common_Xcu, - gid_File_Oo_Office_Extendedcolorscheme_Xcs, - gid_File_Oo_Office_OptionsDialog_Xcs, - gid_File_Oo_Office_Recovery_Xcs, - gid_File_Oo_Office_Compatibility_Xcs, - gid_File_Oo_Office_Ui_Controller_Xcs, - gid_File_Oo_Office_Ui_Controller_Xcu, - gid_File_Oo_Office_Dataaccess_Xcs, - gid_File_Oo_Office_Dataaccess_Xcu, - gid_File_Oo_Office_Dataaccess_Drivers_Xcs, - gid_File_Oo_Office_Ui_Dbucommands_Xcs, - gid_File_Oo_Office_Ui_Dbucommands_Xcu, - gid_File_Oo_Office_Ui_Basewindowstate_Xcs, - gid_File_Oo_Office_Ui_Basewindowstate_Xcu, - gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu, - gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu, - gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu, - gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu, - gid_File_Oo_Office_Draw_Xcs, - gid_File_Oo_Office_Events_Xcs, - gid_File_Oo_Office_ExtensionManager_Xcs, - gid_File_Oo_Office_ExtensionManager_Xcu, - gid_File_Oo_Office_Ui_Factories_Xcs, - gid_File_Oo_Office_Ui_Factories_Xcu, - gid_File_Oo_Office_Embedding_Xcu, - gid_File_Oo_Office_Ui_Genericcommands_Xcs, - gid_File_Oo_Office_Ui_Genericcommands_Xcu, - gid_File_Oo_Office_Ui_GlobalSettings_Xcs, - gid_File_Oo_Office_Impress_Xcs, - gid_File_Oo_Office_Impress_Xcu, - gid_File_Oo_Office_Java_Xcs, - gid_File_Oo_Office_Jobs_Xcs, - gid_File_Oo_Office_Jobs_Xcu, - gid_File_Oo_Office_Labels_Xcs, - gid_File_Oo_Office_Labels_Xcu, - gid_File_Oo_Office_Linguistic_Xcs, - gid_File_Oo_Office_Math_Xcs, - gid_File_Oo_Office_Math_Xcu, - gid_File_Oo_Office_Protocolhandler_Xcs, - gid_File_Oo_Office_Protocolhandler_Xcu, - gid_File_Oo_Office_Scripting_Xcs, - gid_File_Oo_Office_Scripting_Xcu, - gid_File_Oo_Office_Security_Xcs, - gid_File_Oo_Office_Security_Xcu, - gid_File_Oo_Office_Sfx_Xcs, - gid_File_Oo_Office_Sfx_Xcu, - gid_File_Oo_Office_Ui_Startmodulecommands_Xcs, - gid_File_Oo_Office_Ui_Startmodulecommands_Xcu, - gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs, - gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu, - gid_File_Oo_Office_Substitution_Xcs, - gid_File_Oo_Office_Ui_Xcs, - gid_File_Oo_Office_Ui_Xcu, - gid_File_Oo_Office_Views_Xcs, - gid_File_Oo_Office_Writer_Xcs, - gid_File_Oo_Office_Writer_Xcu, - gid_File_Oo_Office_WebWizard_Xcs, - gid_File_Oo_Office_WebWizard_Xcu, - gid_File_Oo_Office_FormWizard_Xcs, - gid_File_Oo_Office_FormWizard_Xcu, - gid_File_Oo_Office_TableWizard_Xcs, - gid_File_Oo_Office_TableWizard_Xcu, - gid_File_Oo_Office_Writerweb_Xcs, - gid_File_Oo_Office_TypeDetection_Xcs, - gid_File_Oo_Office_Embedding_Xcs, - gid_File_Oo_Setup_Xcs, - gid_File_Oo_Setup_Xcu, - gid_File_Oo_Setup_Start_Xcu, - gid_File_Oo_Firststartwizard_Xcs, - gid_File_Oo_Firststartwizard_Xcu, - gid_File_Oo_System_Xcs, - gid_File_Oo_Typedetection_Filter_Xcs, - gid_File_Oo_Typedetection_Graphicfilter_Xcs, - gid_File_Oo_Typedetection_Misc_Xcs, - gid_File_Oo_Typedetection_Types_Xcs, - gid_File_Oo_Ucb_Configuration_Xcs, - gid_File_Oo_Ucb_Configuration_Xcu, - gid_File_Oo_Ucb_InteractionHandler_Xcs, - gid_File_Oo_Ucb_Hierarchy_Xcs, - gid_File_Oo_Ucb_Store_Xcs, - gid_File_Oo_Userprofile_Xcs, - gid_File_Oo_Userprofile_Xcu, - gid_File_Oo_Vcl_Xcs, - gid_File_Oo_Vcl_Xcu, - gid_File_Oo_Ldap_Xcs, - gid_File_Oo_Ldap_Xcu, - gid_File_Oo_Typedetection_UISort_Xcs, - gid_File_Oo_Office_Ui_Mathwindowstate_Xcs, - gid_File_Oo_Office_Views_Xcu, - gid_File_Oo_TypeDetection_UISort_Xcu, - gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu, - gid_File_Registry_Spool_Oo_Common_System_Xcu, - gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu, - gid_File_Registry_Spool_Oo_Dataaccess_Adabasdriver_Xcu, - gid_File_Registry_Spool_Oo_Writer_javamail_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu, - gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu, - gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu, + gid_File_Oo_Ldap_Xcd_Sample, + gid_File_Oo_Ad_Ldap_Xcd_Sample, + gid_File_Share_Registry_Main_Xcd, gid_File_Pymailmerge, gid_File_Xsl_Common_Measure_Conversion, gid_File_Xsl_Common_Math_Functions, @@ -930,11 +773,9 @@ Module gid_Module_Oo_Linguistic Styles = (HIDDEN_ROOT); Files = (gid_File_Lib_Spell, gid_File_Lib_Hunspell, - gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu, gid_File_Lib_Hyph, - gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu, gid_File_Lib_Lnth, - gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu); + gid_File_Share_Registry_Lingucomponent_Xcd); End #ifdef LINUX diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp index b0485f7a0f73..1380202f34e7 100644 --- a/scp2/source/ooo/module_improvement.scp +++ b/scp2/source/ooo/module_improvement.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_java.scp,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,6 +37,6 @@ Module gid_Module_Oooimprovement ParentID = gid_Module_Root; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement, gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement, gid_File_Lib_Oooimprovement); + Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement); End #endif diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp index 32cf80586969..e93721ce3c5b 100644 --- a/scp2/source/ooo/module_java.scp +++ b/scp2/source/ooo/module_java.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_java.scp,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_java.ulf b/scp2/source/ooo/module_java.ulf index c58cc885c1ee..c3ccedc59f14 100644 --- a/scp2/source/ooo/module_java.ulf +++ b/scp2/source/ooo/module_java.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_java.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 9f6329fabc77..7ecd4747cdea 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_lang_template.scp,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -47,10 +44,9 @@ Module gid_Module_Langpack_Basis_Template gid_File_Extra_Wordbook, gid_File_Extra_Wordbook_Lang, gid_File_Registry_Filter_Zip, - gid_File_Registry_Drivers_Zip, gid_File_Registry_Lang, gid_File_Registry_Spool_Langpack_Lang, - gid_File_Registry_Spool_Oo_Common_Ctl_Xcu, + gid_File_Share_Registry_Ctl_Xcd, gid_File_InfoPlist_Lang); Dirs = (gid_Dir_Samples_Language); End @@ -69,6 +65,7 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Dba, gid_File_Res_Dbw, gid_File_Res_Dkt, + gid_File_Res_Editeng, gid_File_Res_Epb, gid_File_Res_Epg, gid_File_Res_Epp, diff --git a/scp2/source/ooo/module_langpack.scp b/scp2/source/ooo/module_langpack.scp index d50be8837337..bda152b286da 100644 --- a/scp2/source/ooo/module_langpack.scp +++ b/scp2/source/ooo/module_langpack.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack.scp,v $ - * $Revision: 1.11.222.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 5fbcbdda7107..3127cdd8b904 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack.ulf,v $ - * $Revision: 1.10.178.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 3a643705124e..d77c05768fbb 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_ooo.scp,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index 37e97b3932c7..4660a2a442df 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_ooo.ulf,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp index 552ed2c2e24a..ea9faa7e765c 100644 --- a/scp2/source/ooo/module_systemint.scp +++ b/scp2/source/ooo/module_systemint.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_systemint.scp,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/module_systemint.ulf b/scp2/source/ooo/module_systemint.ulf index 1f2a525fb4cb..b178c80fa2c4 100644 --- a/scp2/source/ooo/module_systemint.ulf +++ b/scp2/source/ooo/module_systemint.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_systemint.ulf,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp index cc5780b56f57..7021f02efc4a 100644 --- a/scp2/source/ooo/ooo_brand.scp +++ b/scp2/source/ooo/ooo_brand.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ooo_brand.scp,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp index 34c3a5ce8957..a2491045caf9 100644 --- a/scp2/source/ooo/profile_ooo.scp +++ b/scp2/source/ooo/profile_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: profile_ooo.scp,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,17 +27,6 @@ #include "macros.inc" -Profile gid_Profile_Configmgr_Ini - ModuleID = gid_Module_Root; - #ifdef UNX - Name = "configmgrrc"; - #else - Name = "configmgr.ini"; - #endif - Dir = gid_Dir_Program; - Styles = (NETWORK); -End - Profile gid_Profile_Uno_Ini ModuleID = gid_Module_Root; #ifdef UNX diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 69c771c83782..bb3a9ecd4126 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -1,14 +1,11 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: profileitem_ooo.scp,v $ - * $Revision: 1.67.2.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,262 +27,6 @@ #include "macros.inc" -// for the configmgr - -ProfileItem gid_Profileitem_Configmgr_Cfg_Servertype - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 1; - Key = "CFG_ServerType"; - Value = "uno"; -End - - -ProfileItem gid_Profileitem_Configmgr_Bootstrap_Ini - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 2; - Key = "BootstrapFile"; - Value = "$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap); -End - -ProfileItem gid_Profileitem_Configmgr_Version_Ini - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 2; - Key = "VersionFile"; - Value = "$BRAND_BASE_DIR/program/" PROFILENAME(version); -End - - -ProfileItem gid_Profileitem_Configmgr_Uno_Ini - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 3; - Key = "UnoFile"; - #ifdef UNX - Value = "$ORIGIN/unorc"; - #else - Value = "$ORIGIN/uno.ini"; - #endif -End - - -ProfileItem gid_Profileitem_Configmgr_Baseinstallation - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 4; - Key = "BaseInstallation"; - Value = "${OOO_BASE_DIR}"; -End - - -ProfileItem gid_Profileitem_Configmgr_Userinstallation - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 5; - Key = "UserInstallation"; - Value = "${$BootstrapFile:UserInstallation}"; -End - -ProfileItem gid_Profileitem_Configmgr_Schemaversion - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 6; - Key = "CFG_SchemaVersion"; - Value = "${$VersionFile:buildid}"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemadataurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 7; - Key = "CFG_SchemaDataUrl"; - Value = "$BaseInstallation/share/registry/schema ?$CFG_BrandLayerUrl/schema ?$CFG_UnoSharedPackages/schema ?$CFG_UnoUserPackages/schema"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultdataurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 8; - Key = "CFG_DefaultLayerUrls"; - Value = "$BaseInstallation/share/registry $CFG_UnoSharedPackages $CFG_UnoUserPackages"; -End - -ProfileItem gid_Profileitem_Configmgr_Cachedisposal - ProfileID =gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 9; - Key = "CFG_CacheDisposeDelay"; - Value = "900"; -End - -ProfileItem gid_Profileitem_Configmgr_Cacheinterval - ProfileID = gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 10; - Key = "CFG_CacheDisposeInterval"; - Value = "60"; -End - -ProfileItem gid_Profileitem_Configmgr_Cachewrite - ProfileID = gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 11; - Key = "CFG_CacheWriteInterval"; - Value = "2"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Userdataurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 12; - Key = "CFG_UserLayerUrl"; - Value = "$UserInstallation/user/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Cacheurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 13; - Key = "CFG_CacheUrl"; - Value = "$UserInstallation/user/registry/cache"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultlayerurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 14; - Key = "CFG_DefaultLayerUrl"; - Value = "$BaseInstallation/share/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Modulelayerurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 15; - Key = "CFG_ModuleLayerUrl"; - Value = "$CFG_DefaultLayerUrl/modules"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Unosharedpackages - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 16; - Key = "CFG_UnoSharedPackages"; - Value = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Unouserpackages - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 17; - Key = "CFG_UnoUserPackages"; - Value = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerUrl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 18; - Key = "CFG_BrandLayerUrl"; - Value = "${BRAND_BASE_DIR}/share/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerModulesUrl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 19; - Key = "CFG_BrandLayerModulesUrl"; - Value = "$CFG_BrandLayerUrl/modules"; -End - -ProfileItem gid_Profileitem_Configmgr_Unocfg_Backendservice - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 20; - Key = "CFG_BackendService"; - Value = "com.sun.star.comp.configuration.backend.MultiStratumBackend"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemasupplier - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 21; - Key = "CFG_SchemaSupplier"; - Value = "com.sun.star.comp.configuration.backend.LocalSchemaSupplier"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Datasvc - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 22; - Key = "CFG_LocalDataSvc"; - Value = "com.sun.star.comp.configuration.backend.LocalStratum"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Moduledatasvc - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 23; - Key = "CFG_LocalModuleDataSvc"; - Value = "com.sun.star.comp.configuration.backend.LocalMultiStratum"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Resdatasvc - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 24; - Key = "CFG_LocalResDataSvc"; - Value = "com.sun.star.comp.configuration.backend.LocalResourceStratum"; -End - - -ProfileItem gid_Profileitem_Configmgr_Strata - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 25; - Key = "CFG_Strata"; - Value = "${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalModuleDataSvc}:$CFG_ModuleLayerUrl;${CFG_LocalResDataSvc}:$CFG_DefaultLayerUrl;?${CFG_LocalDataSvc}:$CFG_BrandLayerUrl;?${CFG_LocalModuleDataSvc}:$CFG_BrandLayerModulesUrl;${CFG_LocalDataSvc}:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;${CFG_LocalDataSvc}:$CFG_UnoUserPackages;${CFG_LocalDataSvc}:$CFG_UserLayerUrl;"; -End - -ProfileItem gid_Profileitem_Configmgr_Ldapmappingurl - ProfileID = gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 26; - Key = "CFG_LdapMappingUrl"; - Value = "$BaseInstallation/share/registry/ldap"; -End - -//end configmgr - ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath ProfileID = gid_Profile_Setup_Ini; ModuleID = gid_Module_Root; diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 6544de17f993..04162a200ccf 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_ooo.scp,v $ - * $Revision: 1.34 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf index cbcf513d1358..cbb57ef56d98 100644 --- a/scp2/source/ooo/registryitem_ooo.ulf +++ b/scp2/source/ooo/registryitem_ooo.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_ooo.ulf,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index f88737451a5f..e5314c7c386e 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: scpaction_ooo.scp,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 3824fe3a0841..fb43b041c585 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: shortcut_ooo.scp,v $ - * $Revision: 1.32 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/starregistry_ooo.scp b/scp2/source/ooo/starregistry_ooo.scp index dfd1d3c0170b..41bacdcecf48 100644 --- a/scp2/source/ooo/starregistry_ooo.scp +++ b/scp2/source/ooo/starregistry_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: starregistry_ooo.scp,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 41f2b73adbe8..ca7a7222b074 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ure.scp,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp index 0f5be1aae19b..397d8fd8f2da 100755 --- a/scp2/source/ooo/ure_into_ooo.scp +++ b/scp2/source/ooo/ure_into_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ure_into_ooo.scp,v $ - * $Revision: 1.5.176.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp index d4fd951c9771..caa78335e509 100755 --- a/scp2/source/ooo/ure_standalone.scp +++ b/scp2/source/ooo/ure_standalone.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ure_standalone.scp,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index b7e6e81dc331..70c490d954f8 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -2,12 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2009 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: vc_redist.scp,v $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index ceb0b156cd7b..b69082b05cd5 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: windowscustomaction_ooo.scp,v $ - * $Revision: 1.30 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index d8412b7e2cab..1303bf59460f 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_python.scp,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -121,11 +118,11 @@ End // Scripting Framework Python configuration settings -File gid_File_Registry_Spool_Oo_Scripting_Python_Xcu +File gid_File_Share_Registry_Pyuno_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Scripting; - Name = "/registry/spool/org/openoffice/Office/Scripting-python.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "pyuno.xcd"; End #ifndef SYSTEM_PYTHON diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk index f78bdbd7d349..b34c0af1491d 100644 --- a/scp2/source/python/makefile.mk +++ b/scp2/source/python/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.15 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index a3e7611dc56f..3abeec2e3142 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_python.scp,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,7 @@ Module gid_Module_Optional_Pyuno MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); ParentID = gid_Module_Optional; Sortkey = "750"; - Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu); + Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); Minimal = NO; Default = YES; Styles = ( ); diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf index 411debf2d469..2303dcd8a383 100644 --- a/scp2/source/python/module_python.ulf +++ b/scp2/source/python/module_python.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_python.ulf,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp index 2d7f68d3a315..00a5c30a122c 100644 --- a/scp2/source/python/module_python_mailmerge.scp +++ b/scp2/source/python/module_python_mailmerge.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_python_mailmerge.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/python/module_python_mailmerge.ulf b/scp2/source/python/module_python_mailmerge.ulf index 12de9f65ed8f..b69dda152aeb 100755 --- a/scp2/source/python/module_python_mailmerge.ulf +++ b/scp2/source/python/module_python_mailmerge.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_python_mailmerge.ulf,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index 75bb6710f0f9..be8edc601eb6 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: profileitem_python.scp,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/quickstart/file_quickstart.scp b/scp2/source/quickstart/file_quickstart.scp index 50548eac85f9..447dcee0431a 100644 --- a/scp2/source/quickstart/file_quickstart.scp +++ b/scp2/source/quickstart/file_quickstart.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_quickstart.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp index 0243c6fba216..b533637cc788 100644 --- a/scp2/source/quickstart/folderitem_quickstart.scp +++ b/scp2/source/quickstart/folderitem_quickstart.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_quickstart.scp,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk index 96adeafcce16..283d220733e3 100644 --- a/scp2/source/quickstart/makefile.mk +++ b/scp2/source/quickstart/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp index 7e1bad4f825f..078de4b5f041 100644 --- a/scp2/source/quickstart/module_quickstart.scp +++ b/scp2/source/quickstart/module_quickstart.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_quickstart.scp,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/quickstart/module_quickstart.ulf b/scp2/source/quickstart/module_quickstart.ulf index 93d39ef0bf6b..f8a8809f69a3 100644 --- a/scp2/source/quickstart/module_quickstart.ulf +++ b/scp2/source/quickstart/module_quickstart.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_quickstart.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp index 3a10ff71e929..4c8b4c5ad2a5 100644 --- a/scp2/source/quickstart/registryitem_quickstart.scp +++ b/scp2/source/quickstart/registryitem_quickstart.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_quickstart.scp,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/sdkoo/makefile.mk b/scp2/source/sdkoo/makefile.mk index 5a4fdf72f021..6b4200b4671c 100644 --- a/scp2/source/sdkoo/makefile.mk +++ b/scp2/source/sdkoo/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp index 4777fb0b5598..b24bd7aafd50 100644 --- a/scp2/source/sdkoo/module_sdkoo.scp +++ b/scp2/source/sdkoo/module_sdkoo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_sdkoo.scp,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/sdkoo/module_sdkoo.ulf b/scp2/source/sdkoo/module_sdkoo.ulf index 52c377ce6af3..1bb139979403 100644 --- a/scp2/source/sdkoo/module_sdkoo.ulf +++ b/scp2/source/sdkoo/module_sdkoo.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_sdkoo.ulf,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index b8dd4e5faed4..9794fa06719e 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdkoo.scp,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk index 59f5dab89f9e..47be771c5e50 100755 --- a/scp2/source/templates/makefile.mk +++ b/scp2/source/templates/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack.sct b/scp2/source/templates/module_langpack.sct index 1d349100eb4b..2876776f5f32 100755 --- a/scp2/source/templates/module_langpack.sct +++ b/scp2/source/templates/module_langpack.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack.sct,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_base.sct b/scp2/source/templates/module_langpack_base.sct index 7dacd0710437..4c569f322b52 100755 --- a/scp2/source/templates/module_langpack_base.sct +++ b/scp2/source/templates/module_langpack_base.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_base.sct,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct index e4f558df0d1a..76f389049580 100644 --- a/scp2/source/templates/module_langpack_binfilter.sct +++ b/scp2/source/templates/module_langpack_binfilter.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_binfilter.sct,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_calc.sct b/scp2/source/templates/module_langpack_calc.sct index de6d8385fc02..865d03ebe3ff 100755 --- a/scp2/source/templates/module_langpack_calc.sct +++ b/scp2/source/templates/module_langpack_calc.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_calc.sct,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_draw.sct b/scp2/source/templates/module_langpack_draw.sct index 1a6349fd4c27..b87ff103a517 100755 --- a/scp2/source/templates/module_langpack_draw.sct +++ b/scp2/source/templates/module_langpack_draw.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_draw.sct,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_impress.sct b/scp2/source/templates/module_langpack_impress.sct index 919cf74e2355..fe90cfdc8892 100755 --- a/scp2/source/templates/module_langpack_impress.sct +++ b/scp2/source/templates/module_langpack_impress.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_impress.sct,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_math.sct b/scp2/source/templates/module_langpack_math.sct index 6b5189a86ca1..5b7722a146c0 100755 --- a/scp2/source/templates/module_langpack_math.sct +++ b/scp2/source/templates/module_langpack_math.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_math.sct,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_onlineupdate.sct b/scp2/source/templates/module_langpack_onlineupdate.sct index 6aed95ff6a2d..24fb09c3566a 100755 --- a/scp2/source/templates/module_langpack_onlineupdate.sct +++ b/scp2/source/templates/module_langpack_onlineupdate.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_onlineupdate.sct,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct index 977608d78ea3..0eb5a5373f55 100755 --- a/scp2/source/templates/module_langpack_root.sct +++ b/scp2/source/templates/module_langpack_root.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_root.sct,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/module_langpack_writer.sct b/scp2/source/templates/module_langpack_writer.sct index 15e5aab9bcd9..d4c59baa68af 100755 --- a/scp2/source/templates/module_langpack_writer.sct +++ b/scp2/source/templates/module_langpack_writer.sct @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_langpack_writer.sct,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/templates/modules.pl b/scp2/source/templates/modules.pl index 2b77662a95b8..68133b14a772 100755 --- a/scp2/source/templates/modules.pl +++ b/scp2/source/templates/modules.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: modules.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp index 4e44a1f80fcd..86faf16faefc 100644 --- a/scp2/source/testtool/file_testtool.scp +++ b/scp2/source/testtool/file_testtool.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_testtool.scp,v $ - * $Revision: 1.7.156.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk index 036cd1420c12..edcad2e17abe 100644 --- a/scp2/source/testtool/makefile.mk +++ b/scp2/source/testtool/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp index 356772a62310..1a6bc0d01484 100644 --- a/scp2/source/testtool/module_testtool.scp +++ b/scp2/source/testtool/module_testtool.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_testtool.scp,v $ - * $Revision: 1.9.156.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/testtool/module_testtool.ulf b/scp2/source/testtool/module_testtool.ulf index 20a93f19d6c0..8d219eaab541 100644 --- a/scp2/source/testtool/module_testtool.ulf +++ b/scp2/source/testtool/module_testtool.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_testtool.ulf,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index dd8b8912ae8c..50f0aa064d71 100644..100755 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_winexplorerext.scp,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -42,13 +39,6 @@ File gid_File_Lib_OOoFilt Name = "ooofilt.dll"; End -File gid_File_Lib_OOoFiltProxy - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "ooofiltproxy.dll"; -End - #ifdef BUILD_X64 File gid_File_Lib_OOoFilt64 @@ -59,14 +49,6 @@ File gid_File_Lib_OOoFilt64 ComponentCondition = "VersionNT64"; End -File gid_File_Lib_OOoFiltProxy64 - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "ooofiltproxy_x64.dll"; - ComponentCondition = "VersionNT64"; -End - #endif File gid_File_Lib_Shlxthdl @@ -87,34 +69,29 @@ End #endif -#if defined M1310 -File gid_File_Lib_Shlxthdl_Msvcr71 +File gid_File_Lib_PropertyHdl TXT_FILE_BODY; + Styles = (PACKED); Dir = gid_Dir_Shlxthdl; - Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG); + Name = "propertyhdl.dll"; +End + +#ifdef BUILD_X64 + File gid_File_Lib_PropertyHdl64 + TXT_FILE_BODY; Styles = (PACKED); + Dir = gid_Dir_Shlxthdl; + Name = "propertyhdl_x64.dll"; + ComponentCondition = "VersionNT64"; End + #endif -#if !defined USE_SYSTEM_STL -File gid_File_Lib_Shlxthdl_Stlport +#if defined M1310 +File gid_File_Lib_Shlxthdl_Msvcr71 TXT_FILE_BODY; Dir = gid_Dir_Shlxthdl; -#if defined _gcc3 /* && defined WNT */ -#if defined _STLP_DEBUG - Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug"); -#else - Name = SCP2_URE_DL_NORMAL("libstlport_gcc"); -#endif -#elif (defined(M1310) || defined(M1400) || defined(M1500)) /* && defined WNT */ -#if defined _STLP_DEBUG - Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); -#else - Name = SCP2_URE_DL_NORMAL("stlport_vc7145"); -#endif -#else -#error "stlport dynamic library: unsupported platform" -#endif + Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG); Styles = (PACKED); End #endif @@ -132,3 +109,4 @@ File gid_File_Lib_Reg64 Dir = SCP2_OOO_BIN_DIR; Name = "reg64msi.dll"; End + diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk index 6fc8ef03b382..21eaad714eac 100644..100755 --- a/scp2/source/winexplorerext/makefile.mk +++ b/scp2/source/winexplorerext/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index c1f0ac7f9010..6993ba25c1d1 100644..100755 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_winexplorerext.scp,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,7 +29,7 @@ Module gid_Module_Optional_Winexplorerext MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS ); - Sortkey = "1200"; + Sortkey = "1205"; Default = YES; Minimal = YES; ParentID = gid_Module_Optional; @@ -40,12 +37,21 @@ Module gid_Module_Optional_Winexplorerext Files = (gid_File_Lib_Shlxthdl, gid_File_Lib_Shlxthdl64, gid_File_Lib_OOoFilt, - gid_File_Lib_OOoFiltProxy, gid_File_Lib_OOoFilt64, - gid_File_Lib_OOoFiltProxy64, gid_File_Lib_Shlxthdl_Msvcr71, - gid_File_Lib_Shlxthdl_Stlport, gid_File_Lib_Shlxtmsi, gid_File_Lib_Reg64, gid_File_Tmp_Userinstall_Winexplorerext_Inf); End + +Module gid_Module_Optional_Winexplorerext_PropertyHdl + ParentID = gid_Module_Optional_Winexplorerext; + Name = "gid_Module_Optional_Winexplorerext_PropertyHdl"; + Description = "gid_Module_Optional_Winexplorerext_PropertyHdl"; + Sortkey = "1210"; + Default = YES; + Styles = (HIDDEN_ROOT); + Dirs = (gid_Dir_Shlxthdl); + Files = (gid_File_Lib_PropertyHdl, + gid_File_Lib_PropertyHdl64); +End diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf b/scp2/source/winexplorerext/module_winexplorerext.ulf index bfc8aaa90d14..506c80d71766 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.ulf +++ b/scp2/source/winexplorerext/module_winexplorerext.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_winexplorerext.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index 87084695ada0..7c932bac1f28 100644..100755 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_winexplorerext.scp,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -38,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel @@ -61,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel @@ -93,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel @@ -127,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer ModuleID = gid_Module_Root; Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; Styles = (X64); // Values: X64 / X64_ONLY - Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll"; - Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll"; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll"; End RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel @@ -170,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer ModuleID = gid_Module_Optional_Winexplorerext; Styles = (X64); Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; - Value = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll\""; - Val64 = "\"[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll\""; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; End RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel @@ -184,4 +181,50 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer Val64 = "Apartment"; End -// End registry entries for the PropertySheet handler
\ No newline at end of file +// End registry entries for the PropertySheet handler + +// Begin registry entries for the Property handler + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}"; + Value = "%PRODUCTNAME Property Handler"; + Val64 = "%PRODUCTNAME Property Handler"; +End + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32 + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; + Value = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl.dll"; + Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll"; +End + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; + Name = "ThreadingModel"; + Value = "Apartment"; + Val64 = "Apartment"; +End + +RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + ComponentCondition = "VersionNT >= 600"; + Styles = (X64); + Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; + Name = "{AE424E85-F6DF-4910-A6A9-438797986431}"; + Value = "%PRODUCTNAME Property Handler"; + Val64 = "%PRODUCTNAME Property Handler"; +End + +// End registry entries for the Property handler diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 91ff3a33ca0a..3d7c22b9e7a9 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_writer.scp,v $ - * $Revision: 1.39 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -66,13 +63,6 @@ File gid_File_Exe_Sweb End #endif -File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-writer.xcu"; -End - File gid_File_Help_Swriter_Zip Dir = gid_Dir_Help_Isolanguage; ARCHIVE_TXT_FILE_BODY; @@ -102,164 +92,10 @@ File gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml Name = "/uiconfig/sglobal/menubar/menubar.xml"; End */ -File gid_File_Oo_Office_Ui_Writercommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Writercommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterCommands.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_writer_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_writer_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_web_types.xcu"; -End -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu +File gid_File_Share_Registry_Writer_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_web_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "writer.xcd"; End - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_global_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_global_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-writer.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-writer.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-writer.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Xformswindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Xformswindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu"; -End - diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp index 3b7f28b67970..7541e1d2d344 100644 --- a/scp2/source/writer/folderitem_writer.scp +++ b/scp2/source/writer/folderitem_writer.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_writer.scp,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/writer/folderitem_writer.ulf b/scp2/source/writer/folderitem_writer.ulf index d585bfd18dc6..a088978663d6 100644 --- a/scp2/source/writer/folderitem_writer.ulf +++ b/scp2/source/writer/folderitem_writer.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: folderitem_writer.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk index 09d48fc67134..136079bec377 100644 --- a/scp2/source/writer/makefile.mk +++ b/scp2/source/writer/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 6384bc28f3e3..16928c8b25b9 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_writer.scp,v $ - * $Revision: 1.29 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -60,21 +57,7 @@ Module gid_Module_Prg_Wrt_Bin gid_File_Jar_Email, gid_File_Jar_Mail, gid_File_Jar_Activation, - gid_File_Oo_Office_Ui_Writercommands_Xcs, - gid_File_Oo_Office_Ui_Writercommands_Xcu, - gid_File_Registry_Spool_Oo_Common_Writer_Xcu, - gid_File_Registry_Spool_Oo_Setup_Writer_Xcu, - gid_File_Registry_Spool_Oo_Common_Dicooo_Xcu, - gid_File_Oo_Office_Ui_Writerwindowstate_Xcs, - gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs, - gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs, - gid_File_Oo_Office_Ui_Writerwindowstate_Xcu, - gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu, - gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu, - gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu, + gid_File_Share_Registry_Writer_Xcd, gid_File_Tmp_Userinstall_Wrt_Inf); End diff --git a/scp2/source/writer/module_writer.ulf b/scp2/source/writer/module_writer.ulf index 32b9bf2804fb..1e02043e19ee 100644 --- a/scp2/source/writer/module_writer.ulf +++ b/scp2/source/writer/module_writer.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_writer.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 819ba6128663..b6497f889630 100644..100755 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_writer.scp,v $ - * $Revision: 1.15.122.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -542,6 +539,14 @@ RegistryItem gid_Regitem_Stw_Contenttype Value = "application/vnd.sun.xml.writer.template"; End +RegistryItem gid_Regitem_stw_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarWriterTemplate.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxg_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -586,6 +591,14 @@ RegistryItem gid_Regitem_Sxg_Mime_Database Value = ".sxg"; End +RegistryItem gid_Regitem_sxg_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarWriterGlobalDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Sxw_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -646,6 +659,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +RegistryItem gid_Regitem_sxw_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "soffice.StarWriterDocument.6"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // new odt file extension @@ -696,13 +717,12 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odt ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Wrt_Bin; Name = "application/vnd.oasis.opendocument.text"; Value = "opendocument.WriterDocument.1"; Styles = (); End - RegistryItem gid_Regitem_Odt_Contenttype ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -761,6 +781,14 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable Subkey = "opendocument.WriterDocument.1\Insertable"; End +RegistryItem gid_Regitem_odt_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -921,6 +949,14 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon Value = "<progpath>\program\soffice.exe,2"; End +RegistryItem gid_Regitem_ott_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -1037,6 +1073,14 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon Value = "<progpath>\program\soffice.exe,10"; End +RegistryItem gid_Regitem_odm_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterGlobalDocument.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.WriterGlobalDocument.1\shell"; @@ -1195,6 +1239,14 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; End +RegistryItem gid_Regitem_oth_FullDetails + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; + Subkey = "opendocument.WriterWebTemplate.1"; + Name = "FullDetails"; + Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; +End + // "OpenWith" Windows Registry keys for extensions supported by Writer // .ODT @@ -1428,6 +1480,18 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swri Value = "<progpath>"; End + +// registering the property handler for the supported file types + +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odt ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ott ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( oth ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odm ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxw ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stw ) +REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg ) + +// registering the mso file types // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid, key, cond, disp_name, icon_id, app, default, dox_type) CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_Bin, doc, DOC, MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer ) diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf index 87c27fbce898..ce8108ae572d 100644 --- a/scp2/source/writer/registryitem_writer.ulf +++ b/scp2/source/writer/registryitem_writer.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: registryitem_writer.ulf,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp index c85dde29958c..848b1c707ff7 100644 --- a/scp2/source/xsltfilter/file_xsltfilter.scp +++ b/scp2/source/xsltfilter/file_xsltfilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: file_xsltfilter.scp,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,18 +27,11 @@ #include "macros.inc" -File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_xslt_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu +File gid_File_Share_Registry_Xsltfilter_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_xslt_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "xsltfilter.xcd"; End File gid_File_Stw_Docbooktemplate diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk index 29e2ffb4c2f5..a9c6c9f77888 100644 --- a/scp2/source/xsltfilter/makefile.mk +++ b/scp2/source/xsltfilter/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 7432e169d909..7854ce70474f 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_xsltfilter.scp,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,8 +43,7 @@ Module gid_Module_Optional_Xsltfiltersamples gid_File_Xsl_Export_Xhtml_Master_Usability_Links, gid_File_Xsl_Export_Xhtml_Ooo2xhtml, gid_File_Xsl_Export_Xhtml_Table, - gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu ); + gid_File_Share_Registry_Xsltfilter_Xcd ); Minimal = NO; Default = NO; Styles = ( ); diff --git a/scp2/source/xsltfilter/module_xsltfilter.ulf b/scp2/source/xsltfilter/module_xsltfilter.ulf index 5620f926d210..9561c2dc6ec6 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.ulf +++ b/scp2/source/xsltfilter/module_xsltfilter.ulf @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: module_xsltfilter.ulf,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index bafca83860cb..1fed891823b6 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.58 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -176,7 +172,7 @@ SCP1FILES += \ .IF "$(ENABLE_CRASHDUMP)" != "" SCP1FILES += \ - file_crashrep_dynamic.par + file_crashrep.par .ENDIF SCP1FILES += \ @@ -329,7 +325,7 @@ SCP2FILES += \ .IF "$(ENABLE_CRASHDUMP)" != "" SCP2FILES += \ - file_crashrep_dynamic.par + file_crashrep.par .ENDIF SCP2FILES += \ diff --git a/set_soenv.in b/set_soenv.in index 90d6582f5f1e..b8f3afc96d87 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -594,7 +594,6 @@ elsif ( $platform =~ m/osf1/ ) } elsif ( $platform =~ m/cygwin/ ) { - $COMPATH = PathFormat('@COMPATH@'); $MSPDB_PATH = PathFormat('@MSPDB_PATH@'); $MIDL_PATH = PathFormat('@MIDL_PATH@'); $CSC_PATH = PathFormat('@CSC_PATH@'); @@ -619,6 +618,8 @@ elsif ( $platform =~ m/cygwin/ ) $FLIPCMD = "slfl.pl"; $PATH_SEPERATOR = ';'; $outfile = "winmingw.set"; + $COMPATH = PathFormat('@COMPATH@/bin'); + $COMPATH =~ s/\/bin$//i; $COM = "GCC"; $CVER = "C341"; $OUTPATH = "wntgcci"; @@ -627,6 +628,7 @@ elsif ( $platform =~ m/cygwin/ ) } else # The MSVC section starts here { $outfile = "winenv.set"; + $COMPATH = PathFormat('@COMPATH@'); $COM = "MSC"; $OUTPATH = "wntmsci@COMEX@"; $INPATH = $OUTPATH.$PROEXT; @@ -1842,6 +1844,13 @@ ToFile( "SYSTEM_EXPAT", "@SYSTEM_EXPAT@", "e" ); ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" ); ToFile( "DB_VERSION", "@DB_VERSION@", "e" ); ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); +ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" ); +ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" ); +ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" ); +ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" ); +ToFile( "MYSQL_LIB", "@MYSQL_LIB@", "e" ); +ToFile( "MYSQL_DEFINES", "@MYSQL_DEFINES@", "e" ); +ToFile( "LIBMYSQL_PATH", "@LIBMYSQL_PATH@", "e" ); ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" ); ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" ); ToFile( "SYSTEM_LUCENE", "@SYSTEM_LUCENE@", "e" ); diff --git a/soldep/bootstrp/appdef.cxx b/soldep/bootstrp/appdef.cxx index 9c867064c4cc..8ce777888781 100644 --- a/soldep/bootstrp/appdef.cxx +++ b/soldep/bootstrp/appdef.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: appdef.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/bootstrp/build_list_converter.pl b/soldep/bootstrp/build_list_converter.pl index 95493997d717..3887eca03a12 100644 --- a/soldep/bootstrp/build_list_converter.pl +++ b/soldep/bootstrp/build_list_converter.pl @@ -6,14 +6,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: build_list_converter.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/bootstrp/dep.cxx b/soldep/bootstrp/dep.cxx index 7f9646a6530d..fb4edcc998bc 100644 --- a/soldep/bootstrp/dep.cxx +++ b/soldep/bootstrp/dep.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dep.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/bootstrp/hashtbl.cxx b/soldep/bootstrp/hashtbl.cxx index 66b88f3c78dc..b6f9b0b7826a 100644 --- a/soldep/bootstrp/hashtbl.cxx +++ b/soldep/bootstrp/hashtbl.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hashtbl.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk index ac56f781b791..56d3fa1f07f4 100644 --- a/soldep/bootstrp/makefile.mk +++ b/soldep/bootstrp/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx index 2a8a69dbc3b5..8c08d3a69840 100644 --- a/soldep/bootstrp/minormk.cxx +++ b/soldep/bootstrp/minormk.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: minormk.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx index 5e93c1142673..d13e08a05283 100644 --- a/soldep/bootstrp/prj.cxx +++ b/soldep/bootstrp/prj.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: prj.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/bootstrp/prodmap.cxx b/soldep/bootstrp/prodmap.cxx index 5c48704d5a6d..166d111b563b 100644 --- a/soldep/bootstrp/prodmap.cxx +++ b/soldep/bootstrp/prodmap.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: prodmap.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/appdef.hxx b/soldep/inc/appdef.hxx index 7539b3c9c49b..cc8d5d0f2f8b 100644 --- a/soldep/inc/appdef.hxx +++ b/soldep/inc/appdef.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: appdef.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx index a7a2b31d046a..f7ef15ace882 100644 --- a/soldep/inc/dep.hxx +++ b/soldep/inc/dep.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dep.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/dtsodcmp.hrc b/soldep/inc/dtsodcmp.hrc index e43fd369c4d1..bfeca821562b 100644 --- a/soldep/inc/dtsodcmp.hrc +++ b/soldep/inc/dtsodcmp.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dtsodcmp.hrc,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/minormk.hxx b/soldep/inc/minormk.hxx index a4c743fdcbb2..0f14497dbaa7 100644 --- a/soldep/inc/minormk.hxx +++ b/soldep/inc/minormk.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: minormk.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx index 3faa8ed9368a..97b554b9e52d 100644 --- a/soldep/inc/prodmap.hxx +++ b/soldep/inc/prodmap.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: prodmap.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx index 478cf2843cc3..40ef986245e5 100644 --- a/soldep/inc/soldep/connctr.hxx +++ b/soldep/inc/soldep/connctr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: connctr.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/depper.hxx b/soldep/inc/soldep/depper.hxx index 7caffca8662e..a9de33c57043 100644 --- a/soldep/inc/soldep/depper.hxx +++ b/soldep/inc/soldep/depper.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: depper.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx index 152e81fe2f19..4464e91aa59a 100644 --- a/soldep/inc/soldep/depwin.hxx +++ b/soldep/inc/soldep/depwin.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: depwin.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/graphwin.hxx b/soldep/inc/soldep/graphwin.hxx index 54ee629632fa..e0152d6e34f7 100644 --- a/soldep/inc/soldep/graphwin.hxx +++ b/soldep/inc/soldep/graphwin.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: graphwin.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/hashobj.hxx b/soldep/inc/soldep/hashobj.hxx index 798430125b58..73d4daf699e7 100644 --- a/soldep/inc/soldep/hashobj.hxx +++ b/soldep/inc/soldep/hashobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hashobj.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/hashtbl.hxx b/soldep/inc/soldep/hashtbl.hxx index c7bc3ebf372e..0308a6a33e0e 100644 --- a/soldep/inc/soldep/hashtbl.hxx +++ b/soldep/inc/soldep/hashtbl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hashtbl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx index 884507a2fa81..e7bc94826858 100644 --- a/soldep/inc/soldep/objwin.hxx +++ b/soldep/inc/soldep/objwin.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objwin.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx index bd94a3e87f9a..b04d6ac1fe4e 100644 --- a/soldep/inc/soldep/prj.hxx +++ b/soldep/inc/soldep/prj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: prj.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/sdtresid.hxx b/soldep/inc/soldep/sdtresid.hxx index 6b7f9ca50846..02a3a57e37ea 100644 --- a/soldep/inc/soldep/sdtresid.hxx +++ b/soldep/inc/soldep/sdtresid.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtresid.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/soldep.hxx b/soldep/inc/soldep/soldep.hxx index 8c65e9ca08eb..55fb4fc0e11c 100644 --- a/soldep/inc/soldep/soldep.hxx +++ b/soldep/inc/soldep/soldep.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: soldep.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/soldlg.hrc b/soldep/inc/soldep/soldlg.hrc index 95bea8e50880..94a26514e5b2 100644 --- a/soldep/inc/soldep/soldlg.hrc +++ b/soldep/inc/soldep/soldlg.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: soldlg.hrc,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/soldlg.hxx b/soldep/inc/soldep/soldlg.hxx index 8ab3a4bed220..ef57908b6913 100644 --- a/soldep/inc/soldep/soldlg.hxx +++ b/soldep/inc/soldep/soldlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: soldlg.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/inc/soldep/tbox.hxx b/soldep/inc/soldep/tbox.hxx index 2159d05c0f49..69276895aad5 100644 --- a/soldep/inc/soldep/tbox.hxx +++ b/soldep/inc/soldep/tbox.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbox.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/connctr.cxx b/soldep/source/connctr.cxx index acba58ce48d9..10650cb41fca 100644 --- a/soldep/source/connctr.cxx +++ b/soldep/source/connctr.cxx @@ -1,275 +1,272 @@ -/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: connctr.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifdef _MSC_VER
-#pragma warning(disable:4100)
-#endif
-#include <soldep/connctr.hxx>
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-#include "math.h"
-
-BOOL Connector::msbHideMode = FALSE;
-
-Connector::Connector( DepWin* pParent, WinBits nWinStyle ) :
-mpStartWin( 0L ),
-mpEndWin( 0L ),
-mnStartId( 0 ),
-mnEndId( 0 ),
-bVisible( FALSE ),
-len( 70 )
-{
- mpParent = pParent;
- if ( mpParent )
- mpParent->AddConnector( this );
-}
-
-Connector::~Connector()
-{
- if ( mpStartWin )
- mpStartWin->RemoveConnector( this );
- if ( mpEndWin )
- mpEndWin->RemoveConnector( this );
- if ( mpParent )
- mpParent->RemoveConnector( this );
- mpParent->Invalidate( Rectangle( mStart, mEnd ));
- mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
-}
-
-void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis )
-{
- mpStartWin = pStartWin;
- mpEndWin = pEndWin;
- mpStartWin->AddConnector( this );
- mpEndWin->AddConnector( this );
- mCenter = GetMiddle();
- mStart = pStartWin->GetFixPoint( mCenter );
- mEnd = pEndWin->GetFixPoint( mCenter );
- mnStartId = pStartWin->GetId();
- mnEndId = pEndWin->GetId();
- bVisible = bVis;
-
-// if ( mpParent->IsPaintEnabled())
- if ( IsVisible() )
- {
- mpParent->DrawLine( mEnd, mStart );
- mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
- }
- UpdateVisibility(); //null_Project
-}
-
-void Connector::UpdateVisibility()
-{
- bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible();
-}
-
-
-Point Connector::GetMiddle()
-{
- Point aStartPoint = mpStartWin->GetPosPixel();
- Size aStartSize = mpStartWin->GetSizePixel();
- int nMoveHorz, nMoveVert;
- aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 );
-
- Point aEndPoint = mpEndWin->GetPosPixel();
- Size aEndSize = mpEndWin->GetSizePixel();
-
- aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 );
-
- Point aRetPoint = aEndPoint;
-
- nMoveHorz = aStartPoint.X() - aEndPoint.X();
- if ( nMoveHorz )
- nMoveHorz /= 2;
- nMoveVert = aStartPoint.Y() - aEndPoint.Y();
- if ( nMoveVert )
- nMoveVert /= 2;
- aRetPoint.Move( nMoveHorz, nMoveVert );
- return aRetPoint;
-
-}
-
-void Connector::Paint( const Rectangle& rRect )
-{
- //MyApp *pApp = (MyApp*)GetpApp();
- //SolDep *pSoldep = pApp->GetSolDep();
- if (msbHideMode)
- {
- if (!(mpStartWin->IsNullObject())) //null_project
- {
- if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING )
- {
- mpStartWin->SetViewMask(0); //objwin invisible
- } else
- {
- mpStartWin->SetViewMask(1); //objwin visible
- }
- }
- if (!(mpEndWin->IsNullObject()))
- {
- if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING )
- {
- mpEndWin->SetViewMask(0); //objwin invisible
- } else
- {
- mpEndWin->SetViewMask(1); //objwin visible
- }
- }
- UpdateVisibility();
- } else //IsHideMode
- {
- //bVisible = TRUE;
- if (!(mpStartWin->IsNullObject())) //null_project
- {
- mpStartWin->SetViewMask(1);
- }
- if (!(mpEndWin->IsNullObject())) //null_project
- {
- mpEndWin->SetViewMask(1);
- }
- UpdateVisibility();
- }
- if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project
- (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible()) //null_project
- {
- mpParent->DrawLine( mEnd, mStart );
- mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2)));
- }
-}
-
-void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
-{
- if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project
- (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible()) //null_project
- {
- pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset );
- Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) );
- aRect.Move( -rOffset.X(), -rOffset.Y() );
- pDevice->DrawEllipse( aRect );
- }
-}
-
-void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint )
-{
-// more than one call ?
-//
- Point OldStart, OldEnd;
- static ULONG nCallCount = 0;
-
- //MyApp *pApp = (MyApp*)GetpApp();
- //SolDep *pSoldep = pApp->GetSolDep();
- if (msbHideMode)
- bVisible = 1;
-
- if ( nCallCount ) // only one call
- nCallCount++;
- else
- {
- nCallCount++;
- while ( nCallCount )
- {
- if ( bPaint )
- {
- OldStart = mStart;
- OldEnd = mEnd;
- }
- mCenter = GetMiddle();
- mStart=mpStartWin->GetFixPoint( mCenter, bPaint );
- mEnd=mpEndWin->GetFixPoint( mCenter, bPaint );
- if ( bPaint )
- {
- mpParent->Invalidate( Rectangle( OldStart, OldEnd ));
- mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2)));
-//Don't paint "null_project" connectors
- if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project
- (mpEndWin->GetBodyText() != ByteString("null"))) //null_project
- {
- Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3)));
- Paint ( Rectangle( mEnd, mStart ));
- }
- }
- nCallCount--;
- }
- }
-}
-
-USHORT Connector::Save( SvFileStream& rOutFile )
-{
- rOutFile << mpStartWin->GetId();
- rOutFile << mpEndWin->GetId();
-
- return 0;
-}
-
-USHORT Connector::Load( SvFileStream& rInFile )
-{
- rInFile >> mnStartId;
- rInFile >> mnEndId;
-
- return 0;
-}
-
-ObjectWin* Connector::GetOtherWin( ObjectWin* pWin )
-{
-// get correspondent object ptr
- if ( mpStartWin == pWin )
- return mpEndWin;
- else
- if ( mpEndWin == pWin )
- return mpStartWin;
-
- return NULL;
-}
-
-ULONG Connector::GetOtherId( ULONG nId )
-{
-// get correspondent object id
- if ( mnStartId == nId )
- return mnEndId;
- else
- if ( mnEndId == nId )
- return mnStartId;
-
- return NULL;
-}
-
-ULONG Connector::GetLen()
-{
- double dx, dy;
-
- dx = mStart.X() - mEnd.X();
- dy = mStart.Y() - mEnd.Y();
-
- return (ULONG) sqrt( dx * dx + dy * dy );
-}
-
-BOOL Connector::IsStart( ObjectWin* pWin )
-{
- return pWin == mpStartWin;
-}
+/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifdef _MSC_VER +#pragma warning(disable:4100) +#endif +#include <soldep/connctr.hxx> +#include <soldep/objwin.hxx> +#include <soldep/depwin.hxx> +#include "math.h" + +BOOL Connector::msbHideMode = FALSE; + +Connector::Connector( DepWin* pParent, WinBits nWinStyle ) : +mpStartWin( 0L ), +mpEndWin( 0L ), +mnStartId( 0 ), +mnEndId( 0 ), +bVisible( FALSE ), +len( 70 ) +{ + mpParent = pParent; + if ( mpParent ) + mpParent->AddConnector( this ); +} + +Connector::~Connector() +{ + if ( mpStartWin ) + mpStartWin->RemoveConnector( this ); + if ( mpEndWin ) + mpEndWin->RemoveConnector( this ); + if ( mpParent ) + mpParent->RemoveConnector( this ); + mpParent->Invalidate( Rectangle( mStart, mEnd )); + mpParent->Invalidate( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3))); +} + +void Connector::Initialize( ObjectWin* pStartWin, ObjectWin* pEndWin, BOOL bVis ) +{ + mpStartWin = pStartWin; + mpEndWin = pEndWin; + mpStartWin->AddConnector( this ); + mpEndWin->AddConnector( this ); + mCenter = GetMiddle(); + mStart = pStartWin->GetFixPoint( mCenter ); + mEnd = pEndWin->GetFixPoint( mCenter ); + mnStartId = pStartWin->GetId(); + mnEndId = pEndWin->GetId(); + bVisible = bVis; + +// if ( mpParent->IsPaintEnabled()) + if ( IsVisible() ) + { + mpParent->DrawLine( mEnd, mStart ); + mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2))); + } + UpdateVisibility(); //null_Project +} + +void Connector::UpdateVisibility() +{ + bVisible = mpStartWin->IsVisible() && mpEndWin->IsVisible(); +} + + +Point Connector::GetMiddle() +{ + Point aStartPoint = mpStartWin->GetPosPixel(); + Size aStartSize = mpStartWin->GetSizePixel(); + int nMoveHorz, nMoveVert; + aStartPoint.Move( aStartSize.Width() / 2, aStartSize.Height() / 2 ); + + Point aEndPoint = mpEndWin->GetPosPixel(); + Size aEndSize = mpEndWin->GetSizePixel(); + + aEndPoint.Move( aEndSize.Width() / 2, aEndSize.Height() / 2 ); + + Point aRetPoint = aEndPoint; + + nMoveHorz = aStartPoint.X() - aEndPoint.X(); + if ( nMoveHorz ) + nMoveHorz /= 2; + nMoveVert = aStartPoint.Y() - aEndPoint.Y(); + if ( nMoveVert ) + nMoveVert /= 2; + aRetPoint.Move( nMoveHorz, nMoveVert ); + return aRetPoint; + +} + +void Connector::Paint( const Rectangle& rRect ) +{ + //MyApp *pApp = (MyApp*)GetpApp(); + //SolDep *pSoldep = pApp->GetSolDep(); + if (msbHideMode) + { + if (!(mpStartWin->IsNullObject())) //null_project + { + if ( mpStartWin->GetMarkMode() == 0 || mpStartWin->GetMarkMode() == MARKMODE_DEPENDING ) + { + mpStartWin->SetViewMask(0); //objwin invisible + } else + { + mpStartWin->SetViewMask(1); //objwin visible + } + } + if (!(mpEndWin->IsNullObject())) + { + if ( mpEndWin->GetMarkMode() == 0 || mpEndWin->GetMarkMode() == MARKMODE_DEPENDING ) + { + mpEndWin->SetViewMask(0); //objwin invisible + } else + { + mpEndWin->SetViewMask(1); //objwin visible + } + } + UpdateVisibility(); + } else //IsHideMode + { + //bVisible = TRUE; + if (!(mpStartWin->IsNullObject())) //null_project + { + mpStartWin->SetViewMask(1); + } + if (!(mpEndWin->IsNullObject())) //null_project + { + mpEndWin->SetViewMask(1); + } + UpdateVisibility(); + } + if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project + (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible()) //null_project + { + mpParent->DrawLine( mEnd, mStart ); + mpParent->DrawEllipse( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2))); + } +} + +void Connector::DrawOutput( OutputDevice* pDevice, const Point& rOffset ) +{ + if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project + (mpEndWin->GetBodyText() != ByteString("null")) && IsVisible()) //null_project + { + pDevice->DrawLine( pDevice->PixelToLogic( mEnd ) - rOffset, pDevice->PixelToLogic( mStart ) - rOffset ); + Rectangle aRect( pDevice->PixelToLogic( Rectangle( mEnd - Point( 2, 2), mEnd + Point( 2, 2) ) ) ); + aRect.Move( -rOffset.X(), -rOffset.Y() ); + pDevice->DrawEllipse( aRect ); + } +} + +void Connector::UpdatePosition( ObjectWin* pWin, BOOL bPaint ) +{ +// more than one call ? +// + Point OldStart, OldEnd; + static ULONG nCallCount = 0; + + //MyApp *pApp = (MyApp*)GetpApp(); + //SolDep *pSoldep = pApp->GetSolDep(); + if (msbHideMode) + bVisible = 1; + + if ( nCallCount ) // only one call + nCallCount++; + else + { + nCallCount++; + while ( nCallCount ) + { + if ( bPaint ) + { + OldStart = mStart; + OldEnd = mEnd; + } + mCenter = GetMiddle(); + mStart=mpStartWin->GetFixPoint( mCenter, bPaint ); + mEnd=mpEndWin->GetFixPoint( mCenter, bPaint ); + if ( bPaint ) + { + mpParent->Invalidate( Rectangle( OldStart, OldEnd )); + mpParent->Invalidate( Rectangle( OldEnd - Point( 2, 2), OldEnd + Point( 2, 2))); +//Don't paint "null_project" connectors + if ( (mpStartWin->GetBodyText() != ByteString("null")) && //null_project + (mpEndWin->GetBodyText() != ByteString("null"))) //null_project + { + Paint ( Rectangle( mEnd - Point( 3, 3), mEnd + Point( 3, 3))); + Paint ( Rectangle( mEnd, mStart )); + } + } + nCallCount--; + } + } +} + +USHORT Connector::Save( SvFileStream& rOutFile ) +{ + rOutFile << mpStartWin->GetId(); + rOutFile << mpEndWin->GetId(); + + return 0; +} + +USHORT Connector::Load( SvFileStream& rInFile ) +{ + rInFile >> mnStartId; + rInFile >> mnEndId; + + return 0; +} + +ObjectWin* Connector::GetOtherWin( ObjectWin* pWin ) +{ +// get correspondent object ptr + if ( mpStartWin == pWin ) + return mpEndWin; + else + if ( mpEndWin == pWin ) + return mpStartWin; + + return NULL; +} + +ULONG Connector::GetOtherId( ULONG nId ) +{ +// get correspondent object id + if ( mnStartId == nId ) + return mnEndId; + else + if ( mnEndId == nId ) + return mnStartId; + + return NULL; +} + +ULONG Connector::GetLen() +{ + double dx, dy; + + dx = mStart.X() - mEnd.X(); + dy = mStart.Y() - mEnd.Y(); + + return (ULONG) sqrt( dx * dx + dy * dy ); +} + +BOOL Connector::IsStart( ObjectWin* pWin ) +{ + return pWin == mpStartWin; +} diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx index 6b000cc6fbce..0c2b11f030be 100644 --- a/soldep/source/depapp.cxx +++ b/soldep/source/depapp.cxx @@ -1,150 +1,147 @@ -/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: depapp.cxx,v $
- * $Revision: 1.6 $
- *
- * 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 "depapp.hxx"
-#include <ucbhelper/contentbroker.hxx>
-#include <ucbhelper/configurationkeys.hxx>
-
-void MyApp::Main()
-{
-#if defined(WNT)
- pDebugFile = fopen( "fprintf.out", "w" );
-#endif
-
- pMyApp = GetpApp();
- MyWin aMainWin( NULL, WB_APP | WB_STDWORK );
- pAppWindow = &aMainWin;
- // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK );
- //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN));
-
- pSolDep = new SolDep( &aMainWin );
- pSolDep->Init();
- aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME ));
- pSolDep->Hide();
- aMainWin.Show();
- Help aHelp;
- SetHelp(&aHelp);
- aHelp.EnableContextHelp();
- aHelp.EnableQuickHelp();
- Execute();
- delete pResMgr;
- delete pSolDep;
-}
-
-// -----------------------------------------------------------------------
-
-MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
- WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)),
- // depper aTaskBarFrame(this, 0)
-{
-//depper aTaskBarFrame.EnableAlwaysOnTop();
-
-//depper aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) );
-//depper aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) );
-//depper SetMenuBar( &aMenuBar );
-//depper aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
-// aToolBox.Show();
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseMove( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseMove( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonDown( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonUp( rMEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyInput( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyInput( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::KeyUp( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyUp( rKEvt );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Paint( const Rectangle& rRect )
-{
- WorkWindow::Paint( rRect );
-}
-
-// -----------------------------------------------------------------------
-
-void MyWin::Resize()
-{
- ((MyApp*)GetpApp())->GetSolDep()->Resize();
- WorkWindow::Resize();
-}
-
-SAL_IMPLEMENT_MAIN()
-{
- //Reference< XMultiServiceFactory > xMS;
-
- // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini
- Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
-
- //xMS = cppu::createRegistryServiceFactory(
- // rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
-
- Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY);
-
- InitVCL( xMS );
- ::comphelper::setProcessServiceFactory(xMS);
- com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
- aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
- aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
-
- ::ucbhelper::ContentBroker::initialize( xMS, aArgs );
-
- aMyApp.Main();
- DeInitVCL();
- return 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 "depapp.hxx" +#include <ucbhelper/contentbroker.hxx> +#include <ucbhelper/configurationkeys.hxx> + +void MyApp::Main() +{ +#if defined(WNT) + pDebugFile = fopen( "fprintf.out", "w" ); +#endif + + pMyApp = GetpApp(); + MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); + pAppWindow = &aMainWin; + // pToolBarFrame = new FloatingWindow( aMainWin, WB_STDWORK ); + //pToolBox = new ToolBox(pToolBarFrame,DtSodResId(TID_SOLDEP_MAIN)); + + pSolDep = new SolDep( &aMainWin ); + pSolDep->Init(); + aMainWin.SetText( String::CreateFromAscii( SOLDEPL_NAME )); + pSolDep->Hide(); + aMainWin.Show(); + Help aHelp; + SetHelp(&aHelp); + aHelp.EnableContextHelp(); + aHelp.EnableQuickHelp(); + Execute(); + delete pResMgr; + delete pSolDep; +} + +// ----------------------------------------------------------------------- + +MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : + WorkWindow( pParent, nWinStyle )//,aToolBox( this, DtSodResId(TID_SOLDEP_MAIN)), + // depper aTaskBarFrame(this, 0) +{ +//depper aTaskBarFrame.EnableAlwaysOnTop(); + +//depper aMenuBar.InsertItem( 1, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Source" ) ) ); +//depper aMenuBar.InsertItem( 2, XubString( RTL_CONSTASCII_USTRINGPARAM( "~Exit" ) ) ); +//depper SetMenuBar( &aMenuBar ); +//depper aToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 )); +// aToolBox.Show(); +} + +// ----------------------------------------------------------------------- + +void MyWin::MouseMove( const MouseEvent& rMEvt ) +{ + WorkWindow::MouseMove( rMEvt ); +} + +// ----------------------------------------------------------------------- + +void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) +{ + WorkWindow::MouseButtonDown( rMEvt ); +} + +// ----------------------------------------------------------------------- + +void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) +{ + WorkWindow::MouseButtonUp( rMEvt ); +} + +// ----------------------------------------------------------------------- + +void MyWin::KeyInput( const KeyEvent& rKEvt ) +{ + WorkWindow::KeyInput( rKEvt ); +} + +// ----------------------------------------------------------------------- + +void MyWin::KeyUp( const KeyEvent& rKEvt ) +{ + WorkWindow::KeyUp( rKEvt ); +} + +// ----------------------------------------------------------------------- + +void MyWin::Paint( const Rectangle& rRect ) +{ + WorkWindow::Paint( rRect ); +} + +// ----------------------------------------------------------------------- + +void MyWin::Resize() +{ + ((MyApp*)GetpApp())->GetSolDep()->Resize(); + WorkWindow::Resize(); +} + +SAL_IMPLEMENT_MAIN() +{ + //Reference< XMultiServiceFactory > xMS; + + // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini + Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); + + //xMS = cppu::createRegistryServiceFactory( + // rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True ); + + Reference< XMultiServiceFactory > xMS( xComponentContext->getServiceManager(), UNO_QUERY); + + InitVCL( xMS ); + ::comphelper::setProcessServiceFactory(xMS); + com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2); + aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); + aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + + ::ucbhelper::ContentBroker::initialize( xMS, aArgs ); + + aMyApp.Main(); + DeInitVCL(); + return 0; +} diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx index e6cb96a63832..cf8c1935c220 100644 --- a/soldep/source/depapp.hxx +++ b/soldep/source/depapp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: depapp.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/depper.cxx b/soldep/source/depper.cxx index c6a4b4899d54..11610ea1fcef 100644 --- a/soldep/source/depper.cxx +++ b/soldep/source/depper.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: depper.cxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/depwin.cxx b/soldep/source/depwin.cxx index 2f4fe79cf410..5d7a1e36e4e7 100644 --- a/soldep/source/depwin.cxx +++ b/soldep/source/depwin.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: depwin.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/graphwin.cxx b/soldep/source/graphwin.cxx index bc120fae2671..7450d654ab38 100644 --- a/soldep/source/graphwin.cxx +++ b/soldep/source/graphwin.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: graphwin.cxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/hashobj.cxx b/soldep/source/hashobj.cxx index b9836316ed7b..7f05dc33870a 100644 --- a/soldep/source/hashobj.cxx +++ b/soldep/source/hashobj.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hashobj.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk index 7ababf509010..5261ee5175f6 100644 --- a/soldep/source/makefile.mk +++ b/soldep/source/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.17 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/objwin.cxx b/soldep/source/objwin.cxx index baa24d41fce0..07eab4dd4cb7 100644 --- a/soldep/source/objwin.cxx +++ b/soldep/source/objwin.cxx @@ -1,824 +1,821 @@ -/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: objwin.cxx,v $
- * $Revision: 1.6 $
- *
- * 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 <tools/list.hxx>
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/help.hxx>
-#include <vcl/wall.hxx>
-
-#include <soldep/objwin.hxx>
-#include <soldep/depwin.hxx>
-//#include "depapp.hxx"
-#include <soldep/depper.hxx>
-//#include "prjdep.hxx"
-#include <soldep/connctr.hxx>
-#include <stdio.h>
-
-static Color aDefaultColor = 0L;
-static Wallpaper* pDefaultWallpaper = 0L;
-
-// Initialize static class member
-BOOL ObjectWin::msbHideMode = FALSE;
-ULONG ObjectWin::msnGlobalViewMask = 0;
-
-
-UINT32 aColorMap[] = {
- RGB_COLORDATA( 0xFF, 0xFF, 0x80 ), //MARKMODE_DEFAULT 0
- COL_GREEN, //MARKMODE_DEPENDING 1
- COL_RED, //MARKMODE_NEEDED 2
- COL_MAGENTA, //1+2
- COL_GRAY, //MARKMODE_ACTIVATED 4
- COL_LIGHTGREEN, //1+4
- COL_LIGHTRED, //2+4
- COL_LIGHTMAGENTA, //1+2+4
- COL_BLUE, //MARKMODE_SELECTED 8
- COL_LIGHTGRAY, //1+8
- COL_CYAN, //2+8
- COL_LIGHTCYAN, //1+2+8
- COL_LIGHTBLUE, //4+8
- COL_BROWN, //1+4+8
- COL_BLACK, //2+4+8
- COL_BLUE //1+2+4+8
-};
-
-
-//
-// class ObjectWin
-//
-
-/*****************************************************************************/
-ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle )
-/*****************************************************************************/
- : Window( pParent, nWinStyle ),
- msBodyText( "" ),
- msTipText( "" ),
- mnObjectId( 0 ),
- mnMarkMode( 0 ),
- mnViewMask( 0 ),
- mbVisible( FALSE ),
- mbMenuExecute( FALSE ),
- mbVisited( FALSE ),
- mnRootDist( 0 ),
- mnHeadDist( 0 ),
- mbFixed( FALSE )
-{
- SetBackground( Wallpaper( aColorMap[0] ));
-
- aTipTimer.SetTimeout( 500 );
- aTipTimer.SetTimeoutHdl(
- LINK( this, ObjectWin, TipHdl ));
-
- SetFont( Font( GetFont() ) );
- Font aFont( GetFont() );
- Size aSize = aFont.GetSize();
- aFont.SetSize( aSize );
- SetFont( aFont );
-
- EnableClipSiblings();
- SetZOrder( NULL, WINDOW_ZORDER_FIRST );
- mpPopup = new PopupMenu();
- mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" ));
- mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" ));
- mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" ));
- mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" ));
-// mpPopup->InsertSeparator();
- mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected ));
- mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated ));
- mnPopupStaticItems = mpPopup->GetItemCount();
-
- if ( ! pDefaultWallpaper )
- {
- pDefaultWallpaper = new Wallpaper( GetBackground() );
- aDefaultColor = GetTextColor();
- }
- Hide();
-}
-
-/*****************************************************************************/
-ObjectWin::~ObjectWin()
-/*****************************************************************************/
-{
- while ( mConnections.Count() > 0 )
- {
- delete mConnections.GetObject( 0 );
- }
-}
-
-void ObjectWin::SetHideMode(BOOL bHide)
-{
- msbHideMode = bHide;
- mConnections.GetObject(0)->SetHideMode(msbHideMode);
-}
-
-BOOL ObjectWin::ToggleHideMode()
-{
- msbHideMode = !msbHideMode;
- mConnections.GetObject(0)->SetHideMode(msbHideMode);
- return msbHideMode;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetViewMask( ULONG nMask )
-/*****************************************************************************/
-{
- mnViewMask = nMask;
- // Compares
- if ( mnViewMask & msnGlobalViewMask) {
- mbVisible = TRUE;
- Show();
- }
- else {
- Hide();
- mbVisible = FALSE;
- }
- for ( ULONG i = 0; i < mConnections.Count(); i++ )
- mConnections.GetObject( i )->UpdateVisibility();
-}
-
-/*****************************************************************************/
-void ObjectWin::SetBodyText( const ByteString& rNewString )
-/*****************************************************************************/
-{
- msBodyText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetBodyText()
-/*****************************************************************************/
-{
- return msBodyText;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetTipText( const ByteString& rNewString )
-/*****************************************************************************/
-{
- msTipText = rNewString;
-}
-
-/*****************************************************************************/
-ByteString& ObjectWin::GetTipText()
-/*****************************************************************************/
-{
- return msTipText;
-}
-
-/*****************************************************************************/
-Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos )
-/*****************************************************************************/
-{
- Point aLocalPoint;
- if ( bUseRealPos )
- aLocalPoint = GetPosPixel();
- else
- aLocalPoint = GetCalcPosPixel();
-
- Size aLocalSize = GetSizePixel();
- Point aRetPoint;
-
- USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ;
- USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ;
-
- // always false...
- //if ( nRefX < 0 ) nRefX = 0;
- //if ( nRefY < 0 ) nRefY = 0;
-
- if ( rRefPoint.X() > nRefX )
- {
- if ( rRefPoint.Y() > nRefY )
- {
- if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
- {
- aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
- aRetPoint.Y() = nRefY;
- }
- else
- {
- aRetPoint.X() = nRefX;
- aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
- }
- }
- else
- {
- if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
- {
- aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width();
- aRetPoint.Y() = nRefY;
- }
- else
- {
- aRetPoint.X() = nRefX;
- aRetPoint.Y() = aLocalPoint.Y();
- }
- }
- }
- else
- {
- if ( rRefPoint.Y() > nRefY )
- {
- if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
- {
- aRetPoint.X() = aLocalPoint.X();
- aRetPoint.Y() = nRefY;
- }
- else
- {
- aRetPoint.X() = nRefX;
- aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height();
- }
- }
- else
- {
- if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY ))
- {
- aRetPoint.X() = aLocalPoint.X();
- aRetPoint.Y() = nRefY;
- }
- else
- {
- aRetPoint.X() = nRefX;
- aRetPoint.Y() = aLocalPoint.Y();
- }
- }
- }
-
- return PixelToLogic(aRetPoint);
-
-}
-
-/*****************************************************************************/
-void ObjectWin::AddConnector( Connector* pNewCon )
-/*****************************************************************************/
-{
- mConnections.Insert( pNewCon );
-}
-
-/*****************************************************************************/
-BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin )
-/*****************************************************************************/
-{
- for ( ULONG i = 0; i < mConnections.Count(); i++ )
- if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin )
- return TRUE;
-
- return FALSE;
-}
-
-/*****************************************************************************/
-void ObjectWin::RemoveConnector( Connector* pOldCon )
-/*****************************************************************************/
-{
- mConnections.Remove( pOldCon );
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( ULONG nIndex )
-/*****************************************************************************/
-{
- ULONG nConCount = mConnections.Count();
-
- if ( nIndex < nConCount )
- return mConnections.GetObject( nIndex );
- return NULL;
-}
-
-/*****************************************************************************/
-Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId )
-/*****************************************************************************/
-{
- if ( mnObjectId != nStartId )
- return NULL;
-
- USHORT i;
- Connector* pCon;
- ULONG nConCount = mConnections.Count();
-
- for ( i = 0; i < nConCount; i++ )
- {
- pCon = mConnections.GetObject( i );
- if ( pCon->GetOtherWin( this )->GetId() == nEndId )
- return pCon;
- }
- return NULL;
-}
-
-void ObjectWin::SetAllConnectorsUnvisible()
-{
- Connector* pCon;
- ULONG nConCount = mConnections.Count();
- for ( ULONG i = 0; i < nConCount; i++ )
- {
- pCon = mConnections.GetObject( i );
- if (pCon) pCon->SetVisibility( FALSE );
- }
-}
-
-/*****************************************************************************/
-void ObjectWin::SetMarkMode( ULONG nMarkMode )
-/*****************************************************************************/
-{
- //Wallpaper aWallpaper;
-
- if ( nMarkMode == MARKMODE_DEFAULT )
- {
- if ( pDefaultWallpaper )
- {
- maObjWallpaper = GetBackground();
- maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
- SetBackground( maObjWallpaper );
- SetTextColor( aDefaultColor );
- }
- }
- else
- {
- mnMarkMode |= nMarkMode;
- maObjWallpaper = GetBackground();
- maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] );
- SetBackground( maObjWallpaper );
- SetTextColor( COL_WHITE );
- }
-
- Invalidate();
-}
-
-/*****************************************************************************/
-void ObjectWin::UnsetMarkMode( ULONG nMarkMode )
-/*****************************************************************************/
-{
- //Wallpaper aWallpaper;
-
- ULONG nOldMode = mnMarkMode;
- mnMarkMode &= ( !nMarkMode );
-
- if ( nOldMode != mnMarkMode ) {
- if ( mnMarkMode == MARKMODE_DEFAULT )
- {
- if ( pDefaultWallpaper )
- {
- maObjWallpaper = GetBackground();
- maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() );
- SetBackground( maObjWallpaper );
- SetTextColor( aDefaultColor );
- }
- }
- else
- {
- maObjWallpaper = GetBackground();
- maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode
- SetBackground( maObjWallpaper );
- SetTextColor( COL_WHITE );
- }
- Invalidate();
- }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkNeeded( BOOL bReset )
-/*****************************************************************************/
-{
- Connector* pCon;
- ObjectWin* pWin;
-
- ULONG nConCount = mConnections.Count();
- ULONG i;
-
- for ( i = 0; i < nConCount; i++ )
- {
- pCon = mConnections.GetObject( i );
- if ( pCon && !pCon->IsStart( this))
- {
- pWin = pCon->GetOtherWin( this );
- if ( pWin )
- {
- if ( bReset )
- pWin->UnsetMarkMode( MARKMODE_NEEDED );
- else
- pWin->SetMarkMode( MARKMODE_NEEDED );
- pWin->MarkNeeded( bReset ); // recursive call
- }
- }
- }
-}
-
-/*****************************************************************************/
-void ObjectWin::MarkDepending( BOOL bReset )
-/*****************************************************************************/
-{
- //if ( !bReset )
- // return;
-
- Connector* pCon;
- ObjectWin* pWin;
-
- ULONG nConCount = mConnections.Count();
- ULONG i;
-
- for ( i = 0; i < nConCount; i++ )
- {
- pCon = mConnections.GetObject( i );
- if ( pCon && pCon->IsStart( this) )
- {
- pWin = pCon->GetOtherWin( this );
- if ( pWin )
- {
- if ( bReset )
- pWin->UnsetMarkMode( MARKMODE_DEPENDING );
- else
- pWin->SetMarkMode( MARKMODE_DEPENDING );
- pWin->MarkDepending( bReset ); // recursive call
- }
- }
- }
-}
-
-/*****************************************************************************/
-void ObjectWin::Paint( const Rectangle& rRect )
-/*****************************************************************************/
-{
- Size aWinSize = PixelToLogic( GetOutputSizePixel() );
- Size aTextSize;
- ByteString sbt = msBodyText; //debug
- //sbt += " "; //debug
- //sbt += ByteString::CreateFromInt32(mnMarkMode); //debug
- aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
- aTextSize.Height() = GetTextHeight();
- Point aPos( aWinSize.Width() / 2 - aTextSize.Width() / 2,
- aWinSize.Height() / 2 - aTextSize.Height() / 2 );
-
- //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 ));
- if (msBodyText =="null") //don't paint this "window"
- {
- Hide();
- Invalidate();
- } else
- DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug
-}
-
-void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset )
-/*****************************************************************************/
-{
- Size aWinSize = PixelToLogic( GetSizePixel() );
- Size aTextSize;
- ByteString sbt = msBodyText;
- aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 ));
- aTextSize.Height() = GetTextHeight();
- Point aPos = GetPosPixel();
- Point aTextPos( aWinSize.Width() / 2 - aTextSize.Width() / 2,
- aWinSize.Height() / 2 - aTextSize.Height() / 2 );
- aTextPos += aPos;
- aPos = pDevice->PixelToLogic( aPos ) - rOffset;
- aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset;
- if ( msBodyText !="null" )
- {
- pDevice->SetFillColor( GetBackground().GetColor() );
- pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) );
- Font aFont( GetFont() );
- Size aSize = aFont.GetSize();
- aSize = pDevice->PixelToLogic( aSize );
- aFont.SetSize( aSize );
- pDevice->SetFont( aFont );
- pDevice->SetTextColor( GetTextColor() );
- pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) );
- }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
- //Notify Soldep to clear ObjectList
- SetZOrder( NULL, WINDOW_ZORDER_FIRST );
- GrabFocus();
-
- // workaround fuer vcl-bug
-// GetWindow( WINDOW_REALPARENT)->Invalidate();
-// MyApp *pApp = (MyApp*)GetpApp();
-// SolDep *pSoldep = pApp->GetSolDep();
-
- maMouseOffset = rMEvt.GetPosPixel();
- if ( rMEvt.IsLeft() )
- {
-
- if ( rMEvt.IsMod2() ) // alt + mouse click left
- {
- CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this );
- }
- else {
- CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this );
- }
- if( rMEvt.GetClicks() == 2 )
- CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this );
- else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon())
- {
- //((DepWin*)GetParent())->SaveSelectedObjWin(&this);
- CaptureMouse();
- }
- }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
- fprintf(stdout,"ObjectWin::MouseButtonUp\n");
- if ( rMEvt.IsLeft() )
- {
- if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon())
- CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this );
-// ((DepWin*)GetParent())->NewConnector( this );
- else
- {
- CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this );
- if ( IsMouseCaptured() ) ReleaseMouse();
- }
- }
- else if ( rMEvt.IsRight() )
- {
- USHORT i;
-
- while ( mnPopupStaticItems < mpPopup->GetItemCount() )
- {
- mpPopup->RemoveItem( mnPopupStaticItems );
- }
-
- if ( mConnections.Count()) {
- mpPopup->InsertSeparator();
-
- for( i = 0; i < mConnections.Count() ; i++ )
- {
- mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 ));
- }
- }
- mbMenuExecute = TRUE;
- mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel());
- }
-}
-
-/*****************************************************************************/
-void ObjectWin::MouseMove( const MouseEvent& rMEvt )
-/*****************************************************************************/
-{
- if ( IsMouseCaptured() )
- {
- USHORT i;
-
- Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset );
-
- aNewWinPos.X() = Max( 0L, aNewWinPos.X());
- aNewWinPos.Y() = Max( 0L, aNewWinPos.Y());
- SetPosPixel( aNewWinPos );
- //int t = mConnections.Count();
-
- for ( i=0; i < mConnections.Count();i++)
- {
- mConnections.GetObject( i )->UpdatePosition( this );
- }
- }
- else // !IsMouseCaptured()
- {
- if ( rMEvt.IsLeaveWindow() )
- aTipTimer.Stop();
- else
- aTipTimer.Start();
-
- MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel());
-
- GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove
- }
-}
-
-/*****************************************************************************/
-USHORT ObjectWin::Save( SvFileStream& rOutFile )
-/*****************************************************************************/
-{
- return 0;
-}
-
-/*****************************************************************************/
-USHORT ObjectWin::Load( SvFileStream& rInFile )
-/*****************************************************************************/
-{
- return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::SetId( ULONG nId )
-/*****************************************************************************/
-{
- mnObjectId = nId;
-}
-
-/*****************************************************************************/
-ULONG ObjectWin::GetId()
-/*****************************************************************************/
-{
- return mnObjectId;
-}
-
-/*****************************************************************************/
-void ObjectWin::UpdateConnectors()
-/*****************************************************************************/
-{
- USHORT i;
-
- for ( i = 0; i < mConnections.Count(); i++ )
- {
- mConnections.GetObject( i )->UpdatePosition( this );
- }
-}
-
-IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l )
-{
- USHORT nItemId = mpPopup_l->GetCurItemId();
-
- switch( nItemId )
- {
- case OBJWIN_EDIT_TEXT :
- DBG_ASSERT( FALSE,"edit");
- break;
- case OBJWIN_REMOVE_WIN :
-// DBG_ASSERT( FALSE,"remove");
-// DBG_ASSERT( mpDepperDontuseme,"remove");
- //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId());
- break;
- case OBJWIN_ADD_CONNECTOR :
-// DBG_ASSERT( FALSE,"add con");
- ((DepWin*)GetParent())->NewConnector( this );
- break;
- case OBJWIN_VIEW_CONTENT :
-// DBG_ASSERT( FALSE,"view cnt");
-// mpDepperDontuseme->ViewContent( msBodyText );
-// TBD: CallEventListener
- break;
- default :
-// DBG_ASSERT( FALSE, String (nItemId) );
- Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1);
- pCon = 0;
-// delete pCon;
-// mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId());
-// TBD: CallEventListener
-
- break;
- }
- return 0;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG )
-/*****************************************************************************/
-{
- aTipTimer.Stop();
-
- if ( msTipText.Len()) {
- Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel());
- Help::ShowBalloon( GetpApp()->GetAppWindow(),
- Point( aPos.X(), aPos.Y()),
- String( msTipText, RTL_TEXTENCODING_UTF8 ));
- }
- return 0;
-}
-
-/*****************************************************************************/
-//void ObjectWin::GetFocus()
-/*****************************************************************************/
-//{
- //SetMarkMode( MARKMODE_SELECTED );
-//}
-
-/*****************************************************************************/
-void ObjectWin::LoseFocus()
-/*****************************************************************************/
-{
- if ( !mbMenuExecute && !msbHideMode ) {
- UnsetMarkMode( MARKMODE_SELECTED );
- UnsetMarkMode( MARKMODE_ACTIVATED );
- MarkNeeded( TRUE );
- MarkDepending( TRUE );
- }
- else
- mbMenuExecute = FALSE;
-}
-
-/*****************************************************************************/
-IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l )
-/*****************************************************************************/
-{
- mbMenuExecute = FALSE;
-
- if ( !HasFocus()) {
- UnsetMarkMode( MARKMODE_SELECTED );
- UnsetMarkMode( MARKMODE_ACTIVATED );
- MarkNeeded( TRUE );
- MarkDepending( TRUE );
- }
-
- return 0;
-}
-
-/*****************************************************************************/
-void ObjectWin::Command( const CommandEvent& rEvent)
-/*****************************************************************************/
-{
- fprintf(stdout, "ObjectWin::Command");
-// mpDepperDontuseme->GetGraphWin()->Command( rEvent );
-// TBD: CallEventListener
-
-}
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-ObjectList::ObjectList() : ObjWinList()
-{
-}
-
-/*****************************************************************************/
-void ObjectList::ResetSelectedObject()
-/*****************************************************************************/
-{
-// return;
-
- ULONG nCount_l = Count();
- ObjectWin* pObjectWin = NULL;
- for (ULONG i=0; i < nCount_l; i++ )
- {
- pObjectWin = GetObject( i );
- pObjectWin->UnsetMarkMode( MARKMODE_SELECTED );
- pObjectWin->UnsetMarkMode( MARKMODE_NEEDED );
- pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING );
- pObjectWin->SetActualWallpaper(*pDefaultWallpaper);
- pObjectWin->SetAllConnectorsUnvisible();
- }
- return;
-}
-
-/*****************************************************************************/
-ObjectWin* ObjectList::GetPtrByName( const ByteString& rText )
-/*****************************************************************************/
-{
- ULONG i = 0;
- ULONG nCount_l = Count();
- ObjectWin* pObjectWin = NULL;
- while ( i < nCount_l )
- {
- pObjectWin = GetObject( i );
- ByteString sPrj = pObjectWin->GetBodyText();
- if (sPrj == rText) return pObjectWin;
- i++;
- }
- return 0;
-}
-
-ObjectList* ObjectList::FindTopLevelModules()
-{
- ObjectList* pList = new ObjectList;
- for ( USHORT i=0; i<Count(); i++ )
- {
- ObjectWin* pObjectWin = GetObject( i );
- if ( pObjectWin->IsTop() )
- pList->Insert( pObjectWin );
- }
-
- return pList;
-}
-
-BOOL ObjectWin::IsTop()
-{
- ULONG nConCount = mConnections.Count();
- for ( ULONG i = 0; i < nConCount; i++ )
- {
- Connector* pCon = mConnections.GetObject( i );
- if ( pCon && pCon->IsStart( this) )
- return FALSE;
- }
-
- return TRUE;
+/************************************************************************* + * + * 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 <tools/list.hxx> +#include <tools/debug.hxx> +#include <vcl/svapp.hxx> +#include <vcl/help.hxx> +#include <vcl/wall.hxx> + +#include <soldep/objwin.hxx> +#include <soldep/depwin.hxx> +//#include "depapp.hxx" +#include <soldep/depper.hxx> +//#include "prjdep.hxx" +#include <soldep/connctr.hxx> +#include <stdio.h> + +static Color aDefaultColor = 0L; +static Wallpaper* pDefaultWallpaper = 0L; + +// Initialize static class member +BOOL ObjectWin::msbHideMode = FALSE; +ULONG ObjectWin::msnGlobalViewMask = 0; + + +UINT32 aColorMap[] = { + RGB_COLORDATA( 0xFF, 0xFF, 0x80 ), //MARKMODE_DEFAULT 0 + COL_GREEN, //MARKMODE_DEPENDING 1 + COL_RED, //MARKMODE_NEEDED 2 + COL_MAGENTA, //1+2 + COL_GRAY, //MARKMODE_ACTIVATED 4 + COL_LIGHTGREEN, //1+4 + COL_LIGHTRED, //2+4 + COL_LIGHTMAGENTA, //1+2+4 + COL_BLUE, //MARKMODE_SELECTED 8 + COL_LIGHTGRAY, //1+8 + COL_CYAN, //2+8 + COL_LIGHTCYAN, //1+2+8 + COL_LIGHTBLUE, //4+8 + COL_BROWN, //1+4+8 + COL_BLACK, //2+4+8 + COL_BLUE //1+2+4+8 +}; + + +// +// class ObjectWin +// + +/*****************************************************************************/ +ObjectWin::ObjectWin( Window* pParent, WinBits nWinStyle ) +/*****************************************************************************/ + : Window( pParent, nWinStyle ), + msBodyText( "" ), + msTipText( "" ), + mnObjectId( 0 ), + mnMarkMode( 0 ), + mnViewMask( 0 ), + mbVisible( FALSE ), + mbMenuExecute( FALSE ), + mbVisited( FALSE ), + mnRootDist( 0 ), + mnHeadDist( 0 ), + mbFixed( FALSE ) +{ + SetBackground( Wallpaper( aColorMap[0] )); + + aTipTimer.SetTimeout( 500 ); + aTipTimer.SetTimeoutHdl( + LINK( this, ObjectWin, TipHdl )); + + SetFont( Font( GetFont() ) ); + Font aFont( GetFont() ); + Size aSize = aFont.GetSize(); + aFont.SetSize( aSize ); + SetFont( aFont ); + + EnableClipSiblings(); + SetZOrder( NULL, WINDOW_ZORDER_FIRST ); + mpPopup = new PopupMenu(); + mpPopup->InsertItem( OBJWIN_EDIT_TEXT, String::CreateFromAscii( "Details" )); + mpPopup->InsertItem( OBJWIN_ADD_CONNECTOR, String::CreateFromAscii( "New connection" )); + mpPopup->InsertItem( OBJWIN_REMOVE_WIN, String::CreateFromAscii( "Remove object" )); + mpPopup->InsertItem( OBJWIN_VIEW_CONTENT, String::CreateFromAscii( "View content" )); +// mpPopup->InsertSeparator(); + mpPopup->SetSelectHdl( LINK( this, ObjectWin, PopupSelected )); + mpPopup->SetDeactivateHdl( LINK( this, ObjectWin, PopupDeactivated )); + mnPopupStaticItems = mpPopup->GetItemCount(); + + if ( ! pDefaultWallpaper ) + { + pDefaultWallpaper = new Wallpaper( GetBackground() ); + aDefaultColor = GetTextColor(); + } + Hide(); +} + +/*****************************************************************************/ +ObjectWin::~ObjectWin() +/*****************************************************************************/ +{ + while ( mConnections.Count() > 0 ) + { + delete mConnections.GetObject( 0 ); + } +} + +void ObjectWin::SetHideMode(BOOL bHide) +{ + msbHideMode = bHide; + mConnections.GetObject(0)->SetHideMode(msbHideMode); +} + +BOOL ObjectWin::ToggleHideMode() +{ + msbHideMode = !msbHideMode; + mConnections.GetObject(0)->SetHideMode(msbHideMode); + return msbHideMode; +} + +/*****************************************************************************/ +void ObjectWin::SetViewMask( ULONG nMask ) +/*****************************************************************************/ +{ + mnViewMask = nMask; + // Compares + if ( mnViewMask & msnGlobalViewMask) { + mbVisible = TRUE; + Show(); + } + else { + Hide(); + mbVisible = FALSE; + } + for ( ULONG i = 0; i < mConnections.Count(); i++ ) + mConnections.GetObject( i )->UpdateVisibility(); +} + +/*****************************************************************************/ +void ObjectWin::SetBodyText( const ByteString& rNewString ) +/*****************************************************************************/ +{ + msBodyText = rNewString; +} + +/*****************************************************************************/ +ByteString& ObjectWin::GetBodyText() +/*****************************************************************************/ +{ + return msBodyText; +} + +/*****************************************************************************/ +void ObjectWin::SetTipText( const ByteString& rNewString ) +/*****************************************************************************/ +{ + msTipText = rNewString; +} + +/*****************************************************************************/ +ByteString& ObjectWin::GetTipText() +/*****************************************************************************/ +{ + return msTipText; +} + +/*****************************************************************************/ +Point ObjectWin::GetFixPoint( const Point& rRefPoint, BOOL bUseRealPos ) +/*****************************************************************************/ +{ + Point aLocalPoint; + if ( bUseRealPos ) + aLocalPoint = GetPosPixel(); + else + aLocalPoint = GetCalcPosPixel(); + + Size aLocalSize = GetSizePixel(); + Point aRetPoint; + + USHORT nRefX = aLocalPoint.X() + aLocalSize.Width() / 2 ; + USHORT nRefY = aLocalPoint.Y() + aLocalSize.Height() / 2 ; + + // always false... + //if ( nRefX < 0 ) nRefX = 0; + //if ( nRefY < 0 ) nRefY = 0; + + if ( rRefPoint.X() > nRefX ) + { + if ( rRefPoint.Y() > nRefY ) + { + if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) + { + aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width(); + aRetPoint.Y() = nRefY; + } + else + { + aRetPoint.X() = nRefX; + aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height(); + } + } + else + { + if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) + { + aRetPoint.X() = aLocalPoint.X() + aLocalSize.Width(); + aRetPoint.Y() = nRefY; + } + else + { + aRetPoint.X() = nRefX; + aRetPoint.Y() = aLocalPoint.Y(); + } + } + } + else + { + if ( rRefPoint.Y() > nRefY ) + { + if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) + { + aRetPoint.X() = aLocalPoint.X(); + aRetPoint.Y() = nRefY; + } + else + { + aRetPoint.X() = nRefX; + aRetPoint.Y() = aLocalPoint.Y() + aLocalSize.Height(); + } + } + else + { + if ( Abs( rRefPoint.X() - nRefX ) > Abs( rRefPoint.Y() - nRefY )) + { + aRetPoint.X() = aLocalPoint.X(); + aRetPoint.Y() = nRefY; + } + else + { + aRetPoint.X() = nRefX; + aRetPoint.Y() = aLocalPoint.Y(); + } + } + } + + return PixelToLogic(aRetPoint); + +} + +/*****************************************************************************/ +void ObjectWin::AddConnector( Connector* pNewCon ) +/*****************************************************************************/ +{ + mConnections.Insert( pNewCon ); +} + +/*****************************************************************************/ +BOOL ObjectWin::ConnectionExistsInAnyDirection( ObjectWin *pWin ) +/*****************************************************************************/ +{ + for ( ULONG i = 0; i < mConnections.Count(); i++ ) + if ( mConnections.GetObject( i )->GetOtherWin( this ) == pWin ) + return TRUE; + + return FALSE; +} + +/*****************************************************************************/ +void ObjectWin::RemoveConnector( Connector* pOldCon ) +/*****************************************************************************/ +{ + mConnections.Remove( pOldCon ); +} + +/*****************************************************************************/ +Connector* ObjectWin::GetConnector( ULONG nIndex ) +/*****************************************************************************/ +{ + ULONG nConCount = mConnections.Count(); + + if ( nIndex < nConCount ) + return mConnections.GetObject( nIndex ); + return NULL; +} + +/*****************************************************************************/ +Connector* ObjectWin::GetConnector( ULONG nStartId, ULONG nEndId ) +/*****************************************************************************/ +{ + if ( mnObjectId != nStartId ) + return NULL; + + USHORT i; + Connector* pCon; + ULONG nConCount = mConnections.Count(); + + for ( i = 0; i < nConCount; i++ ) + { + pCon = mConnections.GetObject( i ); + if ( pCon->GetOtherWin( this )->GetId() == nEndId ) + return pCon; + } + return NULL; +} + +void ObjectWin::SetAllConnectorsUnvisible() +{ + Connector* pCon; + ULONG nConCount = mConnections.Count(); + for ( ULONG i = 0; i < nConCount; i++ ) + { + pCon = mConnections.GetObject( i ); + if (pCon) pCon->SetVisibility( FALSE ); + } +} + +/*****************************************************************************/ +void ObjectWin::SetMarkMode( ULONG nMarkMode ) +/*****************************************************************************/ +{ + //Wallpaper aWallpaper; + + if ( nMarkMode == MARKMODE_DEFAULT ) + { + if ( pDefaultWallpaper ) + { + maObjWallpaper = GetBackground(); + maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() ); + SetBackground( maObjWallpaper ); + SetTextColor( aDefaultColor ); + } + } + else + { + mnMarkMode |= nMarkMode; + maObjWallpaper = GetBackground(); + maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); + SetBackground( maObjWallpaper ); + SetTextColor( COL_WHITE ); + } + + Invalidate(); +} + +/*****************************************************************************/ +void ObjectWin::UnsetMarkMode( ULONG nMarkMode ) +/*****************************************************************************/ +{ + //Wallpaper aWallpaper; + + ULONG nOldMode = mnMarkMode; + mnMarkMode &= ( !nMarkMode ); + + if ( nOldMode != mnMarkMode ) { + if ( mnMarkMode == MARKMODE_DEFAULT ) + { + if ( pDefaultWallpaper ) + { + maObjWallpaper = GetBackground(); + maObjWallpaper.SetColor( pDefaultWallpaper->GetColor() ); + SetBackground( maObjWallpaper ); + SetTextColor( aDefaultColor ); + } + } + else + { + maObjWallpaper = GetBackground(); + maObjWallpaper.SetColor( aColorMap[ mnMarkMode ] ); //mnMarkMode + SetBackground( maObjWallpaper ); + SetTextColor( COL_WHITE ); + } + Invalidate(); + } +} + +/*****************************************************************************/ +void ObjectWin::MarkNeeded( BOOL bReset ) +/*****************************************************************************/ +{ + Connector* pCon; + ObjectWin* pWin; + + ULONG nConCount = mConnections.Count(); + ULONG i; + + for ( i = 0; i < nConCount; i++ ) + { + pCon = mConnections.GetObject( i ); + if ( pCon && !pCon->IsStart( this)) + { + pWin = pCon->GetOtherWin( this ); + if ( pWin ) + { + if ( bReset ) + pWin->UnsetMarkMode( MARKMODE_NEEDED ); + else + pWin->SetMarkMode( MARKMODE_NEEDED ); + pWin->MarkNeeded( bReset ); // recursive call + } + } + } +} + +/*****************************************************************************/ +void ObjectWin::MarkDepending( BOOL bReset ) +/*****************************************************************************/ +{ + //if ( !bReset ) + // return; + + Connector* pCon; + ObjectWin* pWin; + + ULONG nConCount = mConnections.Count(); + ULONG i; + + for ( i = 0; i < nConCount; i++ ) + { + pCon = mConnections.GetObject( i ); + if ( pCon && pCon->IsStart( this) ) + { + pWin = pCon->GetOtherWin( this ); + if ( pWin ) + { + if ( bReset ) + pWin->UnsetMarkMode( MARKMODE_DEPENDING ); + else + pWin->SetMarkMode( MARKMODE_DEPENDING ); + pWin->MarkDepending( bReset ); // recursive call + } + } + } +} + +/*****************************************************************************/ +void ObjectWin::Paint( const Rectangle& rRect ) +/*****************************************************************************/ +{ + Size aWinSize = PixelToLogic( GetOutputSizePixel() ); + Size aTextSize; + ByteString sbt = msBodyText; //debug + //sbt += " "; //debug + //sbt += ByteString::CreateFromInt32(mnMarkMode); //debug + aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 )); + aTextSize.Height() = GetTextHeight(); + Point aPos( aWinSize.Width() / 2 - aTextSize.Width() / 2, + aWinSize.Height() / 2 - aTextSize.Height() / 2 ); + + //DrawText( aPos , String( sBodyText, RTL_TEXTENCODING_UTF8 )); + if (msBodyText =="null") //don't paint this "window" + { + Hide(); + Invalidate(); + } else + DrawText( aPos , String( sbt, RTL_TEXTENCODING_UTF8 )); //debug +} + +void ObjectWin::DrawOutput( OutputDevice* pDevice, const Point& rOffset ) +/*****************************************************************************/ +{ + Size aWinSize = PixelToLogic( GetSizePixel() ); + Size aTextSize; + ByteString sbt = msBodyText; + aTextSize.Width() = GetTextWidth( String( msBodyText, RTL_TEXTENCODING_UTF8 )); + aTextSize.Height() = GetTextHeight(); + Point aPos = GetPosPixel(); + Point aTextPos( aWinSize.Width() / 2 - aTextSize.Width() / 2, + aWinSize.Height() / 2 - aTextSize.Height() / 2 ); + aTextPos += aPos; + aPos = pDevice->PixelToLogic( aPos ) - rOffset; + aTextPos = pDevice->PixelToLogic( aTextPos ) - rOffset; + if ( msBodyText !="null" ) + { + pDevice->SetFillColor( GetBackground().GetColor() ); + pDevice->DrawRect( Rectangle( aPos, pDevice->PixelToLogic( GetSizePixel() ) ) ); + Font aFont( GetFont() ); + Size aSize = aFont.GetSize(); + aSize = pDevice->PixelToLogic( aSize ); + aFont.SetSize( aSize ); + pDevice->SetFont( aFont ); + pDevice->SetTextColor( GetTextColor() ); + pDevice->DrawText( aTextPos, String( sbt, RTL_TEXTENCODING_UTF8 ) ); + } +} + +/*****************************************************************************/ +void ObjectWin::MouseButtonDown( const MouseEvent& rMEvt ) +/*****************************************************************************/ +{ + //Notify Soldep to clear ObjectList + SetZOrder( NULL, WINDOW_ZORDER_FIRST ); + GrabFocus(); + + // workaround fuer vcl-bug +// GetWindow( WINDOW_REALPARENT)->Invalidate(); +// MyApp *pApp = (MyApp*)GetpApp(); +// SolDep *pSoldep = pApp->GetSolDep(); + + maMouseOffset = rMEvt.GetPosPixel(); + if ( rMEvt.IsLeft() ) + { + + if ( rMEvt.IsMod2() ) // alt + mouse click left + { + CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT, this ); + } + else { + CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN, this ); + } + if( rMEvt.GetClicks() == 2 ) + CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK, this ); + else if ( !rMEvt.IsShift() && !((DepWin*)GetParent())->IsStartNewCon()) + { + //((DepWin*)GetParent())->SaveSelectedObjWin(&this); + CaptureMouse(); + } + } +} + +/*****************************************************************************/ +void ObjectWin::MouseButtonUp( const MouseEvent& rMEvt ) +/*****************************************************************************/ +{ + fprintf(stdout,"ObjectWin::MouseButtonUp\n"); + if ( rMEvt.IsLeft() ) + { + if ( rMEvt.IsShift() || ((DepWin*)GetParent())->IsStartNewCon()) + CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP_SHFT, this ); +// ((DepWin*)GetParent())->NewConnector( this ); + else + { + CallEventListeners( VCLEVENT_USER_MOUSEBUTTON_UP, this ); + if ( IsMouseCaptured() ) ReleaseMouse(); + } + } + else if ( rMEvt.IsRight() ) + { + USHORT i; + + while ( mnPopupStaticItems < mpPopup->GetItemCount() ) + { + mpPopup->RemoveItem( mnPopupStaticItems ); + } + + if ( mConnections.Count()) { + mpPopup->InsertSeparator(); + + for( i = 0; i < mConnections.Count() ; i++ ) + { + mpPopup->InsertItem( mnPopupStaticItems + i + 1, String( ((mConnections.GetObject( i ))->GetOtherWin( this ))->GetBodyText(), RTL_TEXTENCODING_UTF8 )); + } + } + mbMenuExecute = TRUE; + mpPopup->Execute( GetParent(), rMEvt.GetPosPixel() + GetPosPixel()); + } +} + +/*****************************************************************************/ +void ObjectWin::MouseMove( const MouseEvent& rMEvt ) +/*****************************************************************************/ +{ + if ( IsMouseCaptured() ) + { + USHORT i; + + Point aNewWinPos( GetPosPixel() + rMEvt.GetPosPixel() - maMouseOffset ); + + aNewWinPos.X() = Max( 0L, aNewWinPos.X()); + aNewWinPos.Y() = Max( 0L, aNewWinPos.Y()); + SetPosPixel( aNewWinPos ); + //int t = mConnections.Count(); + + for ( i=0; i < mConnections.Count();i++) + { + mConnections.GetObject( i )->UpdatePosition( this ); + } + } + else // !IsMouseCaptured() + { + if ( rMEvt.IsLeaveWindow() ) + aTipTimer.Stop(); + else + aTipTimer.Start(); + + MouseEvent aNewMEvt( rMEvt.GetPosPixel() + GetPosPixel()); + + GetParent()->MouseMove( aNewMEvt ); //call to DepWin::MouseMove + } +} + +/*****************************************************************************/ +USHORT ObjectWin::Save( SvFileStream& rOutFile ) +/*****************************************************************************/ +{ + return 0; +} + +/*****************************************************************************/ +USHORT ObjectWin::Load( SvFileStream& rInFile ) +/*****************************************************************************/ +{ + return 0; +} + +/*****************************************************************************/ +void ObjectWin::SetId( ULONG nId ) +/*****************************************************************************/ +{ + mnObjectId = nId; +} + +/*****************************************************************************/ +ULONG ObjectWin::GetId() +/*****************************************************************************/ +{ + return mnObjectId; +} + +/*****************************************************************************/ +void ObjectWin::UpdateConnectors() +/*****************************************************************************/ +{ + USHORT i; + + for ( i = 0; i < mConnections.Count(); i++ ) + { + mConnections.GetObject( i )->UpdatePosition( this ); + } +} + +IMPL_LINK( ObjectWin, PopupSelected, PopupMenu*, mpPopup_l ) +{ + USHORT nItemId = mpPopup_l->GetCurItemId(); + + switch( nItemId ) + { + case OBJWIN_EDIT_TEXT : + DBG_ASSERT( FALSE,"edit"); + break; + case OBJWIN_REMOVE_WIN : +// DBG_ASSERT( FALSE,"remove"); +// DBG_ASSERT( mpDepperDontuseme,"remove"); + //mpDepperDontuseme->RemoveObject(mpDepperDontuseme->mpObjectList, ( USHORT ) GetId()); + break; + case OBJWIN_ADD_CONNECTOR : +// DBG_ASSERT( FALSE,"add con"); + ((DepWin*)GetParent())->NewConnector( this ); + break; + case OBJWIN_VIEW_CONTENT : +// DBG_ASSERT( FALSE,"view cnt"); +// mpDepperDontuseme->ViewContent( msBodyText ); +// TBD: CallEventListener + break; + default : +// DBG_ASSERT( FALSE, String (nItemId) ); + Connector* pCon = mConnections.GetObject( nItemId - mnPopupStaticItems - 1); + pCon = 0; +// delete pCon; +// mpDepperDontuseme->RemoveConnector( pCon->GetStartId(), pCon->GetEndId()); +// TBD: CallEventListener + + break; + } + return 0; +} + +/*****************************************************************************/ +IMPL_LINK( ObjectWin, TipHdl, void *, EMTY_ARG ) +/*****************************************************************************/ +{ + aTipTimer.Stop(); + + if ( msTipText.Len()) { + Point aPos( GetpApp()->GetAppWindow()->GetPointerPosPixel()); + Help::ShowBalloon( GetpApp()->GetAppWindow(), + Point( aPos.X(), aPos.Y()), + String( msTipText, RTL_TEXTENCODING_UTF8 )); + } + return 0; +} + +/*****************************************************************************/ +//void ObjectWin::GetFocus() +/*****************************************************************************/ +//{ + //SetMarkMode( MARKMODE_SELECTED ); +//} + +/*****************************************************************************/ +void ObjectWin::LoseFocus() +/*****************************************************************************/ +{ + if ( !mbMenuExecute && !msbHideMode ) { + UnsetMarkMode( MARKMODE_SELECTED ); + UnsetMarkMode( MARKMODE_ACTIVATED ); + MarkNeeded( TRUE ); + MarkDepending( TRUE ); + } + else + mbMenuExecute = FALSE; +} + +/*****************************************************************************/ +IMPL_LINK( ObjectWin, PopupDeactivated, PopupMenu*, mpPopup_l ) +/*****************************************************************************/ +{ + mbMenuExecute = FALSE; + + if ( !HasFocus()) { + UnsetMarkMode( MARKMODE_SELECTED ); + UnsetMarkMode( MARKMODE_ACTIVATED ); + MarkNeeded( TRUE ); + MarkDepending( TRUE ); + } + + return 0; +} + +/*****************************************************************************/ +void ObjectWin::Command( const CommandEvent& rEvent) +/*****************************************************************************/ +{ + fprintf(stdout, "ObjectWin::Command"); +// mpDepperDontuseme->GetGraphWin()->Command( rEvent ); +// TBD: CallEventListener + +} + +/*****************************************************************************/ +/*****************************************************************************/ + +ObjectList::ObjectList() : ObjWinList() +{ +} + +/*****************************************************************************/ +void ObjectList::ResetSelectedObject() +/*****************************************************************************/ +{ +// return; + + ULONG nCount_l = Count(); + ObjectWin* pObjectWin = NULL; + for (ULONG i=0; i < nCount_l; i++ ) + { + pObjectWin = GetObject( i ); + pObjectWin->UnsetMarkMode( MARKMODE_SELECTED ); + pObjectWin->UnsetMarkMode( MARKMODE_NEEDED ); + pObjectWin->UnsetMarkMode( MARKMODE_DEPENDING ); + pObjectWin->SetActualWallpaper(*pDefaultWallpaper); + pObjectWin->SetAllConnectorsUnvisible(); + } + return; +} + +/*****************************************************************************/ +ObjectWin* ObjectList::GetPtrByName( const ByteString& rText ) +/*****************************************************************************/ +{ + ULONG i = 0; + ULONG nCount_l = Count(); + ObjectWin* pObjectWin = NULL; + while ( i < nCount_l ) + { + pObjectWin = GetObject( i ); + ByteString sPrj = pObjectWin->GetBodyText(); + if (sPrj == rText) return pObjectWin; + i++; + } + return 0; +} + +ObjectList* ObjectList::FindTopLevelModules() +{ + ObjectList* pList = new ObjectList; + for ( USHORT i=0; i<Count(); i++ ) + { + ObjectWin* pObjectWin = GetObject( i ); + if ( pObjectWin->IsTop() ) + pList->Insert( pObjectWin ); + } + + return pList; +} + +BOOL ObjectWin::IsTop() +{ + ULONG nConCount = mConnections.Count(); + for ( ULONG i = 0; i < nConCount; i++ ) + { + Connector* pCon = mConnections.GetObject( i ); + if ( pCon && pCon->IsStart( this) ) + return FALSE; + } + + return TRUE; }
\ No newline at end of file diff --git a/soldep/source/sdtresid.cxx b/soldep/source/sdtresid.cxx index b4f3edb51d66..02977059f5c6 100644 --- a/soldep/source/sdtresid.cxx +++ b/soldep/source/sdtresid.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtresid.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx index bc4d096f764e..ce94afbbab92 100644 --- a/soldep/source/soldep.cxx +++ b/soldep/source/soldep.cxx @@ -1,1810 +1,1807 @@ -/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: soldep.cxx,v $
- * $Revision: 1.9 $
- *
- * 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.
- *
- ************************************************************************/
-//TBD: ToolBox handling prjview/back
-
-#include <osl/file.hxx>
-#include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
-#include <bootstrp/sstring.hxx>
-#include <svtools/filedlg.hxx>
-#include <tools/iparser.hxx>
-#include <tools/geninfo.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/bitmap.hxx>
-#include <appdef.hxx>
-#include "time.h"
-#include <soldep/depper.hxx>
-#include <soldep/soldep.hxx>
-#include <soldep/soldlg.hxx>
-#include "dtsodcmp.hrc"
-
-IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );
-//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );
-#define EVENT_RESIZE 0x00000001
-#define MIN(a,b) (a)<(b)?(a):(b)
-#define MAX(a,b) (a)>(b)?(a):(b)
-
-
-//ByteString sDelimiterLine("#==========================================================================");
-
-
-//
-// class SolDep
-//
-
-/*****************************************************************************/
-SolDep::SolDep( Window* pBaseWindow )
-/*****************************************************************************/
- : Depper( pBaseWindow ),
- mbBServer(FALSE),
- mpTravellerList( NULL ),
- mbIsHide( FALSE )
-{
- mnSolWinCount = 0;
- mnSolLastId = 0;
-// mpPrjIdMapper = new SolIdMapper( 63997 );
- maTaskBarFrame.EnableAlwaysOnTop();
- maTaskBarFrame.Show();
- maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
- maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect ));
- maToolBox.Show();
-
- mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener ));
-
- // Kontext-Menue (gehört zu soldep.cxx)
- InitContextMenueMainWnd();
- InitContextMenuePrjViewWnd( mpBasePrjWin );
-}
-
-/*****************************************************************************/
-SolDep::~SolDep()
-/*****************************************************************************/
-{
- mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) );
- delete mpSolIdMapper;
- delete mpStarWriter;
- delete mpStandLst;
-}
-
-/*****************************************************************************/
-void SolDep::Init()
-/*****************************************************************************/
-{
- InformationParser aParser;
- String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
- mpStandLst = aParser.Execute( sStandLst );
- ByteString aUpdater( getenv("UPDATER") );
- if ( mpStandLst && (aUpdater == "YES") ) {
- if ( GetVersion() )
- ReadSource( TRUE );
- } else
- {
- ReadSource(); // if stand.lst isn't available
- }
-}
-
-/*****************************************************************************/
-void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList )
-/*****************************************************************************/
-{
- // Interface for bs
- mbBServer=TRUE;
- if ( pVersionList )
- mpStandLst = new GenericInformationList( *pVersionList );
- else {
- InformationParser aParser;
- String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US );
- mpStandLst = aParser.Execute( sStandLst );
- }
- if ( mpStandLst ) {
- msVersionMajor = ByteString( rVersion );
- ReadSource(TRUE); //call from build server set UPDATER to TRUE
- }
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent )
-/*****************************************************************************/
-{
- if ( pEvent && pEvent->ISA( VclWindowEvent ) )
- {
- ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
- }
- return 0;
-}
-
-
-/*****************************************************************************/
-void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
-/*****************************************************************************/
-{
- Window* pChildWin = _rVclWindowEvent.GetWindow();
-// Window* pParentWin = pChildWin->GetParent();
-//Resize();
- if ( isAlive() )
- {
- ULONG id = _rVclWindowEvent.GetId();
- switch ( id )
- {
- case VCLEVENT_USER_MOUSEBUTTON_DOWN:
- {
- ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
- if( pObjWin )
- {
- // handle mouse click on ObjectWin object
- ObjectWin* pWin = (ObjectWin*) pChildWin;
- //GetObjectList()->ResetSelectedObject();
- if (IsHideMode()) // simple mouse click left
- {
- pWin->CaptureMouse();
- pWin->SetMarkMode( MARKMODE_SELECTED );
- pWin->MarkNeeded();
- pWin->MarkDepending();
- pWin->Invalidate();
- } else
- {
- pWin->LoseFocus();
- pWin->SetMarkMode( MARKMODE_SELECTED );
- pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
- pWin->MarkNeeded( TRUE );
- pWin->MarkDepending( TRUE );
- }
-
- }
- }
- break;
- case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
- {
- ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
- if( pObjWin )
- {
- ObjectWin* pWin = (ObjectWin*) pChildWin;
- MarkObjects( pWin );
- }
- }
- break;
- case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
- {
- ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
- if( pObjWin )
- {
- if (IsHideMode()) ToggleHideDependency();
- ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
- ViewContent(text);
- }
- }
- break;
- case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
- {
- ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
- if( pObjWin )
- {
- ObjectWin* pWin = (ObjectWin*) pChildWin;
- GetDepWin()->NewConnector( pWin );
- }
- }
- break;
- case VCLEVENT_USER_MOUSEBUTTON_UP:
- {
- ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
- if( pObjWin )
- {
- ObjectWin* pWin = (ObjectWin*) pChildWin;
- pWin->ReleaseMouse();
- pWin->SetMarkMode(MARKMODE_SELECTED);
- GetDepWin()->Invalidate();
- }
- }
- break;
- } // switch
- } // if isAlive
- //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);
-}
-
-/*****************************************************************************/
-IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
-/*****************************************************************************/
-{
- USHORT nItemId = pBox->GetCurItemId();
- switch ( nItemId )
- {
- case TID_SOLDEP_FIND:
- FindProject();
- break;
- case TID_SOLDEP_CREATEMETA :
- {
- VirtualDevice aVDev;
- aVDev.SetMapMode( MAP_100TH_MM );
- GDIMetaFile aMtf;
- aVDev.EnableOutput( FALSE );
- aMtf.Record( &aVDev );
-
- aVDev.SetLineColor( Color( COL_BLACK ) );
- aVDev.SetTextAlign( ALIGN_TOP );
-
- Size aSize( GetDepWin()->GetOutputSizePixel() );
- long nXMin = aSize.Width();
- long nXMax = 0;
- long nYMax = 0;
- long nYMin = aSize.Height();
-
- for ( USHORT i=0; i<mpObjectList->Count(); i++ )
- {
- Point aPoint = mpObjectList->GetObject(i)->GetPosPixel();
- Size aSize = mpObjectList->GetObject(i)->GetSizePixel();
- nXMin = MIN( aPoint.X(), nXMin );
- nXMax = MAX( aPoint.X() + aSize.Width(), nXMax );
- nYMin = MIN( aPoint.Y(), nYMin );
- nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax );
- }
-
- Point aOffset( nXMin, nYMin );
- aOffset = aVDev.PixelToLogic( aOffset );
-
- GetDepWin()->DrawOutput( &aVDev, aOffset );
- for ( USHORT i=0; i<mpObjectList->Count(); i++ )
- if ( mpObjectList->GetObject(i)->IsVisible() )
- mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset );
-
- aMtf.Stop();
- aMtf.WindStart();
- aMtf.SetPrefMapMode( aVDev.GetMapMode() );
- Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10);
- aDevSize = aVDev.PixelToLogic( aDevSize );
- aMtf.SetPrefSize( aDevSize );
- SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );
- aMtf.Write( aStream );
- break;
- }
- case TID_SOLDEP_HIDE_INDEPENDEND:
- {
- ToggleHideDependency();
- for ( USHORT i=0; i<mpObjectList->Count(); i++ )
- mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
-
- maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
- GetDepWin()->Invalidate(); //repaint Main-View
- }
- break;
- case TID_SOLDEP_SELECT_WORKSPACE:
- if (mpStandLst)
- {
- if (GetVersion()) // Version dialog box
- {
- delete mpSolIdMapper;
- delete mpStarWriter;
- mpObjectList->ClearAndDelete();
- ReadSource(TRUE);
- }
- }
- break;
- case TID_SOLDEP_BACK:
- maToolBox.HideItem(TID_SOLDEP_BACK);
- maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE); //disabled for prj view (doubleclick ObjWin)
- maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND); //disabled for prj view (doubleclick ObjWin)
- maToolBox.ShowItem(TID_SOLDEP_FIND); //disabled for prj view (doubleclick ObjWin)
- maToolBox.Resize();
- TogglePrjViewStatus();
- break;
- }
- return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ToggleHideDependency()
-/*****************************************************************************/
-{
- mbIsHide = !mbIsHide;
- maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
- ObjectWin* pWin = GetObjectList()->GetObject( 0 );
- pWin->ToggleHideMode();
-};
-
-/*****************************************************************************/
-BOOL SolDep::GetVersion()
-/*****************************************************************************/
-{
- SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst );
- if ( aVersionDlg.Execute() == RET_OK ) {
- msVersionMajor = aVersionDlg.GetVersionMajor();
- msVersionMinor = aVersionDlg.GetVersionMinor();
- return TRUE;
- }
- return FALSE;
-}
-
-void SolDep::InitContextMenueMainWnd()
-{
- InitContextMenuePrjViewWnd( mpBaseWin );
- return; // Disable not actually supported items
-
- mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ;
- mpBaseWin->mpPopup->InsertSeparator();
- mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") );
- mpBaseWin->mpPopup->InsertSeparator();
- mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") );
- mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") );
-}
-
-void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin )
-{
- // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") );
- pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") );
- pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") );
- pBaseWin->mpPopup->InsertSeparator();
- // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") );
- pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") );
-}
-
-/*****************************************************************************/
-ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )
-/*****************************************************************************/
-{
- Prj* pPrj;
-
-//hshtable auf stand halten
- ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );
- if ( pWin )
- {
- ByteString aBodyText( pWin->GetBodyText() );
- if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )
- {
- mpStarWriter->Remove( pPrj );
-//cleanup ist teuer...
- mpStarWriter->CleanUp();
- delete pPrj;
- }
- else
- DBG_ASSERT( FALSE, "project not found - write" );
-
- mpSolIdMapper->Delete( aBodyText );
- if ( bDelete )
- delete pWin;
- return pWin;
- }
- else
- return NULL;
-}
-
-/*****************************************************************************/
-ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )
-/*****************************************************************************/
-{
- ULONG nObjectId;
- if ( bInteract )
- {
- nObjectId = HandleNewPrjDialog( rBodyText );
- }
- else
- {
-//hashtable auf stand halten
- MyHashObject* pHObject;
- nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );
- pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));
- mpSolIdMapper->Insert( rBodyText, pHObject );
- }
- return nObjectId;
-}
-
-/*****************************************************************************/
-ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )
-/*****************************************************************************/
-{
- ULONG nObjectId;
- if ( bInteract )
- {
- nObjectId = HandleNewDirectoryDialog( rBodyText );
- }
- else
- {
-//hshtable auf stand halten
- MyHashObject* pHObject;
- nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );
- pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
- mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
- }
- return nObjectId;
-}
-
-/*****************************************************************************/
-USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
-// DBG_ASSERT( FALSE , "not yet" );
- ByteString sEndName = pEndWin->GetBodyText();
- ByteString sStartName = pStartWin->GetBodyText();
-
- Prj* pPrj = mpStarWriter->GetPrj( sEndName );
- if ( pPrj )
- {
- pPrj->AddDependencies( sStartName );
- return AddConnectorToObjects( pStartWin, pEndWin );
- }
- else
- {
- DBG_ASSERT( FALSE , "non existing Project" );
- return 1;
- }
-}
-
-/*****************************************************************************/
-USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
-/*****************************************************************************/
-{
- SByteStringList* pPrjDeps = NULL;
- ByteString sEndName = pEndWin->GetBodyText();
- ByteString sStartName = pStartWin->GetBodyText();
-
- Prj* pPrj = mpStarWriter->GetPrj( sEndName );
- pPrjDeps = pPrj->GetDependencies( FALSE );
- if ( pPrjDeps )
- {
- ByteString* pString;
- ULONG nPrjDepsCount = pPrjDeps->Count();
- for ( ULONG j = nPrjDepsCount; j > 0; j-- )
- {
- pString = pPrjDeps->GetObject( j - 1 );
- if ( pString->GetToken( 0, '.') == sStartName )
- pPrjDeps->Remove( pString );
- }
- }
-
- return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-/*****************************************************************************/
-void SolDep::RemoveAllObjects( ObjectList* pObjLst )
-/*****************************************************************************/
-{
-
- Depper::RemoveAllObjects( pObjLst );
-
- if ( mpSolIdMapper )
- {
- delete mpSolIdMapper;
- mpSolIdMapper = NULL;
- }
- if ( mpStarWriter )
- {
- delete mpStarWriter;
- mpStarWriter = NULL;
- }
-}
-
-/*****************************************************************************/
-ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
-/*****************************************************************************/
-{
-// DBG_ASSERT( FALSE , "soldep" );
- MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project
-
- if ( !pHObject ) {
- ByteString sNullPrj = "null";//null_project
- ULONG nObjectId = AddObject( sNullPrj, FALSE );
- ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 );
- return nObjectId;
- }
-
- return pHObject->GetId();
-}
-
-/*****************************************************************************/
-ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* )
-/*****************************************************************************/
-{
-// DBG_ASSERT( FALSE , "prjdep" );
- MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir
- if ( !pHObject )
- {
- ByteString bsNull("null");
- ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir
- return nObjectId;
- }
- else
- return pHObject->GetId();
-}
-
-/*****************************************************************************/
-USHORT SolDep::OpenSource()
-/*****************************************************************************/
-{
- if ( mpStandLst ) {
- if ( GetVersion())
- return ReadSource();
- }
- return 0;
-}
-
-/*****************************************************************************/
-USHORT SolDep::ReadSource(BOOL bUpdater)
-/*****************************************************************************/
-{
- mpBaseWin->EnablePaint( FALSE );
- mpBaseWin->Hide();
- ULONG nObjectId, nHashedId;
- ULONG i;
- MyHashObject* pHObject;
- ByteString* pStr;
- ObjectWin *pStartWin, *pEndWin;
-
- mpSolIdMapper = new SolIdMapper( 63997 );
- if (mpStandLst && bUpdater)
- {
- mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE );
- } else
- {
- SolarFileList* pSolarFileList;
- pSolarFileList = GetPrjListFromDir();
- mpStarWriter = new StarWriter( pSolarFileList, TRUE );
- }
- ByteString sTitle( SOLDEPL_NAME );
- if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) {
- sTitle += ByteString( " - mode: single file [" );
- sTitle += (ByteString) mpStarWriter->GetName();
- sTitle += ByteString( "]" );
- }
- else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) {
- sTitle += ByteString( " - mode: multiple files [" );
- sTitle += ByteString( "]" );
- }
- SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) );
-
- ULONG nCount = mpStarWriter->Count();
- for ( i=0; i<nCount; i++ )
- {
- Prj *pPrj = mpStarWriter->GetObject(i);
- ByteString sPrjName = pPrj->GetProjectName();
- nObjectId = AddObject( sPrjName, FALSE );
- ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 );
- }
- for ( i=0; i<nCount; i++ )
- {
- Prj *pPrj = mpStarWriter->GetObject(i);
- SByteStringList *pLst = pPrj->GetDependencies( FALSE );
- if ( pLst )
- {
- ULONG nDepCount = pLst->Count();
- for ( ULONG m=0; m<nDepCount; m++)
- {
- pStr = pLst->GetObject(m);
- pHObject = mpSolIdMapper->Find( *pStr );
- /*if ( !pHObject )
- {
- // create new prj
- Prj *pNewPrj = new Prj( *pStr );
- ByteString sPrjName = pNewPrj->GetProjectName();
- nObjectId = AddObject( sPrjName, FALSE );
- pHObject = mpSolIdMapper->Find( *pStr );
- ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );
- }*/
-
- if ( pHObject )
- {
- nHashedId = pHObject->GetId();
- ByteString sF_Os2 = pPrj->GetProjectName();
- pStr = &sF_Os2;
- pHObject = mpSolIdMapper->Find( *pStr );
- nObjectId = pHObject->GetId();
- pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
- pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
- AddConnectorToObjects( pStartWin, pEndWin );
- }
- }
- }
- }
- if (!IsPrjView())
- {
- AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
- GetDepWin()->EnablePaint( TRUE );
- }
- return 0;
-}
-
-SolarFileList* SolDep::GetPrjListFromDir()
-{
- SolarFileList* pSolarFileList = new SolarFileList();
- String sPrjDir( String::CreateFromAscii( "prj" ));
- String sBuildLst( String::CreateFromAscii( "build.lst" ));
- DirEntry aCurrent( getenv( SOURCEROOT ) );
-
- aCurrent.ToAbs();
- Dir aDir( aCurrent, FSYS_KIND_DIR );
-
- USHORT nEntries = aDir.Count();
- if( nEntries )
- {
- UniStringList aSortDirList;
- for ( USHORT n = 0; n < nEntries; n++ )
- {
- DirEntry& rEntry = aDir[n];
- UniString aName( rEntry.GetName() );
- if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() )
- {
- rEntry += DirEntry( sPrjDir );
- rEntry += DirEntry( sBuildLst );
- if (rEntry.Exists())
- {
- pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND );
- ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8);
- fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer());
- }
- }
- }
- }
- if ( !pSolarFileList->Count() )
- {
- //is empty!! TBD
- delete pSolarFileList;
- return NULL;
- }
- return pSolarFileList;
-}
-
-/*****************************************************************************/
-USHORT SolDep::WriteSource()
-/*****************************************************************************/
-{
-/* zur Sicherheit deaktiviert
- USHORT nMode = mpStarWriter->GetMode();
- if ( nMode == STAR_MODE_SINGLE_PARSE ) {
- ByteString sFileName = mpStarWriter->GetName();
- if ( sFileName.Len()) {
- mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );
- mpStarWriter->RemoveProject( ByteString( "null")); //null_project
- }
- }
- else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {
- // *OBO*
- //String sRoot = mpStarWriter->GetSourceRoot();
- //nicht mehr unterstützt mpStarWriter->GetSourceRoot()
- ByteString sFileName = mpStarWriter->GetName();
- DirEntry aEntry( sFileName );
- aEntry.ToAbs();
- aEntry = aEntry.GetPath().GetPath().GetPath();
- String sRoot = aEntry.GetFull();
-
- if ( sRoot.Len()) {
- mpStarWriter->RemoveProject( ByteString( "null")); //null_project
- mpStarWriter->WriteMultiple( sRoot );
- }
- }
-*/
- return 1;
-}
-
-USHORT SolDep::Load( const ByteString& rFileName )
-{
-// moved from depper class
- DBG_ASSERT( FALSE , "you are dead!" );
- SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );
- depper_head dh;
- ULONG i;
- ULONG nLoadOffs = mnSolLastId; //or Prj??
- ObjectWin* pNewWin;
- aInFile.Read( &dh, sizeof( dh ));
-
- ULONG nObjCount = dh.nObjectCount;
- ULONG nCnctrCount = dh.nCnctrCount;
-
- for ( i=0; i < nObjCount ; i++ )
- {
- ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER );
- pWin->Load( aInFile );
- pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE ));
- pNewWin->SetId( nLoadOffs + pWin->GetId());
- pNewWin->SetPosPixel( pWin->GetPosPixel());
- pNewWin->SetSizePixel( pWin->GetSizePixel());
- }
-
- ULONG nStartId;
- ULONG nEndId;
-// ueber addconnector fuehren!
- for ( i=0; i < nCnctrCount ; i++ )
- {
- Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );
- pCon->Load( aInFile );
-
- nStartId = nLoadOffs + pCon->GetStartId();
- nEndId = nLoadOffs + pCon->GetEndId();
-
- ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId );
- ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId );
-
- pCon->Initialize( pStartWin, pEndWin );
- }
-
-
- return 0;
-}
-
-/*****************************************************************************/
-BOOL SolDep::ViewContent( ByteString& rObjectName )
-/*****************************************************************************/
-{
- mpFocusWin = NULL;
- SetPrjViewStatus(TRUE);
-
- for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )
- if ( mpObjectList->GetObject( i )->HasFocus())
- mpFocusWin = mpObjectList->GetObject( i );
- //HideObjectsAndConnections( mpObjectList );
- mpProcessWin->Resize();
- GetDepWin()->Show();
- return InitPrj( rObjectName );
-}
-
-/*****************************************************************************/
-BOOL SolDep::InitPrj( ByteString& rListName )
-/*****************************************************************************/
-{
- ULONG nObjectId, nHashedId;
- ULONG i, j;
- MyHashObject* pHObject;
- ByteString *pDepName;
- ByteString *pFlagName;
- Prj* pPrj;
- ObjectWin *pStartWin, *pEndWin;
- maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE);
- maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND);
- maToolBox.HideItem(TID_SOLDEP_FIND);
- maToolBox.ShowItem(TID_SOLDEP_BACK);
- maToolBox.Invalidate();
-
- //clean up
- mpObjectPrjList->ClearAndDelete();
- GetDepWin()->ClearConnectorList();
- if (mpPrjIdMapper) delete mpPrjIdMapper;
- mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper
- mnPrjWinCount = 0;
- mnPrjLastId = 0;
-
- ULONG nCount = mpStarWriter->Count();
- GetDepWin()->EnablePaint( FALSE );
- Point aPnt = GetGraphWin()->GetPosPixel();
- Size aSize = GetGraphWin()->GetSizePixel();
-
- GetGraphWin()->SetPosSizePixel( aPnt, aSize ); // Hier wird das Window gesetzt
-
- BOOL bReturn = FALSE;
-
- for ( i=0; i<nCount; i++ )
- {
-// pPrj->GetProjectName() returns the name of
-// the project e.g. svtools
- pPrj = mpStarWriter->GetObject(i);
- ByteString sPrjName = pPrj->GetProjectName();
- if ( sPrjName == rListName )
- {
- bReturn = TRUE;
-
- mpPrj = mpStarWriter->GetObject(i);
- ULONG nDirCount = mpPrj->Count();
- for ( j=0; j<nDirCount; j++ )
- {
- CommandData *pData = mpPrj->GetObject(j);
- fprintf( stdout, "\tProjectDir : %s\n",
- pData->GetLogFile().GetBuffer());
-// pData->GetLogFile() contains internal project IDs
-// e.g. st_mkout etc.
- if ( pData->GetLogFile() != "" )
- {
- ByteString sItem = pData->GetLogFile();
- nObjectId = AddPrjObject( sItem, FALSE);
-// there may be faster ways......
- ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
- pWin->SetViewMask( 0x0001 );
-// pData->GetPath() contains internal project directories
-// e.g. svtools/inc etc.
- ByteString sPath = pData->GetPath();
- pWin->SetTipText( sPath );
- }
- }
-
-// set connectors for dependencies here
- for ( j=0; j<nDirCount; j++ )
- {
- CommandData *pData = mpPrj->GetObject(j);
- SByteStringList *pDeps = pData->GetDependencies();
- if ( pDeps )
- {
- ByteString sFlagName = pData->GetLogFile();
- pFlagName = &sFlagName;
- //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()
- pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));
- if (pHObject)
- {
-
- nObjectId = pHObject->GetId();
-
- ULONG nDepCount = pDeps->Count();
- for ( ULONG k=0; k<nDepCount; k++ )
- {
- pDepName = pDeps->GetObject(k);
- pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.'));
- if (pHObject )
- {
- nHashedId = pHObject->GetId();
- pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId );
- pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
-
- AddConnectorToObjects( pStartWin, pEndWin );
- }
- else
- {
- String sMessage;
- sMessage += String::CreateFromAscii("can't find ");
- sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 );
- sMessage += String::CreateFromAscii(".\ndependency ignored");
- WarningBox aBox( GetDepWin(), WB_OK, sMessage);
- aBox.Execute();
- }
- }
- }
- }
-
- }
-
- break;
- }
- }
- ByteString sNullDir = "null";
- nObjectId = AddPrjObject( sNullDir, FALSE);
- ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
- pWin->SetViewMask( 0x0001 );
- mpGraphPrjWin->EnablePaint( TRUE );
- //debug
-// int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);
-// ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );
- AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );
- mpGraphWin->Hide();
- mpGraphPrjWin->Show();
- mpGraphPrjWin->Invalidate();
-
- return bReturn;
-}
-
-/*****************************************************************************/
-USHORT SolDep::CloseWindow()
-/*****************************************************************************/
-{
-
- ((SystemWindow*)mpProcessWin)->Close();
- return 0;
-}
-
-/*****************************************************************************/
-void SolDep::ShowHelp()
-/*****************************************************************************/
-{
- SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ );
- String aHelpText;
- ByteString aGetStr;
-
- if ( aHelpFile.IsOpen() )
- {
- while ( aHelpFile.ReadLine( aGetStr ) )
- {
- aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8);
- aHelpText += String::CreateFromAscii("\n");
- }
- }
- else
- aHelpText = String::CreateFromAscii("No Helpfile found.");
-
- SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP ));
- aHelpDlg.maMLEHelp.SetText( aHelpText );
- aHelpDlg.maMLEHelp.SetReadOnly();
- aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE );
- aHelpDlg.Execute();
-}
-
-/*****************************************************************************/
-BOOL SolDep::FindProject()
-/*****************************************************************************/
-{
- SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() );
- ObjectWin* pObjectWin = NULL;
- mpObjectList->ResetSelectedObject();
- if (IsHideMode())
- {
- GetDepWin()->Invalidate();
- }
-
- mpFocusWin=NULL;
-
- if ( aFindProjectDlg.Execute() == RET_OK ) {
- msProject = aFindProjectDlg.GetProject();
- //now we have a project string
-
- pObjectWin = mpObjectList->GetPtrByName( msProject );
- if (pObjectWin)
- {
- mpObjectList->ResetSelectedObject();
- MarkObjects( pObjectWin );
- }
- else
- {
- mpObjectList->ResetSelectedObject();
- for ( USHORT i=0; i<mpObjectList->Count(); i++ )
- {
- ObjectWin* pObjectWin = mpObjectList->GetObject( i );
- if ( !pObjectWin->IsTop() )
- pObjectWin->SetViewMask(FALSE);
- }
- }
- }
- return FALSE;
-}
-
-BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )
-{
- if (pObjectWin)
- {
- if (!(pObjectWin->IsNullObject()))
- {
- pObjectWin->SetMarkMode( MARKMODE_SELECTED );
- pObjectWin->MarkNeeded();
- pObjectWin->MarkDepending();
- if (IsHideMode())
- {
- GetDepWin()->Invalidate();
- }
- } else
- {
- fprintf(stdout,"null\n");
- }
- }
- return TRUE;
-}
-
-void SolDep::Resize()
-{
-//funzt! muß aber von der applikation aufgerufen werden.
- Point aOutPos = Point( 0, 0 );
- Size aOutSize = mpProcessWin->GetOutputSizePixel();
- // calculate output size
- ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();
- ULONG nTaskWidth = maToolBox.CalcWindowSizePixel().Width();
- Size aSize( aOutSize.Width(), nTaskHeight );
-
-// ULONG nMenuHeight = 0;
- Point aGraphWinPos = Point(0,0);
- Size aGraphWinSize = Size(0,0);
-
-//weiß nicht wie: nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues
-
- //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
- // Set Docking-Rectangle for ToolBar
- Rectangle aInRect;
-
- if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP ))
- {
- // waagerechte Toolbar oben
- maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()));
- if( maToolBox.IsVisible())
- {
- Point aOutPosTmp;
- Size aOutSizeTmp;
- aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
- aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
- aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
- aGraphWinPos = Point( 0, nTaskHeight );
- aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
- }
- }
- if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM ))
- {
- // waagerechte Toolbar unten
- Point aTbPos = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
- Size aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height());
- maToolBox.SetPosSizePixel( aTbPos, aTbSize );
- if( maToolBox.IsVisible())
- {
- Point aOutPosTmp;
- Size aOutSizeTmp;
- aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height());
- aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height());
- aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
- aGraphWinPos = Point( 0, 0 );
- aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight);
- }
- }
- if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT ))
- {
- // senkrechte ToolBar links
- maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()));
- if( maToolBox.IsVisible())
- {
- Point aOutPosTmp;
- Size aOutSizeTmp;
- aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
- aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
- aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
- aGraphWinPos = Point( nTaskWidth, 0 );
- aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
- }
- }
- if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT ))
- {
- // senkrechte ToolBar rechts
- Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
- Size aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
- maToolBox.SetPosSizePixel( aTbPos, aTbSize);
- if( maToolBox.IsVisible())
- {
- Point aOutPosTmp;
- Size aOutSizeTmp;
- aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y());
- aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height());
- aInRect = Rectangle( aOutPosTmp, aOutSizeTmp );
- aGraphWinPos = Point( 0, 0 );
- aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height());
- }
- }
-
- Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )
- Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
- Size( aOutSize.Width(), aOutSize.Height()));
-/*
- Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );
- Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
- Size( aOutSize.Width(), aOutSize.Height()));
-*/
- maToolBox.SetDockingRects( rout, rin );
-
- BOOL bFloating = maToolBox.IsFloatingMode();
-
- if ( bFloating )
- {
- GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);
- //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();
- if (maToolBox.IsVisible()) maToolBox.Show();
- } else
- {
- GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );
- }
- if (maToolBox.IsVisible()) maToolBox.Show();
-}
-
-USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
-// DBG_ASSERT( FALSE , "not yet" );
- ByteString sEndName = pEndWin->GetBodyText();
- ByteString sStartName = pStartWin->GetBodyText();
- if ( sStartName != ByteString("null"))
- {
- CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
- SByteStringList* pDeps = pEndData->GetDependencies();
- if ( pDeps )
- pDeps->PutString( &sStartName );
- else
- {
- pDeps = new SByteStringList();
- pEndData->SetDependencies( pDeps );
- pDeps->PutString( &sStartName );
- pEndData->GetDependencies();
- }
- }
- return AddConnectorToObjects( pStartWin, pEndWin );
-}
-
-USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
-{
- ByteString sEndName = pEndWin->GetBodyText();
- ByteString sStartName = pStartWin->GetBodyText();
- CommandData* pEndData = mpPrj->GetDirectoryData( sEndName );
- SByteStringList* pDeps = pEndData->GetDependencies();
- if ( pDeps )
- {
- ByteString* pString;
- ULONG nDepsCount = pDeps->Count();
- for ( ULONG j = nDepsCount; j > 0; j-- )
- {
- pString = pDeps->GetObject( j - 1 );
- if ( pString->GetToken( 0, '.') == sStartName )
- pDeps->Remove( pString );
- }
- }
- return RemoveConnectorFromObjects( pStartWin, pEndWin );
-}
-
-USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
-{
- AutoArrangeDlgStart();
- OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID );
- AutoArrangeDlgStop();
- return 0;
-}
-
-Point SolDep::CalcPos( USHORT nSet, USHORT nIndex )
-{
- int nRowIndex = nIndex / DEPPER_MAX_WIDTH;
- ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING );
-
- ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING;
- Point aPos( nPosX, nPosY );
- return aPos;
-}
-
-ULONG SolDep::CalcXOffset( ULONG nObjectsToFit )
-{
- long nDynXOffs;
- long nXMiddle;
- ULONG nTrigger;
-
- nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2;
- if ( nObjectsToFit > DEPPER_MAX_WIDTH )
- nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2;
- nTrigger = ( nObjectsToFit - 1 ) / 2;
- nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger;
- ULONG nXOffs = nXMiddle - nDynXOffs;
-
- if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs )
- mnMinDynXOffs = nXMiddle - nDynXOffs;
-
- return nXOffs;
-
-}
-
-double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )
-{
- ObjectWin* pWin;
- Connector* pCon;
- ULONG nObjCount = pObjList->Count();
- double dRetVal = 0;
- double dWinVal;
- USHORT i, j;
- BOOL bIsStart;
-
- for ( i = 0; i < nObjCount; i++ )
- {
- pWin = pObjList->GetObject( i );
-
- if ( pWin && pWin->IsVisible())
- {
- j = 0;
- dWinVal = 0;
- while ( (pCon = pWin->GetConnector( j )) )
- {
- if ( pCon->IsVisible()) {
- bIsStart = pCon->IsStart( pWin );
- if ( eDistType != BOTH )
- if ( eDistType == TOPDOWN )
- {
- if ( bIsStart )
- {
- pCon->UpdatePosition( pWin, FALSE );
- dWinVal += pCon->GetLen() * pWin->mnHeadDist;
- }
- }
- else
- {
- if ( !bIsStart )
- {
- pCon->UpdatePosition( pWin, FALSE );
- dWinVal += pCon->GetLen() * pWin->mnRootDist;
- }
-
- }
- else
- {
- pCon->UpdatePosition( pWin, FALSE );
- if ( !bIsStart )
- dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 );
- else
- dWinVal += pCon->GetLen() * pWin->mnRootDist;
- }
- }
- j++;
- }
-// if ( j != 0 )
-// dWinVal /= j;
- dRetVal += dWinVal;
- }
- }
-
- return dRetVal;
-}
-
-USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )
-{
- USHORT i = 0;
- ObjectWin* pNewWin;
- Connector* pCon;
-
- nDepth++;
-
- USHORT nMaxDepth = nDepth;
-
- pWin->mbVisited = TRUE;
- pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist );
- if ( nDepth > DEPPER_MAX_DEPTH )
- {
- DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabhängigkeit!" );
- nDepth++;
- return DEP_ENDLES_RECURSION_FOUND;
- }
-
- while ( (pCon = pWin->GetConnector( i )) )
- {
- if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project
- {
- pNewWin = pCon->GetOtherWin( pWin );
- nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth );
- if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND )
- {
- mpTravellerList->Insert( pWin, LIST_APPEND );
- return DEP_ENDLES_RECURSION_FOUND;
- }
- }
- i++;
- }
- pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth );
- return nMaxDepth;
-}
-
-
-double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )
-{
-
- ULONG i, j, l;
- ULONG nEnd = nStart + nSize;
- ObjectWin* pSwapWin;
- ULONG nLevelObjCount = rObjList.Count();
-
-//dont use full recusion for more than 6 objects
- if ( nLevelObjCount > 6 )
- {
- srand(( unsigned ) time( NULL ));
-
- ULONG nIdx1, nIdx2;
- for ( i = 0; i < 101; i++ )
- {
- UpdateSubProgrssBar(i);
- for ( j = 0; j < 100; j++ )
- {
- nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
- while ( rObjList.GetObject( nIdx1 ) == NULL )
- nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
- nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
- while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount )
- nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount );
-
- pSwapWin = rObjList.GetObject( nIdx1 );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
- pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
- rObjList.Replace( pSwapWin, nIdx1 );
-
- double dCurDist = CalcDistSum( &rObjList, eDistType );
-
- if ( dCurDist < dMinDist )
- {
- dMinDist = dCurDist;
- rResultList.Clear();
- for ( l = 0; l < nLevelObjCount; l++ )
- {
- pSwapWin = rObjList.GetObject( l );
- rResultList.Insert( pSwapWin, LIST_APPEND);
- }
- }
-// if ( dCurDist > dMinDist * 1.5 )
- if ( dCurDist > dMinDist * 15 )
- {
- pSwapWin = rObjList.GetObject( nIdx1 );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] );
- pSwapWin = rObjList.Replace( pSwapWin, nIdx2 );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] );
- rObjList.Replace( pSwapWin, nIdx1 );
- }
- }
- }
- }
- else
- {
- for ( i = nStart ; i < nEnd; i++)
- {
- if ( nSize > 1 )
- {
- pSwapWin = rObjList.GetObject( i );
- pSwapWin = rObjList.Replace( pSwapWin, nStart );
- rObjList.Replace( pSwapWin, i );
- double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType );
- dMinDist = MIN( dMinDist, dPermuteDist);
- pSwapWin = rObjList.GetObject( i );
- pSwapWin = rObjList.Replace( pSwapWin, nStart );
- rObjList.Replace( pSwapWin, i );
-
- }
- else
- {
- for ( l = 0; l < nLevelObjCount; l++ )
- {
- pSwapWin = rObjList.GetObject( l );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( pPosArray[ l ] );
- }
-
- double dCurDist = CalcDistSum( &rObjList, eDistType );
-
- if ( dCurDist < dMinDist )
- {
- dMinDist = dCurDist;
- rResultList.Clear();
- for ( l = 0; l < nLevelObjCount; l++ )
- {
- pSwapWin = rObjList.GetObject( l );
- rResultList.Insert( pSwapWin, LIST_APPEND);
- }
- }
-
- }
- }
- }
-
- return dMinDist;
-}
-
-
-USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID )
-{
- ObjWinList aWorkList;
- ObjectWin* pWin;
- Connector* pCon;
- USHORT nRootDist = (USHORT) -1;
- USHORT i, j, k, l, nRetVal;
- USHORT LevelUse[ DEPPER_MAX_DEPTH ];
- USHORT LevelSecUse[ DEPPER_MAX_DEPTH ];
- ObjWinList* LevelList[ DEPPER_MAX_DEPTH ];
- ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ];
- Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ];
-
- mnMinDynXOffs = 0xffff;
-
- for ( i = 0; i < DEPPER_MAX_DEPTH; i++ )
- {
- LevelUse[ i ] = 0;
- LevelList[ i ] = NULL;
- LevelSecUse[ i ] = 0;
- LevelSecList[ i ] = NULL;
- }
-
- GetDepWin()->EnablePaint( FALSE );
-
- ULONG nObjCount = pObjLst->Count();
- for ( i = 0; i < nObjCount; i++ )
- {
- pWin = pObjLst->GetObject( i );
- if ( pWin->IsVisible()) {
- pWin->mbVisited = FALSE;
- pWin->mnHeadDist = 0;
- pWin->mnRootDist = 0;
-
- // find initial objects which need to be connected with
- // root object
- j = 0;
- USHORT nStartCount = 0;
- USHORT nEndCount = 0;
- while ( (pCon = pWin->GetConnector( j )) )
- {
- if ( pCon->IsVisible()) { //null_project
- if( pCon->IsStart( pWin ))
- nStartCount++;
- else
- {
- nEndCount = 1;
- break;
- }
- }
- j++;
- }
-
- if ( nStartCount > 0 && nEndCount == 0 )
- if ( nTopId != pWin->GetId())
- AddConnectorToObjects( pObjLst, nTopId, pWin->GetId());
-
- }
- }
-
- pWin = ObjIdToPtr( pObjLst, nTopId );
-
- if ( mpTravellerList )
- {
- mpTravellerList->Clear();
- delete mpTravellerList;
- }
- mpTravellerList = new ObjWinList();
- // set root and top distance
- nRetVal = Impl_Traveller( pWin, nRootDist );
-
- DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" );
- if ( nRetVal == DEP_ENDLES_RECURSION_FOUND )
- {
- WriteToErrorFile();
- return nRetVal;
- }
-
- ULONG nUnvisited = 0;
- ULONG nUnvisYOffs = 0;
-
- // seperate mainstream, secondary and unconnected
- for ( i = 0; i < nObjCount; i++ )
- {
- pWin = pObjLst->GetObject( i );
- if ( pWin->IsVisible()) {
- if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal )
- {
- if ( !LevelList[ pWin->mnHeadDist ] )
- LevelList[ pWin->mnHeadDist ] = new ObjWinList;
- LevelList[ pWin->mnHeadDist ]->Insert( pWin );
- LevelUse[ pWin->mnHeadDist ]++;
- }
- else
- if ( pWin->mbVisited )
- {
- if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] )
- LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList;
- LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin );
- LevelSecUse[ nRetVal - pWin->mnRootDist ]++;
- }
- else
- {
- // need to be arranged more intelligent...
- Point aPos( 5, nUnvisYOffs );
- pWin->SetCalcPosPixel( aPos );
-
- Point aTmpPos = pWin->GetCalcPosPixel();
- pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos ));
-
- nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height();
- nUnvisited++;
- }
- }
- }
-
- mnLevelOffset = 0;
-
- USHORT nScaleVal;
-
- if ( nRetVal == 0 )
- nScaleVal = 1;
- else
- nScaleVal = nRetVal;
-
- i = 0;
-
- USHORT nStep = 0;
-
- while ( LevelList[ i ] )
- {
- UpdateMainProgressBar(i, nScaleVal, nStep);
- DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." );
- ObjectWin* pSwapWin;
- ULONG nLevelObjCount = LevelList[ i ]->Count();
-
- if ( nLevelObjCount % 2 == 0 )
- {
- LevelList[ i ]->Insert( NULL, LIST_APPEND );
- nLevelObjCount++;
-// LevelUse bleibt orginal...
-// LevelUse[ i ]++;
- }
-
-// catch too big lists
- DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
- if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
- {
- WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
- aWBox.Execute();
- break;
- }
- mnXOffset = CalcXOffset( nLevelObjCount );
- aWorkList.Clear();
-
- // initial positioning for mainstream
- for ( j = 0; j < nLevelObjCount; j++ )
- {
- pSwapWin = LevelList[ i ]->GetObject( j );
- aWorkList.Insert( pSwapWin, LIST_APPEND);
- Point aPos = CalcPos( i, j );
- aPosArray[ j ] = aPos;
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
-
- double dMinDist = CalcDistSum( LevelList[ i ] );
-
- // optimize mainstream order and return best matching list in "aWorkList"
- dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount ));
-
- // set optimized positions - may still be wrong from later tries
- for ( j = 0; j < nLevelObjCount; j++ )
- {
- pSwapWin = aWorkList.GetObject( j );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
-
- if ( LevelSecList[ i ] != NULL )
- {
- ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
- // expand list for better positioning
- while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 )
- {
- LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
- nLevelSecObjCount++;
- }
- if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 )
- {
- LevelSecList[ i ]->Insert( NULL, LIST_APPEND );
- nLevelSecObjCount++;
- }
-
- DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
- if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
- {
- WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking"));
- aWBox.Execute();
- break;
- }
- mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
- aWorkList.Clear();
-
- l = 0;
- BOOL bUsedPos;
-
- // find free positions for secondary objects
- for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
- {
- Point aPos = CalcPos( i, j );
- bUsedPos = FALSE;
- // is already occupied?
- for ( k = 0; k < nLevelObjCount; k++ )
- {
- if ( LevelList[ i ]->GetObject( k ) )
- if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
- bUsedPos = TRUE;
- }
- // if its free, add to pool
- if ( !bUsedPos )
- {
- aPosArray[ l ] = aPos;
- l++;
- }
- }
-
- // initial positioning for secodaries
- for ( j = 0 ; j < nLevelSecObjCount ; j++ )
- {
- pSwapWin = LevelSecList[ i ]->GetObject( j );
- aWorkList.Insert( pSwapWin, LIST_APPEND);
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
- dMinDist = CalcDistSum( LevelSecList[ i ] );
-
- dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount ));
-
- // set optimized positions - may still be wrong from later tries
- for ( j = 0; j < nLevelSecObjCount; j++ )
- {
- pSwapWin = aWorkList.GetObject( j );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
- if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
- mnLevelOffset++;
- }
- if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
- mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
- i++;
- }
-
- mnMinDynXOffs = 0xffff;
-
-// and back again...
- // get better results form already preoptimized upper and lower rows
-
- do
- {
- i--;
- UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down
- if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH )
- mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ;
- ObjectWin* pSwapWin;
- ULONG nLevelObjCount = LevelList[ i ]->Count();
- mnXOffset = CalcXOffset( nLevelObjCount );
- aWorkList.Clear();
-
- for ( j = 0; j < nLevelObjCount; j++ )
- {
- pSwapWin = LevelList[ i ]->GetObject( j );
- aWorkList.Insert( pSwapWin, LIST_APPEND);
- Point aPos = CalcPos( i, j );
- aPosArray[ j ] = aPos;
-//no need to do this stuff....... ?????
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
-
- double dMinDist = CalcDistSum( LevelList[ i ], BOTH );
-
- dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
- for ( j = 0; j < nLevelObjCount; j++ )
- {
- pSwapWin = aWorkList.GetObject( j );
- if ( pSwapWin )
-// pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
-
- if ( LevelSecList[ i ] != NULL )
- {
- ULONG nLevelSecObjCount = LevelSecList[ i ]->Count();
- mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount );
- aWorkList.Clear();
-
- l = 0;
- BOOL bUsedPos;
-
- for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ )
- {
- Point aPos = CalcPos( i, j );
- bUsedPos = FALSE;
-// could be faster
- for ( k = 0; k < nLevelObjCount; k++ )
- {
- if ( LevelList[ i ]->GetObject( k ) )
- if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() )
- bUsedPos = TRUE;
- }
- if ( !bUsedPos )
- {
- aPosArray[ l ] = aPos;
- l++;
- }
- }
-
- for ( j = 0 ; j < nLevelSecObjCount ; j++ )
- {
- pSwapWin = LevelSecList[ i ]->GetObject( j );
- aWorkList.Insert( pSwapWin, LIST_APPEND);
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
- dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );
-
- dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
- for ( j = 0; j < nLevelSecObjCount; j++ )
- {
- pSwapWin = aWorkList.GetObject( j );
- if ( pSwapWin )
- pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
- }
- }
-// i--;
- } while ( i != 0 );
- SetMainProgressBar( 100 );
-
- ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 ) * ( OBJWIN_X_SPACING + GetDefSize().Width() );
-
- // ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier muß man switchen GetStart/GetPrjStart oder so
-
- ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
-
- ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;
- if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize )
- nNewYSize = nUnvisYOffs + GetDefSize().Height();
-
- MapMode aMapMode = GetDepWin()->GetMapMode();
- Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY())));
-
- Size aNowSize( GetGraphWin()->GetSizePixel());
-
- if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() )
- aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ;
-
- if ( GetDepWin()->LogicToPixel( aNowSize ).Height() > aTmpSize.Height() )
- aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;
-
-// if ( nZoomed <= 0 )
-// {
-// mpBaseWin->SetSizePixel( aTmpSize );
-// mpGraphWin->SetTotalSize( aTmpSize );
-// mpGraphWin->EndScroll( 0, 0 );
-// }
-
-// now remap all objects
- ULONG nAllObjCount = pObjLst->Count();
- Point aTmpPos;
- for ( j = 0; j < nAllObjCount; j++ )
- {
- pWin = pObjLst->GetObject( j );
- if ( pWin->IsVisible()) {
- aTmpPos = pWin->GetCalcPosPixel();
- if ( pWin->mbVisited )
- {
-// reserve space for unconnected
- aTmpPos.X() -= mnMinDynXOffs;
- aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;
-// center window
- aTmpPos.X() += GetDefSize().Width() / 2;
- aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;
- }
- pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos ));
- }
- }
- aWorkList.Clear();
- GetDepWin()->EnablePaint( TRUE );
- GetDepWin()->Invalidate();
-//LevelListen loeschen Hä? Welche Levellisten?
-
-//Update all Connectors
-// --> To be done: Don't call twice Object1-Connector-Object2
- ObjectWin* pObject1;
- for ( i = 0 ; i < nObjCount ; i++)
- {
- pObject1 = pObjLst->GetObject( i );
- if ( pObject1->IsVisible())
- pObject1->UpdateConnectors();
- };
- return 0;
-}
-
-void SolDep::WriteToErrorFile()
-{
-//Needs some improvement
- ObjectWin* pWin;
- WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));
- aWBox.Execute();
- char *tmpdir = getenv("TMP");
- char *errfilebasename = "depper.err";
- char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 );
- *ErrFileName = '\0';
- strcat( ErrFileName, tmpdir );
- strcat( ErrFileName, "\\" );
- strcat( ErrFileName, errfilebasename );
- FILE* pErrFile = fopen( "depper.err", "w+" );
- if ( pErrFile )
- {
- for ( USHORT i = 0; i < mpTravellerList->Count(); i++ )
- {
- pWin = mpTravellerList->GetObject( i );
- fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer());
- }
- fclose( pErrFile );
- }
-}
+/************************************************************************* + * + * 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. + * + ************************************************************************/ +//TBD: ToolBox handling prjview/back + +#include <osl/file.hxx> +#include <rtl/ustring.hxx> +#include <tools/debug.hxx> +#include <bootstrp/sstring.hxx> +#include <svtools/filedlg.hxx> +#include <tools/iparser.hxx> +#include <tools/geninfo.hxx> +#include <vcl/gdimtf.hxx> +#include <vcl/bitmap.hxx> +#include <appdef.hxx> +#include "time.h" +#include <soldep/depper.hxx> +#include <soldep/soldep.hxx> +#include <soldep/soldlg.hxx> +#include "dtsodcmp.hrc" + +IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* ); +//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* ); +#define EVENT_RESIZE 0x00000001 +#define MIN(a,b) (a)<(b)?(a):(b) +#define MAX(a,b) (a)>(b)?(a):(b) + + +//ByteString sDelimiterLine("#=========================================================================="); + + +// +// class SolDep +// + +/*****************************************************************************/ +SolDep::SolDep( Window* pBaseWindow ) +/*****************************************************************************/ + : Depper( pBaseWindow ), + mbBServer(FALSE), + mpTravellerList( NULL ), + mbIsHide( FALSE ) +{ + mnSolWinCount = 0; + mnSolLastId = 0; +// mpPrjIdMapper = new SolIdMapper( 63997 ); + maTaskBarFrame.EnableAlwaysOnTop(); + maTaskBarFrame.Show(); + maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 )); + maToolBox.SetSelectHdl( LINK ( this, SolDep, ToolSelect )); + maToolBox.Show(); + + mpBaseWin->AddChildEventListener( LINK( this, SolDep, ChildWindowEventListener )); + + // Kontext-Menue (gehört zu soldep.cxx) + InitContextMenueMainWnd(); + InitContextMenuePrjViewWnd( mpBasePrjWin ); +} + +/*****************************************************************************/ +SolDep::~SolDep() +/*****************************************************************************/ +{ + mpBaseWin->RemoveChildEventListener( LINK( this, SolDep, ChildWindowEventListener ) ); + delete mpSolIdMapper; + delete mpStarWriter; + delete mpStandLst; +} + +/*****************************************************************************/ +void SolDep::Init() +/*****************************************************************************/ +{ + InformationParser aParser; + String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US ); + mpStandLst = aParser.Execute( sStandLst ); + ByteString aUpdater( getenv("UPDATER") ); + if ( mpStandLst && (aUpdater == "YES") ) { + if ( GetVersion() ) + ReadSource( TRUE ); + } else + { + ReadSource(); // if stand.lst isn't available + } +} + +/*****************************************************************************/ +void SolDep::Init( ByteString &rVersion, GenericInformationList *pVersionList ) +/*****************************************************************************/ +{ + // Interface for bs + mbBServer=TRUE; + if ( pVersionList ) + mpStandLst = new GenericInformationList( *pVersionList ); + else { + InformationParser aParser; + String sStandLst( GetDefStandList(), RTL_TEXTENCODING_ASCII_US ); + mpStandLst = aParser.Execute( sStandLst ); + } + if ( mpStandLst ) { + msVersionMajor = ByteString( rVersion ); + ReadSource(TRUE); //call from build server set UPDATER to TRUE + } +} + +/*****************************************************************************/ +IMPL_LINK( SolDep, ChildWindowEventListener, VclSimpleEvent*, pEvent ) +/*****************************************************************************/ +{ + if ( pEvent && pEvent->ISA( VclWindowEvent ) ) + { + ProcessChildWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) ); + } + return 0; +} + + +/*****************************************************************************/ +void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent ) +/*****************************************************************************/ +{ + Window* pChildWin = _rVclWindowEvent.GetWindow(); +// Window* pParentWin = pChildWin->GetParent(); +//Resize(); + if ( isAlive() ) + { + ULONG id = _rVclWindowEvent.GetId(); + switch ( id ) + { + case VCLEVENT_USER_MOUSEBUTTON_DOWN: + { + ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); + if( pObjWin ) + { + // handle mouse click on ObjectWin object + ObjectWin* pWin = (ObjectWin*) pChildWin; + //GetObjectList()->ResetSelectedObject(); + if (IsHideMode()) // simple mouse click left + { + pWin->CaptureMouse(); + pWin->SetMarkMode( MARKMODE_SELECTED ); + pWin->MarkNeeded(); + pWin->MarkDepending(); + pWin->Invalidate(); + } else + { + pWin->LoseFocus(); + pWin->SetMarkMode( MARKMODE_SELECTED ); + pWin->UnsetMarkMode( MARKMODE_ACTIVATED ); + pWin->MarkNeeded( TRUE ); + pWin->MarkDepending( TRUE ); + } + + } + } + break; + case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT: + { + ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); + if( pObjWin ) + { + ObjectWin* pWin = (ObjectWin*) pChildWin; + MarkObjects( pWin ); + } + } + break; + case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK: + { + ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); + if( pObjWin ) + { + if (IsHideMode()) ToggleHideDependency(); + ByteString text = ((ObjectWin*) pChildWin)->GetBodyText(); + ViewContent(text); + } + } + break; + case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT: + { + ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); + if( pObjWin ) + { + ObjectWin* pWin = (ObjectWin*) pChildWin; + GetDepWin()->NewConnector( pWin ); + } + } + break; + case VCLEVENT_USER_MOUSEBUTTON_UP: + { + ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin); + if( pObjWin ) + { + ObjectWin* pWin = (ObjectWin*) pChildWin; + pWin->ReleaseMouse(); + pWin->SetMarkMode(MARKMODE_SELECTED); + GetDepWin()->Invalidate(); + } + } + break; + } // switch + } // if isAlive + //fprintf(stdout,"BLA::Resize: %d\n",pChildWin); +} + +/*****************************************************************************/ +IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox) +/*****************************************************************************/ +{ + USHORT nItemId = pBox->GetCurItemId(); + switch ( nItemId ) + { + case TID_SOLDEP_FIND: + FindProject(); + break; + case TID_SOLDEP_CREATEMETA : + { + VirtualDevice aVDev; + aVDev.SetMapMode( MAP_100TH_MM ); + GDIMetaFile aMtf; + aVDev.EnableOutput( FALSE ); + aMtf.Record( &aVDev ); + + aVDev.SetLineColor( Color( COL_BLACK ) ); + aVDev.SetTextAlign( ALIGN_TOP ); + + Size aSize( GetDepWin()->GetOutputSizePixel() ); + long nXMin = aSize.Width(); + long nXMax = 0; + long nYMax = 0; + long nYMin = aSize.Height(); + + for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + { + Point aPoint = mpObjectList->GetObject(i)->GetPosPixel(); + Size aSize = mpObjectList->GetObject(i)->GetSizePixel(); + nXMin = MIN( aPoint.X(), nXMin ); + nXMax = MAX( aPoint.X() + aSize.Width(), nXMax ); + nYMin = MIN( aPoint.Y(), nYMin ); + nYMax = MAX( aPoint.Y() + aSize.Height(), nYMax ); + } + + Point aOffset( nXMin, nYMin ); + aOffset = aVDev.PixelToLogic( aOffset ); + + GetDepWin()->DrawOutput( &aVDev, aOffset ); + for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + if ( mpObjectList->GetObject(i)->IsVisible() ) + mpObjectList->GetObject(i)->DrawOutput( &aVDev, aOffset ); + + aMtf.Stop(); + aMtf.WindStart(); + aMtf.SetPrefMapMode( aVDev.GetMapMode() ); + Size aDevSize( nXMax-nXMin + 10, nYMax-nYMin + 10); + aDevSize = aVDev.PixelToLogic( aDevSize ); + aMtf.SetPrefSize( aDevSize ); + SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE ); + aMtf.Write( aStream ); + break; + } + case TID_SOLDEP_HIDE_INDEPENDEND: + { + ToggleHideDependency(); + for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + mpObjectList->GetObject(i)->SetViewMask(!mbIsHide); + + maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode()); + GetDepWin()->Invalidate(); //repaint Main-View + } + break; + case TID_SOLDEP_SELECT_WORKSPACE: + if (mpStandLst) + { + if (GetVersion()) // Version dialog box + { + delete mpSolIdMapper; + delete mpStarWriter; + mpObjectList->ClearAndDelete(); + ReadSource(TRUE); + } + } + break; + case TID_SOLDEP_BACK: + maToolBox.HideItem(TID_SOLDEP_BACK); + maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE); //disabled for prj view (doubleclick ObjWin) + maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND); //disabled for prj view (doubleclick ObjWin) + maToolBox.ShowItem(TID_SOLDEP_FIND); //disabled for prj view (doubleclick ObjWin) + maToolBox.Resize(); + TogglePrjViewStatus(); + break; + } + return 0; +} + +/*****************************************************************************/ +void SolDep::ToggleHideDependency() +/*****************************************************************************/ +{ + mbIsHide = !mbIsHide; + maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode()); + ObjectWin* pWin = GetObjectList()->GetObject( 0 ); + pWin->ToggleHideMode(); +}; + +/*****************************************************************************/ +BOOL SolDep::GetVersion() +/*****************************************************************************/ +{ + SolSelectVersionDlg aVersionDlg( GetDepWin(), mpStandLst ); + if ( aVersionDlg.Execute() == RET_OK ) { + msVersionMajor = aVersionDlg.GetVersionMajor(); + msVersionMinor = aVersionDlg.GetVersionMinor(); + return TRUE; + } + return FALSE; +} + +void SolDep::InitContextMenueMainWnd() +{ + InitContextMenuePrjViewWnd( mpBaseWin ); + return; // Disable not actually supported items + + mpBaseWin->mpPopup->InsertItem( DEPPOPUP_AUTOARRANGE, String::CreateFromAscii("Autoarrange")) ; + mpBaseWin->mpPopup->InsertSeparator(); + mpBaseWin->mpPopup->InsertItem( DEPPOPUP_READ_SOURCE, String::CreateFromAscii("Revert all changes") ); + mpBaseWin->mpPopup->InsertSeparator(); + mpBaseWin->mpPopup->InsertItem( DEPPOPUP_OPEN_SOURCE, String::CreateFromAscii("Open") ); + mpBaseWin->mpPopup->InsertItem( DEPPOPUP_WRITE_SOURCE, String::CreateFromAscii("Save") ); +} + +void SolDep::InitContextMenuePrjViewWnd(DepWin* pBaseWin ) +{ + // temp. disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_NEW, String::CreateFromAscii("New object") ); + pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMIN, String::CreateFromAscii("Zoom in") ); + pBaseWin->mpPopup->InsertItem( DEPPOPUP_ZOOMOUT, String::CreateFromAscii("Zoom out") ); + pBaseWin->mpPopup->InsertSeparator(); + // temp disabled pBaseWin->mpPopup->InsertItem( DEPPOPUP_CLEAR, String::CreateFromAscii("Clear") ); + pBaseWin->mpPopup->InsertItem( DEPPOPUP_SHOW_TOOLBOX, String::CreateFromAscii("Show Toolbox") ); +} + +/*****************************************************************************/ +ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete ) +/*****************************************************************************/ +{ + Prj* pPrj; + +//hshtable auf stand halten + ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE ); + if ( pWin ) + { + ByteString aBodyText( pWin->GetBodyText() ); + if( (pPrj = mpStarWriter->GetPrj( aBodyText )) ) + { + mpStarWriter->Remove( pPrj ); +//cleanup ist teuer... + mpStarWriter->CleanUp(); + delete pPrj; + } + else + DBG_ASSERT( FALSE, "project not found - write" ); + + mpSolIdMapper->Delete( aBodyText ); + if ( bDelete ) + delete pWin; + return pWin; + } + else + return NULL; +} + +/*****************************************************************************/ +ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract ) +/*****************************************************************************/ +{ + ULONG nObjectId; + if ( bInteract ) + { + nObjectId = HandleNewPrjDialog( rBodyText ); + } + else + { +//hashtable auf stand halten + MyHashObject* pHObject; + nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE ); + pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId )); + mpSolIdMapper->Insert( rBodyText, pHObject ); + } + return nObjectId; +} + +/*****************************************************************************/ +ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract ) +/*****************************************************************************/ +{ + ULONG nObjectId; + if ( bInteract ) + { + nObjectId = HandleNewDirectoryDialog( rBodyText ); + } + else + { +//hshtable auf stand halten + MyHashObject* pHObject; + nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText ); + pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId )); + mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper + } + return nObjectId; +} + +/*****************************************************************************/ +USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) +/*****************************************************************************/ +{ +// DBG_ASSERT( FALSE , "not yet" ); + ByteString sEndName = pEndWin->GetBodyText(); + ByteString sStartName = pStartWin->GetBodyText(); + + Prj* pPrj = mpStarWriter->GetPrj( sEndName ); + if ( pPrj ) + { + pPrj->AddDependencies( sStartName ); + return AddConnectorToObjects( pStartWin, pEndWin ); + } + else + { + DBG_ASSERT( FALSE , "non existing Project" ); + return 1; + } +} + +/*****************************************************************************/ +USHORT SolDep::RemoveConnector( ObjectWin* pStartWin, ObjectWin* pEndWin ) +/*****************************************************************************/ +{ + SByteStringList* pPrjDeps = NULL; + ByteString sEndName = pEndWin->GetBodyText(); + ByteString sStartName = pStartWin->GetBodyText(); + + Prj* pPrj = mpStarWriter->GetPrj( sEndName ); + pPrjDeps = pPrj->GetDependencies( FALSE ); + if ( pPrjDeps ) + { + ByteString* pString; + ULONG nPrjDepsCount = pPrjDeps->Count(); + for ( ULONG j = nPrjDepsCount; j > 0; j-- ) + { + pString = pPrjDeps->GetObject( j - 1 ); + if ( pString->GetToken( 0, '.') == sStartName ) + pPrjDeps->Remove( pString ); + } + } + + return RemoveConnectorFromObjects( pStartWin, pEndWin ); +} + +/*****************************************************************************/ +void SolDep::RemoveAllObjects( ObjectList* pObjLst ) +/*****************************************************************************/ +{ + + Depper::RemoveAllObjects( pObjLst ); + + if ( mpSolIdMapper ) + { + delete mpSolIdMapper; + mpSolIdMapper = NULL; + } + if ( mpStarWriter ) + { + delete mpStarWriter; + mpStarWriter = NULL; + } +} + +/*****************************************************************************/ +ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList) +/*****************************************************************************/ +{ +// DBG_ASSERT( FALSE , "soldep" ); + MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project + + if ( !pHObject ) { + ByteString sNullPrj = "null";//null_project + ULONG nObjectId = AddObject( sNullPrj, FALSE ); + ObjIdToPtr( pObjList, nObjectId )->SetViewMask( 1 ); + return nObjectId; + } + + return pHObject->GetId(); +} + +/*****************************************************************************/ +ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* ) +/*****************************************************************************/ +{ +// DBG_ASSERT( FALSE , "prjdep" ); + MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir + if ( !pHObject ) + { + ByteString bsNull("null"); + ULONG nObjectId = AddPrjObject( bsNull, FALSE); //null_dir + return nObjectId; + } + else + return pHObject->GetId(); +} + +/*****************************************************************************/ +USHORT SolDep::OpenSource() +/*****************************************************************************/ +{ + if ( mpStandLst ) { + if ( GetVersion()) + return ReadSource(); + } + return 0; +} + +/*****************************************************************************/ +USHORT SolDep::ReadSource(BOOL bUpdater) +/*****************************************************************************/ +{ + mpBaseWin->EnablePaint( FALSE ); + mpBaseWin->Hide(); + ULONG nObjectId, nHashedId; + ULONG i; + MyHashObject* pHObject; + ByteString* pStr; + ObjectWin *pStartWin, *pEndWin; + + mpSolIdMapper = new SolIdMapper( 63997 ); + if (mpStandLst && bUpdater) + { + mpStarWriter = new StarWriter( mpStandLst, msVersionMajor, msVersionMinor, TRUE ); + } else + { + SolarFileList* pSolarFileList; + pSolarFileList = GetPrjListFromDir(); + mpStarWriter = new StarWriter( pSolarFileList, TRUE ); + } + ByteString sTitle( SOLDEPL_NAME ); + if ( mpStarWriter->GetMode() == STAR_MODE_SINGLE_PARSE ) { + sTitle += ByteString( " - mode: single file [" ); + sTitle += (ByteString) mpStarWriter->GetName(); + sTitle += ByteString( "]" ); + } + else if ( mpStarWriter->GetMode() == STAR_MODE_MULTIPLE_PARSE ) { + sTitle += ByteString( " - mode: multiple files [" ); + sTitle += ByteString( "]" ); + } + SetTitle( String( sTitle, RTL_TEXTENCODING_UTF8) ); + + ULONG nCount = mpStarWriter->Count(); + for ( i=0; i<nCount; i++ ) + { + Prj *pPrj = mpStarWriter->GetObject(i); + ByteString sPrjName = pPrj->GetProjectName(); + nObjectId = AddObject( sPrjName, FALSE ); + ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 1 ); + } + for ( i=0; i<nCount; i++ ) + { + Prj *pPrj = mpStarWriter->GetObject(i); + SByteStringList *pLst = pPrj->GetDependencies( FALSE ); + if ( pLst ) + { + ULONG nDepCount = pLst->Count(); + for ( ULONG m=0; m<nDepCount; m++) + { + pStr = pLst->GetObject(m); + pHObject = mpSolIdMapper->Find( *pStr ); + /*if ( !pHObject ) + { + // create new prj + Prj *pNewPrj = new Prj( *pStr ); + ByteString sPrjName = pNewPrj->GetProjectName(); + nObjectId = AddObject( sPrjName, FALSE ); + pHObject = mpSolIdMapper->Find( *pStr ); + ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 ); + }*/ + + if ( pHObject ) + { + nHashedId = pHObject->GetId(); + ByteString sF_Os2 = pPrj->GetProjectName(); + pStr = &sF_Os2; + pHObject = mpSolIdMapper->Find( *pStr ); + nObjectId = pHObject->GetId(); + pStartWin = ObjIdToPtr( mpObjectList, nHashedId ); + pEndWin = ObjIdToPtr( mpObjectList, nObjectId ); + AddConnectorToObjects( pStartWin, pEndWin ); + } + } + } + } + if (!IsPrjView()) + { + AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) ); + GetDepWin()->EnablePaint( TRUE ); + } + return 0; +} + +SolarFileList* SolDep::GetPrjListFromDir() +{ + SolarFileList* pSolarFileList = new SolarFileList(); + String sPrjDir( String::CreateFromAscii( "prj" )); + String sBuildLst( String::CreateFromAscii( "build.lst" )); + DirEntry aCurrent( getenv( SOURCEROOT ) ); + + aCurrent.ToAbs(); + Dir aDir( aCurrent, FSYS_KIND_DIR ); + + USHORT nEntries = aDir.Count(); + if( nEntries ) + { + UniStringList aSortDirList; + for ( USHORT n = 0; n < nEntries; n++ ) + { + DirEntry& rEntry = aDir[n]; + UniString aName( rEntry.GetName() ); + if( aName.Len() && ( aName.GetChar(0) != '.' ) && rEntry.Exists() ) + { + rEntry += DirEntry( sPrjDir ); + rEntry += DirEntry( sBuildLst ); + if (rEntry.Exists()) + { + pSolarFileList->Insert( new String( rEntry.GetFull() ), LIST_APPEND ); + ByteString aName_dbg(rEntry.GetFull(),RTL_TEXTENCODING_UTF8); + fprintf(stdout, "bla:%s\n", aName_dbg.GetBuffer()); + } + } + } + } + if ( !pSolarFileList->Count() ) + { + //is empty!! TBD + delete pSolarFileList; + return NULL; + } + return pSolarFileList; +} + +/*****************************************************************************/ +USHORT SolDep::WriteSource() +/*****************************************************************************/ +{ +/* zur Sicherheit deaktiviert + USHORT nMode = mpStarWriter->GetMode(); + if ( nMode == STAR_MODE_SINGLE_PARSE ) { + ByteString sFileName = mpStarWriter->GetName(); + if ( sFileName.Len()) { + mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) ); + mpStarWriter->RemoveProject( ByteString( "null")); //null_project + } + } + else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) { + // *OBO* + //String sRoot = mpStarWriter->GetSourceRoot(); + //nicht mehr unterstützt mpStarWriter->GetSourceRoot() + ByteString sFileName = mpStarWriter->GetName(); + DirEntry aEntry( sFileName ); + aEntry.ToAbs(); + aEntry = aEntry.GetPath().GetPath().GetPath(); + String sRoot = aEntry.GetFull(); + + if ( sRoot.Len()) { + mpStarWriter->RemoveProject( ByteString( "null")); //null_project + mpStarWriter->WriteMultiple( sRoot ); + } + } +*/ + return 1; +} + +USHORT SolDep::Load( const ByteString& rFileName ) +{ +// moved from depper class + DBG_ASSERT( FALSE , "you are dead!" ); + SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ ); + depper_head dh; + ULONG i; + ULONG nLoadOffs = mnSolLastId; //or Prj?? + ObjectWin* pNewWin; + aInFile.Read( &dh, sizeof( dh )); + + ULONG nObjCount = dh.nObjectCount; + ULONG nCnctrCount = dh.nCnctrCount; + + for ( i=0; i < nObjCount ; i++ ) + { + ObjectWin* pWin = new ObjectWin( mpBaseWin, WB_BORDER ); + pWin->Load( aInFile ); + pNewWin = ObjIdToPtr( mpObjectList, AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, pWin->GetBodyText(), FALSE )); + pNewWin->SetId( nLoadOffs + pWin->GetId()); + pNewWin->SetPosPixel( pWin->GetPosPixel()); + pNewWin->SetSizePixel( pWin->GetSizePixel()); + } + + ULONG nStartId; + ULONG nEndId; +// ueber addconnector fuehren! + for ( i=0; i < nCnctrCount ; i++ ) + { + Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER ); + pCon->Load( aInFile ); + + nStartId = nLoadOffs + pCon->GetStartId(); + nEndId = nLoadOffs + pCon->GetEndId(); + + ObjectWin* pStartWin = ObjIdToPtr( mpObjectList, nStartId ); + ObjectWin* pEndWin = ObjIdToPtr( mpObjectList, nEndId ); + + pCon->Initialize( pStartWin, pEndWin ); + } + + + return 0; +} + +/*****************************************************************************/ +BOOL SolDep::ViewContent( ByteString& rObjectName ) +/*****************************************************************************/ +{ + mpFocusWin = NULL; + SetPrjViewStatus(TRUE); + + for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ ) + if ( mpObjectList->GetObject( i )->HasFocus()) + mpFocusWin = mpObjectList->GetObject( i ); + //HideObjectsAndConnections( mpObjectList ); + mpProcessWin->Resize(); + GetDepWin()->Show(); + return InitPrj( rObjectName ); +} + +/*****************************************************************************/ +BOOL SolDep::InitPrj( ByteString& rListName ) +/*****************************************************************************/ +{ + ULONG nObjectId, nHashedId; + ULONG i, j; + MyHashObject* pHObject; + ByteString *pDepName; + ByteString *pFlagName; + Prj* pPrj; + ObjectWin *pStartWin, *pEndWin; + maToolBox.HideItem(TID_SOLDEP_SELECT_WORKSPACE); + maToolBox.HideItem(TID_SOLDEP_HIDE_INDEPENDEND); + maToolBox.HideItem(TID_SOLDEP_FIND); + maToolBox.ShowItem(TID_SOLDEP_BACK); + maToolBox.Invalidate(); + + //clean up + mpObjectPrjList->ClearAndDelete(); + GetDepWin()->ClearConnectorList(); + if (mpPrjIdMapper) delete mpPrjIdMapper; + mpPrjIdMapper = new SolIdMapper( 63997 ); //generate clean mapper + mnPrjWinCount = 0; + mnPrjLastId = 0; + + ULONG nCount = mpStarWriter->Count(); + GetDepWin()->EnablePaint( FALSE ); + Point aPnt = GetGraphWin()->GetPosPixel(); + Size aSize = GetGraphWin()->GetSizePixel(); + + GetGraphWin()->SetPosSizePixel( aPnt, aSize ); // Hier wird das Window gesetzt + + BOOL bReturn = FALSE; + + for ( i=0; i<nCount; i++ ) + { +// pPrj->GetProjectName() returns the name of +// the project e.g. svtools + pPrj = mpStarWriter->GetObject(i); + ByteString sPrjName = pPrj->GetProjectName(); + if ( sPrjName == rListName ) + { + bReturn = TRUE; + + mpPrj = mpStarWriter->GetObject(i); + ULONG nDirCount = mpPrj->Count(); + for ( j=0; j<nDirCount; j++ ) + { + CommandData *pData = mpPrj->GetObject(j); + fprintf( stdout, "\tProjectDir : %s\n", + pData->GetLogFile().GetBuffer()); +// pData->GetLogFile() contains internal project IDs +// e.g. st_mkout etc. + if ( pData->GetLogFile() != "" ) + { + ByteString sItem = pData->GetLogFile(); + nObjectId = AddPrjObject( sItem, FALSE); +// there may be faster ways...... + ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); + pWin->SetViewMask( 0x0001 ); +// pData->GetPath() contains internal project directories +// e.g. svtools/inc etc. + ByteString sPath = pData->GetPath(); + pWin->SetTipText( sPath ); + } + } + +// set connectors for dependencies here + for ( j=0; j<nDirCount; j++ ) + { + CommandData *pData = mpPrj->GetObject(j); + SByteStringList *pDeps = pData->GetDependencies(); + if ( pDeps ) + { + ByteString sFlagName = pData->GetLogFile(); + pFlagName = &sFlagName; + //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource() + pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.')); + if (pHObject) + { + + nObjectId = pHObject->GetId(); + + ULONG nDepCount = pDeps->Count(); + for ( ULONG k=0; k<nDepCount; k++ ) + { + pDepName = pDeps->GetObject(k); + pHObject = mpPrjIdMapper->Find( (*pDepName).GetToken( 0, '.')); + if (pHObject ) + { + nHashedId = pHObject->GetId(); + pStartWin = ObjIdToPtr( mpObjectPrjList, nHashedId ); + pEndWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); + + AddConnectorToObjects( pStartWin, pEndWin ); + } + else + { + String sMessage; + sMessage += String::CreateFromAscii("can't find "); + sMessage += String( *pDepName, RTL_TEXTENCODING_UTF8 ); + sMessage += String::CreateFromAscii(".\ndependency ignored"); + WarningBox aBox( GetDepWin(), WB_OK, sMessage); + aBox.Execute(); + } + } + } + } + + } + + break; + } + } + ByteString sNullDir = "null"; + nObjectId = AddPrjObject( sNullDir, FALSE); + ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId ); + pWin->SetViewMask( 0x0001 ); + mpGraphPrjWin->EnablePaint( TRUE ); + //debug +// int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList); +// ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l ); + AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) ); + mpGraphWin->Hide(); + mpGraphPrjWin->Show(); + mpGraphPrjWin->Invalidate(); + + return bReturn; +} + +/*****************************************************************************/ +USHORT SolDep::CloseWindow() +/*****************************************************************************/ +{ + + ((SystemWindow*)mpProcessWin)->Close(); + return 0; +} + +/*****************************************************************************/ +void SolDep::ShowHelp() +/*****************************************************************************/ +{ + SvFileStream aHelpFile( String::CreateFromAscii( "g:\\soldep.hlp" ), STREAM_READ ); + String aHelpText; + ByteString aGetStr; + + if ( aHelpFile.IsOpen() ) + { + while ( aHelpFile.ReadLine( aGetStr ) ) + { + aHelpText += String (aGetStr, RTL_TEXTENCODING_UTF8); + aHelpText += String::CreateFromAscii("\n"); + } + } + else + aHelpText = String::CreateFromAscii("No Helpfile found."); + + SolHelpDlg aHelpDlg( mpBaseWin, DtSodResId( RID_SD_DIALOG_HELP )); + aHelpDlg.maMLEHelp.SetText( aHelpText ); + aHelpDlg.maMLEHelp.SetReadOnly(); + aHelpDlg.maMLEHelp.EnableFocusSelectionHide( TRUE ); + aHelpDlg.Execute(); +} + +/*****************************************************************************/ +BOOL SolDep::FindProject() +/*****************************************************************************/ +{ + SolFindProjectDlg aFindProjectDlg( GetDepWin(), GetObjectList() ); + ObjectWin* pObjectWin = NULL; + mpObjectList->ResetSelectedObject(); + if (IsHideMode()) + { + GetDepWin()->Invalidate(); + } + + mpFocusWin=NULL; + + if ( aFindProjectDlg.Execute() == RET_OK ) { + msProject = aFindProjectDlg.GetProject(); + //now we have a project string + + pObjectWin = mpObjectList->GetPtrByName( msProject ); + if (pObjectWin) + { + mpObjectList->ResetSelectedObject(); + MarkObjects( pObjectWin ); + } + else + { + mpObjectList->ResetSelectedObject(); + for ( USHORT i=0; i<mpObjectList->Count(); i++ ) + { + ObjectWin* pObjectWin = mpObjectList->GetObject( i ); + if ( !pObjectWin->IsTop() ) + pObjectWin->SetViewMask(FALSE); + } + } + } + return FALSE; +} + +BOOL SolDep::MarkObjects( ObjectWin* pObjectWin ) +{ + if (pObjectWin) + { + if (!(pObjectWin->IsNullObject())) + { + pObjectWin->SetMarkMode( MARKMODE_SELECTED ); + pObjectWin->MarkNeeded(); + pObjectWin->MarkDepending(); + if (IsHideMode()) + { + GetDepWin()->Invalidate(); + } + } else + { + fprintf(stdout,"null\n"); + } + } + return TRUE; +} + +void SolDep::Resize() +{ +//funzt! muß aber von der applikation aufgerufen werden. + Point aOutPos = Point( 0, 0 ); + Size aOutSize = mpProcessWin->GetOutputSizePixel(); + // calculate output size + ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height(); + ULONG nTaskWidth = maToolBox.CalcWindowSizePixel().Width(); + Size aSize( aOutSize.Width(), nTaskHeight ); + +// ULONG nMenuHeight = 0; + Point aGraphWinPos = Point(0,0); + Size aGraphWinSize = Size(0,0); + +//weiß nicht wie: nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues + + //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize ); + // Set Docking-Rectangle for ToolBar + Rectangle aInRect; + + if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_TOP )) + { + // waagerechte Toolbar oben + maToolBox.SetPosSizePixel( aOutPos, Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height())); + if( maToolBox.IsVisible()) + { + Point aOutPosTmp; + Size aOutSizeTmp; + aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height()); + aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height()); + aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); + aGraphWinPos = Point( 0, nTaskHeight ); + aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight); + } + } + if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_BOTTOM )) + { + // waagerechte Toolbar unten + Point aTbPos = Point( aOutPos.X(), aOutPos.Y() + aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height()); + Size aTbSize = Size( aOutSize.Width(), maToolBox.CalcWindowSizePixel().Height()); + maToolBox.SetPosSizePixel( aTbPos, aTbSize ); + if( maToolBox.IsVisible()) + { + Point aOutPosTmp; + Size aOutSizeTmp; + aOutPosTmp = Point( aOutPos.X(), aOutPos.Y() + maToolBox.CalcWindowSizePixel().Height()); + aOutSizeTmp = Size( aOutSize.Width(), aOutSize.Height() - maToolBox.CalcWindowSizePixel().Height()); + aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); + aGraphWinPos = Point( 0, 0 ); + aGraphWinSize = Size( aOutSize.Width(), aOutSize.Height() - nTaskHeight); + } + } + if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_LEFT )) + { + // senkrechte ToolBar links + maToolBox.SetPosSizePixel( aOutPos, Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height())); + if( maToolBox.IsVisible()) + { + Point aOutPosTmp; + Size aOutSizeTmp; + aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y()); + aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()); + aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); + aGraphWinPos = Point( nTaskWidth, 0 ); + aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height()); + } + } + if (( !maToolBox.IsFloatingMode() ) && ( maToolBox.GetAlign() == WINDOWALIGN_RIGHT )) + { + // senkrechte ToolBar rechts + Point aTbPos = Point( aOutPos.X() + aOutSize.Width() - maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y()); + Size aTbSize= Size( maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()); + maToolBox.SetPosSizePixel( aTbPos, aTbSize); + if( maToolBox.IsVisible()) + { + Point aOutPosTmp; + Size aOutSizeTmp; + aOutPosTmp = Point( aOutPos.X() + maToolBox.CalcWindowSizePixel().Width(), aOutPos.Y()); + aOutSizeTmp = Size( aOutSize.Width()- maToolBox.CalcWindowSizePixel().Width(), aOutSize.Height()); + aInRect = Rectangle( aOutPosTmp, aOutSizeTmp ); + aGraphWinPos = Point( 0, 0 ); + aGraphWinSize = Size( aOutSize.Width() - nTaskWidth, aOutSize.Height()); + } + } + + Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos ) + Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top()) + Size( aOutSize.Width(), aOutSize.Height())); +/* + Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos ); + Rectangle rin = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top()) + Size( aOutSize.Width(), aOutSize.Height())); +*/ + maToolBox.SetDockingRects( rout, rin ); + + BOOL bFloating = maToolBox.IsFloatingMode(); + + if ( bFloating ) + { + GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize); + //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize(); + if (maToolBox.IsVisible()) maToolBox.Show(); + } else + { + GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize ); + } + if (maToolBox.IsVisible()) maToolBox.Show(); +} + +USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) +{ +// DBG_ASSERT( FALSE , "not yet" ); + ByteString sEndName = pEndWin->GetBodyText(); + ByteString sStartName = pStartWin->GetBodyText(); + if ( sStartName != ByteString("null")) + { + CommandData* pEndData = mpPrj->GetDirectoryData( sEndName ); + SByteStringList* pDeps = pEndData->GetDependencies(); + if ( pDeps ) + pDeps->PutString( &sStartName ); + else + { + pDeps = new SByteStringList(); + pEndData->SetDependencies( pDeps ); + pDeps->PutString( &sStartName ); + pEndData->GetDependencies(); + } + } + return AddConnectorToObjects( pStartWin, pEndWin ); +} + +USHORT SolDep::RemoveConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin ) +{ + ByteString sEndName = pEndWin->GetBodyText(); + ByteString sStartName = pStartWin->GetBodyText(); + CommandData* pEndData = mpPrj->GetDirectoryData( sEndName ); + SByteStringList* pDeps = pEndData->GetDependencies(); + if ( pDeps ) + { + ByteString* pString; + ULONG nDepsCount = pDeps->Count(); + for ( ULONG j = nDepsCount; j > 0; j-- ) + { + pString = pDeps->GetObject( j - 1 ); + if ( pString->GetToken( 0, '.') == sStartName ) + pDeps->Remove( pString ); + } + } + return RemoveConnectorFromObjects( pStartWin, pEndWin ); +} + +USHORT SolDep::AutoArrange( SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ) +{ + AutoArrangeDlgStart(); + OptimizePos(pIdMapper, pObjLst, nTopId, nBottmId, aObjID ); + AutoArrangeDlgStop(); + return 0; +} + +Point SolDep::CalcPos( USHORT nSet, USHORT nIndex ) +{ + int nRowIndex = nIndex / DEPPER_MAX_WIDTH; + ULONG nPosX = mnXOffset + nRowIndex % 3 * GetDefSize().Width() / 3 + ( nIndex - ( DEPPER_MAX_WIDTH * nRowIndex )) * (GetDefSize().Width() + OBJWIN_X_SPACING ); + + ULONG nPosY = ( nSet + mnLevelOffset + nRowIndex ) * ( GetDefSize().Height() + OBJWIN_Y_SPACING ) + OBJWIN_Y_SPACING; + Point aPos( nPosX, nPosY ); + return aPos; +} + +ULONG SolDep::CalcXOffset( ULONG nObjectsToFit ) +{ + long nDynXOffs; + long nXMiddle; + ULONG nTrigger; + + nXMiddle = GetDepWin()->PixelToLogic( GetDepWin()->GetSizePixel()).Width() / 2; + if ( nObjectsToFit > DEPPER_MAX_WIDTH ) + nObjectsToFit = DEPPER_MAX_WIDTH - 1 + DEPPER_MAX_WIDTH % 2; + nTrigger = ( nObjectsToFit - 1 ) / 2; + nDynXOffs = ( GetDefSize().Width() + OBJWIN_X_SPACING ) * nTrigger; + ULONG nXOffs = nXMiddle - nDynXOffs; + + if ( ULONG(nXMiddle - nDynXOffs) < mnMinDynXOffs ) + mnMinDynXOffs = nXMiddle - nDynXOffs; + + return nXOffs; + +} + +double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType ) +{ + ObjectWin* pWin; + Connector* pCon; + ULONG nObjCount = pObjList->Count(); + double dRetVal = 0; + double dWinVal; + USHORT i, j; + BOOL bIsStart; + + for ( i = 0; i < nObjCount; i++ ) + { + pWin = pObjList->GetObject( i ); + + if ( pWin && pWin->IsVisible()) + { + j = 0; + dWinVal = 0; + while ( (pCon = pWin->GetConnector( j )) ) + { + if ( pCon->IsVisible()) { + bIsStart = pCon->IsStart( pWin ); + if ( eDistType != BOTH ) + if ( eDistType == TOPDOWN ) + { + if ( bIsStart ) + { + pCon->UpdatePosition( pWin, FALSE ); + dWinVal += pCon->GetLen() * pWin->mnHeadDist; + } + } + else + { + if ( !bIsStart ) + { + pCon->UpdatePosition( pWin, FALSE ); + dWinVal += pCon->GetLen() * pWin->mnRootDist; + } + + } + else + { + pCon->UpdatePosition( pWin, FALSE ); + if ( !bIsStart ) + dWinVal += pCon->GetLen() * ( pWin->mnHeadDist + 1 ); + else + dWinVal += pCon->GetLen() * pWin->mnRootDist; + } + } + j++; + } +// if ( j != 0 ) +// dWinVal /= j; + dRetVal += dWinVal; + } + } + + return dRetVal; +} + +USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth ) +{ + USHORT i = 0; + ObjectWin* pNewWin; + Connector* pCon; + + nDepth++; + + USHORT nMaxDepth = nDepth; + + pWin->mbVisited = TRUE; + pWin->mnRootDist = Max ( nDepth, pWin-> mnRootDist ); + if ( nDepth > DEPPER_MAX_DEPTH ) + { + DBG_ASSERT( nDepth != DEPPER_MAX_DEPTH + 1, "Ringabhängigkeit!" ); + nDepth++; + return DEP_ENDLES_RECURSION_FOUND; + } + + while ( (pCon = pWin->GetConnector( i )) ) + { + if ( pCon->IsStart( pWin )&& pCon->IsVisible() ) //removed: don't show null_project + { + pNewWin = pCon->GetOtherWin( pWin ); + nMaxDepth = Max( Impl_Traveller( pNewWin, nDepth ), nMaxDepth ); + if( nMaxDepth == DEP_ENDLES_RECURSION_FOUND ) + { + mpTravellerList->Insert( pWin, LIST_APPEND ); + return DEP_ENDLES_RECURSION_FOUND; + } + } + i++; + } + pWin->mnHeadDist = MAX( pWin->mnHeadDist, nMaxDepth - nDepth ); + return nMaxDepth; +} + + +double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType ) +{ + + ULONG i, j, l; + ULONG nEnd = nStart + nSize; + ObjectWin* pSwapWin; + ULONG nLevelObjCount = rObjList.Count(); + +//dont use full recusion for more than 6 objects + if ( nLevelObjCount > 6 ) + { + srand(( unsigned ) time( NULL )); + + ULONG nIdx1, nIdx2; + for ( i = 0; i < 101; i++ ) + { + UpdateSubProgrssBar(i); + for ( j = 0; j < 100; j++ ) + { + nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + while ( rObjList.GetObject( nIdx1 ) == NULL ) + nIdx1 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + while ( nIdx1 == nIdx2 || nIdx2 == nLevelObjCount ) + nIdx2 = (ULONG) ( double( rand() ) / RAND_MAX * nLevelObjCount ); + + pSwapWin = rObjList.GetObject( nIdx1 ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] ); + pSwapWin = rObjList.Replace( pSwapWin, nIdx2 ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] ); + rObjList.Replace( pSwapWin, nIdx1 ); + + double dCurDist = CalcDistSum( &rObjList, eDistType ); + + if ( dCurDist < dMinDist ) + { + dMinDist = dCurDist; + rResultList.Clear(); + for ( l = 0; l < nLevelObjCount; l++ ) + { + pSwapWin = rObjList.GetObject( l ); + rResultList.Insert( pSwapWin, LIST_APPEND); + } + } +// if ( dCurDist > dMinDist * 1.5 ) + if ( dCurDist > dMinDist * 15 ) + { + pSwapWin = rObjList.GetObject( nIdx1 ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( pPosArray[ nIdx2 ] ); + pSwapWin = rObjList.Replace( pSwapWin, nIdx2 ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( pPosArray[ nIdx1 ] ); + rObjList.Replace( pSwapWin, nIdx1 ); + } + } + } + } + else + { + for ( i = nStart ; i < nEnd; i++) + { + if ( nSize > 1 ) + { + pSwapWin = rObjList.GetObject( i ); + pSwapWin = rObjList.Replace( pSwapWin, nStart ); + rObjList.Replace( pSwapWin, i ); + double dPermuteDist = Impl_PermuteMin( rObjList, pPosArray, rResultList, dMinDist, nStart + 1, nSize - 1, eDistType ); + dMinDist = MIN( dMinDist, dPermuteDist); + pSwapWin = rObjList.GetObject( i ); + pSwapWin = rObjList.Replace( pSwapWin, nStart ); + rObjList.Replace( pSwapWin, i ); + + } + else + { + for ( l = 0; l < nLevelObjCount; l++ ) + { + pSwapWin = rObjList.GetObject( l ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( pPosArray[ l ] ); + } + + double dCurDist = CalcDistSum( &rObjList, eDistType ); + + if ( dCurDist < dMinDist ) + { + dMinDist = dCurDist; + rResultList.Clear(); + for ( l = 0; l < nLevelObjCount; l++ ) + { + pSwapWin = rObjList.GetObject( l ); + rResultList.Insert( pSwapWin, LIST_APPEND); + } + } + + } + } + } + + return dMinDist; +} + + +USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nTopId, ULONG nBottmId, ULONG aObjID ) +{ + ObjWinList aWorkList; + ObjectWin* pWin; + Connector* pCon; + USHORT nRootDist = (USHORT) -1; + USHORT i, j, k, l, nRetVal; + USHORT LevelUse[ DEPPER_MAX_DEPTH ]; + USHORT LevelSecUse[ DEPPER_MAX_DEPTH ]; + ObjWinList* LevelList[ DEPPER_MAX_DEPTH ]; + ObjWinList* LevelSecList[ DEPPER_MAX_DEPTH ]; + Point aPosArray[ DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ]; + + mnMinDynXOffs = 0xffff; + + for ( i = 0; i < DEPPER_MAX_DEPTH; i++ ) + { + LevelUse[ i ] = 0; + LevelList[ i ] = NULL; + LevelSecUse[ i ] = 0; + LevelSecList[ i ] = NULL; + } + + GetDepWin()->EnablePaint( FALSE ); + + ULONG nObjCount = pObjLst->Count(); + for ( i = 0; i < nObjCount; i++ ) + { + pWin = pObjLst->GetObject( i ); + if ( pWin->IsVisible()) { + pWin->mbVisited = FALSE; + pWin->mnHeadDist = 0; + pWin->mnRootDist = 0; + + // find initial objects which need to be connected with + // root object + j = 0; + USHORT nStartCount = 0; + USHORT nEndCount = 0; + while ( (pCon = pWin->GetConnector( j )) ) + { + if ( pCon->IsVisible()) { //null_project + if( pCon->IsStart( pWin )) + nStartCount++; + else + { + nEndCount = 1; + break; + } + } + j++; + } + + if ( nStartCount > 0 && nEndCount == 0 ) + if ( nTopId != pWin->GetId()) + AddConnectorToObjects( pObjLst, nTopId, pWin->GetId()); + + } + } + + pWin = ObjIdToPtr( pObjLst, nTopId ); + + if ( mpTravellerList ) + { + mpTravellerList->Clear(); + delete mpTravellerList; + } + mpTravellerList = new ObjWinList(); + // set root and top distance + nRetVal = Impl_Traveller( pWin, nRootDist ); + + DBG_ASSERT( nRetVal < DEPPER_MAX_DEPTH , "zu tief" ); + if ( nRetVal == DEP_ENDLES_RECURSION_FOUND ) + { + WriteToErrorFile(); + return nRetVal; + } + + ULONG nUnvisited = 0; + ULONG nUnvisYOffs = 0; + + // seperate mainstream, secondary and unconnected + for ( i = 0; i < nObjCount; i++ ) + { + pWin = pObjLst->GetObject( i ); + if ( pWin->IsVisible()) { + if (( pWin->mnHeadDist + pWin->mnRootDist ) == nRetVal ) + { + if ( !LevelList[ pWin->mnHeadDist ] ) + LevelList[ pWin->mnHeadDist ] = new ObjWinList; + LevelList[ pWin->mnHeadDist ]->Insert( pWin ); + LevelUse[ pWin->mnHeadDist ]++; + } + else + if ( pWin->mbVisited ) + { + if ( !LevelSecList[ nRetVal - pWin->mnRootDist ] ) + LevelSecList[ nRetVal - pWin->mnRootDist ] = new ObjWinList; + LevelSecList[ nRetVal - pWin->mnRootDist ]->Insert( pWin ); + LevelSecUse[ nRetVal - pWin->mnRootDist ]++; + } + else + { + // need to be arranged more intelligent... + Point aPos( 5, nUnvisYOffs ); + pWin->SetCalcPosPixel( aPos ); + + Point aTmpPos = pWin->GetCalcPosPixel(); + pWin->SetPosPixel( mpBaseWin->LogicToPixel( aTmpPos )); + + nUnvisYOffs += pWin->PixelToLogic( pWin->GetSizePixel()).Height(); + nUnvisited++; + } + } + } + + mnLevelOffset = 0; + + USHORT nScaleVal; + + if ( nRetVal == 0 ) + nScaleVal = 1; + else + nScaleVal = nRetVal; + + i = 0; + + USHORT nStep = 0; + + while ( LevelList[ i ] ) + { + UpdateMainProgressBar(i, nScaleVal, nStep); + DBG_ASSERT( LevelUse[ i ] == LevelList[ i ]->Count() , "level index im a..." ); + ObjectWin* pSwapWin; + ULONG nLevelObjCount = LevelList[ i ]->Count(); + + if ( nLevelObjCount % 2 == 0 ) + { + LevelList[ i ]->Insert( NULL, LIST_APPEND ); + nLevelObjCount++; +// LevelUse bleibt orginal... +// LevelUse[ i ]++; + } + +// catch too big lists + DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" ); + if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ) + { + WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking")); + aWBox.Execute(); + break; + } + mnXOffset = CalcXOffset( nLevelObjCount ); + aWorkList.Clear(); + + // initial positioning for mainstream + for ( j = 0; j < nLevelObjCount; j++ ) + { + pSwapWin = LevelList[ i ]->GetObject( j ); + aWorkList.Insert( pSwapWin, LIST_APPEND); + Point aPos = CalcPos( i, j ); + aPosArray[ j ] = aPos; + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + + double dMinDist = CalcDistSum( LevelList[ i ] ); + + // optimize mainstream order and return best matching list in "aWorkList" + dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount )); + + // set optimized positions - may still be wrong from later tries + for ( j = 0; j < nLevelObjCount; j++ ) + { + pSwapWin = aWorkList.GetObject( j ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + + if ( LevelSecList[ i ] != NULL ) + { + ULONG nLevelSecObjCount = LevelSecList[ i ]->Count(); + // expand list for better positioning + while ( nLevelSecObjCount + LevelUse[ i ] < DEPPER_MAX_WIDTH - 1 ) + { + LevelSecList[ i ]->Insert( NULL, LIST_APPEND ); + nLevelSecObjCount++; + } + if ( ( nLevelSecObjCount + LevelUse[ i ])% 2 == 0 ) + { + LevelSecList[ i ]->Insert( NULL, LIST_APPEND ); + nLevelSecObjCount++; + } + + DBG_ASSERT( nLevelSecObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" ); + if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH ) + { + WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph zu breit! dat geiht nich gut. breaking")); + aWBox.Execute(); + break; + } + mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount ); + aWorkList.Clear(); + + l = 0; + BOOL bUsedPos; + + // find free positions for secondary objects + for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ ) + { + Point aPos = CalcPos( i, j ); + bUsedPos = FALSE; + // is already occupied? + for ( k = 0; k < nLevelObjCount; k++ ) + { + if ( LevelList[ i ]->GetObject( k ) ) + if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() ) + bUsedPos = TRUE; + } + // if its free, add to pool + if ( !bUsedPos ) + { + aPosArray[ l ] = aPos; + l++; + } + } + + // initial positioning for secodaries + for ( j = 0 ; j < nLevelSecObjCount ; j++ ) + { + pSwapWin = LevelSecList[ i ]->GetObject( j ); + aWorkList.Insert( pSwapWin, LIST_APPEND); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + dMinDist = CalcDistSum( LevelSecList[ i ] ); + + dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount )); + + // set optimized positions - may still be wrong from later tries + for ( j = 0; j < nLevelSecObjCount; j++ ) + { + pSwapWin = aWorkList.GetObject( j ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH ) + mnLevelOffset++; + } + if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH ) + mnLevelOffset+= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ; + i++; + } + + mnMinDynXOffs = 0xffff; + +// and back again... + // get better results form already preoptimized upper and lower rows + + do + { + i--; + UpdateMainProgressBar(i, nScaleVal, nStep, TRUE); // TRUE ~ counting down + if ( LevelUse[ i ] + LevelSecUse[ i ] > DEPPER_MAX_WIDTH ) + mnLevelOffset-= ( LevelUse[ i ] + LevelSecUse[ i ] ) / DEPPER_MAX_WIDTH ; + ObjectWin* pSwapWin; + ULONG nLevelObjCount = LevelList[ i ]->Count(); + mnXOffset = CalcXOffset( nLevelObjCount ); + aWorkList.Clear(); + + for ( j = 0; j < nLevelObjCount; j++ ) + { + pSwapWin = LevelList[ i ]->GetObject( j ); + aWorkList.Insert( pSwapWin, LIST_APPEND); + Point aPos = CalcPos( i, j ); + aPosArray[ j ] = aPos; +//no need to do this stuff....... ????? + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + + double dMinDist = CalcDistSum( LevelList[ i ], BOTH ); + + dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH )); +// wrong position for remaping - keep old positions for comparing + for ( j = 0; j < nLevelObjCount; j++ ) + { + pSwapWin = aWorkList.GetObject( j ); + if ( pSwapWin ) +// pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] )); + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + + if ( LevelSecList[ i ] != NULL ) + { + ULONG nLevelSecObjCount = LevelSecList[ i ]->Count(); + mnXOffset = CalcXOffset( LevelUse[ i ] + nLevelSecObjCount ); + aWorkList.Clear(); + + l = 0; + BOOL bUsedPos; + + for ( j = 0; j < ( LevelUse[ i ] + nLevelSecObjCount ) ; j++ ) + { + Point aPos = CalcPos( i, j ); + bUsedPos = FALSE; +// could be faster + for ( k = 0; k < nLevelObjCount; k++ ) + { + if ( LevelList[ i ]->GetObject( k ) ) + if ( aPos == LevelList[ i ]->GetObject( k )->GetCalcPosPixel() ) + bUsedPos = TRUE; + } + if ( !bUsedPos ) + { + aPosArray[ l ] = aPos; + l++; + } + } + + for ( j = 0 ; j < nLevelSecObjCount ; j++ ) + { + pSwapWin = LevelSecList[ i ]->GetObject( j ); + aWorkList.Insert( pSwapWin, LIST_APPEND); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + dMinDist = CalcDistSum( LevelSecList[ i ], BOTH ); + + dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH )); +// wrong position for remaping - keep old positions for comparing + for ( j = 0; j < nLevelSecObjCount; j++ ) + { + pSwapWin = aWorkList.GetObject( j ); + if ( pSwapWin ) + pSwapWin->SetCalcPosPixel( aPosArray[ j ] ); + } + } +// i--; + } while ( i != 0 ); + SetMainProgressBar( 100 ); + + ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 ) * ( OBJWIN_X_SPACING + GetDefSize().Width() ); + + // ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier muß man switchen GetStart/GetPrjStart oder so + + ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID); + + ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING; + if (( nUnvisYOffs + GetDefSize().Height()) > nNewYSize ) + nNewYSize = nUnvisYOffs + GetDefSize().Height(); + + MapMode aMapMode = GetDepWin()->GetMapMode(); + Size aTmpSize( (ULONG) (double(nNewXSize) * double( aMapMode.GetScaleX())), (ULONG) (double( nNewYSize) * double( aMapMode.GetScaleY()))); + + Size aNowSize( GetGraphWin()->GetSizePixel()); + + if ( GetDepWin()->LogicToPixel( aNowSize ).Width() > aTmpSize.Width() ) + aTmpSize.Width() = GetDepWin()->LogicToPixel( aNowSize ).Width() ; + + if ( GetDepWin()->LogicToPixel( aNowSize ).Height() > aTmpSize.Height() ) + aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ; + +// if ( nZoomed <= 0 ) +// { +// mpBaseWin->SetSizePixel( aTmpSize ); +// mpGraphWin->SetTotalSize( aTmpSize ); +// mpGraphWin->EndScroll( 0, 0 ); +// } + +// now remap all objects + ULONG nAllObjCount = pObjLst->Count(); + Point aTmpPos; + for ( j = 0; j < nAllObjCount; j++ ) + { + pWin = pObjLst->GetObject( j ); + if ( pWin->IsVisible()) { + aTmpPos = pWin->GetCalcPosPixel(); + if ( pWin->mbVisited ) + { +// reserve space for unconnected + aTmpPos.X() -= mnMinDynXOffs; + aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING; +// center window + aTmpPos.X() += GetDefSize().Width() / 2; + aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ; + } + pWin->SetPosPixel( GetDepWin()->LogicToPixel( aTmpPos )); + } + } + aWorkList.Clear(); + GetDepWin()->EnablePaint( TRUE ); + GetDepWin()->Invalidate(); +//LevelListen loeschen Hä? Welche Levellisten? + +//Update all Connectors +// --> To be done: Don't call twice Object1-Connector-Object2 + ObjectWin* pObject1; + for ( i = 0 ; i < nObjCount ; i++) + { + pObject1 = pObjLst->GetObject( i ); + if ( pObject1->IsVisible()) + pObject1->UpdateConnectors(); + }; + return 0; +} + +void SolDep::WriteToErrorFile() +{ +//Needs some improvement + ObjectWin* pWin; + WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects")); + aWBox.Execute(); + char *tmpdir = getenv("TMP"); + char *errfilebasename = "depper.err"; + char *ErrFileName = (char*) malloc( strlen( tmpdir ) + strlen( errfilebasename) + 3 ); + *ErrFileName = '\0'; + strcat( ErrFileName, tmpdir ); + strcat( ErrFileName, "\\" ); + strcat( ErrFileName, errfilebasename ); + FILE* pErrFile = fopen( "depper.err", "w+" ); + if ( pErrFile ) + { + for ( USHORT i = 0; i < mpTravellerList->Count(); i++ ) + { + pWin = mpTravellerList->GetObject( i ); + fprintf( pErrFile, " %s -> \n", (pWin->GetBodyText()).GetBuffer()); + } + fclose( pErrFile ); + } +} diff --git a/soldep/source/soldlg.cxx b/soldep/source/soldlg.cxx index f49562c2cd27..96ad469f8284 100644 --- a/soldep/source/soldlg.cxx +++ b/soldep/source/soldlg.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: soldlg.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src index 9d9897971826..0f5035fcee6e 100644 --- a/soldep/source/soldlg.src +++ b/soldep/source/soldlg.src @@ -1,377 +1,374 @@ -/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: soldlg.src,v $
- * $Revision: 1.7 $
- *
- * 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 <dtsodcmp.hrc>
-#include <soldep/soldlg.hrc>
-
-//========================================================================
-// Dialogs
-ModalDialog RID_SD_DIALOG_NEWPROJECT
-{
- OutputSize = TRUE;
- Text = "New Project";
- PosSize = MAP_SYSFONT(18,18,142,142);
- SVLook = TRUE;
- MOVEABLE = TRUE;
- CLOSEABLE = TRUE;
- OKButton BTN_OK
- {
- PosSize = MAP_SYSFONT(5,123,40,14);
- TabStop = TRUE;
- Hide = FALSE;
- DefButton = TRUE;
- };
- CancelButton BTN_CANCEL {
- PosSize = MAP_SYSFONT(50,123,40,14);
- TabStop = TRUE;
- };
- FixedText FT_PRJNAME {
- PosSize = MAP_SYSFONT( 5, 10, 100, 10 );
- Text = "Project Name";
- };
- Edit EDIT_PRJNAME {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,20,132,10);
- };
- FixedText FT_PRJSHORT {
- PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
- Text = "Project Short Name";
- };
- Edit EDIT_PRJSHORT {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,40,132,10);
- };
- FixedText FT_PRJDEPS {
- PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
- Text = "Project Depends on";
- };
- Edit EDIT_PRJDEPS {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,60,132,10);
- };
-};
-
-ModalDialog RID_SD_DIALOG_NEWDIRECTORY
-{
- OutputSize = TRUE;
- Text = "New Directory";
- PosSize = MAP_SYSFONT(18,18,142,142);
- SVLook = TRUE;
- MOVEABLE = TRUE;
- CLOSEABLE = TRUE;
- OKButton BTN_OK
- {
- PosSize = MAP_SYSFONT(5,123,40,14);
- TabStop = TRUE;
- Hide = FALSE;
- DefButton = TRUE;
- };
- CancelButton BTN_CANCEL {
- PosSize = MAP_SYSFONT(50,123,40,14);
- TabStop = TRUE;
- };
- FixedText FT_DIRNAME {
- PosSize = MAP_SYSFONT( 5, 10, 132, 10 );
- Text = "Directory Name ( with projectname )";
- };
- Edit EDIT_DIRNAME {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,20,132,10);
- };
- FixedText FT_DIRFLAG {
- PosSize = MAP_SYSFONT( 5, 30, 100, 10 );
- Text = "Directory Flag";
- };
- Edit EDIT_DIRFLAG {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,40,132,10);
- };
- FixedText FT_DIRDEPS {
- PosSize = MAP_SYSFONT( 5, 50, 100, 10 );
- Text = "Directory Depends on";
- };
- Edit EDIT_DIRDEPS {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,60,132,10);
- };
- FixedText FT_DIRACTION {
- PosSize = MAP_SYSFONT( 5, 70, 100, 10 );
- Text = "What To Do";
- };
- Edit EDIT_DIRACTION {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,80,132,10);
- };
- FixedText FT_DIRENV {
- PosSize = MAP_SYSFONT( 5, 90, 100, 10 );
- Text = "Which Environments";
- };
- Edit EDIT_DIRENV {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,100,132,10);
- };
-};
-
-
-ModalDialog RID_SD_DIALOG_HELP
-{
- OutputSize = TRUE;
- Text = "Help";
- PosSize = MAP_SYSFONT(18,18,242,242);
- SVLook = TRUE;
- MOVEABLE = TRUE;
- CLOSEABLE = TRUE;
- OKButton BTN_OK
- {
- PosSize = MAP_SYSFONT(101,223,40,14);
- TabStop = TRUE;
- Hide = FALSE;
- DefButton = TRUE;
- };
- MultiLineEdit EDIT_HELP {
- Border = TRUE;
- PosSize = MAP_SYSFONT(5,5,232,213);
- };
-};
-
-ModalDialog DLG_VERSIONSELECT {
- OutputSize = TRUE;
- Pos = MAP_APPFONT( 92, 40 );
- Size = MAP_APPFONT( 161, 98 );
- Text = "Open workspace";
- Moveable = TRUE;
- Closeable = TRUE;
- ListBox DLG_VERSIONSELECT_LISTBOX {
- Border = TRUE;
- Pos = MAP_APPFONT( 8, 16 );
- Size = MAP_APPFONT( 96, 72 );
- TabStop = TRUE;
- };
- GroupBox DLG_VERSIONSELECT_GROUP {
- Pos = MAP_APPFONT( 4, 4 );
- Size = MAP_APPFONT( 104, 88 );
- Text = "Workspaces";
- };
- OKButton DLG_VERSIONSELECT_OK {
- Pos = MAP_APPFONT( 116, 64 );
- Size = MAP_APPFONT( 40, 12 );
- DefButton = TRUE;
- TabStop = TRUE;
- };
- CancelButton DLG_VERSIONSELECT_CANCEL {
- Pos = MAP_APPFONT( 116, 80 );
- Size = MAP_APPFONT( 40, 12 );
- TabStop = TRUE;
- };
- GroupBox DLG_MINORSELECT_GROUP {
- Pos = MAP_APPFONT( 110, 4 );
- Size = MAP_APPFONT( 47, 30 );
- Text = "Minor";
- };
- Edit DLG_MINORSELECT_EDIT {
- Border = TRUE;
- Pos = MAP_APPFONT( 115, 16 );
- Size = MAP_APPFONT( 36, 12 );
- TabStop = TRUE;
- };
-};
-
-ModelessDialog DLG_AUTOARRANGE {
- OutputSize = TRUE;
- Pos = MAP_APPFONT( 40, 12 );
- Size = MAP_APPFONT( 225, 82 );
- Text = "Autoarrange";
- Moveable = TRUE;
- GroupBox DLG_AUTOARRANGE_GROUP {
- Pos = MAP_APPFONT( 4, 4 );
- Size = MAP_APPFONT( 216, 72 );
- Text = "Progress";
- };
- FixedText DLG_AUTOARRANGE_TEXT_MODULE {
- Pos = MAP_APPFONT( 8, 16 );
- Size = MAP_APPFONT( 208, 10 );
- Text = "";
- };
- FixedText DLG_AUTOARRANGE_TEXT_OVERALL {
- Pos = MAP_APPFONT( 8, 48 );
- Size = MAP_APPFONT( 208, 10 );
- Text = "";
- };
-};
-
-ModalDialog DLG_FIND_PROJECT {
- OutputSize = TRUE;
- Pos = MAP_APPFONT( 40, 12 );
- Size = MAP_APPFONT( 155, 55 );
- Text = "Find Project";
- Moveable = TRUE;
- SVLook = TRUE;
- ComboBox DLG_FIND_PROJECT_COMBOBOX
- {
- Pos = MAP_APPFONT ( 5 , 18 ) ;
- Size = MAP_APPFONT ( 100 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- VScroll = TRUE ;
- Sort = TRUE ;
- };
- OKButton DLG_FIND_PROJECT_OK {
- Pos = MAP_APPFONT( 110, 10 );
- Size = MAP_APPFONT( 40, 12 );
- DefButton = TRUE;
- TabStop = TRUE;
- };
- CancelButton DLG_FIND_PROJECT_CANCEL {
- Pos = MAP_APPFONT( 110, 26 );
- Size = MAP_APPFONT( 40, 12 );
- TabStop = TRUE;
- };
-};
-
-ToolBox TID_SOLDEP_MAIN
-{
- ButtonType = BUTTON_SYMBOL;
- Align = BOXALIGN_TOP;
- LineCount = 1;
- SVLook = TRUE;
- Border = TRUE;
- Sizeable = TRUE;
- Dockable = TRUE;
- Scroll = TRUE;
- Moveable = TRUE;
- Closeable = TRUE;
- Zoomable = TRUE;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TID_SOLDEP_OPEN;
- Type = TOOLBOXITEM_BUTTON;
- Text = "Load";
- HelpId = TID_SOLDEP_OPEN;
- HelpText = "Load";
- Checkable = TRUE;
- ItemBitmap = Bitmap
- {
- File = "sx03190.png";
- };
- };
- ToolBoxItem
- {
- Identifier = TID_SOLDEP_SAVE;
- Type = TOOLBOXITEM_BUTTON;
- Text = "Save";
- HelpId = TID_SOLDEP_SAVE;
- HelpText = "Save";
- Checkable = TRUE;
- ItemBitmap = Bitmap
- {
- File = "sc05505.png";
- };
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR;
- };
- ToolBoxItem
- {
- Identifier = TID_SOLDEP_SELECT_WORKSPACE;
- Type = TOOLBOXITEM_BUTTON;
- Text = "Select Workspace";
- HelpId = TID_SOLDEP_HIDE_INDEPENDEND;
- HelpText = "Select Workspace";
- Checkable = TRUE;
- ItemBitmap = Bitmap
- {
- File = "selectupd_16.png";
- };
- };
- ToolBoxItem
- {
- Identifier = TID_SOLDEP_FIND;
- Type = TOOLBOXITEM_BUTTON;
- Text = "Find Module";
- HelpId = TID_SOLDEP_FIND;
- HelpText = "Find Module";
- Checkable = TRUE;
- ItemBitmap = Bitmap
- {
- File = "sc05961.png";
- };
- };
- ToolBoxItem
- {
- Identifier = TID_SOLDEP_BACK;
- Type = TOOLBOXITEM_BUTTON;
- Text = "Back to Overview";
- HelpId = TID_SOLDEP_BACK;
- HelpText = "Back to Overview";
- Checkable = TRUE;
- ItemBitmap = Bitmap
- {
- File = "arrowup_16.png";
- };
- };
- ToolBoxItem
- {
- Identifier = TID_SOLDEP_HIDE_INDEPENDEND;
- Type = TOOLBOXITEM_BUTTON;
- Text = "Hide Independend Modules";
- HelpId = TID_SOLDEP_HIDE_INDEPENDEND;
- HelpText = "Hide Independend Modules";
- Checkable = TRUE;
- ItemBitmap = Bitmap
- {
- File = "hidedependency_16.png";
- };
- };
- ToolBoxItem
- {
- Identifier = TID_SOLDEP_CREATEMETA;
- Type = TOOLBOXITEM_BUTTON;
- Text = "Create MetaFile";
- Checkable = TRUE;
- };
- };
-};
-
-/*****************************************************************************/
-Bitmap TID_SMALL_PIN_PINED
-/*****************************************************************************/
-{
- File = "ballgreen_7.png";
-};
-
-/*****************************************************************************/
-Bitmap TID_SMALL_PIN_UNPINED
-/*****************************************************************************/
-{
- File = "ballred_7.png";
-};
+/************************************************************************* + * + * 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 <dtsodcmp.hrc> +#include <soldep/soldlg.hrc> + +//======================================================================== +// Dialogs +ModalDialog RID_SD_DIALOG_NEWPROJECT +{ + OutputSize = TRUE; + Text = "New Project"; + PosSize = MAP_SYSFONT(18,18,142,142); + SVLook = TRUE; + MOVEABLE = TRUE; + CLOSEABLE = TRUE; + OKButton BTN_OK + { + PosSize = MAP_SYSFONT(5,123,40,14); + TabStop = TRUE; + Hide = FALSE; + DefButton = TRUE; + }; + CancelButton BTN_CANCEL { + PosSize = MAP_SYSFONT(50,123,40,14); + TabStop = TRUE; + }; + FixedText FT_PRJNAME { + PosSize = MAP_SYSFONT( 5, 10, 100, 10 ); + Text = "Project Name"; + }; + Edit EDIT_PRJNAME { + Border = TRUE; + PosSize = MAP_SYSFONT(5,20,132,10); + }; + FixedText FT_PRJSHORT { + PosSize = MAP_SYSFONT( 5, 30, 100, 10 ); + Text = "Project Short Name"; + }; + Edit EDIT_PRJSHORT { + Border = TRUE; + PosSize = MAP_SYSFONT(5,40,132,10); + }; + FixedText FT_PRJDEPS { + PosSize = MAP_SYSFONT( 5, 50, 100, 10 ); + Text = "Project Depends on"; + }; + Edit EDIT_PRJDEPS { + Border = TRUE; + PosSize = MAP_SYSFONT(5,60,132,10); + }; +}; + +ModalDialog RID_SD_DIALOG_NEWDIRECTORY +{ + OutputSize = TRUE; + Text = "New Directory"; + PosSize = MAP_SYSFONT(18,18,142,142); + SVLook = TRUE; + MOVEABLE = TRUE; + CLOSEABLE = TRUE; + OKButton BTN_OK + { + PosSize = MAP_SYSFONT(5,123,40,14); + TabStop = TRUE; + Hide = FALSE; + DefButton = TRUE; + }; + CancelButton BTN_CANCEL { + PosSize = MAP_SYSFONT(50,123,40,14); + TabStop = TRUE; + }; + FixedText FT_DIRNAME { + PosSize = MAP_SYSFONT( 5, 10, 132, 10 ); + Text = "Directory Name ( with projectname )"; + }; + Edit EDIT_DIRNAME { + Border = TRUE; + PosSize = MAP_SYSFONT(5,20,132,10); + }; + FixedText FT_DIRFLAG { + PosSize = MAP_SYSFONT( 5, 30, 100, 10 ); + Text = "Directory Flag"; + }; + Edit EDIT_DIRFLAG { + Border = TRUE; + PosSize = MAP_SYSFONT(5,40,132,10); + }; + FixedText FT_DIRDEPS { + PosSize = MAP_SYSFONT( 5, 50, 100, 10 ); + Text = "Directory Depends on"; + }; + Edit EDIT_DIRDEPS { + Border = TRUE; + PosSize = MAP_SYSFONT(5,60,132,10); + }; + FixedText FT_DIRACTION { + PosSize = MAP_SYSFONT( 5, 70, 100, 10 ); + Text = "What To Do"; + }; + Edit EDIT_DIRACTION { + Border = TRUE; + PosSize = MAP_SYSFONT(5,80,132,10); + }; + FixedText FT_DIRENV { + PosSize = MAP_SYSFONT( 5, 90, 100, 10 ); + Text = "Which Environments"; + }; + Edit EDIT_DIRENV { + Border = TRUE; + PosSize = MAP_SYSFONT(5,100,132,10); + }; +}; + + +ModalDialog RID_SD_DIALOG_HELP +{ + OutputSize = TRUE; + Text = "Help"; + PosSize = MAP_SYSFONT(18,18,242,242); + SVLook = TRUE; + MOVEABLE = TRUE; + CLOSEABLE = TRUE; + OKButton BTN_OK + { + PosSize = MAP_SYSFONT(101,223,40,14); + TabStop = TRUE; + Hide = FALSE; + DefButton = TRUE; + }; + MultiLineEdit EDIT_HELP { + Border = TRUE; + PosSize = MAP_SYSFONT(5,5,232,213); + }; +}; + +ModalDialog DLG_VERSIONSELECT { + OutputSize = TRUE; + Pos = MAP_APPFONT( 92, 40 ); + Size = MAP_APPFONT( 161, 98 ); + Text = "Open workspace"; + Moveable = TRUE; + Closeable = TRUE; + ListBox DLG_VERSIONSELECT_LISTBOX { + Border = TRUE; + Pos = MAP_APPFONT( 8, 16 ); + Size = MAP_APPFONT( 96, 72 ); + TabStop = TRUE; + }; + GroupBox DLG_VERSIONSELECT_GROUP { + Pos = MAP_APPFONT( 4, 4 ); + Size = MAP_APPFONT( 104, 88 ); + Text = "Workspaces"; + }; + OKButton DLG_VERSIONSELECT_OK { + Pos = MAP_APPFONT( 116, 64 ); + Size = MAP_APPFONT( 40, 12 ); + DefButton = TRUE; + TabStop = TRUE; + }; + CancelButton DLG_VERSIONSELECT_CANCEL { + Pos = MAP_APPFONT( 116, 80 ); + Size = MAP_APPFONT( 40, 12 ); + TabStop = TRUE; + }; + GroupBox DLG_MINORSELECT_GROUP { + Pos = MAP_APPFONT( 110, 4 ); + Size = MAP_APPFONT( 47, 30 ); + Text = "Minor"; + }; + Edit DLG_MINORSELECT_EDIT { + Border = TRUE; + Pos = MAP_APPFONT( 115, 16 ); + Size = MAP_APPFONT( 36, 12 ); + TabStop = TRUE; + }; +}; + +ModelessDialog DLG_AUTOARRANGE { + OutputSize = TRUE; + Pos = MAP_APPFONT( 40, 12 ); + Size = MAP_APPFONT( 225, 82 ); + Text = "Autoarrange"; + Moveable = TRUE; + GroupBox DLG_AUTOARRANGE_GROUP { + Pos = MAP_APPFONT( 4, 4 ); + Size = MAP_APPFONT( 216, 72 ); + Text = "Progress"; + }; + FixedText DLG_AUTOARRANGE_TEXT_MODULE { + Pos = MAP_APPFONT( 8, 16 ); + Size = MAP_APPFONT( 208, 10 ); + Text = ""; + }; + FixedText DLG_AUTOARRANGE_TEXT_OVERALL { + Pos = MAP_APPFONT( 8, 48 ); + Size = MAP_APPFONT( 208, 10 ); + Text = ""; + }; +}; + +ModalDialog DLG_FIND_PROJECT { + OutputSize = TRUE; + Pos = MAP_APPFONT( 40, 12 ); + Size = MAP_APPFONT( 155, 55 ); + Text = "Find Project"; + Moveable = TRUE; + SVLook = TRUE; + ComboBox DLG_FIND_PROJECT_COMBOBOX + { + Pos = MAP_APPFONT ( 5 , 18 ) ; + Size = MAP_APPFONT ( 100 , 90 ) ; + TabStop = TRUE ; + DropDown = TRUE ; + VScroll = TRUE ; + Sort = TRUE ; + }; + OKButton DLG_FIND_PROJECT_OK { + Pos = MAP_APPFONT( 110, 10 ); + Size = MAP_APPFONT( 40, 12 ); + DefButton = TRUE; + TabStop = TRUE; + }; + CancelButton DLG_FIND_PROJECT_CANCEL { + Pos = MAP_APPFONT( 110, 26 ); + Size = MAP_APPFONT( 40, 12 ); + TabStop = TRUE; + }; +}; + +ToolBox TID_SOLDEP_MAIN +{ + ButtonType = BUTTON_SYMBOL; + Align = BOXALIGN_TOP; + LineCount = 1; + SVLook = TRUE; + Border = TRUE; + Sizeable = TRUE; + Dockable = TRUE; + Scroll = TRUE; + Moveable = TRUE; + Closeable = TRUE; + Zoomable = TRUE; + ItemList = + { + ToolBoxItem + { + Identifier = TID_SOLDEP_OPEN; + Type = TOOLBOXITEM_BUTTON; + Text = "Load"; + HelpId = TID_SOLDEP_OPEN; + HelpText = "Load"; + Checkable = TRUE; + ItemBitmap = Bitmap + { + File = "sx03190.png"; + }; + }; + ToolBoxItem + { + Identifier = TID_SOLDEP_SAVE; + Type = TOOLBOXITEM_BUTTON; + Text = "Save"; + HelpId = TID_SOLDEP_SAVE; + HelpText = "Save"; + Checkable = TRUE; + ItemBitmap = Bitmap + { + File = "sc05505.png"; + }; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR; + }; + ToolBoxItem + { + Identifier = TID_SOLDEP_SELECT_WORKSPACE; + Type = TOOLBOXITEM_BUTTON; + Text = "Select Workspace"; + HelpId = TID_SOLDEP_HIDE_INDEPENDEND; + HelpText = "Select Workspace"; + Checkable = TRUE; + ItemBitmap = Bitmap + { + File = "selectupd_16.png"; + }; + }; + ToolBoxItem + { + Identifier = TID_SOLDEP_FIND; + Type = TOOLBOXITEM_BUTTON; + Text = "Find Module"; + HelpId = TID_SOLDEP_FIND; + HelpText = "Find Module"; + Checkable = TRUE; + ItemBitmap = Bitmap + { + File = "sc05961.png"; + }; + }; + ToolBoxItem + { + Identifier = TID_SOLDEP_BACK; + Type = TOOLBOXITEM_BUTTON; + Text = "Back to Overview"; + HelpId = TID_SOLDEP_BACK; + HelpText = "Back to Overview"; + Checkable = TRUE; + ItemBitmap = Bitmap + { + File = "arrowup_16.png"; + }; + }; + ToolBoxItem + { + Identifier = TID_SOLDEP_HIDE_INDEPENDEND; + Type = TOOLBOXITEM_BUTTON; + Text = "Hide Independend Modules"; + HelpId = TID_SOLDEP_HIDE_INDEPENDEND; + HelpText = "Hide Independend Modules"; + Checkable = TRUE; + ItemBitmap = Bitmap + { + File = "hidedependency_16.png"; + }; + }; + ToolBoxItem + { + Identifier = TID_SOLDEP_CREATEMETA; + Type = TOOLBOXITEM_BUTTON; + Text = "Create MetaFile"; + Checkable = TRUE; + }; + }; +}; + +/*****************************************************************************/ +Bitmap TID_SMALL_PIN_PINED +/*****************************************************************************/ +{ + File = "ballgreen_7.png"; +}; + +/*****************************************************************************/ +Bitmap TID_SMALL_PIN_UNPINED +/*****************************************************************************/ +{ + File = "ballred_7.png"; +}; diff --git a/soldep/source/tbox.cxx b/soldep/source/tbox.cxx index fe693e4a7fd0..327941167808 100644 --- a/soldep/source/tbox.cxx +++ b/soldep/source/tbox.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbox.cxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soldep/util/perl.mk b/soldep/util/perl.mk index 21591d1b1ecb..733459a96394 100644 --- a/soldep/util/perl.mk +++ b/soldep/util/perl.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: perl.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk index b9a1e6e18f66..c7b02e15db35 100644 --- a/solenv/bin/addsym.awk +++ b/solenv/bin/addsym.awk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: header.hxx,v $ -# -# $Revision: 1.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 5b4d4622754a..5775468d0ead 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -5,14 +5,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: build.pl,v $ -# -# $Revision: 1.171 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl index 8c8151f0a9b8..54a5c4f84de2 100755 --- a/solenv/bin/build_client.pl +++ b/solenv/bin/build_client.pl @@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: build_client.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh index e64b8fd2aa4c..e8faa516a852 100755 --- a/solenv/bin/checkdll.sh +++ b/solenv/bin/checkdll.sh @@ -3,14 +3,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: header.hxx,v $ -# -# $Revision: 1.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/cleandiff.pl b/solenv/bin/cleandiff.pl index 6b2e1fbe7244..c7fc80487a7f 100644 --- a/solenv/bin/cleandiff.pl +++ b/solenv/bin/cleandiff.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: cleandiff.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl index 87ff24ffa7ef..8103a13945b1 100755 --- a/solenv/bin/cleanzip.pl +++ b/solenv/bin/cleanzip.pl @@ -3,14 +3,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: cleanzip.pl,v $ -# -# $Revision$ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl index aa73d86991d2..365e0bb14950 100644 --- a/solenv/bin/clipatchconfig.pl +++ b/solenv/bin/clipatchconfig.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: clipatchconfig.pl,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/convertlinks.pl b/solenv/bin/convertlinks.pl index c8644aa4c9af..09b298bd5ea5 100644 --- a/solenv/bin/convertlinks.pl +++ b/solenv/bin/convertlinks.pl @@ -2,7 +2,7 @@ # convertlinks - a perl script to make hrefs to # http://api.openoffice.org/common/ref relativ. # -# Copyright (c) 2000 Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # use File::Find; diff --git a/solenv/bin/converttags.pl b/solenv/bin/converttags.pl index 641b83d696b6..aa2fe63c6ce8 100644 --- a/solenv/bin/converttags.pl +++ b/solenv/bin/converttags.pl @@ -2,7 +2,7 @@ # converttags - a perl script to coonvert some predefined tags # to user specified values # -# Copyright (c) 2000 Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # if($#ARGV == -1) diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl index 8b6218adbab2..75047f3952f5 100644 --- a/solenv/bin/createpdbrelocators.pl +++ b/solenv/bin/createpdbrelocators.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: createpdbrelocators.pl,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl index 801d62add78c..f3abc0a7a320 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -3,14 +3,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: cws.pl,v $ -# -# $Revision: 1.1.2.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -38,6 +34,7 @@ use strict; use Getopt::Long; use File::Basename; use File::Path; +use File::Copy; use Cwd; use Benchmark; @@ -62,7 +59,7 @@ use Cws; # TODO: replace dummy vales with actual SVN->hg and source_config migration milestones my $dev300_migration_milestone = 'm64'; my $dev300_source_config_milestone = 'm65'; -my $ooo320_migration_milestone = 'm999'; +my $ooo320_migration_milestone = 'm13'; my $ooo320_source_config_milestone = 'm999'; # valid command with possible abbreviations @@ -71,7 +68,6 @@ my @valid_commands = ( 'create', 'fetch', 'f', 'rebase', 'rb', - 'analyze', 'an', 'query', 'q', 'task', 't', 'integrate', @@ -87,7 +83,6 @@ my %valid_options_hash = ( 'fetch' => ['help', 'switch', 'milestone', 'childworkspace','platforms','quiet', 'onlysolver'], 'rebase' => ['help', 'milestone','commit'], - 'analyze' => ['help'], 'query' => ['help', 'milestone','masterworkspace','childworkspace'], 'task' => ['help'], 'integrate' => ['help', 'childworkspace'], @@ -159,9 +154,6 @@ sub parse_command_line elsif ($command eq 'rb') { $command = 'rebase'; } - elsif ($command eq 'an') { - $command = 'analyze'; - } elsif ($command eq 'q') { $command = 'query'; } @@ -477,19 +469,7 @@ sub hgrc_append_push_path_and_hooks close(HGRC); } -sub is_hg_strip_available -{ - my $profile = hg_show(); - - foreach (@{$profile}) { - if ( $_ =~ /hgext.mq=/ ) { - return 1; - } - } - return 0; -} - -sub hg_clone_repository +sub hg_clone_cws_or_milestone { my $rep_type = shift; my $cws = shift; @@ -530,74 +510,75 @@ sub hg_clone_repository } } - # clone from local source if possible, otherwise from LAN source - if ( -d $master_local_source && can_use_hardlinks($master_local_source, dirname($target)) ) { - hg_local_clone_repository($master_local_source, $target, $milestone_tag); - } - else { - hg_lan_clone_repository($master_lan_source, $target, $milestone_tag); - } - - # now pull from the remote cws outgoing repository if it already contains something + my $pull_from_remote = 0; + my $cws_remote_source; if ( !$clone_milestone_only ) { - my $cws_remote_source = "$hg_remote_source/cws/" . $cws->child(); + $cws_remote_source = "$hg_remote_source/cws/" . $cws->child(); # The outgoing repository might not yet be available. Which is not # an error. Since pulling from the cws outgoing URL results in an ugly - # and hardly understandable error message, we check for the availaility + # and hardly understandable error message, we check for availibility # first. TODO: incorporate configured proxy instead of env_proxy. Use # a dedicated request and content-type to find out if the repo is there # instead of parsing the content of the page + print_message("... check availibility of 'outgoing' repository '$cws_remote_source'."); require LWP::Simple; my $content = LWP::Simple::get($cws_remote_source); my $pattern = "<title>cws/". $cws->child(); if ( $content =~ /$pattern/ ) { - hg_remote_pull_repository($cws_remote_source, $target); + $pull_from_remote = 1; } else { - print_message("The 'outgoing' repository '$cws_remote_source' is not accessible/available"); + print_message("... 'outgoing' repository '$cws_remote_source' is not accessible/available yet."); } - hgrc_append_push_path_and_hooks($target, $cws_remote_source); } - # update the result - hg_update_repository($target); - -} + # clone repository (without working tree if we still need to pull from remote) + my $clone_with_update = !$pull_from_remote; + hg_clone_repository($master_local_source, $master_lan_source, $target, $milestone_tag, $clone_with_update); -sub hg_local_clone_repository -{ - my $local_source = shift; - my $dest = shift; - my $milestone_tag = shift; + # now pull from the remote cws outgoing repository if its already available + if ( $pull_from_remote ) { + hg_remote_pull_repository($cws_remote_source, $target); + } - # fastest way to clone a repository up to a certain milestone - # 1) clone w/o -r options (hard links!) - # 2) find (local) revision which corresponds to milestone - # 3) strip revision+1 + # if we fetched a CWS adorn the result with push-path and hooks + if ( $cws_remote_source ) { + hgrc_append_push_path_and_hooks($target, $cws_remote_source); + } - my $t1 = Benchmark->new(); - print_message("... clone LOCAL repository '$local_source' to '$dest'"); - hg_clone($local_source, $dest, '-U'); - my $id_option = "-n -r $milestone_tag"; - my $revision = hg_ident($dest, $milestone_tag); - if ( defined($revision) ) { - my $strip_revision = $revision+1; - hg_strip($dest, $revision); + # update the result if necessary + if ( !$clone_with_update ) { + hg_update_repository($target); } - my $t2 = Benchmark->new(); - print_time_elapsed($t1, $t2) if $profile; + } -sub hg_lan_clone_repository +sub hg_clone_repository { + my $local_source = shift; my $lan_source = shift; my $dest = shift; my $milestone_tag = shift; + my $update = shift; my $t1 = Benchmark->new(); - print_message("... clone LAN repository '$lan_source' to '$dest'"); - hg_clone($lan_source, $dest, "-U -r $milestone_tag"); + my $source; + my $clone_option = $update ? '' : '-U '; + if ( -d $local_source && can_use_hardlinks($local_source, $dest) ) { + $source = $local_source; + if ( !hg_milestone_is_latest_in_repository($local_source, $milestone_tag) ) { + $clone_option .= "-r $milestone_tag"; + } + print_message("... clone LOCAL repository '$local_source' to '$dest'"); + } + else { + $source = $lan_source; + $clone_option .= "-r $milestone_tag"; + print_message("... clone LAN repository '$lan_source' to '$dest'"); + } + hg_clone($source, $dest, $clone_option); + my $t2 = Benchmark->new(); print_time_elapsed($t1, $t2) if $profile; } @@ -625,6 +606,21 @@ sub hg_update_repository print_time_elapsed($t1, $t2) if $profile; } +sub hg_milestone_is_latest_in_repository +{ + my $repository = shift; + my $milestone_tag = shift; + + # Our milestone is the lastest thing in the repository + # if the parent of the repository tip is adorned + # with the milestone tag. + my $tags_of_parent_of_tip = hg_parent($repository, 'tip', "--template='{tags}\\n'"); + if ( $tags_of_parent_of_tip =~ /\b$milestone_tag\b/ ) { + return 1; + } + return 0; +} + # Check if clone source and destination are on the same filesystem, # in that case hg clone can employ hard links. sub can_use_hardlinks @@ -638,12 +634,14 @@ sub can_use_hardlinks } # st_dev is the first field return by stat() my @stat_source = stat($source); - my @stat_dest = stat($dest); + my @stat_dest = stat(dirname($dest)); if ( $debug ) { - print STDERR "can_use_hardlinks(): source device: '$stat_source[0]', destination device: '$stat_dest[0]'\n"; + my $source_result = defined($stat_source[0]) ? $stat_source[0] : 'stat failed'; + my $dest_result = defined($stat_dest[0]) ? $stat_dest[0] : 'stat failed'; + print STDERR "CWS-DEBUG: can_use_hardlinks(): source device: '$stat_source[0]', destination device: '$stat_dest[0]'\n"; } - if ( $stat_source[0] == $stat_dest[0] ) { + if ( defined($stat_source[0]) && defined($stat_dest[0]) && $stat_source[0] == $stat_dest[0] ) { return 1; } return 0; @@ -1320,6 +1318,57 @@ sub relink_workspace { } } +sub fetch_external_tarballs +{ + my $source_root_dir = shift; + my $external_tarballs_source = shift; + + my $ooo_external_file = "$source_root_dir/ooo/ooo.lst"; + my $sun_external_file = "$source_root_dir/sun/sun.lst"; + my $sun_path = "$source_root_dir/sun"; + + my @external_sources_list; + push(@external_sources_list, read_external_file($ooo_external_file)); + if ( -d $sun_path ) { + if ( -e $sun_external_file ) { + push(@external_sources_list, read_external_file($sun_external_file)); + } + else { + print_error("Can't find external file list '$sun_external_file'.", 8); + } + } + + my $ext_sources_dir = "$source_root_dir/ext_sources"; + print_message("Copy external tarballs to '$ext_sources_dir'"); + if ( ! -d $ext_sources_dir) { + if ( !mkdir($ext_sources_dir) ) { + print_error("Can't create directory '$ext_sources_dir': $!.", 44); + } + } + foreach (@external_sources_list) { + if ( ! copy("$external_tarballs_source/$_", $ext_sources_dir) ) { + print_error("Can't copy file '$external_tarballs_source' -> '$ext_sources_dir': $!", 0); + } + } + return; +} + +sub read_external_file +{ + my $external_file = shift; + + my @external_sources; + open(EXT, "<$external_file") or print_error("Can't open file '$external_file' for reading: $!", 98); + while(<EXT>) { + if ( !/^http:/ ) { + chomp; + push(@external_sources, $_); + } + } + close(EXT); + return @external_sources; +} + sub update_solver { my $platform = shift; @@ -1528,11 +1577,10 @@ sub do_help print STDERR "\thelp (h,?)\n"; print STDERR "\tcreate\n"; print STDERR "\tfetch (f)\n"; - print STDERR "\trebase (rb)\n"; - print STDERR "\tanalyze (an)\n"; + print STDERR "\trebase (rb) (SVN only)\n"; print STDERR "\tquery (q)\n"; print STDERR "\ttask (t)\n"; - print STDERR "\tcdiff (cd)\n"; + print STDERR "\tcdiff (cd) (SVN only)\n"; print STDERR "\tsetcurrent\n"; print STDERR "\tintegrate *** release engineers only ***\n"; print STDERR "\teisclone *** release engineers only ***\n"; @@ -1602,7 +1650,6 @@ sub do_help } elsif ($arg eq 'fetch') { - print STDERR "THE USER-INTERFACE TO THIS SUBCOMMAND IS LIKELY TO CHANGE IN FUTURE\n"; print STDERR "fetch: fetch a milestone or CWS\n"; print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-m milestone> <workspace>\n"; print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-c cws> <workspace>\n"; @@ -1625,7 +1672,7 @@ sub do_help print STDERR "\t--quiet: Same as -q\n"; } elsif ($arg eq 'rebase') { - print STDERR "rebase: Rebase a child workspace to a new milestone\n"; + print STDERR "rebase: Rebase a child workspace to a new milestone (SVN only)\n"; print STDERR "usage: rebase <-m milestone> <workspace>\n"; print STDERR "usage: rebase <-C> <workspace>\n"; print STDERR "\t-m milestone: Merge changes on MWS into CWS up to and including milestone <milestone>\n"; @@ -1645,7 +1692,7 @@ sub do_help print STDERR "\t--commit: Same as -C\n" } elsif ($arg eq 'cdiff') { - print STDERR "cdiff: Show changes on CWS relative to current milestone\n"; + print STDERR "cdiff: Show changes on CWS relative to current milestone (SVN only)\n"; print STDERR "usage: cdiff [-M master] [-c child] [--files] [--modules]\n"; print STDERR "\t-M master:\t\toverride MWS specified in environment\n"; print STDERR "\t-c child:\t\toverride CWS specified in environment\n"; @@ -2061,14 +2108,6 @@ sub do_rebase } } -sub do_analyze -{ - my $args_ref = shift; - my $options_ref = shift; - - print_error("not yet implemented.", 2); -} - sub do_integrate { my $args_ref = shift; @@ -2163,26 +2202,18 @@ sub do_fetch print STDERR "CWS-DEBUG: SCM: $scm\n"; } - if ( $scm eq 'HG' ) { - if ( !is_hg_strip_available() ) { - print_error("The 'cws fetch' command requires that 'hg strip' is enabled", 0); - print_error("Please add the following lines to your hg profile (\$HOME/.hgrc)", 0); - print_error("[extensions]", 0); - print_error("hgext.mq=", 33); - } - } - my $config = CwsConfig->new(); my $ooo_svn_server = $config->get_ooo_svn_server(); my $so_svn_server = $config->get_so_svn_server(); + my $prebuild_dir = $config->get_prebuild_binaries_location(); # Check early for platforms so we can bail out before anything time consuming is done # in case of a missing platform my @platforms; - my $prebuild_dir; if ( defined($platforms) ) { use Archive::Zip; # warn early if module is missing - $prebuild_dir = $config->get_prebuild_binaries_location(); - $masterws = $cws->master(); + if ( !defined($prebuild_dir ) ) { + print_error("PREBUILD_BINARIES not configured, can't find platform solvers", 99); + } $prebuild_dir = "$prebuild_dir/$masterws"; @platforms = split(/,/, $platforms); @@ -2212,8 +2243,8 @@ sub do_fetch $nonproduct = 1; } } - push(@platforms, 'common.pro') if ($product && !$added_product); - push(@platforms, 'common') if ($nonproduct && !$added_nonproduct); + unshift(@platforms, 'common.pro') if ($product && !$added_product); + unshift(@platforms, 'common') if ($nonproduct && !$added_nonproduct); } foreach(@platforms) { @@ -2303,8 +2334,8 @@ sub do_fetch svn_checkout($so_url, "$work_master/sun", $quiet); } else{ - hg_clone_repository('ooo', $cws, "$work_master/ooo", $clone_milestone_only); - hg_clone_repository('so', $cws, "$work_master/sun", $clone_milestone_only); + hg_clone_cws_or_milestone('ooo', $cws, "$work_master/ooo", $clone_milestone_only); + hg_clone_cws_or_milestone('so', $cws, "$work_master/sun", $clone_milestone_only); } if ( get_source_config_for_milestone($masterws, $milestone) ) { # write source_config file @@ -2331,12 +2362,20 @@ sub do_fetch svn_checkout($ooo_url, $workspace, $quiet); } else { - hg_clone_repository('ooo', $cws, $workspace, $clone_milestone_only); + hg_clone_cws_or_milestone('ooo', $cws, $workspace, $clone_milestone_only); } } } } + if ( !$onlysolver ) { + my $source_root_dir = "$workspace/$masterws"; + my $external_tarball_source = "$prebuild_dir/$masterws/ext_sources"; + if ( -e "$source_root_dir/ooo/ooo.lst" && defined($prebuild_dir) && -d $external_tarball_source ) { + fetch_external_tarballs($source_root_dir, $external_tarball_source); + } + } + if ( defined($platforms) ) { if ( !-d $workspace ) { if ( !mkdir($workspace) ) { @@ -2524,6 +2563,9 @@ sub do_cdiff print_error("'$childws' is not a valid CWS name.\n", 30); } + if ( $cws->get_scm() eq 'HG' ) { + print_error("cws cdiff is not supported for mercurial based childworkspaces", 80); + } my $milestone = $cws->milestone(); my $config = CwsConfig->new(); @@ -3005,44 +3047,20 @@ sub hg_clone return @result; } -sub hg_ident -{ - my $repository = shift; - my $rev_id = shift; - - if ( $debug ) { - print STDERR "CWS-DEBUG: ... hg ident: 'repository', revision: '$rev_id'\n"; - } - - my @result = execute_hg_command(0, 'ident', "--cwd $repository", "-n -r $rev_id"); - my $line = $result[0]; - if ($line =~ /abort: unknown revision/) { - return undef; - } - else { - chomp($line); - return $line; - } -} - -sub hg_strip +sub hg_parent { my $repository = shift; my $rev_id = shift; + my $options = shift; if ( $debug ) { - print STDERR "CWS-DEBUG: ... hg strip: 'repository', revision: '$rev_id'\n"; + print STDERR "CWS-DEBUG: ... hg parent: 'repository', revision: '$rev_id', options: $options\n"; } - my @result = execute_hg_command(1, 'strip', "--cwd $repository", '-n', $rev_id); + my @result = execute_hg_command(0, 'parent', "--cwd $repository", "-r $rev_id", $options); my $line = $result[0]; - if ($line =~ /abort: unknown revision/) { - return undef; - } - else { - chomp($line); - return $line; - } + chomp($line); + return $line; } sub hg_pull diff --git a/solenv/bin/cwsattach.pl b/solenv/bin/cwsattach.pl index 60ad81f2f152..05e1b8df3cb4 100644 --- a/solenv/bin/cwsattach.pl +++ b/solenv/bin/cwsattach.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: cwsattach.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi index ddb56fd1d7c1..63712be76623 100755 --- a/solenv/bin/cwscheckapi +++ b/solenv/bin/cwscheckapi @@ -1,15 +1,12 @@ #!/bin/bash #************************************************************************* +# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: cwscheckapi,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -26,6 +23,7 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm index 64c624dd4bba..73f8da0e6d39 100755 --- a/solenv/bin/cwscheckapi.btm +++ b/solenv/bin/cwscheckapi.btm @@ -1,15 +1,12 @@ @echo off REM ************************************************************************** +REM * REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM * -REM * Copyright 2008 by Sun Microsystems, Inc. +REM * Copyright 2000, 2010 Oracle and/or its affiliates. REM * REM * OpenOffice.org - a multi-platform office productivity suite REM * -REM * $RCSfile: cwscheckapi.btm,v $ -REM * -REM * $Revision: 1.3.6.4 $ -REM * REM * This file is part of OpenOffice.org. REM * REM * OpenOffice.org is free software: you can redistribute it and/or modify @@ -26,6 +23,7 @@ REM * You should have received a copy of the GNU Lesser General Public License REM * version 3 along with OpenOffice.org. If not, see REM * <http://www.openoffice.org/license.html> REM * for a copy of the LGPLv3 License. +REM * REM ************************************************************************/ rem echo on diff --git a/solenv/bin/cwstestresult.pl b/solenv/bin/cwstestresult.pl index c786870b4c61..43b41ff7b5e8 100644 --- a/solenv/bin/cwstestresult.pl +++ b/solenv/bin/cwstestresult.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: cwsattach.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl index 03e5095e78b4..eb306277580c 100755 --- a/solenv/bin/cwstouched.pl +++ b/solenv/bin/cwstouched.pl @@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' #************************************************************************* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,6 +25,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ use strict; diff --git a/solenv/bin/cwstouched.py b/solenv/bin/cwstouched.py index 6ed3e67757b2..87dfe4b03595 100755 --- a/solenv/bin/cwstouched.py +++ b/solenv/bin/cwstouched.py @@ -3,7 +3,7 @@ #************************************************************************* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -23,6 +23,7 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ import os diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 0d6c8b27afa4..a4fc9f21d2b5 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: deliver.pl,v $ -# -# $Revision$ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -111,9 +107,17 @@ $opt_checkdlst = 0; $delete_common = 1; # for "-delete": if defined delete files from common tree also if ($^O ne 'cygwin') { # iz59477 - cygwin needes a dot "." at the end of filenames to disable - $maybedot = ''; # some .exe transformation magic. + $maybedot = ''; # some .exe transformation magic. } else { - $maybedot = '.'; + my $cygvernum = `uname -r`; + my @cygvernum = split( /\./, $cygvernum); + $cygvernum = shift @cygvernum; + $cygvernum .= shift @cygvernum; + if ( $cygvernum < 17 ) { + $maybedot = '.'; + } else { + $maybedot = ''; # no longer works with cygwin 1.7. other magic below. + } } ($gui = lc($ENV{GUI})) || die "Can't determine 'GUI'. Please set environment.\n"; @@ -832,6 +836,11 @@ sub copy_if_newer sleep $try; $try ++; $success = rename($temp_file, $to); + if ( $^O eq 'cygwin' && $to =~ /\.bin$/) { + # hack to survive automatically added .exe for executables renamed to + # *.bin - will break if there is intentionally a .bin _and_ .bin.exe file. + $success = rename( "$to.exe", $to ) if -f "$to.exe"; + } } if ( $success ) { # handle special packaging of *.dylib files for Mac OS X @@ -1204,16 +1213,7 @@ sub zip_files next if ( $opt_check ); local $work_file = ""; - if ( $ext) { - # We are delivering into a minor. Zip files must not contain the - # minor extension, so we have to pre and post process it. - # - # Pre process: add minor extension to path, create working copy in - # temp directory. - $work_file = get_tempfilename() . ".zip"; - die "Error: temp file $work_file already exists" if ( -e $work_file); - zipped_path_extension($zip_file, $work_file, $ext, 1) if ( -e $zip_file ); - } elsif ( $zip_file eq $common_zip_file) { + if ( $zip_file eq $common_zip_file) { # Zip file in common tree: work on uniq copy to avoid collisions $work_file = $zip_file; $work_file =~ s/\.zip$//; @@ -1263,14 +1263,9 @@ sub zip_files print ZIP "$file\n"; } close(ZIP); + fix_broken_cygwin_created_zips($work_file) if $^O eq "cygwin"; } - if ( $ext ) { - # Post process: strip minor from stored path again - zipped_path_extension($work_file, $zip_file, $ext, 0); - if (( -e $work_file ) && ($work_file ne $zip_file)) { - unlink $work_file; - } - } elsif ( $zip_file eq $common_zip_file) { + if ( $zip_file eq $common_zip_file) { # rename work file back if ( -e $work_file ) { if ( -e $zip_file) { @@ -1294,45 +1289,30 @@ sub zip_files } } -sub zipped_path_extension +sub fix_broken_cygwin_created_zips # add given extension to or strip it from stored path { require Archive::Zip; import Archive::Zip; - my ($from, $to, $extension, $with_ext) = @_; + my $zip_file = shift; $zip = Archive::Zip->new(); - if ( -e $from) { - die 'Error: zip read error' unless $zip->read( $from) == 0; - my $name; - my $newmember; - my $DateTime = 0; - foreach my $member ( $zip->members() ) { - $name = $member->fileName(); - if ( $with_ext ) { - if ( $name !~ m#$extension/# ) { - $name =~ s#^(.*?)/#$1$extension/#o; - } - } else { - $name =~ s#^(.*?)$extension/#$1/#o; - } - $member->fileName( $name ); - if ( $member->lastModTime() ) { - if ( $DateTime < $member->lastModTime() ) { - $DateTime = $member->lastModTime(); - } - } + unless ( $zip->read($work_file) == AZ_OK ) { + die "Error: can't open zip file '$zip_file' to fix broken cygwin file permissions"; + } + my $latest_member_mod_time = 0; + foreach $member ( $zip->members() ) { + my $attributes = $member->unixFileAttributes(); + $attributes &= ~0xFE00; + print $member->fileName($name) . ": " . sprintf("%lo", $attributes) if $is_debug; + $attributes |= 0x10; # add group write permission + print "-> " . sprintf("%lo", $attributes) . "\n" if $is_debug; + $member->unixFileAttributes($attributes); + if ( $latest_member_mod_time < $member->lastModTime() ) { + $latest_member_mod_time = $member->lastModTime(); } - if ( -e $to ) { - die 'Error: zip write error' unless $zip->overwrite( ) == 0; - File::Copy::move( $from, $to) or die "Error $!: cannot move $from $to"; - } else { - die 'Error: zip write error' unless $zip->writeToFileNamed( $to ) == 0; - } - utime $DateTime, $DateTime, $to; - } else { - die "Error: file $from does not exist" if ( ! $opt_delete); } - return; + die "Error: can't overwrite zip file '$zip_file' for fixing permissions" unless $zip->overwrite() == AZ_OK; + utime($latest_member_mod_time, $latest_member_mod_time, $zip_file); } sub get_tempfilename diff --git a/solenv/bin/diffmv.pl b/solenv/bin/diffmv.pl index 3bd1065b9569..89e5e4fd9ffb 100755 --- a/solenv/bin/diffmv.pl +++ b/solenv/bin/diffmv.pl @@ -5,14 +5,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: diffmv.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/exectest.pl b/solenv/bin/exectest.pl index 552935eb5b6b..d343cf298017 100644 --- a/solenv/bin/exectest.pl +++ b/solenv/bin/exectest.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: exectest.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl index 6b2ec3170641..7c9ac4b24c2e 100644..100755 --- a/solenv/bin/gccinstlib.pl +++ b/solenv/bin/gccinstlib.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: gccinstlib.pl,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl index d1a2e1ba2dee..ae2aa6f251e0 100644 --- a/solenv/bin/gen_update_info.pl +++ b/solenv/bin/gen_update_info.pl @@ -6,14 +6,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: gen_update_info.pl,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl index 2e5ed3cf2588..e65968e6b6c2 100755 --- a/solenv/bin/gen_userfeedback_VCL_names.pl +++ b/solenv/bin/gen_userfeedback_VCL_names.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: ,v $ -# -# $Revision: $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk index 7b471294180c..068960481130 100644 --- a/solenv/bin/getcompver.awk +++ b/solenv/bin/getcompver.awk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: header.hxx,v $ -# -# $Revision: 1.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/getcsym.awk b/solenv/bin/getcsym.awk index daa3a81fad60..9490a06b3535 100644 --- a/solenv/bin/getcsym.awk +++ b/solenv/bin/getcsym.awk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: getcsym.awk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl index 9839a5d637d7..c5326204eb49 100755 --- a/solenv/bin/guw.pl +++ b/solenv/bin/guw.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: guw.pl,v $ -# -# $Revision: 1.28 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/hicontrast-to-theme.pl b/solenv/bin/hicontrast-to-theme.pl index 531762889914..027d7405dab2 100644 --- a/solenv/bin/hicontrast-to-theme.pl +++ b/solenv/bin/hicontrast-to-theme.pl @@ -5,14 +5,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: hicontrast-to-theme.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice index 29645688b56a..59ad271ee142 100755 --- a/solenv/bin/installoffice +++ b/solenv/bin/installoffice @@ -1,8 +1,9 @@ #!/bin/bash #************************************************************************* +# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -22,6 +23,7 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ EXIT_SUCCESS=0 diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm index ffd6633fafcd..a77f8defeb45 100755 --- a/solenv/bin/installoffice.btm +++ b/solenv/bin/installoffice.btm @@ -1,15 +1,12 @@ @echo off REM ************************************************************************** +REM * REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM * -REM * Copyright 2008 by Sun Microsystems, Inc. +REM * Copyright 2000, 2010 Oracle and/or its affiliates. REM * REM * OpenOffice.org - a multi-platform office productivity suite REM * -REM * $RCSfile: installoffice.btm,v $ -REM * -REM * $Revision: 1.3.6.1 $ -REM * REM * This file is part of OpenOffice.org. REM * REM * OpenOffice.org is free software: you can redistribute it and/or modify @@ -26,6 +23,7 @@ REM * You should have received a copy of the GNU Lesser General Public License REM * version 3 along with OpenOffice.org. If not, see REM * <http://www.openoffice.org/license.html> REM * for a copy of the LGPLv3 License. +REM * REM ************************************************************************/ diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl index 0d297e289b3f..b6c852ae8624 100755 --- a/solenv/bin/installoffice.pl +++ b/solenv/bin/installoffice.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' #************************************************************************* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: installoffice.pl,v $ -# -# $Revision: 1.2.24.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,6 +25,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ use strict; diff --git a/solenv/bin/leconvert.pl b/solenv/bin/leconvert.pl index 48723c1d79f0..dec0d333f99d 100755 --- a/solenv/bin/leconvert.pl +++ b/solenv/bin/leconvert.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: leconvert.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/licinserter.pl b/solenv/bin/licinserter.pl index b01a85b75731..bfb4d1999fe1 100644 --- a/solenv/bin/licinserter.pl +++ b/solenv/bin/licinserter.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: licinserter.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index a413e485b30a..fe75d0d562d4 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -12,14 +12,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: linkoo,v $ -# -# $Revision: 1.17 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -57,7 +53,7 @@ export OOO_DISABLE_RECOVERY=1 $program_dir = 'program'; $program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX'); -my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' ); +my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); %replaceable = ( $program_dir => '\.so', @@ -298,9 +294,6 @@ sub link_soffice_bin_files() do_link ($src, $dest, 'intro.bmp', 'intro.bmp', 1); do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1); - $dest = "$OOO_BUILD/configmgr/$TARGET/lib"; - do_link ($src, $dest, 'configmgrrc', 'configmgrrc', 1); - print "\n"; } diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 5e7064631ec0..b7530e4f5e98 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: macosx-change-install-names.pl,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle index f4cbeacc20f1..ba7d624e68f3 100755 --- a/solenv/bin/macosx-create-bundle +++ b/solenv/bin/macosx-create-bundle @@ -3,14 +3,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: macosx-create-bundle,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl index 159eb66d782d..1554bbe56016 100644 --- a/solenv/bin/macosx-dylib-link-list.pl +++ b/solenv/bin/macosx-dylib-link-list.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: macosx-dylib-link-list.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl index 464b0d75e25d..dd492ea3bfa1 100644 --- a/solenv/bin/make_download.pl +++ b/solenv/bin/make_download.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: make_installer.pl,v $ -# -# $Revision: 1.121 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/make_ext_update_info.pl b/solenv/bin/make_ext_update_info.pl index e3dac8a95cbe..f350dc489386 100755 --- a/solenv/bin/make_ext_update_info.pl +++ b/solenv/bin/make_ext_update_info.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: make_ext_update_info.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 6458fbfdc5cb..a2f552eceb8d 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -2,12 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: make_installer.pl,v $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl index df11a50c7e17..cdebaab77617 100644 --- a/solenv/bin/makemani.pl +++ b/solenv/bin/makemani.pl @@ -5,14 +5,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makemani.pl,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl index 9d1c837377b6..48c335c2adba 100644 --- a/solenv/bin/mapgen.pl +++ b/solenv/bin/mapgen.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: mapgen.pl,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index 52a62ef70040..f2d0acc649f6 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: mhids.pl,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/mkdir.pl b/solenv/bin/mkdir.pl index d2a374adfc67..85c2cc78f199 100755 --- a/solenv/bin/mkdir.pl +++ b/solenv/bin/mkdir.pl @@ -7,7 +7,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' # options -p (for compatibility) # -mode mode # -# Copyright (c) 2000 Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. use Cwd; diff --git a/solenv/bin/mkout.pl b/solenv/bin/mkout.pl index d803e83bf991..4839b8525bb9 100755 --- a/solenv/bin/mkout.pl +++ b/solenv/bin/mkout.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: mkout.pl,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm index 0b57e748b486..8f272fe896f8 100644 --- a/solenv/bin/modules/CreatePDBRelocators.pm +++ b/solenv/bin/modules/CreatePDBRelocators.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: CreatePDBRelocators.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/Cws.pm b/solenv/bin/modules/Cws.pm index 2ec5d13ff88c..6948c21d554e 100755 --- a/solenv/bin/modules/Cws.pm +++ b/solenv/bin/modules/Cws.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: Cws.pm,v $ -# -# $Revision: 1.26 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/CwsConfig.pm b/solenv/bin/modules/CwsConfig.pm index 3574bc89e7a8..6121691e1e7f 100644 --- a/solenv/bin/modules/CwsConfig.pm +++ b/solenv/bin/modules/CwsConfig.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: CwsConfig.pm,v $ -# -# $Revision: 1.11.44.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/Eis.pm b/solenv/bin/modules/Eis.pm index f06c0387d64f..696595f5af71 100755 --- a/solenv/bin/modules/Eis.pm +++ b/solenv/bin/modules/Eis.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: Eis.pm,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/GenInfoParser.pm b/solenv/bin/modules/GenInfoParser.pm index c211c0c82a28..2671da13a69d 100644 --- a/solenv/bin/modules/GenInfoParser.pm +++ b/solenv/bin/modules/GenInfoParser.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: GenInfoParser.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 088005e43d7b..88aa226f68a9 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: SourceConfig.pm,v $ -# -# $Revision: 1.0 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm index 62a35193cd69..80c468b61db2 100644 --- a/solenv/bin/modules/installer/archivefiles.pm +++ b/solenv/bin/modules/installer/archivefiles.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: archivefiles.pm,v $ -# -# $Revision: 1.18 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm index ed6a5b4b2707..4aa82d25b5b2 100644 --- a/solenv/bin/modules/installer/configuration.pm +++ b/solenv/bin/modules/installer/configuration.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: configuration.pm,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index b58f376486e0..7818b74f4b40 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: control.pm,v $ -# -# $Revision: 1.42 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm index 72901448598a..beeec52b71ac 100644 --- a/solenv/bin/modules/installer/converter.pm +++ b/solenv/bin/modules/installer/converter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: converter.pm,v $ -# -# $Revision: 1.18 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm index ed826d692df5..5db9cf7f8b04 100644 --- a/solenv/bin/modules/installer/copyproject.pm +++ b/solenv/bin/modules/installer/copyproject.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: copyproject.pm,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 4fbe8d4255f8..46512e525046 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: download.pm,v $ -# -# $Revision: 1.47 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -1043,6 +1039,10 @@ sub nsis_language_converter my $nsislanguage = ""; + # Assign language used by NSIS. + # The files "$nsislanguage.nsh" and "$nsislanguage.nlf" + # are needed in the NSIS environment. + # Directory: <NSIS-Dir>/Contrib/Language files if ( $language eq "en-US" ) { $nsislanguage = "English"; } elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; } elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; } @@ -1061,6 +1061,7 @@ sub nsis_language_converter elsif ( $language eq "fr" ) { $nsislanguage = "French"; } elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; } elsif ( $language eq "he" ) { $nsislanguage = "Hebrew"; } + elsif ( $language eq "is" ) { $nsislanguage = "Icelandic"; } elsif ( $language eq "id" ) { $nsislanguage = "Indonesian"; } elsif ( $language eq "it" ) { $nsislanguage = "Italian"; } elsif ( $language eq "lv" ) { $nsislanguage = "Latvian"; } diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm index ad6ddabece55..aa3bbb25a484 100644 --- a/solenv/bin/modules/installer/downloadsigner.pm +++ b/solenv/bin/modules/installer/downloadsigner.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: remover.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index c51612722fd9..2ee6fd41af47 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: environment.pm,v $ -# -# $Revision: 1.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -80,6 +76,30 @@ sub create_pathvariables } ################################################## +# Replacing tilde in pathes, because of +# problem with deep recursion (task 104830) +################################################## + +sub check_tilde_in_directory +{ + if ( $ENV{'HOME'} ) + { + my $home = $ENV{'HOME'}; + $home =~ s/\Q$installer::globals::separator\E\s*$//; + $installer::globals::localinstalldir =~ s/~/$home/; + my $infoline = "Info: Changing LOCALINSTALLDIR to $installer::globals::localinstalldir\n"; + push(@installer::globals::logfileinfo, $infoline); + } + else + { + # exit, because "~" is not allowed, if HOME is not set + my $infoline = "ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!\n"; + push(@installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program("ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!", "check_tilde_in_directory"); + } +} + +################################################## # Setting some fundamental global variables. # All these variables can be overwritten # by parameters. @@ -111,6 +131,9 @@ sub set_global_environment_variables if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; } if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; } if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; } + + # Special handling, if LOCALINSTALLDIR contains "~" in the path + if ( $installer::globals::localinstalldir =~ /^\s*\~/ ) { check_tilde_in_directory(); } } 1; diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 8b8a7aa2bafb..95f661160a0e 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: epmfile.pm,v $ -# -# $Revision: 1.87 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/existence.pm b/solenv/bin/modules/installer/existence.pm index bcdcfa478a78..1ecf9ce9965b 100644 --- a/solenv/bin/modules/installer/existence.pm +++ b/solenv/bin/modules/installer/existence.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: existence.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm index 15192ca86378..d5976f428b93 100644 --- a/solenv/bin/modules/installer/exiter.pm +++ b/solenv/bin/modules/installer/exiter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: exiter.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm index db869ad7906a..73ea26738b05 100644 --- a/solenv/bin/modules/installer/files.pm +++ b/solenv/bin/modules/installer/files.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: files.pm,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm index 0a1ef456adcb..1abc035d5615 100644 --- a/solenv/bin/modules/installer/followme.pm +++ b/solenv/bin/modules/installer/followme.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: environment.pm,v $ -# -# $Revision: 1.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 8579e67ed970..79cbd3a8cc80 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: globals.pm,v $ -# -# $Revision: 1.103.16.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm index b9735e5aee29..f68346bdcce2 100644 --- a/solenv/bin/modules/installer/javainstaller.pm +++ b/solenv/bin/modules/installer/javainstaller.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: javainstaller.pm,v $ -# -# $Revision: 1.30 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm index 11b8ecbd2edb..ded5bc3d2e21 100644 --- a/solenv/bin/modules/installer/languagepack.pm +++ b/solenv/bin/modules/installer/languagepack.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: languagepack.pm,v $ -# -# $Revision: 1.16.226.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm index 978a213bda35..7070b09f80b8 100644 --- a/solenv/bin/modules/installer/languages.pm +++ b/solenv/bin/modules/installer/languages.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: languages.pm,v $ -# -# $Revision: 1.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm index 26d0b6313743..c5982c6a05f9 100644 --- a/solenv/bin/modules/installer/logger.pm +++ b/solenv/bin/modules/installer/logger.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: logger.pm,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/mail.pm b/solenv/bin/modules/installer/mail.pm index 054eccf3f4db..3580b3f3b6ab 100644 --- a/solenv/bin/modules/installer/mail.pm +++ b/solenv/bin/modules/installer/mail.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: mail.pm,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm index 79eaa3a96d7d..f2becc19a610 100644 --- a/solenv/bin/modules/installer/packagelist.pm +++ b/solenv/bin/modules/installer/packagelist.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: packagelist.pm,v $ -# -# $Revision: 1.19 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm index 4ca68bf30d38..d4032b7db17e 100644 --- a/solenv/bin/modules/installer/packagepool.pm +++ b/solenv/bin/modules/installer/packagepool.pm @@ -1,35 +1,27 @@ #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# $RCSfile: copyproject.pm,v $ +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# $Revision: 1.8 $ +# OpenOffice.org - a multi-platform office productivity suite # -# last change: $Author: obo $ $Date: 2007/07/19 07:16:23 $ +# This file is part of OpenOffice.org. # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 2.1. +# 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). # -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License version 2.1, as published by the Free Software Foundation. -# -# This library 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 for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# 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. # #************************************************************************* diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index a0d91954ddb5..8a54c27db3a9 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: parameter.pm,v $ -# -# $Revision: 1.56 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm index 3aa6ece5f691..1c57a0d76e02 100644 --- a/solenv/bin/modules/installer/pathanalyzer.pm +++ b/solenv/bin/modules/installer/pathanalyzer.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: pathanalyzer.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm index 5bea2b9f9b27..3feef2e8a367 100644 --- a/solenv/bin/modules/installer/profiles.pm +++ b/solenv/bin/modules/installer/profiles.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: profiles.pm,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm index bb6461b00d7d..1c2821549131 100644 --- a/solenv/bin/modules/installer/regmerge.pm +++ b/solenv/bin/modules/installer/regmerge.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: regmerge.pm,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/remover.pm b/solenv/bin/modules/installer/remover.pm index e142682be614..541a33bce4c1 100644 --- a/solenv/bin/modules/installer/remover.pm +++ b/solenv/bin/modules/installer/remover.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: remover.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm index bc358903093c..32a142828981 100644 --- a/solenv/bin/modules/installer/scppatchsoname.pm +++ b/solenv/bin/modules/installer/scppatchsoname.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: scppatchsoname.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm index f5a242b5ff0a..52dea6032ee1 100644 --- a/solenv/bin/modules/installer/scpzipfiles.pm +++ b/solenv/bin/modules/installer/scpzipfiles.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: scpzipfiles.pm,v $ -# -# $Revision: 1.15 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 5f02acab8e81..778ca23e740a 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: scriptitems.pm,v $ -# -# $Revision: 1.53 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm index f0afea5583a6..38c21a57593b 100644 --- a/solenv/bin/modules/installer/servicesfile.pm +++ b/solenv/bin/modules/installer/servicesfile.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: servicesfile.pm,v $ -# -# $Revision: 1.33 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index a131d32b21c0..e266832e6ba6 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: setupscript.pm,v $ -# -# $Revision: 1.19 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index a543c32c048a..d18c4cb5745b 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: simplepackage.pm,v $ -# -# $Revision: 1.19.48.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/sorter.pm b/solenv/bin/modules/installer/sorter.pm index 080a20223e70..dd983c060093 100644 --- a/solenv/bin/modules/installer/sorter.pm +++ b/solenv/bin/modules/installer/sorter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: sorter.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm index 5a2f3b23947c..a9541879d119 100644 --- a/solenv/bin/modules/installer/strip.pm +++ b/solenv/bin/modules/installer/strip.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: strip.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm index c97b2ec6ec57..12cb6ab8eb4f 100644 --- a/solenv/bin/modules/installer/substfilenamefiles.pm +++ b/solenv/bin/modules/installer/substfilenamefiles.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: substfilenamefiles.pm,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index ba04d1085532..bbc65d3c1f7a 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: systemactions.pm,v $ -# -# $Revision: 1.38 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -59,7 +55,12 @@ sub create_directory $infoline = "\nCreated directory: $directory\n"; push(@installer::globals::logfileinfo, $infoline); - my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; + my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1"; + system($localcall); + + # chmod 0775 is not sufficient on mac to remove sticky tag + $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1"; + system($localcall); } else { @@ -1401,7 +1402,11 @@ sub try_to_create_directory $infoline = "\nCreated directory: $directory\n"; push(@installer::globals::logfileinfo, $infoline); - my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; + my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1"; + system($localcall); + + # chmod 0775 is not sufficient on mac to remove sticky tag + $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1"; system($localcall); } else diff --git a/solenv/bin/modules/installer/upx.pm b/solenv/bin/modules/installer/upx.pm index ebdd859a87d2..7bfb14fae0d5 100644 --- a/solenv/bin/modules/installer/upx.pm +++ b/solenv/bin/modules/installer/upx.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: upx.pm,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index c6c175fa5027..d22a1299e9c9 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: admin.pm,v $ -# -# $Revision: 1.1.2.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm index 7b2372603b70..bb5efe2207d5 100644 --- a/solenv/bin/modules/installer/windows/assembly.pm +++ b/solenv/bin/modules/installer/windows/assembly.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: assembly.pm,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/binary.pm b/solenv/bin/modules/installer/windows/binary.pm index 4f327b6d93c0..96ee50eb4b19 100644 --- a/solenv/bin/modules/installer/windows/binary.pm +++ b/solenv/bin/modules/installer/windows/binary.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: binary.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm index 1cddc98cf6af..125c8607f249 100644 --- a/solenv/bin/modules/installer/windows/component.pm +++ b/solenv/bin/modules/installer/windows/component.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: component.pm,v $ -# -# $Revision: 1.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm index 3abb3acad3d3..7ade8866c6c5 100644 --- a/solenv/bin/modules/installer/windows/createfolder.pm +++ b/solenv/bin/modules/installer/windows/createfolder.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: createfolder.pm,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index 94ac41d8cb92..2ad207731b51 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: directory.pm,v $ -# -# $Revision: 1.30.126.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm index b422dc45eb65..39521baecdfe 100644 --- a/solenv/bin/modules/installer/windows/feature.pm +++ b/solenv/bin/modules/installer/windows/feature.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: feature.pm,v $ -# -# $Revision: 1.24 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm index 0c3d5763325e..c5053212aad3 100644 --- a/solenv/bin/modules/installer/windows/featurecomponent.pm +++ b/solenv/bin/modules/installer/windows/featurecomponent.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: featurecomponent.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm index e8d46c124317..10666be7460c 100644 --- a/solenv/bin/modules/installer/windows/file.pm +++ b/solenv/bin/modules/installer/windows/file.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: file.pm,v $ -# -# $Revision: 1.24 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm index fec60e719150..9dab78caf5f7 100644 --- a/solenv/bin/modules/installer/windows/font.pm +++ b/solenv/bin/modules/installer/windows/font.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: font.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/icon.pm b/solenv/bin/modules/installer/windows/icon.pm index 5f101131ff4f..ac2fa9ea8cfa 100644 --- a/solenv/bin/modules/installer/windows/icon.pm +++ b/solenv/bin/modules/installer/windows/icon.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: icon.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index e9ad0c73d249..6f03228ca10a 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: idtglobal.pm,v $ -# -# $Revision: 1.45 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/inifile.pm b/solenv/bin/modules/installer/windows/inifile.pm index b6737495279a..de279da8d48b 100644 --- a/solenv/bin/modules/installer/windows/inifile.pm +++ b/solenv/bin/modules/installer/windows/inifile.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: inifile.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/java.pm b/solenv/bin/modules/installer/windows/java.pm index 6b9cb7d725aa..11ccd7076f71 100644 --- a/solenv/bin/modules/installer/windows/java.pm +++ b/solenv/bin/modules/installer/windows/java.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: java.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm index 11a31c6c5f60..c0dca543eb56 100644 --- a/solenv/bin/modules/installer/windows/language.pm +++ b/solenv/bin/modules/installer/windows/language.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: language.pm,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm index c8b1e03ab5e3..35e90f6a3856 100644 --- a/solenv/bin/modules/installer/windows/media.pm +++ b/solenv/bin/modules/installer/windows/media.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: media.pm,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm index 7dfd8ff49c76..eb524fdafc3e 100755 --- a/solenv/bin/modules/installer/windows/mergemodule.pm +++ b/solenv/bin/modules/installer/windows/mergemodule.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: mergemodule.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 6c49a8db3cf2..66731f860092 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -2,12 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: msiglobal.pm,v $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -1879,15 +1877,22 @@ sub set_global_code_variables if ( $#{$languagesref} > 0 ) # more than one language { - if (( ${$languagesref}[1] =~ /jp/ ) || - ( ${$languagesref}[1] =~ /ko/ ) || - ( ${$languagesref}[1] =~ /zh/ )) + if (( $installer::globals::added_english ) && ( $#{$languagesref} == 1 )) # only multilingual because of added English { - $onelanguage = "multiasia"; + $onelanguage = ${$languagesref}[1]; # setting the first language, that is not english } else { - $onelanguage = "multiwestern"; + if (( ${$languagesref}[1] =~ /jp/ ) || + ( ${$languagesref}[1] =~ /ko/ ) || + ( ${$languagesref}[1] =~ /zh/ )) + { + $onelanguage = "multiasia"; + } + else + { + $onelanguage = "multiwestern"; + } } } else # only one language diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 0a5a35f05693..a4996945de4d 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: msp.pm,v $ -# -# $Revision: 1.1.2.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/patch.pm b/solenv/bin/modules/installer/windows/patch.pm index 25f8fab6caa2..536464192a71 100644 --- a/solenv/bin/modules/installer/windows/patch.pm +++ b/solenv/bin/modules/installer/windows/patch.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: patch.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 9ce90d8bc7eb..4679e0e19a1b 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: property.pm,v $ -# -# $Revision: 1.31 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm index 9f9da9485677..16174750d178 100644 --- a/solenv/bin/modules/installer/windows/registry.pm +++ b/solenv/bin/modules/installer/windows/registry.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: registry.pm,v $ -# -# $Revision: 1.18 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/removefile.pm b/solenv/bin/modules/installer/windows/removefile.pm index 73c276a44310..ec2a6142db71 100644 --- a/solenv/bin/modules/installer/windows/removefile.pm +++ b/solenv/bin/modules/installer/windows/removefile.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: removefile.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/selfreg.pm b/solenv/bin/modules/installer/windows/selfreg.pm index 821eae4dceb4..70dffc3ea1af 100644 --- a/solenv/bin/modules/installer/windows/selfreg.pm +++ b/solenv/bin/modules/installer/windows/selfreg.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: selfreg.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm index acc0f7484910..dac740bcd9de 100644 --- a/solenv/bin/modules/installer/windows/shortcut.pm +++ b/solenv/bin/modules/installer/windows/shortcut.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: shortcut.pm,v $ -# -# $Revision: 1.15 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm index ecefbd9fd1f8..81ba78c8b218 100644 --- a/solenv/bin/modules/installer/windows/sign.pm +++ b/solenv/bin/modules/installer/windows/sign.pm @@ -2,12 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: binary.pm,v $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -120,9 +118,9 @@ sub check_system_path { # The following files have to be found in the environment variable PATH # Only, if \"-sign\" is used. - # Windows : "msicert.exe", "msidb.exe", "signtool.exe" + # Windows : "msicert.exe", "diff.exe", "msidb.exe", "signtool.exe" - my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe"); + my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe", "diff.exe"); if ( $installer::globals::internal_cabinet_signing ) { push(@needed_files_in_path, "cabarc.exe"); @@ -307,6 +305,34 @@ sub get_hash_count } ############################################################ +# Collect all last files in a cabinet file. This is +# necessary to control, if the cabinet file was damaged +# by calling signtool.exe. +############################################################ + +sub analyze_file_file +{ + my ($filecontent) = @_; + + my %filenamehash = (); + + for ( my $i = 0; $i <= $#{$filecontent}; $i++ ) + { + if ( $i < 3 ) { next; } + + if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ ) + { + my $name = $1; + my $sequence = $8; + + $filenamehash{$sequence} = $name; + } + } + + return ( \%filenamehash ); +} + +############################################################ # Collect all DiskIds to the corresponding cabinet files. ############################################################ @@ -315,6 +341,7 @@ sub analyze_media_file my ($filecontent) = @_; my %diskidhash = (); + my %lastsequencehash = (); for ( my $i = 0; $i <= $#{$filecontent}; $i++ ) { @@ -323,13 +350,15 @@ sub analyze_media_file if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ ) { my $diskid = $1; + my $lastsequence = $2; my $cabfile = $4; $diskidhash{$cabfile} = $diskid; + $lastsequencehash{$cabfile} = $lastsequence; } } - return \%diskidhash; + return ( \%diskidhash, \%lastsequencehash ); } ######################################################## @@ -342,15 +371,20 @@ sub collect_diskid_from_media_table # creating working directory my $workdir = installer::systemactions::create_directories("media", \$languagestring); - installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media"); + installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media File"); # Reading tables my $filename = $workdir . $installer::globals::separator . "Media.idt"; if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); } my $filecontent = installer::files::read_file($filename); - my $diskidhash = analyze_media_file($filecontent); + my ( $diskidhash, $lastsequencehash ) = analyze_media_file($filecontent); + + $filename = $workdir . $installer::globals::separator . "File.idt"; + if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); } + $filecontent = installer::files::read_file($filename); + my $filenamehash = analyze_file_file($filecontent); - return $diskidhash; + return ( $diskidhash, $filenamehash, $lastsequencehash ); } ######################################################## @@ -429,7 +463,7 @@ sub analyze_installset_content if ( $msidatabase ne "" ) { $contains_msidatabase = 1; } - return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase); + return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, \@sourcefiles); } ######################################################## @@ -445,6 +479,8 @@ sub msicert_database foreach my $cabfile ( keys %{$allcabfiles} ) { + my $origfilesize = -s $cabfile; + my $mediacabfilename = $cabfile; if ( $internalcabfile ) { $mediacabfilename = "\#" . $mediacabfilename; } if ( ! exists($cabfilehash->{$mediacabfilename}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); } @@ -453,18 +489,168 @@ sub msicert_database my $systemcall = "msicert.exe -d $msidatabase -m $diskid -c $cabfile -h"; $success = make_systemcall($systemcall, $systemcall); if ( ! $success ) { $fullsuccess = 0; } + + # size of cabinet file must not change + my $finalfilesize = -s $cabfile; + + if ( $origfilesize != $finalfilesize ) { installer::exiter::exit_program("ERROR: msicert.exe changed size of cabinet file !", "msicert_database"); } } return $fullsuccess; } ######################################################## +# Checking if cabinet file was broken by signtool. +######################################################## + +sub cabinet_cosistency_check +{ + my ( $onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath ) = @_; + + my $infoline = "Making consistency check of $onefile\n"; + push( @installer::globals::logfileinfo, $infoline); + my $expandfile = "expand.exe"; # Has to be in the path + + if ( $^O =~ /cygwin/i ) + { + $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe); + chomp $expandfile; + } + + if ( $filenamehash == 0 ) + { + $infoline = "Warning: Stopping consistency check: Important hash of filenames is empty!\n"; + push( @installer::globals::logfileinfo, $infoline); + } + elsif ( $lastsequencehash == 0 ) + { + $infoline = "Warning: Stopping consistency check; Important hash of last sequences is empty!\n"; + push( @installer::globals::logfileinfo, $infoline); + } + else # both hashes are available + { + # $onefile contains only the name of the cabinet file without path + my $sequence = $lastsequencehash->{$onefile}; + my $lastfile = $filenamehash->{$sequence}; + $infoline = "Check of $onefile: Sequence: $sequence is file: $lastfile\n"; + push( @installer::globals::logfileinfo, $infoline); + + # Therefore the file $lastfile need to be binary compared. + # It has to be expanded from the cabinet file + # of the original installation set and from the + # newly signed cabinet file. + + # How about cabinet files extracted from msi database? + my $finalinstalldir = $followmeinfohash->{'finalinstalldir'}; + + $finalinstalldir =~ s/\\\s*$//; + $finalinstalldir =~ s/\/\s*$//; + my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile; + my $currentpath = cwd(); + my $destcabfile = $currentpath . $installer::globals::separator . $onefile; + # my $destcabfile = $onefile; + + if ( $^O =~ /cygwin/i ) + { + chomp( $destcabfile = qx{cygpath -w "$destcabfile"} ); + $destcabfile =~ s/\\/\//g; + } + + if ( ! -f $sourcecabfile ) + { + $infoline = "WARNING: Check of cab file cannot happen, because source cabinet file was not found: $sourcecabfile\n"; + push( @installer::globals::logfileinfo, $infoline); + } + elsif ( ! -f $destcabfile ) + { + $infoline = "WARNING: Check of cab file cannot happen, because destination cabinet file was not found: $sourcecabfile\n"; + push( @installer::globals::logfileinfo, $infoline); + } + else # everything is okay for the check + { + my $diffpath = get_diff_path($temppath); + + my $origdiffpath = $diffpath . $installer::globals::separator . "orig"; + my $newdiffpath = $diffpath . $installer::globals::separator . "new"; + + if ( ! -d $origdiffpath ) { mkdir($origdiffpath); } + if ( ! -d $newdiffpath ) { mkdir($newdiffpath); } + + my $systemcall = "$expandfile $sourcecabfile $origdiffpath -f:$lastfile "; + $infoline = $systemcall . "\n"; + push( @installer::globals::logfileinfo, $infoline); + + my $success = make_systemcall($systemcall, $systemcall); + if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); } + + $systemcall = "$expandfile $destcabfile $newdiffpath -f:$lastfile "; + $infoline = $systemcall . "\n"; + push( @installer::globals::logfileinfo, $infoline); + + $success = make_systemcall($systemcall, $systemcall); + if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); } + + # and finally the two files can be diffed. + my $origfile = $origdiffpath . $installer::globals::separator . $lastfile; + my $newfile = $newdiffpath . $installer::globals::separator . $lastfile; + + if ( ! -f $origfile ) { installer::exiter::exit_program("ERROR: Unpacked original file not found: $origfile !", "cabinet_cosistency_check"); } + if ( ! -f $newfile ) { installer::exiter::exit_program("ERROR: Unpacked new file not found: $newfile !", "cabinet_cosistency_check"); } + + my $origsize = -s $origfile; + my $newsize = -s $newfile; + + if ( $origsize != $newsize ) # This shows an error! + { + $infoline = "ERROR: Different filesize after signtool.exe was used. Original: $origsize Bytes, new: $newsize. File: $lastfile\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program("ERROR: The cabinet file $destcabfile is broken after signtool.exe signed this file !", "cabinet_cosistency_check"); + } + else + { + $infoline = "Same size of last file in cabinet file after usage of signtool.exe: $newsize (File: $lastfile)\n"; + push( @installer::globals::logfileinfo, $infoline); + + # Also making a binary diff? + + my $difffile = "diff.exe"; # has to be in the path + # $systemcall = "$difffile $sourcecabfile $destcabfile"; # Test for differences + $systemcall = "$difffile $origfile $newfile"; + $infoline = $systemcall . "\n"; + $returnvalue = make_systemcall($systemcall, $systemcall); + + my $success = $?; + + if ( $success == 0 ) + { + $infoline = "Last files are identical after signing cabinet file (File: $lastfile)\n"; + push( @installer::globals::logfileinfo, $infoline); + } + elsif ( $success == 1 ) + { + $infoline = "ERROR: Last files are different after signing cabinet file (File: $lastfile)\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program("ERROR: Last files are different after signing cabinet file (File: $lastfile)!", "cabinet_cosistency_check"); + } + else + { + $infoline = "ERROR: Problem occured calling diff.exe (File: $lastfile)\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program("ERROR: Problem occured calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check"); + } + } + } + } + +} + +######################################################## # Signing a list of files ######################################################## sub sign_files { - my ( $followmeinfohash, $allfiles, $pw, $cabinternal ) = @_; + my ( $followmeinfohash, $allfiles, $pw, $cabinternal, $filenamehash, $lastsequencehash, $temppath ) = @_; my $infoline = ""; my $fullsuccess = 1; @@ -508,6 +694,12 @@ sub sign_files $counter++; } + # Special check for cabinet files, that sometimes get damaged by signtool.exe + if (( $success ) && ( $onefile =~ /\.cab\s*$/ ) && ( ! $cabinternal )) + { + cabinet_cosistency_check($onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath); + } + if ( ! $success ) { $fullsuccess = 0; @@ -570,6 +762,21 @@ sub get_cab_path } ################################################################# +# Setting the path, where the diff can happen. +################################################################# + +sub get_diff_path +{ + my ($temppath) = @_; + + my $diffpath = "diff_" . $$; + $diffpath = $temppath . $installer::globals::separator . $diffpath; + if ( ! -d $diffpath ) { installer::systemactions::create_directory($diffpath); } + + return $diffpath; +} + +################################################################# # Exclude all cab files from the msi database. ################################################################# @@ -888,7 +1095,7 @@ sub sign_files_in_cabinet_files $allfileshash{$onefile} = 1; } } - $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1); + $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1, 0, 0, $temppath); if ( ! $success ) { $complete_success = 0; } chdir($from); @@ -901,6 +1108,44 @@ sub sign_files_in_cabinet_files } ######################################################## +# Comparing the content of two directories. +# Only filesize is compared. +######################################################## + +sub compare_directories +{ + my ( $dir1, $dir2, $files ) = @_; + + $dir1 =~ s/\\\s*//; + $dir2 =~ s/\\\s*//; + $dir1 =~ s/\/\s*//; + $dir2 =~ s/\/\s*//; + + my $infoline = "Comparing directories: $dir1 and $dir2\n"; + push( @installer::globals::logfileinfo, $infoline); + + foreach my $onefile ( @{$files} ) + { + my $file1 = $dir1 . $installer::globals::separator . $onefile; + my $file2 = $dir2 . $installer::globals::separator . $onefile; + + if ( ! -f $file1 ) { installer::exiter::exit_program("ERROR: Missing file : $file1!", "compare_directories"); } + if ( ! -f $file2 ) { installer::exiter::exit_program("ERROR: Missing file : $file2!", "compare_directories"); } + + my $size1 = -s $file1; + my $size2 = -s $file2; + + $infoline = "Comparing files: $file1 ($size1) and $file2 ($size2)\n"; + push( @installer::globals::logfileinfo, $infoline); + + if ( $size1 != $size2 ) + { + installer::exiter::exit_program("ERROR: File defect after copy (different size) $file1 ($size1 bytes) and $file2 ($size2 bytes)!", "compare_directories"); + } + } +} + +######################################################## # Signing an existing Windows installation set. ######################################################## @@ -929,7 +1174,9 @@ sub sign_install_set else { $installsetpath = rename_install_set($installsetpath); } # collecting all files in the installation set - my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase) = analyze_installset_content($installsetpath); + my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, $sourcefiles) = analyze_installset_content($installsetpath); + + if ( $make_copy ) { compare_directories($installsetpath, $followmeinfohash->{'finalinstalldir'}, $sourcefiles); } # changing into installation set my $from = cwd(); @@ -947,7 +1194,7 @@ sub sign_install_set if ( $contains_msidatabase ) { # exclude media table from msi database and get all diskids. - my $cabfilehash = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'}); + my ( $cabfilehash, $filenamehash, $lastsequencehash ) = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'}); # Check, if there are internal cab files my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash); @@ -963,7 +1210,7 @@ sub sign_install_set if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $all_internal_cab_files, $pw, $temppath); } - $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0); + $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0, $filenamehash, $lastsequencehash, $temppath); if ( ! $success ) { $complete_success = 0; } $success = msicert_database($fullmsidatabase, $all_internal_cab_files, $cabfilehash, 1); if ( ! $success ) { $complete_success = 0; } @@ -980,7 +1227,7 @@ sub sign_install_set { if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $allcabfiles, $pw, $temppath); } - $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0); + $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0, $filenamehash, $lastsequencehash, $temppath); if ( ! $success ) { $complete_success = 0; } $success = msicert_database($msidatabase, $allcabfiles, $cabfilehash, 0); if ( ! $success ) { $complete_success = 0; } @@ -988,7 +1235,7 @@ sub sign_install_set } # finally all other files can be signed - $success = sign_files($followmeinfohash, $allfiles, $pw, 0); + $success = sign_files($followmeinfohash, $allfiles, $pw, 0, 0, 0, $temppath); if ( ! $success ) { $complete_success = 0; } # and changing back diff --git a/solenv/bin/modules/installer/windows/strip.pm b/solenv/bin/modules/installer/windows/strip.pm index c7e5e883596c..79b1046c1e8f 100644 --- a/solenv/bin/modules/installer/windows/strip.pm +++ b/solenv/bin/modules/installer/windows/strip.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: strip.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm index 4c1081fa8458..efe6949b6fc4 100644 --- a/solenv/bin/modules/installer/windows/update.pm +++ b/solenv/bin/modules/installer/windows/update.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: update.pm,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm index 5e3d5379579a..d9d371fc1b56 100644 --- a/solenv/bin/modules/installer/windows/upgrade.pm +++ b/solenv/bin/modules/installer/windows/upgrade.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: upgrade.pm,v $ -# -# $Revision: 1.16 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index d64ac15ff73a..b5b6af308d0e 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: worker.pm,v $ -# -# $Revision: 1.65.56.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -2656,15 +2652,13 @@ sub set_time_stamp } } -############################################## -# Include only files from install directory -# in pkgmap file. -############################################## -######################################## -# Generating pathes for cygwin. -######################################## +############################################################ +# Generating pathes for cygwin (first version) +# This function has problems with cygwin, if $tmpfilename +# contains many thousand files (OpenOffice SDK). +############################################################ -sub generate_cygwin_pathes +sub generate_cygwin_pathes_old { my ($filesref) = @_; @@ -2682,8 +2676,100 @@ sub generate_cygwin_pathes { ${$filesref}[$i]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i]; } + +} + +################################################# +# Generating pathes for cygwin (second version) +# This function generates smaller files for +################################################# + +sub generate_cygwin_pathes +{ + my ($filesref) = @_; + + installer::logger::include_timestamp_into_logfile("Starting generating cygwin pathes"); + + my $infoline = "Generating cygwin pathes (generate_cygwin_pathes)\n"; + push( @installer::globals::logfileinfo, $infoline); + + my $max = 5000; # number of pathes in one file + + my @pathcollector = (); + my $startnumber = 0; + my $counter = 0; + + for ( my $i = 0; $i <= $#{$filesref}; $i++ ) + { + my $line = ${$filesref}[$i]->{'sourcepath'} . "\n"; + push(@pathcollector, $line); + $counter++; + + if (( $i == $#{$filesref} ) || ((( $counter % $max ) == 0 ) && ( $i > 0 ))) + { + my $tmpfilename = "cygwinhelper_" . $i . ".txt"; + my $temppath = $installer::globals::temppath; + $temppath =~ s/\Q$installer::globals::separator\E\s*$//; + $tmpfilename = $temppath . $installer::globals::separator . $tmpfilename; + $infoline = "Creating temporary file for cygwin conversion: $tmpfilename (contains $counter pathes)\n"; + push( @installer::globals::logfileinfo, $infoline); + if ( -f $tmpfilename ) { unlink $tmpfilename; } + + installer::files::save_file($tmpfilename, \@pathcollector); + + my $success = 0; + my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"}; + chomp @cyg_sourcepathlist; + + # Validating the array, it has to contain the correct number of values + my $new_pathes = $#cyg_sourcepathlist + 1; + if ( $new_pathes == $counter ) { $success = 1; } + + if ($success) + { + $infoline = "Success: Successfully converted to cygwin pathes!\n"; + push( @installer::globals::logfileinfo, $infoline); + } + else + { + $infoline = "ERROR: Failed to convert to cygwin pathes!\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program("ERROR: Failed to convert to cygwin pathes!", "generate_cygwin_pathes"); + } + + for ( my $j = 0; $j <= $#cyg_sourcepathlist; $j++ ) + { + my $number = $startnumber + $j; + ${$filesref}[$number]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$j]; + } + + if ( -f $tmpfilename ) { unlink $tmpfilename; } + + @pathcollector = (); + $startnumber = $startnumber + $max; + $counter = 0; + } + } + + # Checking existence fo cyg_sourcepath for every file + for ( my $i = 0; $i <= $#{$filesref}; $i++ ) + { + if (( ! exists(${$filesref}[$i]->{'cyg_sourcepath'}) ) || ( ${$filesref}[$i]->{'cyg_sourcepath'} eq "" )) + { + $infoline = "ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program("ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}!", "generate_cygwin_pathes"); + } + } + + installer::logger::include_timestamp_into_logfile("Ending generating cygwin pathes"); } +############################################## +# Include only files from install directory +# in pkgmap file. +############################################## + sub filter_pkgmapfile { my ($pkgmapfile) = @_; diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm index e81380807a87..c6938292b313 100644 --- a/solenv/bin/modules/installer/xpdinstaller.pm +++ b/solenv/bin/modules/installer/xpdinstaller.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: xpdinstaller.pm,v $ -# -# $Revision: 1.19 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 3232daf2138f..a434163b0dd9 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: ziplist.pm,v $ -# -# $Revision: 1.22 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/macosxotoolhelper.pm b/solenv/bin/modules/macosxotoolhelper.pm index c8d30c52e473..96ad8b2ed6f4 100644 --- a/solenv/bin/modules/macosxotoolhelper.pm +++ b/solenv/bin/modules/macosxotoolhelper.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: macosxotoolhelper.pm,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/packager/check.pm b/solenv/bin/modules/packager/check.pm index 1b1aaedab46f..8811451cd27c 100644 --- a/solenv/bin/modules/packager/check.pm +++ b/solenv/bin/modules/packager/check.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: check.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/packager/existence.pm b/solenv/bin/modules/packager/existence.pm index e3b3d99d4e35..81f13395befc 100644 --- a/solenv/bin/modules/packager/existence.pm +++ b/solenv/bin/modules/packager/existence.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: existence.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/packager/exiter.pm b/solenv/bin/modules/packager/exiter.pm index fbbbbbc719ec..d81d5f148f15 100644 --- a/solenv/bin/modules/packager/exiter.pm +++ b/solenv/bin/modules/packager/exiter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: exiter.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/packager/files.pm b/solenv/bin/modules/packager/files.pm index d2054838fa12..295f55fade45 100644 --- a/solenv/bin/modules/packager/files.pm +++ b/solenv/bin/modules/packager/files.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: files.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/packager/globals.pm b/solenv/bin/modules/packager/globals.pm index 85bd58fef690..955a1598adc8 100644 --- a/solenv/bin/modules/packager/globals.pm +++ b/solenv/bin/modules/packager/globals.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: globals.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm index 43a1ae2abe77..ae0c743a635f 100644 --- a/solenv/bin/modules/packager/work.pm +++ b/solenv/bin/modules/packager/work.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: work.pm,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm index 70b557f94d25..7a975f530445 100644 --- a/solenv/bin/modules/par2script/check.pm +++ b/solenv/bin/modules/par2script/check.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: check.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/converter.pm b/solenv/bin/modules/par2script/converter.pm index 1adff9b2bf0b..49f0d62d4c64 100644 --- a/solenv/bin/modules/par2script/converter.pm +++ b/solenv/bin/modules/par2script/converter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: converter.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/existence.pm b/solenv/bin/modules/par2script/existence.pm index a557020647ee..08fb8eda4c7c 100644 --- a/solenv/bin/modules/par2script/existence.pm +++ b/solenv/bin/modules/par2script/existence.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: existence.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/exiter.pm b/solenv/bin/modules/par2script/exiter.pm index ddfe5a9d499b..24399422dc73 100644 --- a/solenv/bin/modules/par2script/exiter.pm +++ b/solenv/bin/modules/par2script/exiter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: exiter.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/files.pm b/solenv/bin/modules/par2script/files.pm index c781b6f9a3bc..3b7e70d2d4a9 100644 --- a/solenv/bin/modules/par2script/files.pm +++ b/solenv/bin/modules/par2script/files.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: files.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm index 1968b1907bda..9a3c06f23879 100644 --- a/solenv/bin/modules/par2script/globals.pm +++ b/solenv/bin/modules/par2script/globals.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: globals.pm,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/module.pm b/solenv/bin/modules/par2script/module.pm index f58022564f09..00b341306db2 100644 --- a/solenv/bin/modules/par2script/module.pm +++ b/solenv/bin/modules/par2script/module.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: module.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm index d24b2ea9e641..9c8abec78a0c 100644 --- a/solenv/bin/modules/par2script/parameter.pm +++ b/solenv/bin/modules/par2script/parameter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: parameter.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/remover.pm b/solenv/bin/modules/par2script/remover.pm index b6b94d124403..ba981f914881 100644 --- a/solenv/bin/modules/par2script/remover.pm +++ b/solenv/bin/modules/par2script/remover.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: remover.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/shortcut.pm b/solenv/bin/modules/par2script/shortcut.pm index 49063c3162f5..ecaa1506beb1 100644 --- a/solenv/bin/modules/par2script/shortcut.pm +++ b/solenv/bin/modules/par2script/shortcut.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: shortcut.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm index e51565a01f02..f5a8db9979a7 100644 --- a/solenv/bin/modules/par2script/systemactions.pm +++ b/solenv/bin/modules/par2script/systemactions.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: systemactions.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/undefine.pm b/solenv/bin/modules/par2script/undefine.pm index e6c1c586502f..5fc1d18ebd3d 100644 --- a/solenv/bin/modules/par2script/undefine.pm +++ b/solenv/bin/modules/par2script/undefine.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: undefine.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm index e37ce9c6dcdd..fd266e306d04 100644 --- a/solenv/bin/modules/par2script/work.pm +++ b/solenv/bin/modules/par2script/work.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: work.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/directory.pm b/solenv/bin/modules/pre2par/directory.pm index e09223d037f6..2253c54bc47a 100644 --- a/solenv/bin/modules/pre2par/directory.pm +++ b/solenv/bin/modules/pre2par/directory.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: directory.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/existence.pm b/solenv/bin/modules/pre2par/existence.pm index 6ae1f6500fcf..1775f1d9394c 100644 --- a/solenv/bin/modules/pre2par/existence.pm +++ b/solenv/bin/modules/pre2par/existence.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: existence.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/exiter.pm b/solenv/bin/modules/pre2par/exiter.pm index 2c6c755494b7..fe992aad4253 100644 --- a/solenv/bin/modules/pre2par/exiter.pm +++ b/solenv/bin/modules/pre2par/exiter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: exiter.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/files.pm b/solenv/bin/modules/pre2par/files.pm index e01c25fd4af9..e3de88b6dd4e 100644 --- a/solenv/bin/modules/pre2par/files.pm +++ b/solenv/bin/modules/pre2par/files.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: files.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm index 9f9e498ce227..55da94a211d2 100644 --- a/solenv/bin/modules/pre2par/globals.pm +++ b/solenv/bin/modules/pre2par/globals.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: globals.pm,v $ -# -# $Revision: 1.13 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm index 2686dbb3fdee..b5dc336ba847 100644 --- a/solenv/bin/modules/pre2par/language.pm +++ b/solenv/bin/modules/pre2par/language.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: language.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm index 9d9f9cbd3572..763f1963051c 100644 --- a/solenv/bin/modules/pre2par/parameter.pm +++ b/solenv/bin/modules/pre2par/parameter.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: parameter.pm,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/pathanalyzer.pm b/solenv/bin/modules/pre2par/pathanalyzer.pm index 116adb6dde76..f45a0808d53a 100644 --- a/solenv/bin/modules/pre2par/pathanalyzer.pm +++ b/solenv/bin/modules/pre2par/pathanalyzer.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: pathanalyzer.pm,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/remover.pm b/solenv/bin/modules/pre2par/remover.pm index 5c71c964bd6d..4efe6ea0610c 100644 --- a/solenv/bin/modules/pre2par/remover.pm +++ b/solenv/bin/modules/pre2par/remover.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: remover.pm,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm index c92bfd805a3e..e084d7753f48 100644 --- a/solenv/bin/modules/pre2par/systemactions.pm +++ b/solenv/bin/modules/pre2par/systemactions.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: systemactions.pm,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/modules/pre2par/work.pm b/solenv/bin/modules/pre2par/work.pm index c08313cc3b7f..d70f75e80b2e 100644 --- a/solenv/bin/modules/pre2par/work.pm +++ b/solenv/bin/modules/pre2par/work.pm @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: work.pm,v $ -# -# $Revision: 1.13 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/oochkpatch.pl b/solenv/bin/oochkpatch.pl index a15a6ba6fcc7..0234c6d5cf92 100644 --- a/solenv/bin/oochkpatch.pl +++ b/solenv/bin/oochkpatch.pl @@ -5,14 +5,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: oochkpatch.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/packager.pl b/solenv/bin/packager.pl index aca8a48cc9b6..75d929ab86d6 100644 --- a/solenv/bin/packager.pl +++ b/solenv/bin/packager.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: packager.pl,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl index 16cf2a113e8a..9466110124d2 100755 --- a/solenv/bin/packimages.pl +++ b/solenv/bin/packimages.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: packimages.pl,v $ -# -# $Revision: 1.17 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/packregistry.xslt b/solenv/bin/packregistry.xslt new file mode 100644 index 000000000000..55558d55450c --- /dev/null +++ b/solenv/bin/packregistry.xslt @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* 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. +* +**********************************************************************--> + +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:oor="http://openoffice.org/2001/registry"> + <xsl:strip-space elements="*"/> + <xsl:preserve-space elements="value"/> + <xsl:template match="/"> + <oor:data xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <xsl:copy-of select="list/dependency"/> +<!-- + <xsl:copy-of select="document(list/filename)/oor:component-schema"/> + <xsl:copy-of select="document(list/filename)/oor:component-data"/> + + instead of the below for-each would only issue warnings, not errors, for + non-existing or otherwise bad input files; it is important that the input + filename list is already sorted in an order suitable for the configmgr + (e.g., xcs files preceeding xcu files). +--> + <xsl:for-each select="list/filename"> + <xsl:choose> + <xsl:when test="count(document(.)/oor:component-schema) = 1"> + <xsl:apply-templates select="document(.)/oor:component-schema"/> + </xsl:when> + <xsl:when test="count(document(.)/oor:component-data) = 1"> + <xsl:apply-templates select="document(.)/oor:component-data"/> + </xsl:when> + <xsl:otherwise> + <xsl:message terminate="yes"> + <xsl:text>cannot process </xsl:text> + <xsl:value-of select="."/> + </xsl:message> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </oor:data> + </xsl:template> + <xsl:template + match="oor:component-schema|oor:component-data|templates|component|group| + set|node-ref|prop|item|value|node"> + <xsl:copy copy-namespaces="no"> + <!-- prune oor:component-data xmlns:install="..." namespaces (would only + work in XSLT 2.0, however) --> + <xsl:for-each select="@*"> + <xsl:attribute name="{name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:for-each> + <xsl:apply-templates/> + </xsl:copy> + </xsl:template> + <xsl:template match="info|import|uses|constraints"/> + <!-- TODO: no longer strip elements when they are eventually read by + configmgr implementation --> +</xsl:stylesheet> diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl index e7d89964df5e..0789c460d510 100644 --- a/solenv/bin/par2script.pl +++ b/solenv/bin/par2script.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: par2script.pl,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/patch_sanitizer.pl b/solenv/bin/patch_sanitizer.pl index d7297f772497..25260f9274c1 100755 --- a/solenv/bin/patch_sanitizer.pl +++ b/solenv/bin/patch_sanitizer.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: patch_sanitizer.pl,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/pre2par.pl b/solenv/bin/pre2par.pl index 2c243ce7bb48..f279ae106797 100644 --- a/solenv/bin/pre2par.pl +++ b/solenv/bin/pre2par.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: pre2par.pl,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/relocate b/solenv/bin/relocate index 4b19a578636e..2158d5d7314c 100755 --- a/solenv/bin/relocate +++ b/solenv/bin/relocate @@ -13,14 +13,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: relocate,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/rmdir.pl b/solenv/bin/rmdir.pl index 01b817eb9e59..8feb1603fb44 100644 --- a/solenv/bin/rmdir.pl +++ b/solenv/bin/rmdir.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: rmdir.pl,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper index 1c94bc0a9f10..1a285ddaa3e6 100755 --- a/solenv/bin/rpm-wrapper +++ b/solenv/bin/rpm-wrapper @@ -1,15 +1,12 @@ #!/bin/bash #************************************************************************* +# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -26,6 +23,7 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ # At least on v20z-so3, when /so/env/bt_linux_libc2.11/DEV300/bin/rpm is called diff --git a/solenv/bin/slfl.pl b/solenv/bin/slfl.pl index b5d8987af4f3..638e15140718 100755 --- a/solenv/bin/slfl.pl +++ b/solenv/bin/slfl.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: slfl.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh index f886f0fb88d1..1aa34f2a4a45 100755 --- a/solenv/bin/soirpm.sh +++ b/solenv/bin/soirpm.sh @@ -2,14 +2,10 @@ #************************************************************************* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -26,6 +22,7 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. +# #***********************************************************************/ LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print) diff --git a/solenv/bin/sort.pl b/solenv/bin/sort.pl index 9e88552651f5..b157ed119aa2 100644 --- a/solenv/bin/sort.pl +++ b/solenv/bin/sort.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: sort.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/touch.pl b/solenv/bin/touch.pl index 2747dd822cea..4c7719cbbbc4 100644 --- a/solenv/bin/touch.pl +++ b/solenv/bin/touch.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: touch.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl new file mode 100644 index 000000000000..0d6ab34583b3 --- /dev/null +++ b/solenv/bin/transform_description.pl @@ -0,0 +1,138 @@ +#!/usr/bin/perl +#************************************************************************* +#* +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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. +# +#************************************************************************/ + +parse_args(); +execute_args(); +exit(0); + +my $source = undef; +my $dest = undef; +my @languages = undef; + +sub parse_args +{ + # at most two arguments + explain(), exit(100) if ( $#ARGV > 1 ); + + # destination file is the second argument, if present + $dest = $ARGV[1] if ( $#ARGV > 0 ); + + # source file is the first argument if present + if ( $#ARGV > -1 ) + { + $source = $ARGV[0]; + if ( ! -f $source ) + { + print STDERR "$source is not a valid file, aborting"; + exit(101); + } + } + + # check which languages to use + my $languages = $ENV{WITH_LANG}; + if ( ! defined $languages ) + { + print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n"; + $languages = "en-US"; + } + @languages = split ( ' ', $languages ); +} + +sub execute_args +{ + my @description = (); + if ( defined $source ) + { + open SOURCE, "$source" || die "could not open $source: $?\n"; + @description = <SOURCE>; + close SOURCE; + } + else + { + @description = <STDIN>; + } + + if ( defined $dest ) + { + open DEST, ">$dest" || die "could not open $dest for writing: $?\n"; + } + + foreach (@description) + { + chomp; s/\r//; + + if ( /\#LANG\#/ ) + { + foreach $lang ( @languages ) + { + my $transformed = $_; + $transformed =~ s/\#LANG#/$lang/g; + if ( defined $dest ) + { + print DEST "$transformed\n"; + } + else + { + print STDOUT "$transformed\n"; + } + } + } + else + { + if ( defined $dest ) + { + print DEST "$_\n"; + } + else + { + print STDOUT "$_\n"; + } + } + } + + close DEST if ( defined $dest ); +} + +# explains the program's usage +sub explain +{ + print STDOUT "usage:\n"; + print STDOUT " $0 [<description_file> [<output_file>]]\n"; + print STDOUT " transforms the given extension description file\n"; + print STDOUT "\n"; + print STDOUT " If <output_file> is not given, STDOUT is used.\n"; + print STDOUT " If <description_file> is not given, STDIN is used.\n"; + print STDOUT "\n"; + print STDOUT " The following transformations are done at the moment:\n"; + print STDOUT " - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n"; + print STDOUT " replacing every occurance of \$LANG with a token\n"; + print STDOUT "\n"; + print STDOUT " And yes, the functionality of this script should be\n"; + print STDOUT " - moved to solenv/inc/tg_ext.mk\n"; + print STDOUT " - implemented as XSLT, to be much less error-prone\n"; +} diff --git a/solenv/bin/unxmap-to-macosx-explist.awk b/solenv/bin/unxmap-to-macosx-explist.awk index 4f8bd93035a9..b791d46a291c 100644 --- a/solenv/bin/unxmap-to-macosx-explist.awk +++ b/solenv/bin/unxmap-to-macosx-explist.awk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxmap-to-macosx-explist.awk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/update_module_ignore_lists.pl b/solenv/bin/update_module_ignore_lists.pl index e4e4c2abe4e3..88d73a0217d6 100644 --- a/solenv/bin/update_module_ignore_lists.pl +++ b/solenv/bin/update_module_ignore_lists.pl @@ -5,14 +5,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: hicontrast-to-theme.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl index c83f4d32ef73..f19f79f00e52 100755 --- a/solenv/bin/zipdep.pl +++ b/solenv/bin/zipdep.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: header.hxx,v $ -# -# $Revision: 1.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index b5b4230fc193..0e15c21c445e 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -8,7 +8,7 @@ common BIG_SVX TRUE BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE + BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office @@ -23,6 +23,7 @@ common ENABLE_GTK TRUE ENABLE_MEDIAWIKI YES ENABLE_MINIMIZER YES + ENABLE_MYSQLC YES ENABLE_NSS_MODULE YES ENABLE_RANDR TRUE ENABLE_REPORTBUILDER YES @@ -68,7 +69,7 @@ common } crashdump { - ENABLE_CRASHDUMP STATIC + ENABLE_CRASHDUMP TRUE } hg { @@ -652,6 +653,7 @@ unxlngi6 JDK14PATH %SOLAR_JDK14PATH% JDK15PATH %SOLAR_JDK15PATH% KDE_ROOT /so/env/kde/linux/kde-3.2.2 + LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6 NO_BSYMBOLIC True OJDK16PATH %SOLAR_OJDK16PATH% OS LINUX @@ -925,6 +927,7 @@ unxlngx6 JDK14PATH %SOLAR_JDK14PATH% JDK15PATH %SOLAR_JDK15PATH% KDE_ROOT /so/env/kde/linux/kde-3.2.2 + LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6 NO_BSYMBOLIC True OJDK16PATH %SOLAR_OJDK16PATH% OS LINUX @@ -1218,6 +1221,7 @@ unxmacxi JDK13PATH %SOLAR_JDK13PATH% JDK14PATH %SOLAR_JDK15PATH% JDK15PATH %SOLAR_JDK15PATH% + LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi NO_BSYMBOLIC True OS MACOSX OUTPATH unxmacxi @@ -1464,6 +1468,7 @@ unxsoli4 JDK13PATH %SOLAR_JDK13PATH% JDK14PATH %SOLAR_JDK14PATH% JDK15PATH %SOLAR_JDK15PATH% + LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4 OJDK16PATH %SOLAR_OJDK16PATH% OS SOLARIS OUTPATH unxsoli4 @@ -1721,6 +1726,7 @@ unxsols4 JDK13PATH %SOLAR_JDK13PATH% JDK14PATH %SOLAR_JDK14PATH% JDK15PATH %SOLAR_JDK15PATH% + LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4 LM_LICENSE_FILE %SOLAR_LICENSE_FILE% OJDK16PATH %SOLAR_OJDK16PATH% OS SOLARIS @@ -3036,6 +3042,7 @@ wntmsci12 GUIBASE WIN GVER NT351 INPATH wntmsci12%PROEXT% + LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12 MOZILLABUILD %SOLARROOT%/mozilla-build-1.3 OS WNT OUTPATH wntmsci12 diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 1098745b673e..e8c0a71feaa6 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -93,7 +93,7 @@ common ENABLE_PASF ENABLE_RANDR ENABLE_REPORTBUILDER - ENABLE_REPORTDESIGN + ENABLE_REPORTDESIGN ENABLE_SVCTAGS ENABLE_VBA FORCE2ARCHIVE diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index ce62599a11b7..2d182a66a437 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: ant.mk,v $ -# -# $Revision: 1.36 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk index 26ccfa6fe3bc..d840e4457f61 100644 --- a/solenv/inc/antsettings.mk +++ b/solenv/inc/antsettings.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: antsettings.mk,v $ -# -# $Revision: 1.7.166.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk index 6571d60d3ab0..0659e68adad7 100644 --- a/solenv/inc/cppunit.mk +++ b/solenv/inc/cppunit.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: cppunit.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index 07968efada54..47b62d20dd12 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: extension_post.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,6 +25,8 @@ # #************************************************************************* +EXTENSION_TARGET:=$(ZIP9TARGETN) + .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) . .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema . @@ -129,12 +127,18 @@ PHONYDESC=.PHONY .IF "$(DESCRIPTION)"!="" $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC) @@-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME) @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk - $(COMMAND_ECHO)$(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)/desc.tmp.$(EXTNAME) - @@-$(RM) $@.$(EXTNAME) - $(COMMAND_ECHO)$(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@ - @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME) + + $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME) + + $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME) + @@-$(RM) $@.1.$(EXTNAME) + + $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $@.3.$(EXTNAME) + @@-$(RM) $@.2.$(EXTNAME) + + $(COMMAND_ECHO)$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@ + @@-$(RM) $@.3.$(EXTNAME) .ENDIF # "$(DESCRIPTION)"!="" # default OOo license text!!! diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk index 84a9d48fd804..abef2e7f8b73 100644 --- a/solenv/inc/extension_pre.mk +++ b/solenv/inc/extension_pre.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: extension_pre.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk index 6d34ced82a61..8f9207fd3917 100644 --- a/solenv/inc/javaunittest.mk +++ b/solenv/inc/javaunittest.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: javaunittest.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk index b013c0a68b67..fc5321653fbc 100644 --- a/solenv/inc/lang.mk +++ b/solenv/inc/lang.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: lang.mk,v $ -# -# $Revision: 1.16 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 4d40600ba368..cbde1659ae5d 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: libs.mk,v $ -# -# $Revision: 1.134.2.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -182,7 +178,6 @@ BTCOMMUNILIB=-lbtcommuni$(DLLPOSTFIX) AUTOMATIONLIB=-lsts$(DLLPOSTFIX) SVLLIB=-lsvl$(DLLPOSTFIX) TKTLIB=-ltkt$(DLLPOSTFIX) -GOODIESLIB=-lgo$(DLLPOSTFIX) SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail DOCMGRLIB=-ldmg$(DLLPOSTFIX) @@ -210,7 +205,7 @@ ZLIB3RDLIB=-lzlib #i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-( .IF "$(OS)" == "FREEBSD" JPEG3RDLIB=/usr/local/lib/libjpeg.so -.ELIF "$(CPUNAME)" == "X86_64" +.ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64" JPEG3RDLIB=/usr/lib64/libjpeg.so .ELSE JPEG3RDLIB=/usr/lib/libjpeg.so @@ -245,6 +240,7 @@ FWILIB=-lfwi$(DLLPOSTFIX) SVXCORELIB=-lsvxcore$(DLLPOSTFIX) MSFILTERLIB=-lmsfilter$(DLLPOSTFIX) SVXLIB=-lsvx$(DLLPOSTFIX) +EDITENGLIB=-lediteng$(DLLPOSTFIX) BASCTLLIB=-lbasctl$(DLLPOSTFIX) BASICIDELIB=-lybctl SVXLLIB=-lsvxl @@ -344,6 +340,7 @@ PYUNOLIB=-lpyuno LPSOLVELIB=-llpsolve55 SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp +CONFIGMGRLIB=-lconfigmgr .ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -421,7 +418,6 @@ BTCOMMUNILIB=ibtcommuni.lib AUTOMATIONLIB=ists.lib SVLLIB=isvl.lib PLUGAPPLIB=plugapp.lib -GOODIESLIB=igo.lib SAXLIB=isax.lib MAILLIB=mail.lib DOCMGRLIB=docmgr.lib @@ -432,6 +428,7 @@ SJLIB=sj.lib SVXCORELIB=isvxcore.lib MSFILTERLIB=imsfilter.lib SVXLIB=isvx.lib +EDITENGLIB=iediteng.lib BASCTLLIB=basctl.lib BASICIDELIB=ybctl.lib SVXLLIB=svxl.lib @@ -525,5 +522,6 @@ PYUNOLIB=ipyuno.lib LPSOLVELIB=lpsolve55.lib SOFFICELIB=isofficeapp.lib UNOPKGAPPLIB=iunopkgapp.lib +CONFIGMGRLIB=iconfigmgr.lib .ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index b2edcd774b83..6e6607f779e1 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m71(Build:9481) -BUILD=9481 -LAST_MINOR=m71 +RSCREVISION=300m74(Build:9487) +BUILD=9487 +LAST_MINOR=m74 SOURCEVERSION=DEV300 diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk index 03ad2f7a35da..981479f184c4 100644 --- a/solenv/inc/os2.mk +++ b/solenv/inc/os2.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: os2.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk index 8305a5d25e56..46dcba24aaa1 100644 --- a/solenv/inc/os2gcci.mk +++ b/solenv/inc/os2gcci.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: os2.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk index 4c04de5b5520..3654083e76ad 100644 --- a/solenv/inc/pkg_config.mk +++ b/solenv/inc/pkg_config.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: pkg_config.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h index 0cb58b86ff20..68f85b6c0f65 100644 --- a/solenv/inc/postmac.h +++ b/solenv/inc/postmac.h @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: postmac.h,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index 4a7f6aeae28c..77413849c5f9 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: postset.mk,v $ -# -# $Revision: 1.47.50.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h index 3b12d39bccec..dee99bc6d3f4 100644 --- a/solenv/inc/preinclude.h +++ b/solenv/inc/preinclude.h @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: preinclude.h,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index 45d55cde4802..451a33b8ab00 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: premac.h,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 814e37708b6b..74c50ae9616d 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: pstrules.mk,v $ -# -# $Revision: 1.50 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 2722661ab45d..b3c3cb5283dd 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: rules.mk,v $ -# -# $Revision: 1.103.4.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/sc.mk b/solenv/inc/sc.mk index 50cef7c5b028..ad2102a92b4f 100644 --- a/solenv/inc/sc.mk +++ b/solenv/inc/sc.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: sc.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/scpre.mk b/solenv/inc/scpre.mk index 01ec9c72591b..1b9b7a7dacac 100644 --- a/solenv/inc/scpre.mk +++ b/solenv/inc/scpre.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: scpre.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/set_ext.mk b/solenv/inc/set_ext.mk index 1e035ed311cd..8d6d4db5a627 100644 --- a/solenv/inc/set_ext.mk +++ b/solenv/inc/set_ext.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: set_ext.mk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 23dbee21d2cd..bf2ca9314f33 100644..100755 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: set_wntx64.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -128,6 +124,7 @@ COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib +PROPSYSLIB_X64=$(LIBPATH_X64)/propsys.lib MSILIB_X64=$(LIBPATH_X64)/msi.lib DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 2980d939a2ce..7e9ca7548c22 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: settings.mk,v $ -# -# $Revision: 1.214.30.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc index c114458617de..86257dc843a0 100644 --- a/solenv/inc/shlinfo.rc +++ b/solenv/inc/shlinfo.rc @@ -2,7 +2,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 2330aa64e49b..e446635be9a2 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: target.mk,v $ -# -# $Revision: 1.211.4.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/templates/extension_tmpl.mk b/solenv/inc/templates/extension_tmpl.mk index fdc597c67164..b9ea7db7ee76 100644 --- a/solenv/inc/templates/extension_tmpl.mk +++ b/solenv/inc/templates/extension_tmpl.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: extension_tmpl.mk,v $ -# -# $Revision: 1.3.56.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index 29ea4ca9221a..cefdf14db033 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_app.mk,v $ -# -# $Revision: 1.75 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk index 5c00ffb74f28..8218887528fe 100644 --- a/solenv/inc/tg_compv.mk +++ b/solenv/inc/tg_compv.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_compv.mk,v $ -# -# $Revision: 1.22 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk index 06aadd094d03..2f1b9fedde80 100644 --- a/solenv/inc/tg_config.mk +++ b/solenv/inc/tg_config.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_config.mk,v $ -# -# $Revision: 1.21.72.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 90262f95e2ff..0bbd1f6b1ab1 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_def.mk,v $ -# -# $Revision: 1.49 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk index 8fb6d5502fd4..37517e2f14b8 100644 --- a/solenv/inc/tg_dep.mk +++ b/solenv/inc/tg_dep.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_dep.mk,v $ -# -# $Revision: 1.30.166.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 0a80bc5a5fdd..b2d79b1200b5 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_ext.mk,v $ -# -# $Revision: 1.91 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk index a8a33051f0fc..aa62b1cf477f 100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.pmk,v $ -# -# $Revision: 1.25 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index 25bff261081b..d1109ec4e8f1 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_jar.mk,v $ -# -# $Revision: 1.25 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk index 2192bb2d410f..5c00f2bbf7f5 100644 --- a/solenv/inc/tg_java.mk +++ b/solenv/inc/tg_java.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_java.mk,v $ -# -# $Revision: 1.13 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk index e39533f9b6f6..fe5f7fe17e81 100644 --- a/solenv/inc/tg_javav.mk +++ b/solenv/inc/tg_javav.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_javav.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk index 7ea3efea65ab..08909156b729 100644 --- a/solenv/inc/tg_lib.mk +++ b/solenv/inc/tg_lib.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_lib.mk,v $ -# -# $Revision: 1.24 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index 324daba82f8b..a40d48a81c66 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_merge.mk,v $ -# -# $Revision: 1.11.72.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk index 2cde0e93e003..8c1c0dfa39d4 100644 --- a/solenv/inc/tg_moz.mk +++ b/solenv/inc/tg_moz.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_moz.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index a7cabeb51bac..3a597c2409b3 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_obj.mk,v $ -# -# $Revision: 1.16 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk index 2a530f904886..cad40533e7b8 100644 --- a/solenv/inc/tg_res.mk +++ b/solenv/inc/tg_res.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_res.mk,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index fedfa8fbd43e..40096386c436 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_rslb.mk,v $ -# -# $Revision: 1.26 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk index cb86abae4c20..fd970deaae18 100644 --- a/solenv/inc/tg_scp.mk +++ b/solenv/inc/tg_scp.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_scp.mk,v $ -# -# $Revision: 1.18 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk index 0ac0e24d2a85..a515fc1ed13a 100644 --- a/solenv/inc/tg_sdi.mk +++ b/solenv/inc/tg_sdi.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_sdi.mk,v $ -# -# $Revision: 1.18 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 8cb6653f334e..91edbed333ec 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_shl.mk,v $ -# -# $Revision: 1.127 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk index 4b96f2ffc3e0..0a0ae789a8c7 100644 --- a/solenv/inc/tg_slo.mk +++ b/solenv/inc/tg_slo.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_slo.mk,v $ -# -# $Revision: 1.15 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk index 3d79bd932b00..347dd25569de 100644 --- a/solenv/inc/tg_srs.mk +++ b/solenv/inc/tg_srs.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_srs.mk,v $ -# -# $Revision: 1.26.164.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk index 987b81276748..12e049763a84 100644 --- a/solenv/inc/tg_wntx64.mk +++ b/solenv/inc/tg_wntx64.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_wntx64.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk index c42420a08279..5dfb95e07eec 100644 --- a/solenv/inc/tg_yxx.mk +++ b/solenv/inc/tg_yxx.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_yxx.mk,v $ -# -# $Revision: 1.15 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index bca8d00208dd..0a0364e02ab3 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: tg_zip.mk,v $ -# -# $Revision: 1.42 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/udkversion.mk b/solenv/inc/udkversion.mk index 2e11029e6687..18fa3cf45d77 100644 --- a/solenv/inc/udkversion.mk +++ b/solenv/inc/udkversion.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: udkversion.mk,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index e76d1e292a62..ceca059ad0b3 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unitools.mk,v $ -# -# $Revision: 1.53.30.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 36e5cd70447f..c6d756343d79 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unx.mk,v $ -# -# $Revision: 1.40 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk index 3590a3d8a936..571cee1053c6 100644 --- a/solenv/inc/unxaixp.mk +++ b/solenv/inc/unxaixp.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxaixp.mk,v $ -# -# $Revision: 1.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxbsda.mk b/solenv/inc/unxbsda.mk index 6e9fe1d9e7e4..fefaa1f02bd7 100644 --- a/solenv/inc/unxbsda.mk +++ b/solenv/inc/unxbsda.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxbsda.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk index 44942a34f11d..5e9c06605940 100644 --- a/solenv/inc/unxbsdi.mk +++ b/solenv/inc/unxbsdi.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxbsdi.mk,v $ -# -# $Revision: 1.17 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk index dd579f0caa9e..f4206304501b 100644 --- a/solenv/inc/unxbsdi2.mk +++ b/solenv/inc/unxbsdi2.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxbsdi2.mk,v $ -# -# $Revision: 1.18 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk index 698764f2801e..0811c85a4c6d 100644 --- a/solenv/inc/unxbsds.mk +++ b/solenv/inc/unxbsds.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxbsds.mk,v $ -# -# $Revision: 1.18 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk index dbf23846b3e8..4a22beaec256 100644 --- a/solenv/inc/unxfbsd.mk +++ b/solenv/inc/unxfbsd.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxfbsd.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk index 98de991f0b0b..c1227a35f2d3 100644 --- a/solenv/inc/unxfbsdi.mk +++ b/solenv/inc/unxfbsdi.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxfbsdi.mk,v $ -# -# $Revision: 1.26 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk index 62817d5604fc..4a8e120d318e 100644 --- a/solenv/inc/unxfbsdx.mk +++ b/solenv/inc/unxfbsdx.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxfbsdx.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk index 9146457483c6..9ac0c7e3daf1 100644 --- a/solenv/inc/unxhpgr.mk +++ b/solenv/inc/unxhpgr.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxhpgr.mk,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk index 00323aa0ed53..174d61fc2b4c 100644 --- a/solenv/inc/unxhpxr.mk +++ b/solenv/inc/unxhpxr.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxhpxr.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index b6c8f798a5f9..b27afb8c1fa4 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngi6.mk,v $ -# -# $Revision: 1.48 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk index 2f18fe7b43c6..da5d2fcd3d38 100644 --- a/solenv/inc/unxlnga.mk +++ b/solenv/inc/unxlnga.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlnga.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk index 240eef609365..7ae2d25c332e 100644 --- a/solenv/inc/unxlnghppa.mk +++ b/solenv/inc/unxlnghppa.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlnghppa.mk,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk index dcc2addcd46c..d86aab185d0e 100644 --- a/solenv/inc/unxlngi.mk +++ b/solenv/inc/unxlngi.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngi6.mk,v $ -# -# $Revision: 1.48 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk index 25d5118839e4..da6ed55d8cfd 100644 --- a/solenv/inc/unxlngm68k.mk +++ b/solenv/inc/unxlngm68k.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngm68k.mk,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk index c4510ecb5738..53c927d10b32 100644 --- a/solenv/inc/unxlngmips.mk +++ b/solenv/inc/unxlngmips.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngmips.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk index 3a7a8058498c..408233539bf8 100644 --- a/solenv/inc/unxlngppc.mk +++ b/solenv/inc/unxlngppc.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngppc4.mk,v $ -# -# $Revision: 1.34 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngppc64.mk b/solenv/inc/unxlngppc64.mk index 1fa6b8f30e90..7ce9f35c4ad8 100644 --- a/solenv/inc/unxlngppc64.mk +++ b/solenv/inc/unxlngppc64.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngppc64.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk index b108888d190b..1bcbb6626219 100644 --- a/solenv/inc/unxlngr.mk +++ b/solenv/inc/unxlngr.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngr.mk,v $ -# -# $Revision: 1.20 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk index 1286179659ae..b4e6f5f58f4d 100644 --- a/solenv/inc/unxlngs.mk +++ b/solenv/inc/unxlngs.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngs.mk,v $ -# -# $Revision: 1.27 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk index 303542dc7619..47e2e37011e8 100644 --- a/solenv/inc/unxlngs390.mk +++ b/solenv/inc/unxlngs390.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngs3904.mk,v $ -# -# $Revision: 1.22 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngs390x.mk b/solenv/inc/unxlngs390x.mk index 6a0dfab905c7..108e30b7337a 100644 --- a/solenv/inc/unxlngs390x.mk +++ b/solenv/inc/unxlngs390x.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngs390x.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk index ba74a55cfdc3..1ced6c3912d0 100644 --- a/solenv/inc/unxlngx.mk +++ b/solenv/inc/unxlngx.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngx6.mk,v $ -# -# $Revision: 1.19.12.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 6cb113e7918b..b40814b9a9d7 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxmacx.mk,v $ -# -# $Revision: 1.34.56.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk index 09d5d424b690..6a21022d4830 100644 --- a/solenv/inc/unxmacxi.mk +++ b/solenv/inc/unxmacxi.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxmacxi.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk index f1336f12e543..28b2881962de 100644 --- a/solenv/inc/unxmacxp.mk +++ b/solenv/inc/unxmacxp.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxmacxp.mk,v $ -# -# $Revision: 1.59 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk index 486fcf02deb3..901fe7b2cb22 100644 --- a/solenv/inc/unxscoi.mk +++ b/solenv/inc/unxscoi.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxscoi.mk,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk index c4559e44c4f2..ce82fca29fa9 100644 --- a/solenv/inc/unxsogi.mk +++ b/solenv/inc/unxsogi.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxsogi.mk,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk index 6b052c33f50b..dd0fb53272f8 100644 --- a/solenv/inc/unxsogs.mk +++ b/solenv/inc/unxsogs.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxsogs.mk,v $ -# -# $Revision: 1.16 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index c4c777376561..0f227f9520fc 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxsoli4.mk,v $ -# -# $Revision: 1.48 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,7 +29,6 @@ ASM=/usr/ccs/bin/as AFLAGS=-P - CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) SOLAR_JAVA*=TRUE diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 67bafa3a1c14..0bd85aa0bd4f 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxsols4.mk,v $ -# -# $Revision: 1.53 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,7 +30,6 @@ ASM=/usr/ccs/bin/as # needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus AFLAGS=-P -xarch=v8plus -D__sparcv8plus - CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) SOLAR_JAVA*=TRUE diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk index 02459ad91d5d..494ecb0478b3 100644 --- a/solenv/inc/unxsolu4.mk +++ b/solenv/inc/unxsolu4.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxsolu4.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc index 58e98b3a1c6d..d0a585af90ee 100644 --- a/solenv/inc/verinfo.hrc +++ b/solenv/inc/verinfo.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: verinfo.hrc,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc index 048b59205e08..d4c205f942b9 100644 --- a/solenv/inc/version.hrc +++ b/solenv/inc/version.hrc @@ -1,80 +1,80 @@ -/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- *************************************************************************/
-
-#define VERSION 3
-#define SUBVERSION 2
-//#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID)
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT 0
-//#define VER_BETA 6
-#define VER_FINAL 0
-
-#define VER_DAY 1
-#define VER_MONTH 1
-#define VER_YEAR 2010
-
-#ifndef VER_FIRSTYEAR
-#define VER_FIRSTYEAR VER_YEAR
-#endif
-
-#include "verinfo.hrc"
-
-#ifdef WIN32
-#define FOR_WIN_X " (32 Bit)"
-#else
-#define FOR_WIN_X ""
-#endif
-
-// -----------------------------------------------------------------------
-// language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
-#ifdef LG_D
- "040704B0", // Germany -> Unicode
- "040704E4", // Germany -> Windows, Multilingual
-#else
- "040904B0", // Germany -> Unicode
- "040904E4", // USA -> Windows, Multilingual
-#endif
- "04090000", // USA -> 7-Bit-ASCII
- 0 // end of table
-}
-
-
-// version binary entry
-VS_VERSION_INFO rcdata
-{
- 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
- VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-};
-
+/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + *************************************************************************/ + +#define VERSION 3 +#define SUBVERSION 2 +//#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) +// .0 + VER_CONCEPT +// .100 + VER_ALPHA +// .200 + VER_BETA +// .300 + VER_GAMMA +// .500 + VER_FINAL +//#define VER_CONCEPT 0 +//#define VER_BETA 6 +#define VER_FINAL 0 + +#define VER_DAY 1 +#define VER_MONTH 1 +#define VER_YEAR 2010 + +#ifndef VER_FIRSTYEAR +#define VER_FIRSTYEAR VER_YEAR +#endif + +#include "verinfo.hrc" + +#ifdef WIN32 +#define FOR_WIN_X " (32 Bit)" +#else +#define FOR_WIN_X "" +#endif + +// ----------------------------------------------------------------------- +// language/character set specification table +// ----------------------------------------------------------------------- + +RCD_LANGUAGE rcdata +{ +#ifdef LG_D + "040704B0", // Germany -> Unicode + "040704E4", // Germany -> Windows, Multilingual +#else + "040904B0", // Germany -> Unicode + "040904E4", // USA -> Windows, Multilingual +#endif + "04090000", // USA -> 7-Bit-ASCII + 0 // end of table +} + + +// version binary entry +VS_VERSION_INFO rcdata +{ + 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, + VERSION, SUBVERSION, VERVARIANT, VER_COUNT +}; + diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc index 852af90168b0..70ea1c193ee6 100644 --- a/solenv/inc/version_so.hrc +++ b/solenv/inc/version_so.hrc @@ -1,79 +1,79 @@ -/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- *************************************************************************/
-
-#define VERSION 9
-#define SUBVERSION 2
-//#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID)
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT 0
-//#define VER_BETA 6
-#define VER_FINAL 0
-
-#define VER_DAY 1
-#define VER_MONTH 1
-#define VER_YEAR 2010
-
-#ifndef VER_FIRSTYEAR
-#define VER_FIRSTYEAR VER_YEAR
-#endif
-
-#include "verinfo.hrc"
-
-#ifdef WIN32
-#define FOR_WIN_X " (32 Bit)"
-#else
-#define FOR_WIN_X ""
-#endif
-
-// -----------------------------------------------------------------------
-// language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
-#ifdef LG_D
- "040704B0", // Germany -> Unicode
- "040704E4", // Germany -> Windows, Multilingual
-#else
- "040904B0", // Germany -> Unicode
- "040904E4", // USA -> Windows, Multilingual
-#endif
- "04090000", // USA -> 7-Bit-ASCII
- 0 // end of table
-}
-
-// version binary entry
-VS_VERSION_INFO rcdata
-{
- 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
- VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-};
-
+/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + *************************************************************************/ + +#define VERSION 9 +#define SUBVERSION 2 +//#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) +// .0 + VER_CONCEPT +// .100 + VER_ALPHA +// .200 + VER_BETA +// .300 + VER_GAMMA +// .500 + VER_FINAL +//#define VER_CONCEPT 0 +//#define VER_BETA 6 +#define VER_FINAL 0 + +#define VER_DAY 1 +#define VER_MONTH 1 +#define VER_YEAR 2010 + +#ifndef VER_FIRSTYEAR +#define VER_FIRSTYEAR VER_YEAR +#endif + +#include "verinfo.hrc" + +#ifdef WIN32 +#define FOR_WIN_X " (32 Bit)" +#else +#define FOR_WIN_X "" +#endif + +// ----------------------------------------------------------------------- +// language/character set specification table +// ----------------------------------------------------------------------- + +RCD_LANGUAGE rcdata +{ +#ifdef LG_D + "040704B0", // Germany -> Unicode + "040704E4", // Germany -> Windows, Multilingual +#else + "040904B0", // Germany -> Unicode + "040904E4", // USA -> Windows, Multilingual +#endif + "04090000", // USA -> 7-Bit-ASCII + 0 // end of table +} + +// version binary entry +VS_VERSION_INFO rcdata +{ + 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, + VERSION, SUBVERSION, VERVARIANT, VER_COUNT +}; + diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index 6acab30cc80d..78f496927899 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: wnt.mk,v $ -# -# $Revision: 1.84 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index b45b659d5f84..1d331b7f1e94 100644..100755 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: wntgcci6.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -218,3 +214,4 @@ UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib WININETLIB=-lwininet OLDNAMESLIB=-lmoldname MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib +PROPSYSLIB=-lpropsys diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk index 09ec567fbd62..b4221d310b74 100644 --- a/solenv/inc/wntmsci10.mk +++ b/solenv/inc/wntmsci10.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: wntmsci10.mk,v $ -# -# $Revision: 1.44 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 1bb994f1ad6f..a04dbd881798 100644..100755 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: wntmsci11.mk,v $ -# -# $Revision: 1.25 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -380,4 +376,5 @@ UNICOWSLIB=unicows.lib WININETLIB=wininet.lib OLDNAMESLIB=oldnames.lib MSIMG32LIB=msimg32.lib +PROPSYSLIB=propsys.lib diff --git a/solenv/makefile.mk b/solenv/makefile.mk index 85823378e245..31bed765ac7f 100644 --- a/solenv/makefile.mk +++ b/solenv/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/solenv/src/version.c b/solenv/src/version.c index dd37580f758c..b06b1510f300 100644 --- a/solenv/src/version.c +++ b/solenv/src/version.c @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: version.c,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l index 700a044555c2..e99618f30225 100755 --- a/soltools/HIDCompiler/hidclex.l +++ b/soltools/HIDCompiler/hidclex.l @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hidclex.l,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/HIDCompiler/makefile.mk b/soltools/HIDCompiler/makefile.mk index bba1e136854d..8c65fc09cd21 100644 --- a/soltools/HIDCompiler/makefile.mk +++ b/soltools/HIDCompiler/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/HIDCompiler/wrap_hidclex.cxx b/soltools/HIDCompiler/wrap_hidclex.cxx index 0b1f9224590f..1eb79e80a5da 100644 --- a/soltools/HIDCompiler/wrap_hidclex.cxx +++ b/soltools/HIDCompiler/wrap_hidclex.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: wrap_hidclex.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/adjustvisibility/adjustvisibility.cxx b/soltools/adjustvisibility/adjustvisibility.cxx index 916a55d94102..e67017018b1a 100644 --- a/soltools/adjustvisibility/adjustvisibility.cxx +++ b/soltools/adjustvisibility/adjustvisibility.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: adjustvisibility.cxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk index 4c8f03942793..ea0d09c2cf96 100755..100644 --- a/soltools/adjustvisibility/makefile.mk +++ b/soltools/adjustvisibility/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c index 722aa7ba979b..7c5473fb2510 100644 --- a/soltools/checkdll/checkdll.c +++ b/soltools/checkdll/checkdll.c @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: checkdll.c,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk index 0e30fceb7d0e..fc09a566005e 100644 --- a/soltools/checkdll/makefile.mk +++ b/soltools/checkdll/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk index c64ebf91da7e..818c27028345 100644 --- a/soltools/cpp/makefile.mk +++ b/soltools/cpp/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx index 4b0fd96e0a00..838e46287b0c 100644 --- a/soltools/giparser/gen_info.cxx +++ b/soltools/giparser/gen_info.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gen_info.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx index 7b84bc94ef0a..5726a2bf0740 100644 --- a/soltools/giparser/gi_list.cxx +++ b/soltools/giparser/gi_list.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gi_list.cxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx index 932958c63150..ad960e48a1e2 100644 --- a/soltools/giparser/gi_parse.cxx +++ b/soltools/giparser/gi_parse.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gi_parse.cxx,v $ - * $Revision: 1.6.16.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk index fe1b8d2e3dad..bab26d2e7e1b 100644 --- a/soltools/giparser/makefile.mk +++ b/soltools/giparser/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.14 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/giparser/st_gilrw.cxx b/soltools/giparser/st_gilrw.cxx index f03957802785..d57d8811cb31 100644 --- a/soltools/giparser/st_gilrw.cxx +++ b/soltools/giparser/st_gilrw.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: st_gilrw.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx index 31e6306fba5e..fae89435bed7 100644 --- a/soltools/inc/gen_info.hxx +++ b/soltools/inc/gen_info.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gen_info.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx index 4d8baf77222f..ad7f8d5e93f8 100644 --- a/soltools/inc/gi_list.hxx +++ b/soltools/inc/gi_list.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gi_list.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx index 4d81e2d61666..636e3bffcb9c 100644 --- a/soltools/inc/gi_parse.hxx +++ b/soltools/inc/gi_parse.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gi_parse.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx index 9ccd651c0c03..f9dd4c21f4e3 100644 --- a/soltools/inc/gilacces.hxx +++ b/soltools/inc/gilacces.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gilacces.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/pch/precompiled_soltools.cxx b/soltools/inc/pch/precompiled_soltools.cxx index 4ba03f51c6ba..186dcaba7488 100644 --- a/soltools/inc/pch/precompiled_soltools.cxx +++ b/soltools/inc/pch/precompiled_soltools.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: precompiled_soltools.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/pch/precompiled_soltools.hxx b/soltools/inc/pch/precompiled_soltools.hxx index 662818e7db12..ef1d1b1f0a1b 100644 --- a/soltools/inc/pch/precompiled_soltools.hxx +++ b/soltools/inc/pch/precompiled_soltools.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: precompiled_soltools.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx index 34984485ef93..883db0d96bdf 100644 --- a/soltools/inc/simstr.hxx +++ b/soltools/inc/simstr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: simstr.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/st_gilrw.hxx b/soltools/inc/st_gilrw.hxx index 725fa1d4811f..b70c52e1e75f 100644 --- a/soltools/inc/st_gilrw.hxx +++ b/soltools/inc/st_gilrw.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: st_gilrw.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx index d87a232b2310..adc791f7fdf2 100644 --- a/soltools/inc/st_list.hxx +++ b/soltools/inc/st_list.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: st_list.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/inc/st_types.hxx b/soltools/inc/st_types.hxx index b64df4b54fb3..29eb7396440c 100644 --- a/soltools/inc/st_types.hxx +++ b/soltools/inc/st_types.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: st_types.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c index eeb7e1b62357..d840e6606689 100644 --- a/soltools/javadep/javadep.c +++ b/soltools/javadep/javadep.c @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: javadep.c,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk index ecd51fe4eb47..1b3b54de6c06 100644 --- a/soltools/javadep/makefile.mk +++ b/soltools/javadep/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.11 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx index c182fb457f45..27d48926f0df 100644 --- a/soltools/ldump/hashtbl.cxx +++ b/soltools/ldump/hashtbl.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hashtbl.cxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/ldump/hashtbl.hxx b/soltools/ldump/hashtbl.hxx index 76ca1c73c0e1..62d1f8e9120e 100644 --- a/soltools/ldump/hashtbl.hxx +++ b/soltools/ldump/hashtbl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hashtbl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx index e9e0991d867f..8c6e85b62594 100644 --- a/soltools/ldump/ldump.cxx +++ b/soltools/ldump/ldump.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ldump.cxx,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/ldump/ldump.hxx b/soltools/ldump/ldump.hxx index b933bbee8cca..c0a1a166b8b2 100644 --- a/soltools/ldump/ldump.hxx +++ b/soltools/ldump/ldump.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ldump.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk index fccdaac0d34b..51ff42e60772 100644 --- a/soltools/ldump/makefile.mk +++ b/soltools/ldump/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.9 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index af4bae825601..630c688faba2 100755..100644 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.20 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk index 42ec0676e702..d3f1095f6eb2 100644 --- a/soltools/support/makefile.mk +++ b/soltools/support/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx index b691373c52d8..d2ecf3480677 100644 --- a/soltools/support/simstr.cxx +++ b/soltools/support/simstr.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: simstr.cxx,v $ - * $Revision: 1.5.16.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx index 393ad6101fb2..acae18be7e9f 100644 --- a/soltools/testSHL/inc/tlog.hxx +++ b/soltools/testSHL/inc/tlog.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tlog.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx index d6e41bdb4447..208714322395 100644 --- a/soltools/testSHL/inc/tstMgr.hxx +++ b/soltools/testSHL/inc/tstMgr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tstMgr.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/inc/tutil.hxx b/soltools/testSHL/inc/tutil.hxx index 8fbfc6d6f504..37398a72381a 100644 --- a/soltools/testSHL/inc/tutil.hxx +++ b/soltools/testSHL/inc/tutil.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tutil.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk index d896ed6764d2..0377137b2274 100644 --- a/soltools/testSHL/makefile.mk +++ b/soltools/testSHL/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx index 7b36f19a8b76..9642d8761f50 100644 --- a/soltools/testSHL/testshl.cxx +++ b/soltools/testSHL/testshl.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: testshl.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/util/makefile.mk b/soltools/testSHL/util/makefile.mk index 7e0ec8468ba6..a2582f9c1abd 100644 --- a/soltools/testSHL/util/makefile.mk +++ b/soltools/testSHL/util/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx index b2e3a9d6c925..48eeafc7908a 100644 --- a/soltools/testSHL/util/tlog.cxx +++ b/soltools/testSHL/util/tlog.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tlog.cxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx index 9fb455cadaed..2aad1c758d41 100644 --- a/soltools/testSHL/util/tstMgr.cxx +++ b/soltools/testSHL/util/tstMgr.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tstMgr.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx index 00bef19705ac..60c5f6deba02 100644 --- a/soltools/testSHL/util/tutil.cxx +++ b/soltools/testSHL/util/tutil.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tutil.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl index eb9e540f0a82..325d0f896135 100644 --- a/soltools/testhxx/create.pl +++ b/soltools/testhxx/create.pl @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: create.pl,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk index 79811dbebbe2..1b2a0ce42923 100644 --- a/soltools/testhxx/makefile.mk +++ b/soltools/testhxx/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx index fcded0bd9521..63b15276d523 100644 --- a/soltools/testhxx/testhxx.cxx +++ b/soltools/testhxx/testhxx.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: testhxx.cxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index a119dd844472..33c04cf547eb 100755..100644 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.pmk,v $ -# -# $Revision: 1.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk index 0e086e119f06..9fb4f512c692 100644 --- a/soltools/winunistd/makefile.mk +++ b/soltools/winunistd/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst index 2c13a4c6d503..d9e4a9f180a1 100644 --- a/splitbuild/calc.lst +++ b/splitbuild/calc.lst @@ -1 +1 @@ -scaddins sccomp sc +chart2 scaddins sccomp sc diff --git a/splitbuild/common.lst b/splitbuild/common.lst index 7b7214f0d227..a82dc37f0270 100644 --- a/splitbuild/common.lst +++ b/splitbuild/common.lst @@ -1 +1 @@ -basebmp basegfx bean comphelper configmgr connectivity embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards +basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst index 89ed01c617d6..1333e7dc7eec 100644 --- a/splitbuild/framework.lst +++ b/splitbuild/framework.lst @@ -1 +1 @@ -automation avmedia basic basctl cui desktop drawinglayer embeddedobj extensions forms formula framework idl scripting sfx2 svx xmlsecurity +automation avmedia basic basctl cui desktop drawinglayer extensions forms formula framework idl scripting sfx2 svx xmlsecurity vbahelper diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst index 55c2e7a20309..d64284379728 100644 --- a/splitbuild/gui.lst +++ b/splitbuild/gui.lst @@ -1 +1 @@ -accessibility canvas cppcanvas dtrans fpicker goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl +accessibility canvas cppcanvas dtrans editeng fpicker padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst index a2bdbf37c28d..0356e8b8d975 100644 --- a/splitbuild/prj/build.lst +++ b/splitbuild/prj/build.lst @@ -1,2 +1 @@ -spl splitbuild :: reportdesign dbaccess packimages postprocess scp2 testtools instsetoo_native scaddins sccomp sc basebmp basegfx bean comphelper configmgr connectivity crashrep embedserv eventattacher fileaccess i18npool i18nutil javainstaller2 linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools l10ntools ucb ucbhelper unotools unoxml vos xmerge xmlhelp xmloff xmlscript wizards animations sd slideshow migrationanalysis reportbuilder sdext swext afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu JFREEREPORT:jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib automation avmedia basic drawinglayer embeddedobj filter formula fpicker framework idl oox sfx2 svx uui accessibility canvas cppcanvas dtrans goodies padmin psprint_config setup_native svtools sysui toolkit UnoControls vcl binfilter dictionaries extras helpcontent2 soltools basctl chart2 cui desktop extensions forms scripting starmath xmlsecurity autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp hwpfilter sw writerfilter writerperfect NULL - +spl splitbuild :: postprocess NULL diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst index 619d7c52d9c7..28bd99c6372e 100644 --- a/splitbuild/writer.lst +++ b/splitbuild/writer.lst @@ -1 +1 @@ -hwpfilter sw writerfilter writerperfect +hwpfilter starmath sw writerfilter writerperfect diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 0ea9d9fe068c..4165a4a0dd7d 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.45.2.1 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional index 232cddbef5ad..59b61f95f250 100644 --- a/stlport/systemstl/functional +++ b/stlport/systemstl/functional @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: functional,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map index b969b11b211b..415e39f77926 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hash_map,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set index 89c4b51853dd..11ac7edb5a55 100644 --- a/stlport/systemstl/hash_set +++ b/stlport/systemstl/hash_set @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hash_set,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric index 5ea17ad0758a..3510ccb5bf57 100644 --- a/stlport/systemstl/numeric +++ b/stlport/systemstl/numeric @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: numeric,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope index c6349947ca7b..71ea13a022cf 100644 --- a/stlport/systemstl/rope +++ b/stlport/systemstl/rope @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: rope,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist index 48a37c2fd512..6535c545e50d 100644 --- a/stlport/systemstl/slist +++ b/stlport/systemstl/slist @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: slist,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/stlport/systemstl/vector b/stlport/systemstl/vector index 1b9ab9eef418..f15038f9eaaf 100644 --- a/stlport/systemstl/vector +++ b/stlport/systemstl/vector @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: vector,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |