You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2013/04/18 12:58:04 UTC
svn commit: r1469276 [1/2] - in /openoffice/trunk/main:
comphelper/source/officeinstdir/ configmgr/qa/unit/ configmgr/source/
connectivity/source/drivers/mozab/bootstrap/ crashrep/source/win32/
cui/source/dialogs/ desktop/scripts/ desktop/source/app/ d...
Author: jsc
Date: Thu Apr 18 10:58:02 2013
New Revision: 1469276
URL: http://svn.apache.org/r1469276
Log:
#121996# integrate first part to remove 3layer office
Modified:
openoffice/trunk/main/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
openoffice/trunk/main/configmgr/qa/unit/makefile.mk
openoffice/trunk/main/configmgr/source/components.cxx
openoffice/trunk/main/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
openoffice/trunk/main/crashrep/source/win32/soreport.cpp
openoffice/trunk/main/cui/source/dialogs/about.cxx
openoffice/trunk/main/desktop/scripts/soffice.sh
openoffice/trunk/main/desktop/source/app/app.cxx
openoffice/trunk/main/desktop/source/app/appfirststart.cxx
openoffice/trunk/main/desktop/source/deployment/misc/dp_update.cxx
openoffice/trunk/main/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx
openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
openoffice/trunk/main/desktop/source/splash/splash.cxx
openoffice/trunk/main/desktop/win32/source/extendloaderenvironment.cxx
openoffice/trunk/main/extensions/source/update/check/updatecheck.cxx
openoffice/trunk/main/extensions/source/update/check/updateprotocol.cxx
openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx
openoffice/trunk/main/filter/source/msfilter/msocximex.cxx
openoffice/trunk/main/framework/source/services/substitutepathvars.cxx
openoffice/trunk/main/instsetoo_native/util/makefile.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/postprocess/packregistry/makefile.mk
openoffice/trunk/main/sal/osl/unx/signal.c
openoffice/trunk/main/scp2/source/ooo/common_brand.scp
openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp
openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
openoffice/trunk/main/scp2/source/ooo/makefile.mk
openoffice/trunk/main/scp2/source/ooo/ooo_brand.scp
openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp
openoffice/trunk/main/scp2/source/ooo/profileitem_ooo.scp
openoffice/trunk/main/scp2/source/ooo/ure.scp
openoffice/trunk/main/scp2/source/ooo/ure_into_ooo.scp
openoffice/trunk/main/scripting/examples/beanshell/Highlight/ShowDialog.bsh
openoffice/trunk/main/scripting/examples/java/Highlight/HighlightText.java
openoffice/trunk/main/scripting/examples/javascript/Highlight/ShowDialog.js
openoffice/trunk/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
openoffice/trunk/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
openoffice/trunk/main/scripting/source/provider/URIHelper.cxx
openoffice/trunk/main/scripting/source/pyprov/pythonscript.py
openoffice/trunk/main/scripting/source/storage/ScriptStorageManager.cxx
openoffice/trunk/main/setup_native/scripts/install_linux.sh
openoffice/trunk/main/setup_native/scripts/install_solaris.sh
openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
openoffice/trunk/main/sfx2/source/appl/shutdownicon.cxx
openoffice/trunk/main/sfx2/source/doc/objmisc.cxx
openoffice/trunk/main/solenv/bin/macosx-change-install-names.pl
openoffice/trunk/main/solenv/gbuild/platform/os2.mk
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
openoffice/trunk/main/solenv/inc/settings.mk
openoffice/trunk/main/solenv/inc/unxfbsd.mk
openoffice/trunk/main/solenv/inc/unxlng.mk
openoffice/trunk/main/solenv/inc/unxsoli4.mk
openoffice/trunk/main/solenv/inc/unxsols4.mk
openoffice/trunk/main/solenv/inc/unxsolu4.mk
openoffice/trunk/main/svtools/source/filter/filter.cxx
openoffice/trunk/main/svx/source/dialog/docrecovery.cxx
openoffice/trunk/main/svx/source/dialog/sendreportunx.cxx
openoffice/trunk/main/svx/source/unodraw/recoveryui.cxx
openoffice/trunk/main/tools/source/rc/resmgr.cxx
openoffice/trunk/main/unotools/source/config/bootstrap.cxx
openoffice/trunk/main/unotools/source/config/configmgr.cxx
openoffice/trunk/main/ure/source/jvmfwk3.ini
openoffice/trunk/main/ure/source/jvmfwk3rc
openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
openoffice/trunk/main/vcl/source/gdi/imagerepository.cxx
openoffice/trunk/main/vcl/source/gdi/impimagetree.cxx
openoffice/trunk/main/vcl/unx/generic/app/saldata.cxx
openoffice/trunk/main/vcl/unx/generic/fontmanager/helper.cxx
openoffice/trunk/main/vcl/win/source/gdi/salgdi3.cxx
Modified: openoffice/trunk/main/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/source/officeinstdir/officeinstallationdirectories.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/source/officeinstdir/officeinstallationdirectories.cxx (original)
+++ openoffice/trunk/main/comphelper/source/officeinstdir/officeinstallationdirectories.cxx Thu Apr 18 10:58:02 2013
@@ -343,27 +343,27 @@ void OfficeInstallationDirectories::init
{
*m_pOfficeBrandDir =
xExpander->expandMacros(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ) );
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) ) );
OSL_ENSURE( m_pOfficeBrandDir->getLength() > 0,
"Unable to obtain office brand installation directory!" );
makeCanonicalFileURL( *m_pOfficeBrandDir );
- *m_pOfficeBaseDir =
- xExpander->expandMacros(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
+ *m_pOfficeBaseDir = *m_pOfficeBrandDir;
+ // xExpander->expandMacros(
+ // rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ // "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
- OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
- "Unable to obtain office base installation directory!" );
+ // OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
+ // "Unable to obtain office base installation directory!" );
makeCanonicalFileURL( *m_pOfficeBaseDir );
*m_pUserDir =
xExpander->expandMacros(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) );
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) );
OSL_ENSURE( m_pUserDir->getLength() > 0,
"Unable to obtain office user data directory!" );
Modified: openoffice/trunk/main/configmgr/qa/unit/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/qa/unit/makefile.mk?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/configmgr/qa/unit/makefile.mk (original)
+++ openoffice/trunk/main/configmgr/qa/unit/makefile.mk Thu Apr 18 10:58:02 2013
@@ -68,7 +68,7 @@ TEST .PHONY: $(SHL1TARGETN) $(MISC)/unit
echo 'UNO_SHARED_PACKAGES_CACHE = $$OOO_BASE_DIR' \
>> $(MISC)/unitdata/basis/program/uno$(MY_INI)
echo 'UNO_USER_PACKAGES_CACHE =' \
- '$${$$BRAND_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}' \
+ '$${$$OOO_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}' \
>> $(MISC)/unitdata/basis/program/uno$(MY_INI)
mkdir $(MISC)/unitdata/basis/share
mkdir $(MISC)/unitdata/basis/share/registry
Modified: openoffice/trunk/main/configmgr/source/components.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/source/components.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/configmgr/source/components.cxx (original)
+++ openoffice/trunk/main/configmgr/source/components.cxx Thu Apr 18 10:58:02 2013
@@ -515,19 +515,7 @@ Components::Components(
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/registry"))));
- parseXcsXcuLayer(
- 4,
- expand(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "$BRAND_BASE_DIR/share/registry"))));
- parseModuleLayer(
- 6,
- expand(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "$BRAND_BASE_DIR/share/registry/modules"))));
- parseXcsXcuIniLayer(
+ parseXcsXcuIniLayer(
7,
expand(
rtl::OUString(
@@ -829,7 +817,7 @@ rtl::OUString Components::getModificatio
return expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/registrymodifications.xcu")));
}
@@ -850,7 +838,7 @@ void Components::parseModificationLayer(
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/registry/data"))),
false);
}
Modified: openoffice/trunk/main/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx (original)
+++ openoffice/trunk/main/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx Thu Apr 18 10:58:02 2013
@@ -122,13 +122,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfil
{
nsCOMPtr<nsILocalFile> binDir;
// Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
- rtl::OUString path1(
-#if defined WNT
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")
-#else
- RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program")
-#endif
- );
+ rtl::OUString path1( RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program") );
rtl::Bootstrap::expandMacros(path1);
rtl::OString path2;
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
Modified: openoffice/trunk/main/crashrep/source/win32/soreport.cpp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/crashrep/source/win32/soreport.cpp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/crashrep/source/win32/soreport.cpp (original)
+++ openoffice/trunk/main/crashrep/source/win32/soreport.cpp Thu Apr 18 10:58:02 2013
@@ -179,7 +179,7 @@ static FILE *_tmpfile(void)
static BOOL GetCrashDataPath( LPTSTR szBuffer )
{
- ::rtl::OUString ustrValue = ::rtl::OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
+ ::rtl::OUString ustrValue = ::rtl::OUString::createFromAscii("${$OOO_BASE_DIR/program/bootstrap.ini:UserInstallation}");
::rtl::Bootstrap::expandMacros( ustrValue );
if ( ustrValue.getLength() )
Modified: openoffice/trunk/main/cui/source/dialogs/about.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/about.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/dialogs/about.cxx (original)
+++ openoffice/trunk/main/cui/source/dialogs/about.cxx Thu Apr 18 10:58:02 2013
@@ -71,7 +71,7 @@
#define NOTICE_FILE "NOTICE" FILE_EXTENSION
// Dir where the files are located
-#define BRAND_DIR_SHARE_README "${BRAND_BASE_DIR}/share/readme/"
+#define OOO_DIR_SHARE_README "${OOO_BASE_DIR}/share/readme/"
using namespace com::sun::star;
@@ -219,13 +219,13 @@ namespace
maTabCtrl.Show();
// Notice and License are not localized
- const rtl::OUString sLicense( RTL_CONSTASCII_USTRINGPARAM( BRAND_DIR_SHARE_README LICENSE_FILE ) );
- const rtl::OUString sNotice( RTL_CONSTASCII_USTRINGPARAM( BRAND_DIR_SHARE_README NOTICE_FILE ) );
+ const rtl::OUString sLicense( RTL_CONSTASCII_USTRINGPARAM( OOO_DIR_SHARE_README LICENSE_FILE ) );
+ const rtl::OUString sNotice( RTL_CONSTASCII_USTRINGPARAM( OOO_DIR_SHARE_README NOTICE_FILE ) );
// get localized README
rtl::OUStringBuffer aBuff;
lang::Locale aLocale = Application::GetSettings().GetUILocale();
- aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( BRAND_DIR_SHARE_README README_FILE "_" ) );
+ aBuff.appendAscii( RTL_CONSTASCII_STRINGPARAM( OOO_DIR_SHARE_README README_FILE "_" ) );
aBuff.append( aLocale.Language );
if ( aLocale.Country.getLength() )
{
@@ -350,6 +350,7 @@ void AboutDialog::ApplyStyleSettings()
Color aWindowColor( rSettings.GetWindowColor() );
Wallpaper aWall( aWindowColor );
SetBackground( aWall );
+
Font aNewFont( maCopyrightEdit.GetFont() );
aNewFont.SetTransparent( sal_True );
@@ -517,6 +518,13 @@ sal_Bool AboutDialog::Close()
void AboutDialog::Paint( const Rectangle& rRect )
{
SetClipRegion( rRect );
+
+ // workaround to ensure that the background is painted correct
+ // on MacOS for exmaple the background was grey and the image and other controls white
+ SetFillColor(GetSettings().GetStyleSettings().GetWindowColor());
+ SetLineColor();
+ DrawRect(rRect);
+
DrawImage( maMainLogoPos, maMainLogo );
DrawImage( maAppLogoPos, maAppLogo );
Modified: openoffice/trunk/main/desktop/scripts/soffice.sh
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/scripts/soffice.sh?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/scripts/soffice.sh (original)
+++ openoffice/trunk/main/desktop/scripts/soffice.sh Thu Apr 18 10:58:02 2013
@@ -81,21 +81,20 @@ for sd_arg in "$@"; do
;;
esac
done
-"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
+"$sd_prog/pagein" -L"$sd_prog" \
${sd_pagein_args}
# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
+if [ -x "$sd_prog/javaldx" ] ; then
# this is a temporary hack until we can live with the default search paths
case "`uname -s`" in
FreeBSD)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
- LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ sd_prog1="$sd_prog"
+ LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH
;;
esac
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
Modified: openoffice/trunk/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/app/app.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/app/app.cxx (original)
+++ openoffice/trunk/main/desktop/source/app/app.cxx Thu Apr 18 10:58:02 2013
@@ -589,7 +589,7 @@ static bool needsSynchronization(
static ::rtl::OUString getBrandSharePreregBundledPathURL()
{
::rtl::OUString url(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/prereg/bundled"));
+ RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/prereg/bundled"));
::rtl::Bootstrap::expandMacros(url);
return url;
@@ -883,7 +883,7 @@ static bool needsInstallBundledExtension
// install bundled but non-pre-registered extension blobs
static void installBundledExtensionBlobs()
{
- rtl::OUString aDirUrl( OUSTR("$BRAND_BASE_DIR/share/extensions/install"));
+ rtl::OUString aDirUrl( OUSTR("$OOO_BASE_DIR/share/extensions/install"));
::rtl::Bootstrap::expandMacros( aDirUrl);
::osl::Directory aDir( aDirUrl);
Modified: openoffice/trunk/main/desktop/source/app/appfirststart.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/app/appfirststart.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/app/appfirststart.cxx (original)
+++ openoffice/trunk/main/desktop/source/app/appfirststart.cxx Thu Apr 18 10:58:02 2013
@@ -61,7 +61,7 @@ OUString Desktop::GetLicensePath()
if (aLicensePath.getLength() > 0)
return aLicensePath;
- OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+ OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
rtl::Bootstrap::expandMacros(aBaseInstallPath);
// determine the filename of the license to show
Modified: openoffice/trunk/main/desktop/source/deployment/misc/dp_update.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/deployment/misc/dp_update.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/deployment/misc/dp_update.cxx (original)
+++ openoffice/trunk/main/desktop/source/deployment/misc/dp_update.cxx Thu Apr 18 10:58:02 2013
@@ -237,7 +237,7 @@ OUString getExtensionDefaultUpdateURL()
{
::rtl::OUString sUrl(
RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
+ "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
":Version:ExtensionUpdateURL}"));
::rtl::Bootstrap::expandMacros(sUrl);
return sUrl;
Modified: openoffice/trunk/main/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx (original)
+++ openoffice/trunk/main/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx Thu Apr 18 10:58:02 2013
@@ -197,10 +197,10 @@ BackendImpl::BackendImpl(
{
OUString basic_path(
m_eContext == CONTEXT_USER
- ? OUSTR("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/"
+ ? OUSTR("vnd.sun.star.expand:${$OOO_BASE_DIR/program/"
SAL_CONFIGFILE("bootstrap")
":UserInstallation}/user/basic")
- : OUSTR("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/"
+ : OUSTR("vnd.sun.star.expand:${$OOO_BASE_DIR/program/"
SAL_CONFIGFILE("bootstrap")
":BaseInstallation}/share/basic") );
m_basic_script_libs.reset(
Modified: openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx (original)
+++ openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx Thu Apr 18 10:58:02 2013
@@ -391,10 +391,10 @@ extern "C" int unopkg_main()
//bootstrapped. Otherwies files could be locked by this process.
//If there is no folder left in
- //$BRAND_BASE_DIR/share/extensions
+ //$OOO_BASE_DIR/share/extensions
//then we can delete the registration data at
//$BUNDLED_EXTENSIONS_USER
- if (hasNoFolder(OUSTR("$BRAND_BASE_DIR/share/extensions")))
+ if (hasNoFolder(OUSTR("$OOO_BASE_DIR/share/extensions")))
{
removeFolder(OUSTR("$BUNDLED_EXTENSIONS_PREREG"));
//return otherwise we create the registration data again
Modified: openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_misc.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_misc.cxx (original)
+++ openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_misc.cxx Thu Apr 18 10:58:02 2013
@@ -451,7 +451,7 @@ Reference<XComponentContext> connectToOf
OUString getLockFilePath()
{
OUString ret;
- OUString sBootstrap(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}"));
+ OUString sBootstrap(RTL_CONSTASCII_USTRINGPARAM("${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}"));
rtl::Bootstrap::expandMacros(sBootstrap);
OUString sAbs;
if (::osl::File::E_None == ::osl::File::getAbsoluteFileURL(
Modified: openoffice/trunk/main/desktop/source/splash/splash.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/splash/splash.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/splash/splash.cxx (original)
+++ openoffice/trunk/main/desktop/source/splash/splash.cxx Thu Apr 18 10:58:02 2013
@@ -279,7 +279,7 @@ OUString implReadBootstrapKey( const OUS
OUString sValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${.override:${BRAND_BASE_DIR}/program/edition/edition.ini:")) +
+ "${.override:${OOO_BASE_DIR}/program/edition/edition.ini:")) +
_rKey + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("}")));
rtl::Bootstrap::expandMacros(sValue);
return sValue;
@@ -391,7 +391,7 @@ void SplashScreen::initBitmap()
{
OUString sExecutePath;
::rtl::Bootstrap::get(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "OOO_BASE_DIR" ) ),
sExecutePath );
sExecutePath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" ) );
@@ -410,7 +410,7 @@ void SplashScreen::initBitmap()
rtl::OUString edition(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${BRAND_BASE_DIR}/program/edition")));
+ "${OOO_BASE_DIR}/program/edition")));
rtl::Bootstrap::expandMacros(edition);
haveBitmap = findBitmap(edition);
}
Modified: openoffice/trunk/main/desktop/win32/source/extendloaderenvironment.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/win32/source/extendloaderenvironment.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/win32/source/extendloaderenvironment.cxx (original)
+++ openoffice/trunk/main/desktop/win32/source/extendloaderenvironment.cxx Thu Apr 18 10:58:02 2013
@@ -145,18 +145,19 @@ void extendLoaderEnvironment(WCHAR * bin
exclude1 = true;
}
WCHAR * pad2 = exclude1 ? pad : padEnd + 1;
- pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link"));
+// pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link"));
+ pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L""));
if (pathEnd == NULL) {
fail();
}
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL) {
- fail();
- }
- padEnd = tools::buildPath(pad2, path, pathEnd, MY_STRING(L"\\bin"));
- if (padEnd == NULL) {
- fail();
- }
+ // pathEnd = tools::resolveLink(path);
+ // if (pathEnd == NULL) {
+ // fail();
+ // }
+ // padEnd = tools::buildPath(pad2, path, pathEnd, MY_STRING(L"\\bin"));
+ // if (padEnd == NULL) {
+ // fail();
+ // }
bool exclude2 = contains(env, pad2, padEnd);
if (!(exclude1 && exclude2)) {
if (!(exclude1 || exclude2)) {
Modified: openoffice/trunk/main/extensions/source/update/check/updatecheck.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/update/check/updatecheck.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/update/check/updatecheck.cxx (original)
+++ openoffice/trunk/main/extensions/source/update/check/updatecheck.cxx Thu Apr 18 10:58:02 2013
@@ -120,7 +120,7 @@ static inline rtl::OUString getBuildId()
//------------------------------------------------------------------------------
static inline rtl::OUString getBaseInstallation()
{
- rtl::OUString aPathVal(UNISTRING("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
+ rtl::OUString aPathVal(UNISTRING("${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
rtl::Bootstrap::expandMacros(aPathVal);
return aPathVal;
}
Modified: openoffice/trunk/main/extensions/source/update/check/updateprotocol.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/update/check/updateprotocol.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/update/check/updateprotocol.cxx (original)
+++ openoffice/trunk/main/extensions/source/update/check/updateprotocol.cxx Thu Apr 18 10:58:02 2013
@@ -66,12 +66,12 @@ getBootstrapData(
if ( ! rBuildID.getLength() )
return false;
- rInstallSetID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
+ rInstallSetID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
rtl::Bootstrap::expandMacros( rInstallSetID );
if ( ! rInstallSetID.getLength() )
return false;
- rtl::OUString aValue( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) );
+ rtl::OUString aValue( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) );
rtl::Bootstrap::expandMacros( aValue );
if( aValue.getLength() > 0 )
Modified: openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx (original)
+++ openoffice/trunk/main/extensions/source/update/feed/updatefeed.cxx Thu Apr 18 10:58:02 2013
@@ -357,7 +357,7 @@ UpdateInformationProvider::UpdateInforma
UNISTRING("ooSetupVersion")));
rtl::OUString edition(
UNISTRING(
- "${${BRAND_BASE_DIR}/program/edition/edition.ini:"
+ "${${OOO_BASE_DIR}/program/edition/edition.ini:"
"EDITIONNAME}"));
rtl::Bootstrap::expandMacros(edition);
if (edition.getLength() != 0) {
@@ -378,10 +378,11 @@ UpdateInformationProvider::UpdateInforma
rtl::OUString aBaseBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
rtl::Bootstrap::expandMacros( aBaseBuildId );
- rtl::OUString aBrandBuildId( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
- rtl::Bootstrap::expandMacros( aBrandBuildId );
+ rtl::OUString aBrandBuildId(aBaseBuildId);
+ // rtl::OUString aBrandBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
+ // rtl::Bootstrap::expandMacros( aBrandBuildId );
- rtl::OUString aUserAgent( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
+ rtl::OUString aUserAgent( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
rtl::Bootstrap::expandMacros( aUserAgent );
if ( ! aBaseBuildId.equals( aBrandBuildId ) )
Modified: openoffice/trunk/main/filter/source/msfilter/msocximex.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/msfilter/msocximex.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/msfilter/msocximex.cxx (original)
+++ openoffice/trunk/main/filter/source/msfilter/msocximex.cxx Thu Apr 18 10:58:02 2013
@@ -5306,7 +5306,7 @@ sal_Bool OCX_Image::Read(SotStorageStrea
pS->Seek( imagePos );
- sImageUrl = C2U("vnd.sun.star.expand:${$BRAND_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
+ sImageUrl = C2U("vnd.sun.star.expand:${$OOO_BASE_DIR/program/") + C2U( SAL_CONFIGFILE( "bootstrap" ) ) + C2U("::UserInstallation}/user/temp/") + sName;
sal_uInt8* pImage = new sal_uInt8[ nImageLen ];
pS->Read(pImage, nImageLen);
Modified: openoffice/trunk/main/framework/source/services/substitutepathvars.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/services/substitutepathvars.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/services/substitutepathvars.cxx (original)
+++ openoffice/trunk/main/framework/source/services/substitutepathvars.cxx Thu Apr 18 10:58:02 2013
@@ -1242,7 +1242,7 @@ void SubstitutePathVariables::SetPredefi
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_TEMP ] = ConvertOSLtoUCBURL( aTmp );
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+ RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
rtl::Bootstrap::expandMacros(
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
}
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Thu Apr 18 10:58:02 2013
@@ -82,7 +82,8 @@ ALLTAR : $(LOCALPYFILES)
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
ALLTAR : openoffice
.ELSE
-ALLTAR : openoffice sdkoo_en-US ure_en-US
+ALLTAR : openoffice sdkoo_en-US
+#ALLTAR : openoffice sdkoo_en-US ure_en-US
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
@@ -138,24 +139,24 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
-ure: $(foreach,i,$(alllangiso) ure_$i)
+#ure: $(foreach,i,$(alllangiso) ure_$i)
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
-MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
+#MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
.IF "$(BUILD_SPECIAL)"!=""
MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
+#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
-MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
+#MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
@@ -179,7 +180,7 @@ $(foreach,i,$(alllangiso) sdkoo_$i) : $(
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
+#$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
@@ -223,16 +224,16 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) :
sdkoodev_%{$(PKGFORMAT:^".")} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
-$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
-ure_%{$(PKGFORMAT:^".")} :
-.IF "$(OS)" == "MACOSX"
- @echo 'for now, there is no standalone URE for Mac OS X'
-.ELSE
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \
- -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \
- -msitemplate $(MSIURETEMPLATEDIR) \
- -msilanguage $(MISC)$/win_ulffiles
-.ENDIF
+#$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
+#ure_%{$(PKGFORMAT:^".")} :
+#.IF "$(OS)" == "MACOSX"
+# @echo 'for now, there is no standalone URE for Mac OS X'
+#.ELSE
+# $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.#lst \
+# -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -#format $(@:e:s/.//) $(VERBOSESWITCH) \
+# -msitemplate $(MSIURETEMPLATEDIR) \
+# -msilanguage $(MISC)$/win_ulffiles
+#.ENDIF
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
@@ -254,37 +255,39 @@ $(foreach,i,$(alllangiso) openoffice_$i{
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
@$(COPY) $< $@
-$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
+#$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_nologo$/intro.zip
+$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
$(COPY) $< $@
-$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev_nologo$/intro.zip
+#$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev_nologo$/intro.zip
+$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
- -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
+# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
- -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
+# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
- $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
+# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
+# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+# $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+# $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Thu Apr 18 10:58:02 2013
@@ -35,6 +35,24 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --
.END
my_components = \
+ acceptor \
+ binaryurp \
+ bootstrap \
+ connector \
+ introspection \
+ invocadapt \
+ invocation \
+ javaloader \
+ javavm \
+ juh \
+ namingservice \
+ proxyfac \
+ reflection \
+ stocservices \
+ streams \
+ textinstream \
+ textoutstream \
+ uuresolver \
abp \
adabasui \
analysis \
@@ -110,6 +128,7 @@ my_components = \
lnth \
localebe1 \
log \
+ mailmerge \
mcnttype \
migrationoo2 \
msfilter \
Modified: openoffice/trunk/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packregistry/makefile.mk?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packregistry/makefile.mk Thu Apr 18 10:58:02 2013
@@ -63,15 +63,15 @@ MY_FILES_base = \
$(MY_MOD)/org/openoffice/Office/Common-base.xcu \
$(MY_MOD)/org/openoffice/Setup-base.xcu
-MY_FILES_brand = \
- $(MY_XCU)/Office/Compatibility.xcu \
- $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
- $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
- $(MY_MOD)/org/openoffice/Setup-brand.xcu
-.IF "$(ENABLE_SVCTAGS)" == "YES"
-MY_FILES_brand += \
- $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-registration.xcu
-.END
+#MY_FILES_brand = \
+# $(MY_XCU)/Office/Compatibility.xcu \
+# $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
+# $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
+# $(MY_MOD)/org/openoffice/Setup-brand.xcu
+#.IF "$(ENABLE_SVCTAGS)" == "YES"
+#MY_FILES_brand += \
+# $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-registration.xcu
+#.END
MY_DEPS_calc = main
MY_FILES_calc = \
@@ -230,6 +230,7 @@ MY_FILES_main = \
$(MY_XCU)/Office/Calc.xcu \
$(MY_XCU)/Office/Canvas.xcu \
$(MY_XCU)/Office/Common.xcu \
+ $(MY_XCU)/Office/Compatibility.xcu \
$(MY_XCU)/Office/DataAccess.xcu \
$(MY_XCU)/Office/Embedding.xcu \
$(MY_XCU)/Office/ExtensionDependencies.xcu \
@@ -289,13 +290,20 @@ MY_FILES_main = \
$(MY_MOD)/fcfg_chart_types.xcu \
$(MY_MOD)/fcfg_internalgraphics_filters.xcu \
$(MY_MOD)/fcfg_internalgraphics_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
$(MY_MOD)/org/openoffice/Office/Embedding-chart.xcu \
+ $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
+ $(MY_MOD)/org/openoffice/Setup-brand.xcu \
$(MY_MOD)/org/openoffice/Setup-start.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-calc.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-draw.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-impress.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-math.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-writer.xcu
+.IF "$(ENABLE_SVCTAGS)" == "YES"
+MY_FILES_main += \
+ $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-registration.xcu
+.END
.IF "$(GUIBASE)" == "aqua"
MY_FILES_main += \
$(MY_MOD)/DataAccess/macab.xcu \
Modified: openoffice/trunk/main/sal/osl/unx/signal.c
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/unx/signal.c?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/unx/signal.c (original)
+++ openoffice/trunk/main/sal/osl/unx/signal.c Thu Apr 18 10:58:02 2013
@@ -737,7 +737,7 @@ static int ReportCrash( int Signal )
rtl_string2UString(
&crashrep_url,
RTL_CONSTASCII_USTRINGPARAM(
- "$BRAND_BASE_DIR/program/crashrep"),
+ "$OOO_BASE_DIR/program/crashrep"),
OSTRING_TO_OUSTRING_CVTFLAGS);
rtl_bootstrap_expandMacros(&crashrep_url);
osl_getSystemPathFromFileURL(crashrep_url, &crashrep_path);
Modified: openoffice/trunk/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/common_brand.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/common_brand.scp Thu Apr 18 10:58:02 2013
@@ -43,8 +43,8 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Registry,
gid_Brand_Dir_Share_Xdg);
- Files = (gid_Brand_File_BasisLink,
- gid_Brand_File_Bin_Crashreport,
+ // Files = (gid_Brand_File_BasisLink,
+ Files = (gid_Brand_File_Bin_Crashreport,
gid_Brand_File_Bin_Crashreport_Script,
gid_Brand_File_Bin_Crashreport_Com,
gid_Brand_File_Bin_Python,
@@ -73,8 +73,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Oirm2,
gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
- gid_Brand_File_ServicesRdb,
- gid_Brand_File_Share_Registry_Brand_Xcd,
+// gid_Brand_File_ServicesRdb,
+// gid_Brand_File_Share_Registry_Brand_Xcd,
gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
@@ -89,10 +89,12 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
gid_Brand_File_Txt_Package);
- Unixlinks = (gid_Brand_Unixlink_BasisLink,
- gid_Brand_Unixlink_Program,
- gid_Brand_Unixlink_Unopkg,
- gid_Brand_Unixlink_Urelibs);
+ Unixlinks = (gid_Brand_Unixlink_Program,
+ gid_Brand_Unixlink_Unopkg);
+// Unixlinks = (gid_Brand_Unixlink_BasisLink,
+// gid_Brand_Unixlink_Program,
+// gid_Brand_Unixlink_Unopkg,
+// gid_Brand_Unixlink_Urelibs);
End
// Language specific brand module
@@ -139,7 +141,7 @@ End
Directory gid_Brand_Dir_Readme
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Brand_Root;
#endif
@@ -148,7 +150,7 @@ End
Directory gid_Brand_Dir_License
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Brand_Root;
#endif
@@ -246,28 +248,29 @@ End
// Link to basis
-#if defined(WNT) || defined(OS2)
-File gid_Brand_File_BasisLink
- TXT_FILE_BODY;
- Dir = gid_Dir_Brand_Root;
- Name = "basis-link";
- Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Brand_Dir_BasisLink
- ParentID = gid_Dir_Bundle_Contents;
- DosName = "basis-link";
-End
-#else
-Unixlink gid_Brand_Unixlink_BasisLink
- BIN_FILE_BODY;
- Styles = ();
- // Styles = (LAYERLINK);
- Name = "basis-link";
- Dir = gid_Dir_Brand_Root;
- Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
-End
-#endif
+//#if defined(WNT) || defined(OS2)
+//File gid_Brand_File_BasisLink
+// TXT_FILE_BODY;
+// Dir = gid_Dir_Brand_Root;
+// Name = "basis-link";
+// Styles = (PACKED);
+//End
+//#elif defined MACOSX
+//Directory gid_Brand_Dir_BasisLink
+// ParentID = gid_Dir_Bundle_Contents;
+// DosName = "";
+//// DosName = "basis-link";
+//End
+//#else
+//Unixlink gid_Brand_Unixlink_BasisLink
+// BIN_FILE_BODY;
+// Styles = ();
+// // Styles = (LAYERLINK);
+// Name = "basis-link";
+// Dir = gid_Dir_Brand_Root;
+// Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
+//End
+//#endif
// UnixLinks
@@ -473,12 +476,12 @@ File gid_Brand_File_Txt_Package
Styles = (PACKED);
End
-File gid_Brand_File_Share_Registry_Brand_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "brand.xcd";
-End
+#File gid_Brand_File_Share_Registry_Brand_Xcd
+# TXT_FILE_BODY;
+# Styles = (PACKED, SCPZIP_REPLACE);
+# Dir = gid_Brand_Dir_Share_Registry;
+# Name = "brand.xcd";
+#End
File gid_Brand_File_Share_Registry_Cjk_Xcd
TXT_FILE_BODY;
@@ -723,11 +726,13 @@ Profile gid_Brand_Profile_Version_Ini
Styles = (NETWORK);
End
+#ifdef JSC
Profile gid_Brand_Profile_Fundamental_Ini
ModuleID = gid_Module_Root_Brand;
Name = PROFILENAME(fundamental);
Dir = gid_Brand_Dir_Program;
End
+#endif
#if !defined MACOSX
Profile gid_Brand_Profile_Redirect_Ini
@@ -1025,6 +1030,15 @@ ProfileItem gid_Brand_Profileitem_Versio
Value = "${OOOBASEVERSION}";
End
+ProfileItem gid_Brand_Profileitem_Version_Ooopackageversion
+ ProfileID = gid_Brand_Profile_Version_Ini;
+ ModuleID = gid_Module_Root_Brand;
+ Section = "Version";
+ Order = 18;
+ Key = "OOOPackageVersion";
+ Value = "${OOOPACKAGEVERSION}";
+End
+
ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -1034,6 +1048,8 @@ ProfileItem gid_Brand_Profileitem_Versio
Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
End
+#ifdef JSC
+
ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1048,9 +1064,11 @@ ProfileItem gid_Brand_Profileitem_Fundam
Section = "Bootstrap";
Key = "OOO_BASE_DIR";
#if defined(WNT) || defined(OS2)
- Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
+ Value = "${BRAND_BASE_DIR}";
+// Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
#else
- Value = "${BRAND_BASE_DIR}/basis-link";
+ Value = "${BRAND_BASE_DIR}";
+// Value = "${BRAND_BASE_DIR}/basis-link";
#endif
End
@@ -1182,6 +1200,8 @@ ProfileItem gid_Brand_Profileitem_Fundam
Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_LIB_DIR}";
End
+#endif # JSC
+
#if !defined MACOSX
ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
ModuleID = gid_Module_Root_Brand;
Modified: openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp Thu Apr 18 10:58:02 2013
@@ -69,36 +69,47 @@ End
Directory gid_Dir_Ooo_Openofficeorg
ParentID = PREDEFINED_PROGDIR;
#if defined(WNT) || defined(OS2)
- HostName = "${BASISROOTNAME}";
+ HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
#else
- HostName = "${UNIXBASISROOTNAME}";
+ HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
#endif
+// ParentID = PREDEFINED_PROGDIR;
+// #if defined(WNT) || defined(OS2)
+// HostName = "${BASISROOTNAME}";
+// #else
+// HostName = "${UNIXBASISROOTNAME}";
+// #endif
End
#endif
#ifndef MACOSX
Directory gid_Dir_Ooo_Basis
- #if defined(WNT) || defined(OS2)
- ParentID = gid_Dir_Brand_Root;
- #else
ParentID = gid_Dir_Ooo_Openofficeorg;
- #endif
- #if defined(WNT) || defined(OS2)
- HostName = "Basis";
- #else
- HostName = "basis${OOOBASEVERSION}";
- #endif
+ HostName = "";
Styles = (BASISDIRECTORY);
+// #if defined(WNT) || defined(OS2)
+// ParentID = gid_Dir_Brand_Root;
+// #else
+// ParentID = gid_Dir_Ooo_Openofficeorg;
+// #endif
+// #if defined(WNT) || defined(OS2)
+// HostName = "";
+// #else
+// HostName = "basis${OOOBASEVERSION}";
+// #endif
+// Styles = (BASISDIRECTORY);
End
#endif
Directory gid_Dir_Program
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Brand_Dir_BasisLink;
#else
- ParentID = gid_Dir_Ooo_Basis;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Ooo_Basis;
#endif
- DosName = "program";
+ DosName = "";
End
#if defined MACOSX
@@ -163,7 +174,7 @@ End
Directory gid_Dir_User
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
@@ -342,7 +353,7 @@ End
Directory gid_Dir_Share
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
@@ -1236,18 +1247,26 @@ Directory gid_Dir_Share_Fingerprint
DosName = "fingerprint";
End
+
+#ifndef MACOSX
Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
-#else
ParentID = gid_Dir_Ooo_Basis;
-#endif
DosName = "sdk";
End
+#endif
+
+//Directory gid_Dir_Basis_Sdk
+//#if defined MACOSX
+// ParentID = gid_Brand_Dir_BasisLink;
+//#else
+// ParentID = gid_Dir_Ooo_Basis;
+//#endif
+// DosName = "sdk";
+//End
Directory gid_Dir_Help
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
Modified: openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_ooo.scp Thu Apr 18 10:58:02 2013
@@ -1129,7 +1129,8 @@ File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Styles = (PACKED);
- Name = "offapi.rdb";
+ Name = "types.rdb";
+// Name = "offapi.rdb";
End
File gid_File_Rdb_TypesVba
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Thu Apr 18 10:58:02 2013
@@ -348,10 +348,12 @@ PARFILES= \
profileitem_ooo.par \
ure.par \
ure_into_ooo.par \
- ure_standalone.par \
+ ure_standalone.par \
+ common_brand.par \
common_brand.par \
common_brand_readme.par \
- ooo_brand.par
+ ooo_brand.par
+
.IF "$(GUI)"=="WNT"
PARFILES += \
Modified: openoffice/trunk/main/scp2/source/ooo/ooo_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/ooo_brand.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/ooo_brand.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/ooo_brand.scp Thu Apr 18 10:58:02 2013
@@ -53,12 +53,12 @@ File gid_File_Txt_License_Root
Styles = (PACKED);
End
-File gid_Brand_File_ServicesRdb
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "/ooo/services.rdb";
- Styles = (PACKED);
-End
+//File gid_Brand_File_ServicesRdb
+// TXT_FILE_BODY;
+// Dir = gid_Brand_Dir_Program;
+// Name = "/ooo/services.rdb";
+// Styles = (PACKED);
+//End
ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
ProfileID = gid_Brand_Profile_Bootstrap_Ini;
Modified: openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/profile_ooo.scp Thu Apr 18 10:58:02 2013
@@ -43,6 +43,7 @@ End
Profile gid_Profile_Fundamentalbasis_Ini
ModuleID = gid_Module_Root;
- Name = PROFILENAME(fundamentalbasis);
+ Name = PROFILENAME(fundamental);
+// Name = PROFILENAME(fundamentalbasis);
Dir = gid_Dir_Program;
End
Modified: openoffice/trunk/main/scp2/source/ooo/profileitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/profileitem_ooo.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/profileitem_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/profileitem_ooo.scp Thu Apr 18 10:58:02 2013
@@ -169,93 +169,137 @@ End
#endif
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Lib_Dir
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
Order = 1;
- Key = "BUNDLED_EXTENSIONS";
- Value = "$BRAND_BASE_DIR/share/extensions";
+ Key = "URE_INTERNAL_LIB_DIR";
+ Value = "${ORIGIN}";
End
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Java_Dir
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
- Key = "BUNDLED_EXTENSIONS_USER";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+ Order = 2;
+ Key = "URE_INTERNAL_JAVA_DIR";
+ Value = "${ORIGIN}/classes";
+End
+
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Java_Classpath
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 3;
+ Key = "URE_INTERNAL_JAVA_CLASSPATH";
+ Value = "${URE_MORE_JAVA_TYPES}";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Types
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 4;
+ Key = "UNO_TYPES";
+ Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Services
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 5;
+ Key = "UNO_SERVICES";
+ Value = "${ORIGIN}/services.rdb ${URE_MORE_SERVICES}";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 6;
+ Key = "BUNDLED_EXTENSIONS";
+ Value = "$OOO_BASE_DIR/share/extensions";
End
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_Prereg
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
+ Order = 7;
Key = "BUNDLED_EXTENSIONS_PREREG";
- Value = "$BRAND_BASE_DIR/share/prereg/bundled";
+ Value = "$OOO_BASE_DIR/share/prereg/bundled";
End
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 8;
+ Key = "BUNDLED_EXTENSIONS_USER";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+End
ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
+ Order = 9;
Key = "UNO_SHARED_PACKAGES";
- Value = "$BRAND_BASE_DIR/share/uno_packages";
+ Value = "$OOO_BASE_DIR/share/uno_packages";
End
ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 2;
+ Order = 10;
Key = "UNO_SHARED_PACKAGES_CACHE";
Value = "$UNO_SHARED_PACKAGES/cache";
End
-ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
- Key = "SHARED_EXTENSIONS_USER";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
+ Order = 11;
+ Key = "TMP_EXTENSIONS";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
End
-ProfileItem gid_Profileitem_Uno_Uno_User_Packages
+ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 3;
- Key = "UNO_USER_PACKAGES";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
+ Order = 12;
+ Key = "SHARED_EXTENSIONS_USER";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
End
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
+ProfileItem gid_Profileitem_Uno_Uno_User_Packages
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
- Key = "TMP_EXTENSIONS";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
+ Order = 13;
+ Key = "UNO_USER_PACKAGES";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
End
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
+ Order = 14;
Key = "BAK_EXTENSIONS";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
End
ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 4;
+ Order = 15;
Key = "UNO_USER_PACKAGES_CACHE";
Value = "$UNO_USER_PACKAGES/cache";
End
@@ -263,7 +307,7 @@ ProfileItem gid_Profileitem_Uno_Pkg_Bund
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 5;
+ Order = 16;
Key = "PKG_BundledUnoFile";
Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End
@@ -272,7 +316,7 @@ ProfileItem gid_Profileitem_Uno_Pkg_Shar
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 5;
+ Order = 17;
Key = "PKG_SharedUnoFile";
Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End
@@ -281,11 +325,30 @@ ProfileItem gid_Profileitem_Uno_Pkg_User
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 6;
+ Order = 18;
Key = "PKG_UserUnoFile";
Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End
+#ifdef JSC
+// JSC, will be removed soon
+ProfileItem gid_Profileitem_Fundamentalbasis_Brand_Base_Dir
+ ModuleID = gid_Module_Root;
+ ProfileID = gid_Profile_Fundamentalbasis_Ini;
+ Section = "Bootstrap";
+ Key = "BRAND_BASE_DIR";
+ Value = "${ORIGIN}/..";
+End
+#endif
+
+ProfileItem gid_Profileitem_Fundamentalbasis_Ooo_Base_Dir
+ ModuleID = gid_Module_Root;
+ ProfileID = gid_Profile_Fundamentalbasis_Ini;
+ Section = "Bootstrap";
+ Key = "OOO_BASE_DIR";
+ Value = "${ORIGIN}/..";
+End
+
ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions
ModuleID = gid_Module_Root;
ProfileID = gid_Profile_Fundamentalbasis_Ini;
@@ -355,7 +418,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_MORE_TYPES";
- Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
+ Value = "$ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
@@ -363,7 +426,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_MORE_SERVICES";
- Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
+ Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES}";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
@@ -379,7 +442,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
- Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
+ Value = "${OOO_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_User_Data
@@ -387,7 +450,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
- Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
+ Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Classpath_Urls
@@ -413,9 +476,11 @@ ProfileItem gid_Profileitem_Fundamentalb
Section = "Bootstrap";
Key = "URE_BIN_DIR";
#if defined(WNT) || defined(OS2)
- Value = "${.link:$ORIGIN/../ure-link}/bin";
+ Value = "$ORIGIN";
+// Value = "${.link:$ORIGIN/../ure-link}/bin";
#else
- Value = "$ORIGIN/../ure-link/bin";
+ Value = "$ORIGIN";
+// Value = "$ORIGIN/../ure-link/bin";
#endif
End
@@ -425,14 +490,18 @@ ProfileItem gid_Profileitem_Fundamentalb
Section = "Bootstrap";
Key = "URE_LIB_DIR";
#if defined(WNT) || defined(OS2)
- Value = "${.link:$ORIGIN/../ure-link}/bin";
+ Value = "$ORIGIN";
+// Value = "${.link:$ORIGIN/../ure-link}/bin";
#else
- Value = "$ORIGIN/../ure-link/lib";
+ Value = "$ORIGIN";
+// Value = "$ORIGIN/../ure-link/lib";
#endif
End
// Basis layer: gid_Profile_Version_Ini_Basis
+#if defined(JSC)
+
ProfileItem gid_Basis_Profileitem_Version_Buildid
ProfileID = gid_Profile_Version_Ini_Basis;
ModuleID = gid_Module_Root;
@@ -496,3 +565,5 @@ ProfileItem gid_Basis_Profileitem_Versio
Key = "OOOPackageVersion";
Value = "${OOOPACKAGEVERSION}";
End
+
+#endif // JSC
Modified: openoffice/trunk/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/ure.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/ure.scp Thu Apr 18 10:58:02 2013
@@ -25,47 +25,38 @@
Directory gid_Dir_Ure_Bin
#if defined MACOSX
- ParentID = gid_Dir_UreLink;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_UreLink;
#else
+// see ure_into.scp -> should be cleaned up later
ParentID = gid_Dir_Common_Ure;
#endif
- DosName = "bin";
+ DosName = "";
End
#if !defined(WNT) && !defined(OS2)
Directory gid_Dir_Ure_Lib
#if defined MACOSX
- ParentID = gid_Dir_UreLink;
+ ParentID = gid_Brand_Dir_Program;
+// Parentid = gid_Dir_UreLink;
#else
ParentID = gid_Dir_Common_Ure;
#endif
- DosName = "lib";
+ DosName = "";
End
#endif
-#if !defined(WNT) && !defined(OS2)
-Directory gid_Dir_Ure_Share
+#if defined SOLAR_JAVA
+Directory gid_Dir_Ure_Java
#if defined MACOSX
- ParentID = gid_Dir_UreLink;
+ ParentID = gid_Brand_Dir_Program;
#else
ParentID = gid_Dir_Common_Ure;
#endif
- DosName = "share";
-End
-#endif
-
-#if defined SOLAR_JAVA
-Directory gid_Dir_Ure_Java
- ParentID = SCP2_URE_SHARE_DIR;
- DosName = "java";
+ DosName = "classes";
End
#endif
-Directory gid_Dir_Ure_Misc
- ParentID = SCP2_URE_SHARE_DIR;
- DosName = "misc";
-End
-
// Public Executables:
#if defined WNT
@@ -288,13 +279,13 @@ End
// Private Dynamic Libraries:
-File gid_File_Dl_Profile_Uno
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = PROFILENAME(/ure/uno);
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
-End
+//File gid_File_Dl_Profile_Uno
+// TXT_FILE_BODY;
+// Dir = SCP2_URE_DL_DIR;
+// Name = PROFILENAME(/ure/uno);
+// Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+// // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
+//End
File gid_File_Dl_Reg
TXT_FILE_BODY;
@@ -1109,29 +1100,13 @@ File gid_File_Java_JavaUnoJar
End
#endif
-// Public Miscellaneous Files:
-
-File gid_File_Misc_TypesRdb
- TXT_FILE_BODY;
- Dir = gid_Dir_Ure_Misc;
- Name = "/ure/types.rdb";
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44";
-End
-
-File gid_File_Misc_ServicesRdb
- TXT_FILE_BODY;
- Dir = gid_Dir_Ure_Misc;
- Name = "/ure/services.rdb";
- Styles = (PACKED);
-End
-
// Private Miscellaneous Files:
#if defined SOLAR_JAVA
File gid_File_Misc_JavavendorsXml
TXT_FILE_BODY;
- Dir = gid_Dir_Ure_Misc;
+ //Dir = gid_Dir_Ure_Misc;
+ Dir = gid_Dir_Ure_Bin;
Name = "javavendors.xml";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587";
@@ -1159,9 +1134,7 @@ Module gid_Module_Root_Ure_Hidden
Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Ure_Bin,
gid_Dir_Ure_Lib,
- gid_Dir_Ure_Share,
- gid_Dir_Ure_Java,
- gid_Dir_Ure_Misc);
+ gid_Dir_Ure_Java);
Files = (gid_File_Readme_Ure,
gid_File_LICENSE_Ure,
gid_File_NOTICE_Ure,
@@ -1194,7 +1167,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Dl_PurpEnvHelper,
gid_File_Dl_Sal,
gid_File_Dl_Salhelper,
- gid_File_Dl_Profile_Uno,
gid_File_Dl_Reg,
gid_File_Dl_Store,
gid_File_Dl_Xmlreader,
@@ -1248,69 +1220,10 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Java_JurtJar,
gid_File_Java_RidlJar,
gid_File_Java_JavaUnoJar,
- gid_File_Misc_TypesRdb,
- gid_File_Misc_ServicesRdb,
gid_File_Misc_JavavendorsXml);
Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs);
End
-// Profile version.ini
-
-Profile gid_Profile_Version_Ini_Ure
- ModuleID = gid_Module_Root_Ure_Hidden;
- Name = PROFILENAME(version);
- Dir = gid_Dir_Ure_Bin;
- Styles = ();
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Buildid
- ProfileID = gid_Profile_Version_Ini_Ure;
- ModuleID = gid_Module_Root_Ure_Hidden;
- Section = "Version";
- Key = "buildid";
- Value = "<buildid>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productsource
- ProfileID = gid_Profile_Version_Ini_Ure;
- ModuleID = gid_Module_Root_Ure_Hidden;
- Section = "Version";
- Key = "ProductSource";
- Value = "<sourceid>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productmajor
- ProfileID = gid_Profile_Version_Ini_Ure;
- ModuleID = gid_Module_Root_Ure_Hidden;
- Section = "Version";
- Key = "ProductMajor";
- Value = "<productmajor>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productminor
- ProfileID = gid_Profile_Version_Ini_Ure;
- ModuleID = gid_Module_Root_Ure_Hidden;
- Section = "Version";
- Key = "ProductMinor";
- Value = "<productminor>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productbuildid
- ProfileID = gid_Profile_Version_Ini_Ure;
- ModuleID = gid_Module_Root_Ure_Hidden;
- Section = "Version";
- Key = "ProductBuildid";
- Value = "<productbuildid>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Ooobaseversion
- ProfileID = gid_Profile_Version_Ini_Ure;
- ModuleID = gid_Module_Root_Ure_Hidden;
- Section = "Version";
- Key = "OOOBaseVersion";
- Value = "${OOOBASEVERSION}";
-End
-
// Windows Registry:
RegistryItem gid_Regitem_Path
Modified: openoffice/trunk/main/scp2/source/ooo/ure_into_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/ure_into_ooo.scp?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/ure_into_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/ure_into_ooo.scp Thu Apr 18 10:58:02 2013
@@ -23,41 +23,52 @@
#include "macros.inc"
-#ifndef MACOSX
+//#ifndef MACOSX
Directory gid_Dir_Common_Ure
- #if defined(WNT) || defined(OS2)
+#ifndef MACOSX
ParentID = gid_Dir_Brand_Root;
- #else
- ParentID = gid_Dir_Ooo_Openofficeorg;
- #endif
- #if defined(WNT) || defined(OS2)
- HostName = "URE";
- #else
- HostName = "ure";
- #endif
+#else
+ ParentID = gid_Dir_Bundle_Contents
+#endif
+ HostName = "program";
Styles = (UREDIRECTORY);
End
-#endif
-#if defined(WNT) || defined(OS2)
-File gid_File_UreLink
- TXT_FILE_BODY;
- Dir = gid_Dir_Ooo_Basis;
- Name = "ure-link";
- Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Dir_UreLink
- ParentID = gid_Brand_Dir_BasisLink;
- DosName = "ure-link";
-End
-#else
-Unixlink gid_Unixlink_UreLink
- BIN_FILE_BODY;
- Styles = ();
- // Styles = (LAYERLINK);
- Name = "ure-link";
- Dir = gid_Dir_Ooo_Basis;
- Target = "../ure";
-End
-#endif
+//#ifndef MACOSX
+//Directory gid_Dir_Common_Ure
+// #if defined(WNT) || defined(OS2)
+// ParentID = gid_Dir_Brand_Root;
+// #else
+// ParentID = gid_Dir_Ooo_Openofficeorg;
+// #endif
+// #if defined(WNT) || defined(OS2)
+// HostName = "URE";
+// #else
+// HostName = "ure";
+// #endif
+// Styles = (UREDIRECTORY);
+//End
+//#endif
+
+//#if defined(WNT) || defined(OS2)
+//File gid_File_UreLink
+// TXT_FILE_BODY;
+// Dir = gid_Dir_Ooo_Basis;
+// Name = "ure-link";
+// Styles = (PACKED);
+//End
+//#elif defined MACOSX
+//Directory gid_Dir_UreLink
+// ParentID = gid_Brand_Dir_BasisLink;
+// DosName = "ure-link";
+//End
+//#else
+//Unixlink gid_Unixlink_UreLink
+// BIN_FILE_BODY;
+// Styles = ();
+// // Styles = (LAYERLINK);
+// Name = "ure-link";
+// Dir = gid_Dir_Ooo_Basis;
+// Target = "../ure";
+//End
+//#endif
Modified: openoffice/trunk/main/scripting/examples/beanshell/Highlight/ShowDialog.bsh
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/examples/beanshell/Highlight/ShowDialog.bsh?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/examples/beanshell/Highlight/ShowDialog.bsh (original)
+++ openoffice/trunk/main/scripting/examples/beanshell/Highlight/ShowDialog.bsh Thu Apr 18 10:58:02 2013
@@ -58,7 +58,7 @@ boolean tryLoadingLibrary( xmcf, context
}
libURL = xme.expandMacros(
- "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
+ "${$OOO_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
"/share/basic/ScriptBindingLibrary/" +
name.toLowerCase() + ".xlb/");
Modified: openoffice/trunk/main/scripting/examples/java/Highlight/HighlightText.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/examples/java/Highlight/HighlightText.java?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/examples/java/Highlight/HighlightText.java (original)
+++ openoffice/trunk/main/scripting/examples/java/Highlight/HighlightText.java Thu Apr 18 10:58:02 2013
@@ -224,7 +224,7 @@ public class HighlightText implements co
}
String libURL = xme.expandMacros(
- "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
+ "${$OOO_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
"/share/basic/ScriptBindingLibrary/" +
name.toLowerCase() + ".xlb/");
Modified: openoffice/trunk/main/scripting/examples/javascript/Highlight/ShowDialog.js
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/examples/javascript/Highlight/ShowDialog.js?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/examples/javascript/Highlight/ShowDialog.js (original)
+++ openoffice/trunk/main/scripting/examples/javascript/Highlight/ShowDialog.js Thu Apr 18 10:58:02 2013
@@ -52,7 +52,7 @@ function tryLoadingLibrary( xmcf, contex
}
libURL = xme.expandMacros(
- "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
+ "${$OOO_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
"/share/basic/ScriptBindingLibrary/" +
name.toLowerCase() + ".xlb/");
Modified: openoffice/trunk/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java (original)
+++ openoffice/trunk/main/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java Thu Apr 18 10:58:02 2013
@@ -130,12 +130,12 @@ public class ScriptMetaData extends Scri
// to be exposed at all
private static final String SHARE =
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
+ "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" +
PathUtils.BOOTSTRAP_NAME +
"::BaseInstallation}/share";
private static final String USER =
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
+ "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" +
PathUtils.BOOTSTRAP_NAME +
"::UserInstallation}/user";
Modified: openoffice/trunk/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java (original)
+++ openoffice/trunk/main/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java Thu Apr 18 10:58:02 2013
@@ -138,7 +138,7 @@ public abstract class ScriptProvider
new Type(XMacroExpander.class), serviceObj);
XMLParserFactory.setOfficeDTDURL(me.expandMacros(
- "${$BRAND_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/"));
+ "${$OOO_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/"));
}
catch ( Exception e )
@@ -214,20 +214,20 @@ public abstract class ScriptProvider
if ( originalContextURL.startsWith( "bundled" ) )
{
contextUrl = "vnd.sun.star.expand:$BUNDLED_EXTENSIONS";
- extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+ extensionDb = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
extensionRepository = "bundled";
}
if ( originalContextURL.startsWith( "share" ) )
{
- contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share";
- extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+ contextUrl = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share";
+ extensionDb = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
extensionRepository = "shared";
}
else if ( originalContextURL.startsWith( "user" ) )
{
- contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
- extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+ contextUrl = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+ extensionDb = "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
extensionRepository = "user";
}
Modified: openoffice/trunk/main/scripting/source/provider/URIHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/source/provider/URIHelper.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/source/provider/URIHelper.cxx (original)
+++ openoffice/trunk/main/scripting/source/provider/URIHelper.cxx Thu Apr 18 10:58:02 2013
@@ -42,7 +42,8 @@ namespace script = ::com::sun::star::scr
static const char SHARE[] = "share";
static const char SHARE_URI[] =
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
+ "vnd.sun.star.expand:$$OOO_BASE_DIR";
+// "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
static const char SHARE_UNO_PACKAGES[] = "share:uno_packages";
static const char SHARE_UNO_PACKAGES_URI[] =
@@ -50,7 +51,7 @@ static const char SHARE_UNO_PACKAGES_URI
static const char USER[] = "user";
static const char USER_URI[] =
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
+ "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
static const char USER_UNO_PACKAGES[] = "user:uno_packages";
static const char USER_UNO_PACKAGES_DIR[] =
Modified: openoffice/trunk/main/scripting/source/pyprov/pythonscript.py
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/source/pyprov/pythonscript.py?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/source/pyprov/pythonscript.py (original)
+++ openoffice/trunk/main/scripting/source/pyprov/pythonscript.py Thu Apr 18 10:58:02 2013
@@ -167,9 +167,9 @@ class MyUriHelper:
def __init__( self, ctx, location ):
self.s_UriMap = \
- { "share" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::BaseInstallation}/share/Scripts/python" , \
+ { "share" : "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + toIniName( "bootstrap") + "::BaseInstallation}/share/Scripts/python" , \
"share:uno_packages" : "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \
- "user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \
+ "user" : "vnd.sun.star.expand:${$OOO_BASE_DIR/program/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \
"user:uno_packages" : "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" }
self.m_uriRefFac = ctx.ServiceManager.createInstanceWithContext("com.sun.star.uri.UriReferenceFactory",ctx)
if location.startswith( "vnd.sun.star.tdoc" ):
Modified: openoffice/trunk/main/scripting/source/storage/ScriptStorageManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/source/storage/ScriptStorageManager.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/scripting/source/storage/ScriptStorageManager.cxx (original)
+++ openoffice/trunk/main/scripting/source/storage/ScriptStorageManager.cxx Thu Apr 18 10:58:02 2013
@@ -82,7 +82,7 @@ ScriptStorageManager::ScriptStorageManag
"/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY_THROW );
OUString base = OUString::createFromAscii(
- SAL_CONFIGFILE( "${$BRAND_BASE_DIR/program/bootstrap" ) );
+ SAL_CONFIGFILE( "${$OOO_BASE_DIR/program/bootstrap" ) );
setupAppStorage( xME,
base.concat( OUString::createFromAscii( "::BaseInstallation}/share" ) ),
Modified: openoffice/trunk/main/setup_native/scripts/install_linux.sh
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/scripts/install_linux.sh?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/scripts/install_linux.sh (original)
+++ openoffice/trunk/main/setup_native/scripts/install_linux.sh Thu Apr 18 10:58:02 2013
@@ -281,7 +281,7 @@ echo "Installing the RPMs"
ABSROOT=`cd ${INSTALLDIR}; pwd`
RELOCATIONS=`rpm -qp --qf "--relocate %{PREFIXES}=${ABSROOT}%{PREFIXES} \n" $RPMLIST | sort -u | tr -d "\012"`
-UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm ${DEBIAN_FLAGS} $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST
+UserInstallation=\$OOO_BASE_DIR/../UserInstallation rpm ${DEBIAN_FLAGS} $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST
#
# Create a link into the users home directory
@@ -305,7 +305,7 @@ then
fi
# patch the "bootstraprc" to create a self-containing installation
-find "$INSTALLDIR" -type f -name bootstraprc -exec /bin/bash -ce 'test ! -e "$0".orig && mv "$0" "$0".orig && sed '\''s,^UserInstallation=$SYSUSERCONFIG.*,UserInstallation=$BRAND_BASE_DIR/../UserInstallation,'\'' "$0".orig > "$0"' {} \;
+find "$INSTALLDIR" -type f -name bootstraprc -exec /bin/bash -ce 'test ! -e "$0".orig && mv "$0" "$0".orig && sed '\''s,^UserInstallation=$SYSUSERCONFIG.*,UserInstallation=$OOO_BASE_DIR/../UserInstallation,'\'' "$0".orig > "$0"' {} \;
# if an unpack directory exists, it can be removed now
if [ ! -z "$UNPACKDIR" ]
Modified: openoffice/trunk/main/setup_native/scripts/install_solaris.sh
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/scripts/install_solaris.sh?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/scripts/install_solaris.sh (original)
+++ openoffice/trunk/main/setup_native/scripts/install_solaris.sh Thu Apr 18 10:58:02 2013
@@ -254,7 +254,7 @@ cat > ${INSTALL_ROOT}/usr/lib/postrun <<
set -e
# Override UserInstallation in bootstraprc for unopkg ..
-UserInstallation='$BRAND_BASE_DIR/../UserInstallation'
+UserInstallation='$OOO_BASE_DIR/../UserInstallation'
export UserInstallation
if [ -x /usr/bin/mktemp ]
@@ -363,7 +363,7 @@ fi
# patch the "bootstraprc" to create a self-containing installation
for i in ${PKG_LIST}; do
my_dir=${INSTALL_ROOT}`pkgparam -d ${PACKAGE_PATH} "$i" BASEDIR`
- find "$my_dir" -type f -name bootstraprc -exec sh -ce 'test ! -f "$0".orig && mv "$0" "$0".orig && sed '\''s,^UserInstallation=$SYSUSERCONFIG.*,UserInstallation=$BRAND_BASE_DIR/../UserInstallation,'\'' "$0".orig > "$0"' {} \;
+ find "$my_dir" -type f -name bootstraprc -exec sh -ce 'test ! -f "$0".orig && mv "$0" "$0".orig && sed '\''s,^UserInstallation=$SYSUSERCONFIG.*,UserInstallation=$OOO_BASE_DIR/../UserInstallation,'\'' "$0".orig > "$0"' {} \;
done
# if an unpack directory exists, it can be removed now
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx?rev=1469276&r1=1469275&r2=1469276&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx Thu Apr 18 10:58:02 2013
@@ -174,7 +174,8 @@ static BOOL MoveFileExImpl( LPCSTR lpExi
extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
{
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+// std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+ std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
WIN32_FIND_DATA aFindFileData;