[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/func/futransf.cxx |    3 +--
 sd/source/ui/view/drviews2.cxx |    4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fc3ba80047a12c8577fc695e58fc8cb576777d83
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Dec 16 12:42:05 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 17 12:01:08 2020 +0100

    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/+/107799
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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 279eb753af57..4178150e872a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1485,7 +1485,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();