diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-03-05 21:18:42 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-03-05 21:18:42 +0000 |
commit | fef86c3601bfabc28f2c5baedf27b4cf50845f40 (patch) | |
tree | 166aee0c468702e330fcb9c49ef903cf8e32863b | |
parent | 66d767f3b9f545ead05b6089fad01fa13b1c384f (diff) |
CWS-TOOLING: integrate CWS fwk104
2009-03-05 14:05:04 +0100 msc r268903 : #i99921#
2009-03-04 11:12:23 +0100 cd r268798 : #i99768# Create empty set for report designer to get correct notifications
2009-03-04 11:07:51 +0100 cd r268797 : #i99768# Fix crash due to strange configuration notifications
-rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 6 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 7d069e54d1..a2c52e9c83 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -1205,7 +1205,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: { ::rtl::OUString sModule; sKey = ::utl::extractFirstFromConfigurationPath(sPath); - reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); + if ( sKey.getLength() )
+ reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
} else if ( sGlobalModules.equals(CFG_ENTRY_MODULES) ) { @@ -1213,7 +1214,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: ::rtl::OUString sDropModule = ::rtl::OUString::createFromAscii("Module['") + sModule + ::rtl::OUString::createFromAscii("']"); sPath = ::utl::dropPrefixFromConfigurationPath(sPath, sDropModule); sKey = ::utl::extractFirstFromConfigurationPath(sPath); - reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); + if ( sKey.getLength() )
+ reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); } } diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index b22f4138b9..d5bbef399a 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -5202,6 +5202,7 @@ </prop> </node> </node> + <node oor:name="com.sun.star.report.ReportDefinition" oor:op="replace"/> </node> </node> <node oor:name="SecondaryKeys"> |