diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-16 12:42:05 +0000 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-12-17 13:51:49 +0100 |
| commit | 594a27f191347fadf25ddf795b4f68263ef8abb2 (patch) | |
| tree | 995926338482ca6dd99a8a80c4e6374415a1881d /sd | |
| parent | 871940eba642bec3cc263b48048ee4ffbf8a6c0f (diff) | |
tdf#138963 Clicking the position statusbar box disables selection
if there is no object selected, since...
commit d3dbbdce4eb71ae848e7682374e011c4a6129b15
Date: Wed Jan 17 15:20:31 2018 +0100
lokdialog: Convert the Format -> ... -> Position and Size... to async exec.
Change-Id: Idcdbfb1366db61e247c31eab5cb27a39978b0fd9
Change-Id: I959789b055a880ac4c48a863c17eb6769b322577
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107800
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/futransf.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 4984c675ec4c..fa7398e48b43 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -106,8 +106,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) bWelded = true; } - if (!pDlg) - return; + assert(pDlg && "there must be a dialog at this point"); auto pRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 58cd5e5297b2..ae0f01121d63 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1461,7 +1461,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_TRANSFORM: { SetCurrentFunction( FuTransform::Create( this, GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq ) ); - if (rReq.GetArgs()) + // tdf#138963 conditions tested for here must be the same as those + // of the early returns from FuTransform::DoExecute + if (rReq.GetArgs() || !mpDrawView->AreObjectsMarked()) { Invalidate(SID_RULER_OBJECT); Cancel(); |