core.git: Branch 'libreoffice-25-8' - sw/source

[Tibor Nagy (via logerrit)]

 sw/source/core/doc/SwStyleNameMapper.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 09804b8a8b6dd41e2e17ab25f5ce6b6d90b14633
Author:     Tibor Nagy <tibor.nagy.ext...@allotropia.de>
AuthorDate: Fri Jul 4 00:21:30 2025 +0200
Commit:     Nagy Tibor <tibor.n...@collabora.com>
CommitDate: Fri Jul 4 23:22:45 2025 +0200

    sw: add fallback for page styles using UIName identifiers
    
    Change-Id: I3cbbaaa54784f1b11a34c7711df12770885ffb8f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187354
    Tested-by: Jenkins
    Reviewed-by: Nagy Tibor <tibor.n...@collabora.com>
    (cherry picked from commit edc6bd92c937aab0403c29e6f960da51cf5e75d2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187356

diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx 
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 783a2c789162..744af301744a 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -316,8 +316,10 @@ void SwStyleNameMapper::FillUIName(
     {
         rFillName = UIName(aName.toString());
         // TabStyle: unfortunately ODF documents with UIName table styles exist
-        if (eFlags == SwGetPoolIdFromName::TableStyle || // see testTdf129568ui
-            GetPoolIdFromUIName(UIName(aName.toString()), eFlags) == USHRT_MAX)
+        // PageDesc: same problem as TableStyle, page styles using UINames 
exist
+        if (eFlags == SwGetPoolIdFromName::TableStyle // see testTdf129568ui
+            || eFlags == SwGetPoolIdFromName::PageDesc
+            || GetPoolIdFromUIName(UIName(aName.toString()), eFlags) == 
USHRT_MAX)
         {
             // aName isn't in our Prog name table...check if it has a " 
(user)" suffix, if so remove it
             lcl_CheckSuffixAndDelete(rFillName);