android/source/res/values-ast/strings.xml | 2 +-
android/source/res/values-pt-rBR/strings.xml | 2 +-
chart2/source/inc/InternalData.hxx | 1 +
chart2/source/tools/InternalData.cxx | 20 +++++++++++++++++---
chart2/source/tools/InternalDataProvider.cxx | 2 +-
5 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit 743aec309be41188d87e129a3c246c86f1c796b7
Author: Weblate <nore...@documentfoundation.org>
AuthorDate: Wed Apr 9 13:53:49 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Apr 10 19:38:53 2025 +0200
android-viewer translated using Weblate
Portuguese (Brazil) currently translated at 100.0% (116 of 116 strings)
Change-Id: I37ea0a16ae9196cc706cd4113e9ee09052ab62e1
android-viewer translated using Weblate
Asturian currently translated at 100.0% (116 of 116 strings)
Change-Id: I8848f5e3944243ffe6a011785f0b037b24a649ab
Co-authored-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Co-authored-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Co-authored-by: Weblate <nore...@documentfoundation.org>
Translate-URL:
https://translations.documentfoundation.org/projects/android-viewer/android-strings-25-2/ast/
Translate-URL:
https://translations.documentfoundation.org/projects/android-viewer/android-strings-25-2/pt_BR/
Translation: android-viewer/android-strings-25-2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183926
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/android/source/res/values-ast/strings.xml
b/android/source/res/values-ast/strings.xml
index 6578a9d7d028..ffffb90c8f4a 100644
--- a/android/source/res/values-ast/strings.xml
+++ b/android/source/res/values-ast/strings.xml
@@ -70,7 +70,7 @@
<string name="calc_adjust_height">Axustar l\'altor</string>
<string name="calc_alert_double_click_optimal_length">Conseyu: Tocar dos
vegaes na testera define l\'anchor/altor óptimu.</string>
<string name="select_photo_title">Esbillar una imaxe</string>
- <string name="no_camera_found">Nun s\'atopó denguna cámara</string>
+ <string name="no_camera_found">Nun s\'atopó nenguna cámara</string>
<string name="compress_photo_smallest_size">Tamañu menor</string>
<string name="compress_photo_medium_size">Tamañu mediu</string>
<string name="compress_photo_max_quality">Calidá máxima</string>
diff --git a/android/source/res/values-pt-rBR/strings.xml
b/android/source/res/values-pt-rBR/strings.xml
index b6117c1522a6..1341b64d9e2a 100644
--- a/android/source/res/values-pt-rBR/strings.xml
+++ b/android/source/res/values-pt-rBR/strings.xml
@@ -26,7 +26,7 @@
<string name="message_saving">Salvando o arquivo…</string>
<string name="action_about">Sobre</string>
<string name="action_parts">Partes</string>
- <string name="action_settings">Confirgurações</string>
+ <string name="action_settings">Configurações</string>
<string name="action_keyboard">Mostrar teclado</string>
<string name="action_save">Salvar</string>
<string name="action_save_as">Salvar como…</string>
commit 606003715b7b7f1f145194f8cf9fa7feda0f0efc
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Tue Apr 8 18:02:31 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Apr 10 19:38:49 2025 +0200
tdf#165230 chart: fix multiplying row labels in innerdatatable
We only need to handle category labels as multilevel labels.
regression from: fa0a981af41a2606541eec1cb20a379a739691e0
(DOCX chart import: fix missing complex categories)
Change-Id: I0958d87f315ddbe5cf2721a75a969abb09f4dc34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183858
Tested-by: Jenkins
Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
(cherry picked from commit 8815270721053233e32c8f4f6ad50f56b55b1469)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183962
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/chart2/source/inc/InternalData.hxx
b/chart2/source/inc/InternalData.hxx
index 9d9abeb3a7c0..1d52df4566c7 100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -44,6 +44,7 @@ public:
void setComplexColumnLabel( sal_Int32 nColumnIndex, std::vector<
css::uno::Any >&& rComplexLabel );
void setComplexRowLabel( sal_Int32 nRowIndex, std::vector< css::uno::Any
>&& rComplexLabel );
+ void setComplexCategoryLabel( sal_Int32 nRowIndex, std::vector<
css::uno::Any >&& rComplexLabel );
std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex
) const;
std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex )
const;
diff --git a/chart2/source/tools/InternalData.cxx
b/chart2/source/tools/InternalData.cxx
index c0cddac8bb82..a0f5f087d09c 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -221,10 +221,24 @@ void InternalData::setComplexRowLabel( sal_Int32
nRowIndex, std::vector< uno::An
m_aRowLabels.resize(nRowIndex+1);
enlargeData( 0, nRowIndex+1 );
}
- sal_Int32 nSize = static_cast<sal_Int32>( m_aRowLabels[nRowIndex].size() );
- if( nSize >= 1 && !rComplexLabel.empty() )
+ m_aRowLabels[nRowIndex] = std::move(rComplexLabel);
+
+ dump();
+}
+
+void InternalData::setComplexCategoryLabel(sal_Int32 nRowIndex, std::vector<
uno::Any >&& rComplexLabel)
+{
+ if (nRowIndex < 0)
+ return;
+ if (o3tl::make_unsigned(nRowIndex) >= m_aRowLabels.size())
+ {
+ m_aRowLabels.resize(nRowIndex + 1);
+ enlargeData(0, nRowIndex + 1);
+ }
+ sal_Int32 nSize = static_cast<sal_Int32>(m_aRowLabels[nRowIndex].size());
+ if (nSize >= 1 && !rComplexLabel.empty())
{
- m_aRowLabels[nRowIndex].resize(nSize+1);
+ m_aRowLabels[nRowIndex].resize(nSize + 1);
m_aRowLabels[nRowIndex][nSize] = rComplexLabel[0];
}
else
diff --git a/chart2/source/tools/InternalDataProvider.cxx
b/chart2/source/tools/InternalDataProvider.cxx
index 157c7cbca336..b7a95b5ecb09 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -628,7 +628,7 @@ InternalDataProvider::createDataSequenceFromArray( const
OUString& rArrayStr, st
}
std::vector<uno::Any> aLabels(1,
bStoreNumeric ? uno::Any(fValue) : uno::Any(aRawElems[i]));
- m_aInternalData.setComplexRowLabel(i, std::move(aLabels));
+ m_aInternalData.setComplexCategoryLabel(i, std::move(aLabels));
}
xSeq.set(new UncachedDataSequence(this, lcl_aCategoriesRangeName));
