summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-06 08:23:39 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-06 08:23:39 +0000
commitf5bba36f32ab6309563611a8db27dc9974479249 (patch)
tree5fa3a4581cbafc583e7c76f139e092b78449c00f /framework/source
parentfc5c23be2a2e4218e37814514de461eb57314998 (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/source')
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx6
1 files changed, 4 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);
}
}