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

[Nagy Tibor (via logerrit)]

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

New commits:
commit a5c4cf44a46e5e7e7f0ccbbd17899e599dfcb837
Author:     Nagy Tibor <tibor.n...@collabora.com>
AuthorDate: Fri Jul 11 10:21:13 2025 +0200
Commit:     Nagy Tibor <tibor.n...@collabora.com>
CommitDate: Sun Jul 13 17:44:14 2025 +0200

    Revert "sw: add fallback for page styles using UIName identifiers"
    
    This reverts commit 09804b8a8b6dd41e2e17ab25f5ce6b6d90b14633.
    
    Reason for revert: The issue was on the extension side.
    It used the UI name for the page style instead of the programmatic name.
    
    Change-Id: If0ac25c6bc1fe9e246fa16cf1646c5f94a363e23
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187679
    Tested-by: Jenkins
    Reviewed-by: Nagy Tibor <tibor.n...@collabora.com>

diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx 
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 744af301744a..783a2c789162 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -316,10 +316,8 @@ void SwStyleNameMapper::FillUIName(
     {
         rFillName = UIName(aName.toString());
         // TabStyle: unfortunately ODF documents with UIName table styles exist
-        // 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)
+        if (eFlags == SwGetPoolIdFromName::TableStyle || // see testTdf129568ui
+            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);