From fef86c3601bfabc28f2c5baedf27b4cf50845f40 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Thu, 5 Mar 2009 21:18:42 +0000
Subject: 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

---
 framework/source/accelerators/acceleratorconfiguration.cxx     | 6 ++++--
 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">
-- 
cgit v1.2.3