[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Ivan Timofeev]

 sw/source/ui/misc/glossary.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9b82bd95224203f62cf8d26f2af98888f915e85e
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Thu Aug 8 10:46:25 2013 +0400

    fdo#67817: GetParent returns a VclGrid instance after conversion to .ui
    
    Change-Id: Ib37e2de784823fec209c195963d925748412c692
    (cherry picked from commit a0bbc768a5fac2c3d27cd70877961561fe7f0ffa)
    Reviewed-on: https://gerrit.libreoffice.org/5310
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 3494051..e39d6bf 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -919,7 +919,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag(
         eRet = SV_DRAGDROP_NONE;
     else
     {
-        SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+        SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
         SvTreeListEntry* pParent = GetParent(pEntry);
 
         GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData();
@@ -967,7 +967,7 @@ sal_Bool  SwGlTreeListBox::NotifyMoving(   SvTreeListEntry*  pTarget,
     sal_Bool bRet = sal_False;
     if(pDestParent != pSrcParent)
     {
-        SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+        SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
         SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), sal_True );
 
         GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();
@@ -1013,7 +1013,7 @@ sal_Bool  SwGlTreeListBox::NotifyCopying(   SvTreeListEntry*  pTarget,
     sal_Bool bRet = sal_False;
     if(pDestParent != pSrcParent)
     {
-        SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent();
+        SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
         SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), sal_True );
 
         GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();