[Libreoffice-commits] core.git: 2 commits - include/sfx2 sc/source sw/inc sw/source

[Heiko Tietze (via logerrit)]

 include/sfx2/tabdlg.hxx        |    1 +
 sc/source/ui/view/viewfun2.cxx |    7 +++----
 sw/inc/strings.hrc             |    2 ++
 sw/source/ui/fmtui/tmpdlg.cxx  |    5 +++++
 4 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 7838c4a955eaccd625116fa1508d66f7fd2a95da
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Tue Mar 2 11:43:54 2021 +0100
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Tue Mar 2 15:37:16 2021 +0100

    Related tdf#128469 - Change label of Standard button
    
    Change-Id: I1bfc7cbfa71cf76d1cd76db83d8a7f951535e47e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111821
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    Tested-by: Jenkins

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 2c3352785f31..9afebad1ba58 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -138,6 +138,7 @@ public:
 
     virtual weld::Button& GetOKButton() const override { return *m_xOKBtn; }
     weld::Button&       GetCancelButton() const { return *m_xCancelBtn; }
+    weld::Button&       GetStandardButton() const { return *m_xBaseFmtBtn; }
     weld::Button*       GetUserButton() const { return m_xUserBtn.get(); }
     void                RemoveResetButton();
     void                RemoveStandardButton();
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 3b5da067e5d6..45fe987ddf3e 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -23,6 +23,8 @@
 #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 #define NNC_(Context, StringSingular, StringPlural) reinterpret_cast<char const *>(Context "\004" u8##StringSingular "\004" u8##StringPlural)
 
+
+#define STR_STANDARD_ACTION                     NC_("STR_STANDARD_ACTION", "Set to ~Parent")
 // Format names
 #define STR_POOLCHR_STANDARD                    NC_("STR_POOLCHR_STANDARD", "Default Character Style")
 #define STR_POOLCHR_FOOTNOTE                    NC_("STR_POOLCHR_FOOTNOTE", "Footnote Characters")
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index b87107fd8299..ae69c35093d3 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -47,6 +47,7 @@
 #include <poolfmt.hxx>
 #include <uitool.hxx>
 #include <shellres.hxx>
+#include <strings.hrc>
 
 #include <cmdid.h>
 #include <SwStyleNameMapper.hxx>
@@ -75,6 +76,10 @@ SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent,
 {
     nHtmlMode = ::GetHtmlMode(pWrtShell->GetView().GetDocShell());
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+
+    weld::Button& pStandardButton(GetStandardButton());
+    pStandardButton.set_label(SwResId(STR_STANDARD_ACTION));
+
     // stitch TabPages together
     switch( nRegion )
     {
commit a2d5b5224aff4358865e73c3c0f67d47ce4b9b99
Author:     Noel <noel.grandin at collabora.co.uk>
AuthorDate: Tue Mar 2 12:44:14 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Mar 2 15:37:07 2021 +0100

    Revert "tdf#43175: Adapt ranges when copying or moving several sheets"
    
    because it causes failure in the tdf101894 part of UITest_chart
    
    This reverts commit 3078044653f1e1b0a055c47eeb8d27834c07268a.
    
    Change-Id: If187b7a1125eb6f85bb7329bd9029dc8236a85f7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111822
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 814e3a05b7b3..112226405232 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -3084,10 +3084,6 @@ void ScViewFunc::MoveTable(
                     nDestTab1=nTabCount;
                 }
             }
-            //If sheets are copied or renamed when moved, the references to the data inside the sheets have to be adapted
-            if (bCopy || bRename)
-                ScChartHelper::AdjustRangesOfChartsOnDestinationPage(rDoc, rDestDoc, nMovTab,
-                                                                     nDestTab1);
 
             pDestTabs->push_back(nDestTab1);
         }
@@ -3137,6 +3133,9 @@ void ScViewFunc::MoveTable(
 
         SetTabNo( nNewTab, true );
 
+        //#i29848# adjust references to data on the copied sheet
+        if( bCopy )
+            ScChartHelper::AdjustRangesOfChartsOnDestinationPage( rDoc, rDestDoc, nTab, nNewTab );
     }
 }