[Libreoffice-commits] .: 2 commits - configmgr/source desktop/scripts desktop/source framework/source offapi/com officecfg/registry postprocess/packregistry scp2/source setup_native/source test/user-template tools/inc vcl/aqua vcl/ios vcl/source xmlhelp/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Fri Oct 7 13:06:47 PDT 2011
configmgr/source/components.cxx | 24 --
desktop/scripts/unopkg.sh | 2
desktop/source/pkgchk/unopkg/unopkg_app.cxx | 2
framework/source/accelerators/presethandler.cxx | 50 +++--
framework/source/services/substitutepathvars.cxx | 18 +-
offapi/com/sun/star/util/PathSubstitution.idl | 6
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 4
postprocess/packregistry/makefile.mk | 3
scp2/source/base/file_base.scp | 2
scp2/source/binfilter/file_binfilter.scp | 2
scp2/source/calc/file_calc.scp | 2
scp2/source/draw/file_draw.scp | 2
scp2/source/gnome/file_gnome.scp | 2
scp2/source/graphicfilter/file_graphicfilter.scp | 2
scp2/source/impress/file_impress.scp | 2
scp2/source/impress/module_ogltrans.scp | 2
scp2/source/javafilter/file_javafilter.scp | 6
scp2/source/layout/layout.scp | 2
scp2/source/math/file_math.scp | 2
scp2/source/onlineupdate/file_onlineupdate.scp | 2
scp2/source/ooo/directory_ooo.scp | 90 +++-------
scp2/source/ooo/file_extra_ooo.scp | 4
scp2/source/ooo/file_ooo.scp | 28 +--
scp2/source/python/file_python.scp | 2
scp2/source/writer/file_writer.scp | 2
scp2/source/xsltfilter/file_xsltfilter.scp | 2
setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions | 6
test/user-template/user/registry/main.xcd | 4
tools/inc/tools/diagnose_ex.h | 15 +
vcl/aqua/source/gdi/salgdi.cxx | 16 -
vcl/ios/source/gdi/salgdi.cxx | 18 --
vcl/source/gdi/impimagetree.cxx | 4
xmlhelp/source/cxxhelp/provider/provider.cxx | 2
34 files changed, 150 insertions(+), 182 deletions(-)
New commits:
commit 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 7 21:12:30 2011 +0200
Undo basis/brand split: merge basis share/ into brand share/.
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 4887928..650df69 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -529,32 +529,22 @@ Components::Components(
0,
expand(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/registry"))));
+ RTL_CONSTASCII_USTRINGPARAM(
+ "$BRAND_BASE_DIR/share/registry"))));
parseModuleLayer(
2,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "$OOO_BASE_DIR/share/registry/modules"))));
+ "$BRAND_BASE_DIR/share/registry/modules"))));
parseResLayer(
3,
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(
- 7,
+ 4,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -564,7 +554,7 @@ Components::Components(
"PackageRegistryBackend/configmgr.ini"))),
false);
parseXcsXcuIniLayer(
- 9,
+ 6,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -574,7 +564,7 @@ Components::Components(
"PackageRegistryBackend/configmgr.ini"))),
true);
parseXcsXcuLayer(
- 11,
+ 8,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -585,7 +575,7 @@ Components::Components(
// can be dropped once old UserInstallation format can no longer exist
// (probably OOo 4)
parseXcsXcuIniLayer(
- 13,
+ 10,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 4419ea0..2303349 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -79,7 +79,7 @@ done
if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ]
then
- JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+ JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$BRAND_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
fi
# extend the ld_library_path for java: javaldx checks the sofficerc for us
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index ec156d3..3289d5b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -415,7 +415,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
//for the admin. The value must also be set in the unopkg script (Linux, etc.)
//when calling javaldx
::rtl::Bootstrap::set(OUSTR("UNO_JAVA_JFW_INSTALL_DATA"),
- OUSTR("$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml"));
+ OUSTR("$BRAND_BASE_DIR/share/config/javasettingsunopkginstall.xml"));
}
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index afcd1e0..d4a20da 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1169,6 +1169,12 @@ throw ( NoSuchElementException, RuntimeException )
void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::SetPredefinedPathVariables" );
+
+ aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+ rtl::Bootstrap::expandMacros(
+ aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
+
Any aAny;
::rtl::OUString aOfficePath;
::rtl::OUString aUserPath;
@@ -1180,9 +1186,10 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
::utl::Bootstrap::PathStatus aState;
::rtl::OUString sVal ;
+ rtl::OUString basis;
aState = utl::Bootstrap::locateBaseInstallation( sVal );
if( aState==::utl::Bootstrap::PATH_EXISTS ) {
- aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ] = ConvertOSLtoUCBURL( sVal );
+ basis = ConvertOSLtoUCBURL( sVal );
}
else {
LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Bootstrap code has no value for instpath!");
@@ -1197,6 +1204,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
}
// Set $(inst), $(instpath), $(insturl)
+ aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ] = aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL];
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
// New variable of hierachy service (#i32656#)
@@ -1210,8 +1218,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
// Detect the program directory
// Set $(prog), $(progpath), $(progurl)
- INetURLObject aProgObj(
- aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ] );
+ INetURLObject aProgObj( basis );
if ( !aProgObj.HasError() && aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) )
{
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE);
@@ -1256,11 +1263,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
// Set $(temp)
osl::FileBase::getTempDirURL( aTmp );
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_TEMP ] = ConvertOSLtoUCBURL( aTmp );
-
- aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
- rtl::Bootstrap::expandMacros(
- aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]);
}
} // namespace framework
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index 46711e3..28029c1 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -52,11 +52,9 @@ module com { module sun { module star { module util {
</p>
<dl>
<dt>$(inst)</dt>
- <dd>Installation path of the Office Basis layer.</dd>
+ <dd>Installation path of the Office.</dd>
<dt>$(prog)</dt>
- <dd>Program path of the Office Basis layer.</dd>
- <dt>$(brandbaseurl)</dt>
- <dd>Installation path of the the Office Brand layer.</dd>
+ <dd>Program path of the Office.</dd>
<dt>$(user)</dt>
<dd>The user installation directory.</dd>
<dt>$(work)</dt>
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 353cecf..6101cef 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -160,7 +160,7 @@
</node>
<node oor:name="Misc">
<prop oor:name="TransitionFiles" install:module="ogltrans">
- <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
+ <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
</prop>
</node>
</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 123dffc..874aae7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -475,7 +475,7 @@
</desc>
<label>List of files containing transition effects</label>
</info>
- <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
+ <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
</prop>
<prop oor:name="EffectFiles" oor:type="oor:string-list">
<!-- OldPath: -->
@@ -491,7 +491,7 @@
</desc>
<label>List of files containing object effects</label>
</info>
- <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value>
+ <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value>
</prop>
<prop oor:name="PreviewNewEffects" oor:type="xs:boolean">
<!-- OldPath: -->
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index f03a640..c2dafb1 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -64,6 +64,7 @@ MY_FILES_base = \
$(MY_MOD)/org/openoffice/Office/Common-base.xcu \
$(MY_MOD)/org/openoffice/Setup-base.xcu
+MY_DEPS_brand = main
MY_FILES_brand = \
$(MY_XCU)/Office/Compatibility.xcu \
$(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
@@ -83,6 +84,7 @@ MY_FILES_calc = \
$(MY_MOD)/org/openoffice/Office/Embedding-calc.xcu \
$(MY_MOD)/org/openoffice/Setup-calc.xcu
+MY_DEPS_cjk = main
MY_FILES_cjk = \
$(MY_MOD)/org/openoffice/Office/Common-cjk.xcu \
$(MY_MOD)/org/openoffice/Office/Writer-cjk.xcu
@@ -120,6 +122,7 @@ MY_FILES_impress = \
$(MY_MOD)/org/openoffice/Office/Embedding-impress.xcu \
$(MY_MOD)/org/openoffice/Setup-impress.xcu
+MY_DEPS_korea = main
MY_FILES_korea = \
$(MY_MOD)/org/openoffice/Office/Common-korea.xcu
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index dbab1f4..4a2b6d0 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -84,6 +84,6 @@ End
File gid_File_Share_Registry_Base_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "base.xcd";
End
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 140a430..c1d1b1c 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -31,7 +31,7 @@
File gid_File_Share_Registry_Binfilter_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "binfilter.xcd";
End
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index a2f1fdb..3adb751 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -41,7 +41,7 @@ STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
File gid_File_Share_Registry_Calc_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "calc.xcd";
End
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 975b600..9a388bc 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -30,7 +30,7 @@
File gid_File_Share_Registry_Draw_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "draw.xcd";
End
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index b4da427..e3d2baf 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -48,7 +48,7 @@ End
File gid_File_Share_Registry_Gnome_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "gnome.xcd";
End
#endif
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index 15a18d2..a968866 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -30,7 +30,7 @@
File gid_File_Share_Registry_Graphicfilter_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "graphicfilter.xcd";
End
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 074a479..bbac023 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -40,7 +40,7 @@ End
File gid_File_Share_Registry_Impress_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "impress.xcd";
End
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 300deca..91d5a4e 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -57,6 +57,6 @@ End
File gid_File_Share_Registry_Ogltrans_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "ogltrans.xcd";
End
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index e9eb2d1..614b120 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -52,21 +52,21 @@ End
File gid_File_Share_Registry_Palm_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "palm.xcd";
End
File gid_File_Share_Registry_Pocketexcel_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "pocketexcel.xcd";
End
File gid_File_Share_Registry_Pocketword_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "pocketword.xcd";
End
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index c801808..a080a04 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -28,7 +28,7 @@
#include "macros.inc"
Directory gid_Dir_Share_Layout
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "layout";
End
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 8265088..f3bbd32 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -46,7 +46,7 @@ STD_RES_FILE( gid_File_Res_Sm, sm )
File gid_File_Share_Registry_Math_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "math.xcd";
End
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 2a7ddd3..1267e33 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -32,7 +32,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
File gid_File_Share_Registry_Onlineupdate_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "onlineupdate.xcd";
End
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 0393302..e9c3ade 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -349,22 +349,13 @@ Directory gid_Dir_Plugin
Styles = (WORKSTATION, CREATE);
End
-Directory gid_Dir_Share
-#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
-#else
- ParentID = gid_Dir_Ooo_Basis;
-#endif
- DosName = "share";
-End
-
Directory gid_Dir_Share_Migration
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "migration";
End
Directory gid_Dir_Fonts
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "fonts";
End
@@ -378,7 +369,7 @@ End
#endif
Directory gid_Dir_Share_Xslt
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "xslt";
End
@@ -460,7 +451,7 @@ Directory gid_Dir_Share_Xslt_Import_Common
End
Directory gid_Dir_Share_Dtd
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "dtd";
End
@@ -485,17 +476,12 @@ Directory gid_Dir_Share_Dtd_Math_1_01
End
Directory gid_Dir_Share_Pqa
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "pqa";
End
-Directory gid_Dir_Share_Config
- ParentID = gid_Dir_Share;
- DosName = "config";
-End
-
Directory gid_Dir_Share_Config_Wizard
- ParentID = gid_Dir_Share_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "wizard";
End
@@ -510,7 +496,7 @@ Directory gid_Dir_Share_Config_Wizard_Web_Buttons
End
Directory gid_Dir_Share_Config_Sofficecfg
- ParentID = gid_Dir_Share_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "soffice.cfg";
End
@@ -674,18 +660,13 @@ Directory gid_Dir_Share_Config_Sofficecfg_Swriter_Menubar
DosName = "menubar";
End
-Directory gid_Dir_Share_Registry
- ParentID = gid_Dir_Share;
- DosName = "registry";
-End
-
Directory gid_Dir_Share_Registry_Res
- ParentID = gid_Dir_Share_Registry;
+ ParentID = gid_Brand_Dir_Share_Registry;
HostName = "res";
End
Directory gid_Dir_Autotext
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "autotext";
End
@@ -695,13 +676,13 @@ Directory gid_Dir_Autotext_Language
End
Directory gid_Dir_Share_Autocorr
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "autocorr";
Styles = (WORKSTATION, CREATE);
End
Directory gid_Dir_Basic
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "basic";
End
@@ -761,62 +742,57 @@ Directory gid_Dir_Basic_Scriptbindinglib
End
Directory gid_Dir_Share_Scripts
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "Scripts";
End
Directory gid_Dir_Share_Dict
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "dict";
End
-Directory gid_Dir_Config
- ParentID = gid_Dir_Share;
- DosName = "config";
-End
-
Directory gid_Dir_Config_Language
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DIR_ISOLANGUAGE_ALL_LANG_2;
End
Directory gid_Dir_Share_Config_Help
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "help";
End
Directory gid_Dir_Config_More
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "more";
End
Directory gid_Dir_Config_Start
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "start";
End
Directory gid_Dir_Config_Tasks
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "tasks";
End
Directory gid_Dir_Config_Settings
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "settings";
End
Directory gid_Dir_Config_Symbol
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "symbol";
End
Directory gid_Dir_Config_Webcast
- ParentID = gid_Dir_Config;
+ ParentID = gid_Brand_Dir_Share_Config;
DosName = "webcast";
End
Directory gid_Dir_Gallery
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "gallery";
End
@@ -961,7 +937,7 @@ Directory gid_Dir_Gallery_Wwwgraf
End
Directory gid_Dir_Template
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "template";
End
@@ -1076,7 +1052,7 @@ Directory gid_Dir_Template_Internal
End
Directory gid_Dir_Share_Database
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "database";
End
@@ -1086,12 +1062,12 @@ Directory gid_Dir_Share_Database_Language
End
Directory gid_Dir_Explorer
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "explorer";
End
Directory gid_Dir_Bookmark
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "bookmark";
End
@@ -1131,12 +1107,12 @@ Directory gid_Dir_Bookmark_Tourismus
End
Directory gid_Dir_Palmpilot
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "palmpilot";
End
Directory gid_Dir_Samples
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "samples";
End
@@ -1187,17 +1163,17 @@ Directory gid_Dir_Samples_Databases_Dateien
End
Directory gid_Dir_Wordbook
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "wordbook";
End
Directory gid_Dir_Share_Plugin
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "plugin";
End
Directory gid_Dir_Share_Fingerprint
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "fingerprint";
End
@@ -1307,7 +1283,7 @@ End
#ifdef UNX
Directory gid_Dir_Psprint
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "psprint";
End
@@ -1334,7 +1310,7 @@ End
#ifdef UNX
Directory gid_Dir_Share_Icons
- ParentID = gid_Dir_Share;
+ ParentID = gid_Brand_Dir_Share;
DosName = "icons";
End
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 9931617..6b2efbe 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -51,7 +51,7 @@ End
#ifdef UNX
File gid_File_Extra_Cfgsrv_Bitmap_Unx
- Dir = gid_Dir_Config;
+ Dir = gid_Brand_Dir_Share_Config;
ARCHIVE_TXT_FILE_BODY;
Name = "cfgsrvbitmapunx.zip";
End
@@ -66,7 +66,7 @@ File gid_File_Extra_Cfgusr
End
File gid_File_Extra_Cfgsrv
- Dir = gid_Dir_Config;
+ Dir = gid_Brand_Dir_Share_Config;
TXT_FILE_BODY;
Styles = (ARCHIVE);
Name = "cfgsrvnolang.zip";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 37e1f9d..b7b3294 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -598,7 +598,7 @@ End
File gid_File_Share_Registry_Main_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "main.xcd";
End
@@ -607,7 +607,7 @@ End
File gid_File_Share_Registry_Forcedefault_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "forcedefault.xcd";
End
@@ -616,14 +616,14 @@ End
File gid_File_Oo_Ldap_Xcd_Sample
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "oo-ldap.xcd.sample";
End
File gid_File_Oo_Ad_Ldap_Xcd_Sample
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "oo-ad-ldap.xcd.sample";
End
@@ -656,14 +656,14 @@ End
File gid_File_Registry_Spool_Langpack_Lang
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
FILE_ALL_LANG_LETTER(Langpack-,xcd);
End
File gid_File_Share_Registry_Ctl_Xcd
TXT_FILE_BODY;
Styles = (PACKED,MAKE_LANG_SPECIFIC);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name (ar) = "ctl.xcd";
Name (dz) = "ctl.xcd";
Name (fa) = "ctl.xcd";
@@ -683,7 +683,7 @@ End
File gid_File_Share_Registry_Ctlseqcheck_Xcd
TXT_FILE_BODY;
Styles = (PACKED,MAKE_LANG_SPECIFIC);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name (km) = "ctlseqcheck.xcd";
Name (lo) = "ctlseqcheck.xcd";
Name (th) = "ctlseqcheck.xcd";
@@ -1228,7 +1228,7 @@ End
File gid_File_Config_Javasettingsunopkginstall
USER_FILE_BODY;
- Dir = gid_Dir_Config;
+ Dir = gid_Brand_Dir_Share_Config;
Name = "javasettingsunopkginstall.xml";
#ifdef SOLARIS
Styles = (PACKED,VOLATILEFILE);
@@ -1240,7 +1240,7 @@ End
#ifdef THEME_DEFAULT
File gid_File_Images_Zip
TXT_FILE_BODY;
- Dir = gid_Dir_Share_Config;
+ Dir = gid_Brand_Dir_Share_Config;
Name = "images.zip";
Styles = (PACKED);
End
@@ -1249,7 +1249,7 @@ End
#ifdef THEME_CRYSTAL
File gid_File_ImagesCrystal_Zip
TXT_FILE_BODY;
- Dir = gid_Dir_Share_Config;
+ Dir = gid_Brand_Dir_Share_Config;
Name = "images_crystal.zip";
Styles = (PACKED);
End
@@ -1258,7 +1258,7 @@ End
#ifdef THEME_OXYGEN
File gid_File_ImagesOxygen_Zip
TXT_FILE_BODY;
- Dir = gid_Dir_Share_Config;
+ Dir = gid_Brand_Dir_Share_Config;
Name = "images_oxygen.zip";
Styles = (PACKED);
End
@@ -1267,7 +1267,7 @@ End
#ifdef THEME_HICONTRAST
File gid_File_ImagesHicontrast_Zip
TXT_FILE_BODY;
- Dir = gid_Dir_Share_Config;
+ Dir = gid_Brand_Dir_Share_Config;
Name = "images_hicontrast.zip";
Styles = (PACKED);
End
@@ -1276,7 +1276,7 @@ End
#ifdef THEME_TANGO
File gid_File_ImagesTango_Zip
TXT_FILE_BODY;
- Dir = gid_Dir_Share_Config;
+ Dir = gid_Brand_Dir_Share_Config;
Name = "images_tango.zip";
Styles = (PACKED);
End
@@ -1285,7 +1285,7 @@ End
File gid_File_Share_Registry_Lingucomponent_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "lingucomponent.xcd";
End
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 2895c5c..cfef220 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -118,7 +118,7 @@ End
File gid_File_Share_Registry_Pyuno_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "pyuno.xcd";
End
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index a1ae5ca..3c831d8 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -88,6 +88,6 @@ End
File gid_File_Share_Registry_Writer_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "writer.xcd";
End
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index 788a511..d71b521 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -30,7 +30,7 @@
File gid_File_Share_Registry_Xsltfilter_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Share_Registry;
+ Dir = gid_Brand_Dir_Share_Registry;
Name = "xsltfilter.xcd";
End
diff --git a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
index 6962770..c4ce0df 100644
--- a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
+++ b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
@@ -29,8 +29,6 @@
#Create the folder which contains the temporary user installation
INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"`
-OOO_BASE_DIR="/opt/openoffice.org/basis${OOOBASEVERSION}"
-
case "$1" in
'start')
EXTENSIONDIR=/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/share/extension/install
@@ -50,7 +48,7 @@ case "$1" in
#list. That is, it has not been installed (with unopkg) yet.
#Therefore we do it now.
echo installing $FILE
- /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+ /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=/opt/openoffice.org/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
#Let us remember that this extensions has been installed
#by adding the path name of the extension to the file
#installed
@@ -78,7 +76,7 @@ case "$1" in
# #share/extension/install. Now we remove the installed
# #extension
# echo removing `basename $LINE`
-# /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+# /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=/opt/openoffice.org/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
# REMOVED=1
# else
# NEWCONTENT+=$LINE
diff --git a/test/user-template/user/registry/main.xcd b/test/user-template/user/registry/main.xcd
index d220493..156c664 100644
--- a/test/user-template/user/registry/main.xcd
+++ b/test/user-template/user/registry/main.xcd
@@ -3146,10 +3146,10 @@
<value>true</value>
</prop>
<prop oor:name="TransitionFiles" oor:type="oor:string-list">
- <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
+ <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
</prop>
<prop oor:name="EffectFiles" oor:type="oor:string-list">
- <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value>
+ <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value>
</prop>
<prop oor:name="PreviewNewEffects" oor:type="xs:boolean">
<value>true</value>
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 19f073d..5ac685c 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -1688,7 +1688,7 @@ static bool AddLocalTempFontDirs( void )
return false;
bFirst = false;
- // add private font files found in brand and base layer
+ // add private font files
rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) );
rtl_bootstrap_expandMacros( &aBrandStr.pData );
@@ -1698,19 +1698,7 @@ static bool AddLocalTempFontDirs( void )
rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) );
aBrandFontDir.append( "/share/fonts/truetype/" );
- bool bBrandSuccess = AddTempFontDir( aBrandFontDir.getStr() );
-
- rtl::OUString aBaseStr( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) );
- rtl_bootstrap_expandMacros( &aBaseStr.pData );
- rtl::OUString aBaseSysPath;
- OSL_VERIFY( osl_getSystemPathFromFileURL( aBaseStr.pData, &aBaseSysPath.pData ) == osl_File_E_None );
-
- rtl::OStringBuffer aBaseFontDir( aBaseSysPath.getLength()*2 );
- aBaseFontDir.append( rtl::OUStringToOString( aBaseSysPath, RTL_TEXTENCODING_UTF8 ) );
- aBaseFontDir.append( "/share/fonts/truetype/" );
- bool bBaseSuccess = AddTempFontDir( aBaseFontDir.getStr() );
-
- return bBrandSuccess && bBaseSuccess;
+ return AddTempFontDir( aBrandFontDir.getStr() );
}
void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx
index 374c633..ce557de 100644
--- a/vcl/ios/source/gdi/salgdi.cxx
+++ b/vcl/ios/source/gdi/salgdi.cxx
@@ -1471,7 +1471,7 @@ static bool AddLocalTempFontDirs( void )
return false;
bFirst = false;
- // add private font files found in brand and base layer
+ // add private font files
rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) );
rtl_bootstrap_expandMacros( &aBrandStr.pData );
@@ -1483,21 +1483,9 @@ static bool AddLocalTempFontDirs( void )
aBrandFontDir.append( "/share/fonts/truetype/" );
// iterate font files in that and call CTFontManagerRegisterFontsForURL for them?
- bool bBrandSuccess = true;
+ bool bSuccess = true;
- rtl::OUString aBaseStr( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR" ) );
- rtl_bootstrap_expandMacros( &aBaseStr.pData );
- rtl::OUString aBaseSysPath;
- OSL_VERIFY( osl_getSystemPathFromFileURL( aBaseStr.pData, &aBaseSysPath.pData ) == osl_File_E_None );
-
- rtl::OStringBuffer aBaseFontDir( aBaseSysPath.getLength()*2 );
- aBaseFontDir.append( rtl::OUStringToOString( aBaseSysPath, RTL_TEXTENCODING_UTF8 ) );
- aBaseFontDir.append( "/share/fonts/truetype/" );
-
- // ditto
- bool bBaseSuccess = true;
-
- return bBrandSuccess && bBaseSuccess;
+ return bSuccess;
}
void IosSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 48ef658..b40f6a2 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -301,7 +301,7 @@ void ImplImageTree::resetZips() {
}
{
rtl::OUString url(
- RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config"));
+ RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config"));
rtl::Bootstrap::expandMacros(url);
INetURLObject u(url);
OSL_ASSERT(!u.HasError());
@@ -320,7 +320,7 @@ void ImplImageTree::resetZips() {
{
rtl::OUString url(
RTL_CONSTASCII_USTRINGPARAM(
- "$OOO_BASE_DIR/share/config/images.zip"));
+ "$BRAND_BASE_DIR/share/config/images.zip"));
rtl::Bootstrap::expandMacros(url);
m_zips.push_back(
std::make_pair(
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 3707903..35f84e1 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -353,7 +353,7 @@ void ContentProvider::init()
subst( aPath );
aImagesZipPaths[ 0 ] = aPath;
- aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/config"));
+ aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config"));
rtl::Bootstrap::expandMacros(aPath);
aImagesZipPaths[ 1 ] = aPath;
commit 29e11dd13efc2d1325b0f424788484bc8ecf0ce1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 7 21:09:41 2011 +0200
Improved exception reporting.
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index bcd4788..45c9c4e 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -59,7 +59,7 @@
//_______________________________________________
// other includes
#include <vcl/svapp.hxx>
-
+#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
//_______________________________________________
@@ -209,7 +209,8 @@ void PresetHandler::forgetCachedStorages()
// <- SAFE ----------------------------------
}
-//-----------------------------------------------
+namespace {
+
::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID)
{
::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Unknown error."));
@@ -218,6 +219,7 @@ void PresetHandler::forgetCachedStorages()
{
case ID_CORRUPT_UICONFIG_SHARE :
sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE )));
+
break;
case ID_CORRUPT_UICONFIG_USER :
@@ -232,7 +234,22 @@ void PresetHandler::forgetCachedStorages()
return sMessage;
}
-//-----------------------------------------------
+void lcl_throwCorruptedUIConfigurationException(
+ css::uno::Any const & exception, sal_Int32 id)
+{
+ css::uno::Exception e;
+ bool ok = (exception >>= e);
+ OSL_ASSERT(ok); (void) ok; // avoid warnings
+ throw css::configuration::CorruptedUIConfigurationException(
+ lcl_getLocalizedMessage(id),
+ css::uno::Reference< css::uno::XInterface >(),
+ (exception.getValueTypeName() +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": \"")) + e.Message +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""))));
+}
+
+}
+
css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageShare()
{
css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesShare.getRootStorage();
@@ -280,12 +297,11 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
{
xStorage = css::uno::Reference< css::embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW);
}
- catch(const css::uno::Exception& ex)
+ catch(const css::uno::Exception&)
{
- throw css::configuration::CorruptedUIConfigurationException(
- lcl_getLocalizedMessage(ID_CORRUPT_UICONFIG_SHARE),
- css::uno::Reference< css::uno::XInterface >(),
- ex.Message);
+ css::uno::Any ex(cppu::getCaughtException());
+ lcl_throwCorruptedUIConfigurationException(
+ ex, ID_CORRUPT_UICONFIG_SHARE);
}
m_aSharedStorages->m_lStoragesShare.setRootStorage(xStorage);
@@ -331,12 +347,11 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
{
xStorage = css::uno::Reference< css::embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW);
}
- catch(const css::uno::Exception& ex)
+ catch(const css::uno::Exception&)
{
- throw css::configuration::CorruptedUIConfigurationException(
- lcl_getLocalizedMessage(ID_CORRUPT_UICONFIG_USER),
- css::uno::Reference< css::uno::XInterface >(),
- ex.Message);
+ css::uno::Any ex(cppu::getCaughtException());
+ lcl_throwCorruptedUIConfigurationException(
+ ex, ID_CORRUPT_UICONFIG_USER);
}
m_aSharedStorages->m_lStoragesUser.setRootStorage(xStorage);
@@ -585,12 +600,11 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
// <- SAFE ----------------------------------
}
- catch(const css::uno::Exception& ex)
+ catch(const css::uno::Exception&)
{
- throw css::configuration::CorruptedUIConfigurationException(
- lcl_getLocalizedMessage(ID_CORRUPT_UICONFIG_GENERAL),
- css::uno::Reference< css::uno::XInterface >(),
- ex.Message);
+ css::uno::Any ex(cppu::getCaughtException());
+ lcl_throwCorruptedUIConfigurationException(
+ ex, ID_CORRUPT_UICONFIG_GENERAL);
}
}
diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index 5dd8951..ce1b5a3 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -43,6 +43,7 @@
#if OSL_DEBUG_LEVEL > 0
+ #include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
#include <osl/thread.h>
@@ -60,13 +61,13 @@
sMessage += "\nin function:"; \
sMessage += BOOST_CURRENT_FUNCTION; \
sMessage += "\ntype: "; \
- sMessage += ::rtl::OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() ); \
+ sMessage += ::rtl::OUStringToOString( caught.getValueTypeName(), osl_getThreadTextEncoding() ); \
::com::sun::star::uno::Exception exception; \
caught >>= exception; \
if ( exception.Message.getLength() ) \
{ \
sMessage += "\nmessage: "; \
- sMessage += ::rtl::OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() ); \
+ sMessage += ::rtl::OUStringToOString( exception.Message, osl_getThreadTextEncoding() ); \
} \
if ( exception.Context.is() ) \
{ \
@@ -74,6 +75,16 @@
sMessage += "\ncontext: "; \
sMessage += pContext; \
} \
+ { \
+ ::com::sun::star::configuration::CorruptedConfigurationException \
+ specialized; \
+ if ( caught >>= specialized ) \
+ { \
+ sMessage += "\ndetails: "; \
+ sMessage += ::rtl::OUStringToOString( \
+ specialized.Details, osl_getThreadTextEncoding() ); \
+ } \
+ } \
sMessage += "\n"; \
OSL_ENSURE( false, sMessage.getStr() )
More information about the Libreoffice-commits
mailing list