[Libreoffice-commits] core.git: sd/source

[Noel Grandin]

 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e8ac831bd6d5f2524bab826bfbedf23f8952bbce
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Aug 16 14:41:23 2016 +0300

    Fix 'AddressSanitizer: container-overflow' problem detected on OS X
    
    Patch by Noel. Committed and this message written by tml, who doesn't
    fully understand what the code does, but this definitely fixes the
    problem.
    
    Change-Id: Ifdc9faac0323028fa2888eb4a2d68e6ae5a905ae

diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index 5ee7f9d..ae6aa3a 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -165,8 +165,8 @@ void ConfigurationControllerBroadcaster::DisposeAndClear()
         }
         else
         {
-            Reference<lang::XEventListener> xListener (
-                iMap->second.front().mxListener, UNO_QUERY);
+            Reference<XConfigurationChangeListener> xListener (
+                iMap->second.front().mxListener );
             if (xListener.is())
             {
                 // Tell the listener that the configuration controller is
@@ -174,7 +174,7 @@ void ConfigurationControllerBroadcaster::DisposeAndClear()
                 // types).
                 try
                 {
-                    RemoveListener(iMap->second.front().mxListener);
+                    RemoveListener(xListener);
                     xListener->disposing(aEvent);
                 }
                 catch (const RuntimeException&)