diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2021-06-16 11:02:48 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-06-28 10:41:09 +0200 |
| commit | 65070087508f176a2a65a0cfbe628ab2994e824f (patch) | |
| tree | b547081140077a64cdd0f2149bd45fc6ef96a335 /oox | |
| parent | caa0bccff18c2a6b67b97a3617109bdd7455dd2a (diff) | |
tdf#142646 PPTX import: count repeating slide names
instead of using the default slide name "Slide n".
PPTX slides are named after their titles. Now repeating
titles got a number instead of using the default slide
name "Slide n". E.g. "Title", "Title", "Title" will be
slide names "Title", "Title (2)", Title (3)", and not
"Title", "Slide 2", "Slide 3".
Follow-up to commit I98511c3c9a59598ea113e7387db5202d7f8a7cd4
"tdf#103347: PTX import: fix duplicated slide name"
Change-Id: I449d6f7d7599291b3dae7df65ad6ff86a4269fb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117317
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 253bee65bc24d999c3629a4d503d0fa01b355cfc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117972
Tested-by: Jenkins
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 1756ad9e32ab..563454aaaf66 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -339,6 +339,7 @@ void PPTShape::addShape( { try { + sal_Int32 nCount = 1; OUString aTitleText; Reference<XTextRange> xText(xShape, UNO_QUERY_THROW); aTitleText = xText->getString(); @@ -349,17 +350,23 @@ void PPTShape::addShape( // just a magic value, but we don't want to set slide names which are too long aTitleText.getLength() < 64; // check duplicated title name - for (sal_uInt32 nPage = 0; bUseTitleAsSlideName && nPage < nMaxPages; ++nPage) - { - Reference<XDrawPage> xDrawPage(xDrawPages->getByIndex(nPage), uno::UNO_QUERY); - Reference<container::XNamed> xNamed(xDrawPage, UNO_QUERY_THROW); - if ( xNamed->getName() == aTitleText ) - bUseTitleAsSlideName = false; - } - if ( bUseTitleAsSlideName ) + if (bUseTitleAsSlideName) { + for (sal_uInt32 nPage = 0; nPage < nMaxPages; ++nPage) + { + Reference<XDrawPage> xDrawPage(xDrawPages->getByIndex(nPage), uno::UNO_QUERY); + Reference<container::XNamed> xNamed(xDrawPage, UNO_QUERY_THROW); + OUString sRest; + if (xNamed->getName().startsWith(aTitleText, &sRest) + && (sRest.isEmpty() + || (sRest.startsWith(" (") && sRest.endsWith(")") + && sRest.copy(2, sRest.getLength() - 3).toInt32() > 0))) + nCount++; + } Reference<container::XNamed> xName(rSlidePersist.getPage(), UNO_QUERY_THROW); - xName->setName(aTitleText); + xName->setName( + aTitleText + + (nCount == 1 ? OUString("") : " (" + OUString::number(nCount) + ")")); } } catch (uno::Exception&) |