[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 3 commits - framework/source svx/source vcl/source

[Caolán McNamara (via logerrit)]

 framework/source/services/autorecovery.cxx |   11 -----------
 svx/source/fmcomp/gridcell.cxx             |    8 +++++++-
 vcl/source/app/salvtables.cxx              |   12 ++++++++++--
 3 files changed, 17 insertions(+), 14 deletions(-)

New commits:
commit b6c3bc0ec40fdabf161427c53ac099d93b1305d1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 30 14:50:08 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Oct 5 06:22:11 2021 +0200

    WaE: 'else' branch doesn't make sense, dereferences null
    
    if xModel.is() is false then xModel->getCurrentController() is just going to
    crash.
    
    like this since it was introduced in
    
    commit eafba820349005ea5426cab58911f9ff99969966
    Date:   Tue Jan 5 22:32:38 2010 +0100
    
        autorecovery: define a new css.document.XDocumentRecovery interface, implement it in both SFX and DBACCESS, and use it in the autorecovery
    
    Change-Id: I8ea43a0679d43cb9b865ecae5260129d17b6a386
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122927
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit d800bc83539430815d4f6da103cb345614e532b7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122940

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index c7cdabb4e365..9762f93a286b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1967,17 +1967,6 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
                 aViewNames.push_back( sViewName );
         }
     }
-    else
-    {
-        const Reference< XController2 > xController( xModel->getCurrentController(), UNO_QUERY );
-        OUString sViewName;
-        if ( xController.is() )
-            sViewName = xController->getViewControllerName();
-        OSL_ENSURE( !sViewName.isEmpty(), "AutoRecovery::implts_collectActiveViewNames: (no XController2 ->) no view name -> no recovery of this view!" );
-
-        if ( !sViewName.isEmpty() )
-            aViewNames.push_back( sViewName );
-    }
 
     i_rInfo.ViewNames.realloc( aViewNames.size() );
     ::std::copy( aViewNames.begin(), aViewNames.end(), i_rInfo.ViewNames.getArray() );
commit 994c17db014f6b264fcf11c325880ad58ba8279b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 30 16:08:25 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Oct 5 06:22:11 2021 +0200

    Resolves: tdf#140992 Paste/Cut should mark Edit as modified
    
    Change-Id: Id56b5bf2e922394da7e730f4bab652808253c54e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122858
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Tested-by: Jenkins

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 888376ac0351..c1b514d03324 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3248,11 +3248,19 @@ Edit& SalInstanceEntry::getEntry() { return *m_xEntry; }
 
 void SalInstanceEntry::fire_signal_changed() { signal_changed(); }
 
-void SalInstanceEntry::cut_clipboard() { m_xEntry->Cut(); }
+void SalInstanceEntry::cut_clipboard()
+{
+    m_xEntry->Cut();
+    m_xEntry->Modify();
+}
 
 void SalInstanceEntry::copy_clipboard() { m_xEntry->Copy(); }
 
-void SalInstanceEntry::paste_clipboard() { m_xEntry->Paste(); }
+void SalInstanceEntry::paste_clipboard()
+{
+    m_xEntry->Paste();
+    m_xEntry->Modify();
+}
 
 namespace
 {
commit 9ff46a2c16ab4f507b65b3daa751c89265b2c8aa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 29 09:53:28 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Oct 5 06:22:10 2021 +0200

    Related: tdf#144139 use the classic size calculation
    
    Change-Id: Iac3f9fb9fd6f92f8b17b1f2822dbc9743528cea9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122801
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index ca14d5f0fea3..fd2b83fe9040 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1719,10 +1719,16 @@ void DbCheckBox::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect)
             TriState eState = static_cast<CheckBoxControl*>(m_pWindow.get())->GetState();
 
             MapMode aResMapMode(MapUnit::Map100thMM);
+            Size aImageSize = rDev.LogicToPixel(Size(300, 300), aResMapMode);
             Size aBrd1Size = rDev.LogicToPixel(Size(20, 20), aResMapMode);
             Size aBrd2Size = rDev.LogicToPixel(Size(30, 30), aResMapMode);
             int nCheckWidth = rDev.LogicToPixel(Size(20, 20), aResMapMode).Width();
-            tools::Rectangle aStateRect(rRect);
+
+            tools::Rectangle aStateRect;
+            aStateRect.SetLeft(rRect.Left() + ((rRect.GetWidth() - aImageSize.Width()) / 2));
+            aStateRect.SetTop(rRect.Top() + ((rRect.GetHeight() - aImageSize.Height()) / 2));
+            aStateRect.SetRight(aStateRect.Left() + aImageSize.Width() - 1);
+            aStateRect.SetBottom(aStateRect.Top() + aImageSize.Height() - 1);
 
             rDev.Push();
             rDev.SetMapMode();