summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-12 21:18:29 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-02-20 11:56:40 +0000
commit2190facc78a9e882558be7a9ffdd35f4df6222c1 (patch)
tree72b7e0c8a6d8b9bcfa41c5f89583f9b3e1b895e4
parentc6f09d55596c3e872133f319984bff20b1399407 (diff)
Resolves: tdf#89227 if no SwView then disable accept/reject change buttons
e.g. if the context is an embedded draw ole then we don't have a SwView Change-Id: I6ba07f0ecf1c419e45f7e0ac628a82e6bd486668 (cherry picked from commit 25dd3d277e9b90a59e7b2a03202ef0cba7799b68) Reviewed-on: https://gerrit.libreoffice.org/14456 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx18
1 files changed, 14 insertions, 4 deletions
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index fc993a8c32eb..550b692d1d2f 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -95,7 +95,6 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg(
void SwModelessRedlineAcceptDlg::Activate()
{
SwView *pView = ::GetActiveView();
-
if (!pView) // can happen when switching to another app, when a Listbox in dialog
return; // had the focus previously (actually THs Bug)
@@ -158,6 +157,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, bool bAutoFmt) :
{
aTabPagesCTRL.SetHelpId(HID_REDLINE_CTRL);
pTPView = aTabPagesCTRL.GetViewPage();
+
pTable = pTPView->GetTableControl();
pTPView->InsertWriterHeader();
@@ -166,6 +166,11 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, bool bAutoFmt) :
pTPView->SetRejectClickHdl(LINK(this, SwRedlineAcceptDlg, RejectHdl));
pTPView->SetRejectAllClickHdl(LINK(this, SwRedlineAcceptDlg, RejectAllHdl));
pTPView->SetUndoClickHdl(LINK(this, SwRedlineAcceptDlg, UndoHdl));
+ //tdf#89227 default to disabled, and only enable if possible to accept/reject
+ pTPView->EnableAccept(false);
+ pTPView->EnableReject(false);
+ pTPView->EnableAcceptAll(false);
+ pTPView->EnableRejectAll(false);
aTabPagesCTRL.GetFilterPage()->SetReadyHdl(LINK(this, SwRedlineAcceptDlg, FilterChangedHdl));
@@ -354,9 +359,14 @@ void SwRedlineAcceptDlg::Activate()
return;
SwView *pView = ::GetActiveView();
-
- if (!pView) // can happen when switching to another app, when a Listbox in the dialog
- return; // had the focus previously (actually THs Bug)
+ if (!pView) // can happen when switching to another app
+ {
+ pTPView->EnableAccept(false);
+ pTPView->EnableReject(false);
+ pTPView->EnableAcceptAll(false);
+ pTPView->EnableRejectAll(false);
+ return; // had the focus previously
+ }
SwWait aWait( *pView->GetDocShell(), false );