[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

Caolán McNamara caolanm at redhat.com
Tue Apr 9 06:57:41 PDT 2013


 sc/source/ui/view/cellsh2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e147d836c753280842463326759c9fdb56ff83a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 9 14:02:17 2013 +0100

    Resolves: fdo#61948 delayed delete deletes nothing under windows
    
    The reason there appears to be two dialogs, is because there
    actually is. The original dialog doesn't get deleted under
    windows.
    
    If we use the actual returned type of the dialog here rather than a lower
    baseclass then the right thing happens. Original code works under Linux but not
    Windows.
    
    Change-Id: Iaf99fa4e16f743b1f5a3d29f42a140491f3d67b0
    (cherry picked from commit afb3af7ce5fef803d42a549095863e6bb8210ef2)
    Reviewed-on: https://gerrit.libreoffice.org/3288
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 1ab57f6..0e4a720 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -178,7 +178,7 @@ namespace
 {
     long DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ )
     {
-        delete reinterpret_cast<VclAbstractDialog*>( pAbstractDialog );
+        delete reinterpret_cast<SfxAbstractTabDialog*>( pAbstractDialog );
         return 0;
     }
 }


More information about the Libreoffice-commits mailing list