Attachment 108660 Details for Bug 85562 – patch

patch

patch_85562.txt (text/plain), 1.19 KB, created by Julien Nabet on 2014-10-29 22:38:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Nabet

Created: 2014-10-29 22:38:49 UTC

Size: 1.19 KB

patch

obsolete

>diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
>index 484a551..fec7e86 100644
>--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
>+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
>@@ -211,24 +211,24 @@ bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton,
>     FieldDeletionModify aModify(pDlg.get());
>     SwInputField *const pInputField(dynamic_cast<SwInputField*>(pFld));
>     SwSetExpField *const pSetExpFld(dynamic_cast<SwSetExpField*>(pFld));
>-    if (pInputField)
>+    if (pInputField && pInputField->GetFmtFld())
>     {
>         // Register for possible input field deletion while dialog is open
>         pInputField->GetFmtFld()->Add(&aModify);
>     }
>-    else if (pSetExpFld)
>+    else if (pSetExpFld && pSetExpFld->GetFmtFld())
>     {
>         pSetExpFld->GetFmtFld()->Add(&aModify);
>     }
> 
>     bool bRet = RET_CANCEL == pDlg->Execute();
> 
>-    if (pInputField)
>+    if (pInputField && pInputField->GetFmtFld())
>     {
>         // Dialog closed, remove modification listener
>         pInputField->GetFmtFld()->Remove(&aModify);
>     }
>-    else if (pSetExpFld)
>+    else if (pSetExpFld && pSetExpFld->GetFmtFld())
>     {
>         pSetExpFld->GetFmtFld()->Remove(&aModify);
>     }

Actions: View

Attachments on bug 85562: 108574 | 108660

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.