diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-03-06 08:23:39 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-03-06 08:23:39 +0000 |
commit | 53d6a16a262b21780593a8a41a3a22cb291e86c6 (patch) | |
tree | b8e08e22de8b6fb7070d094476abf1810cac1474 /framework | |
parent | 33b338ab44c7c089bfedc3a90cc1d4c65d77ecbe (diff) |
CWS-TOOLING: integrate CWS fwk104_DEV300
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
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index b0e477d17d1f..330edb9c809a 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); } } |