diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
| commit | 5a7157d319477830426797532e02ac39d3b859f4 (patch) | |
| tree | 3773f5ce209bee14a5643e98672e0f3828c71434 /chart2 | |
| parent | Releasing progress-linux version 4:24.2.0-3~progress7.99u1. (diff) | |
| download | libreoffice-5a7157d319477830426797532e02ac39d3b859f4.tar.xz libreoffice-5a7157d319477830426797532e02ac39d3b859f4.zip | |
Merging upstream version 4:24.2.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 11 | ||||
| -rw-r--r-- | chart2/qa/extras/data/pptx/tdf146487.pptx | bin | 0 -> 33891 bytes | |||
| -rw-r--r-- | chart2/source/controller/main/ShapeController.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/tools/CharacterProperties.cxx | 2 |
4 files changed, 14 insertions, 1 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index f7324c9475..7c24ff6110 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -1979,6 +1979,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf121205) CPPUNIT_ASSERT_EQUAL(OUString("Firstline\nSecondline\nThirdline"), aTitle); } +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146487) +{ + loadFromFile(u"pptx/tdf146487.pptx"); + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + + Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); + uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); + CPPUNIT_ASSERT_MESSAGE("chart doc should not have a title", !xTitle.is()); +} + CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel) { // Bar chart area size is fixed (not automatic) so we can't resize diff --git a/chart2/qa/extras/data/pptx/tdf146487.pptx b/chart2/qa/extras/data/pptx/tdf146487.pptx Binary files differnew file mode 100644 index 0000000000..2a78ae5d85 --- /dev/null +++ b/chart2/qa/extras/data/pptx/tdf146487.pptx diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 97715b07c2..115229de0e 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -440,7 +440,7 @@ void ShapeController::executeDispatch_RenameObject() if ( pDlg->Execute() == RET_OK ) { pDlg->GetName(aName); - if (pSelectedObj->GetName() == aName) + if (pSelectedObj->GetName() != aName) { pSelectedObj->SetName( aName ); } diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 7669d3245a..bf44c6a4c0 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -37,6 +37,7 @@ #include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> #include <vcl/outdev.hxx> +#include <vcl/svapp.hxx> using namespace ::com::sun::star; @@ -340,6 +341,7 @@ void CharacterProperties::AddPropertiesToVector( void CharacterProperties::AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ) { + SolarMutexGuard aGuard; const float fDefaultFontHeight = 13.0; SvtLinguConfig aLinguConfig; |