diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-01 21:06:41 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-07 09:18:08 +0200 |
| commit | 9a4d0bbdb55232efbda6492378714e2910f948f1 (patch) | |
| tree | a10c9787d63503f35f63b91b74f9b8373abd89d6 | |
| parent | 6d59210340cba4db7387e05eff302b59bd93dac3 (diff) | |
Prevent showing the dialog (and crashing) when tiled rendering.
Change-Id: I41d3294bb73b8c183a55e7cb6766ff38bc96418f
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 9b0eecb2abc2..a05430a03036 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -3246,9 +3246,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { case nsSelectionType::SEL_GRF: RstMBDownFlags(); - GetView().GetViewFrame()->GetBindings().Execute( - FN_FORMAT_GRAFIC_DLG, 0, 0, - SfxCallMode::RECORD|SfxCallMode::SLOT); + if (!rSh.isTiledRendering()) + { + GetView().GetViewFrame()->GetBindings().Execute( + FN_FORMAT_GRAFIC_DLG, 0, 0, + SfxCallMode::RECORD|SfxCallMode::SLOT); + } return; // double click on OLE object --> OLE-InPlace @@ -3262,8 +3265,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) case nsSelectionType::SEL_FRM: RstMBDownFlags(); - GetView().GetViewFrame()->GetBindings().Execute( - FN_FORMAT_FRAME_DLG, 0, 0, SfxCallMode::RECORD|SfxCallMode::SLOT); + if (!rSh.isTiledRendering()) + { + GetView().GetViewFrame()->GetBindings().Execute( + FN_FORMAT_FRAME_DLG, 0, 0, + SfxCallMode::RECORD|SfxCallMode::SLOT); + } return; case nsSelectionType::SEL_DRW: |