[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - sc/source translations

[Henry Castro (via logerrit)]

 sc/source/filter/inc/condformatbuffer.hxx |    2 ++
 sc/source/filter/oox/condformatbuffer.cxx |   12 ++++++++++++
 translations                              |    2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit aa64ecc00d4e026164d69c6764f6a4c88a1aa96a
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Fri Mar 17 15:07:42 2023 -0400
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Jun 19 13:36:34 2023 +0200

    sc: filter: oox: update databar format before clone
    
    The ScDataBarFormatData should update from import (finalizeImport)
    before cloning, otherwise it loose data.
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I4af8b79e93eed8091bf01244bacac1d12e591c45
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149068
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153068
    Tested-by: Jenkins
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153249

diff --git a/sc/source/filter/inc/condformatbuffer.hxx 
b/sc/source/filter/inc/condformatbuffer.hxx
index fd4268773313..a1cc7bb81381 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -271,6 +271,7 @@ public:
     void importAxisColor(  const AttributeList& rAttribs );
     void importCfvo(  const AttributeList& rAttribs );
     ExCfRuleModel& getModel() { return maModel; }
+    const ScDataBarFormatData* GetDataBarData() { return mpTarget; }
 };
 
 class ExtCfCondFormat
@@ -311,6 +312,7 @@ public:
     void                finalizeImport();
 private:
     CondFormatRef       createCondFormat();
+    void                updateImport(const ScDataBarFormatData* pTarget);
 
 private:
     typedef RefVector< CondFormat > CondFormatVec;
diff --git a/sc/source/filter/oox/condformatbuffer.cxx 
b/sc/source/filter/oox/condformatbuffer.cxx
index 4f0531a18faa..4ce1ca7fc257 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1199,6 +1199,16 @@ public:
 
 }
 
+void CondFormatBuffer::updateImport(const ScDataBarFormatData* pTarget)
+{
+    for ( const auto& rRule : maCfRules )
+    {
+        if ( rRule && rRule->GetDataBarData() == pTarget )
+            rRule->finalizeImport();
+    }
+}
+
+
 void CondFormatBuffer::finalizeImport()
 {
     std::unordered_set<size_t> aDoneExtCFs;
@@ -1226,6 +1236,8 @@ void CondFormatBuffer::finalizeImport()
             for (const auto& rxEntry : rEntries)
             {
                 CondFormatRuleRef xRule = rCondFormat.createRule();
+                if (ScDataBarFormat *pData = 
dynamic_cast<ScDataBarFormat*>(rxEntry.get()))
+                    updateImport(pData->GetDataBarData());
                 ScFormatEntry* pNewEntry = rxEntry->Clone(pDoc);
                 sal_Int32 nPriority = rPriorities[nEntryIdx];
                 if (nPriority == -1)
commit d48c5a9d1db0db52c72aff774bf0039634009bfb
Author:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Jun 19 13:36:27 2023 +0200
Commit:     Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Mon Jun 19 13:36:27 2023 +0200

    Update git submodules
    
    * Update translations from branch 'libreoffice-7-6'
      to 9baf6fe8f472c82da8663d0857389562f300bfb0
      - update translations for master/7.6
    
        and force-fix errors using pocheck
    
        Change-Id: I49fa67ebe7d8c3ec8f411920017667c1ae1875be
        (cherry picked from commit 25766b4c4f5fe4e28a338f318013d1097228516d)

diff --git a/translations b/translations
index cb90d7d76f41..9baf6fe8f472 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit cb90d7d76f41144d06991b9623999e2666d2f39b
+Subproject commit 9baf6fe8f472c82da8663d0857389562f300bfb0