sw/source/core/swg/SwXMLBlockExport.cxx | 12 ++++--------
sw/source/uibase/config/StoredChapterNumbering.cxx | 15 +++++----------
vcl/win/gdi/salnativewidgets-luna.cxx | 1 +
3 files changed, 10 insertions(+), 18 deletions(-)
New commits:
commit c650a96d0c5ec69e937bf12ad05b032802997c7a
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jun 1 11:41:21 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jun 1 14:26:55 2025 +0200
Remove XML_NAMESPACE_NONE noise from sw
Change-Id: I7708f23f2e758b2f1ba649652f9ba22c7a64f4f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186098
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx
b/sw/source/core/swg/SwXMLBlockExport.cxx
index 33c4cfa142df..4c8243a0660e 100644
--- a/sw/source/core/swg/SwXMLBlockExport.cxx
+++ b/sw/source/core/swg/SwXMLBlockExport.cxx
@@ -48,8 +48,7 @@ ErrCode SwXMLBlockListExport::exportDoc(enum XMLTokenEnum )
addChaffWhenEncryptedStorage();
- AddAttribute ( XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey (
XML_NAMESPACE_BLOCKLIST ),
+ AddAttribute ( GetNamespaceMap_().GetAttrNameByKey (
XML_NAMESPACE_BLOCKLIST ),
GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_BLOCKLIST )
);
AddAttribute( XML_NAMESPACE_BLOCKLIST,
XML_LIST_NAME,
@@ -104,14 +103,11 @@ void SwXMLTextBlockExport::exportDoc(std::u16string_view
rText)
addChaffWhenEncryptedStorage();
- AddAttribute ( XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey (
XML_NAMESPACE_BLOCKLIST ),
+ AddAttribute ( GetNamespaceMap_().GetAttrNameByKey (
XML_NAMESPACE_BLOCKLIST ),
GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_BLOCKLIST )
);
- AddAttribute ( XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_TEXT ),
+ AddAttribute ( GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_TEXT ),
GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_TEXT ) );
- AddAttribute ( XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_OFFICE
),
+ AddAttribute ( GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_OFFICE
),
GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_OFFICE ) );
AddAttribute( XML_NAMESPACE_BLOCKLIST,
XML_LIST_NAME,
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx
b/sw/source/uibase/config/StoredChapterNumbering.cxx
index b39580853040..bcd30627029f 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -210,20 +210,15 @@ public:
{
GetDocHandler()->startDocument();
- AddAttribute(XML_NAMESPACE_NONE,
-
GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_OFFICE),
+ AddAttribute(
GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_OFFICE),
GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_OFFICE));
- AddAttribute(XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey (XML_NAMESPACE_TEXT),
+ AddAttribute( GetNamespaceMap_().GetAttrNameByKey (XML_NAMESPACE_TEXT),
GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_TEXT));
- AddAttribute(XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_STYLE),
+ AddAttribute( GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_STYLE),
GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_STYLE));
- AddAttribute(XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_FO),
+ AddAttribute( GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_FO),
GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_FO));
- AddAttribute(XML_NAMESPACE_NONE,
- GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_SVG),
+ AddAttribute( GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_SVG),
GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_SVG));
{
commit 54802cdceb9ff3903b4be1b81638b75fdbfb21f4
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jun 1 13:31:55 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jun 1 14:26:44 2025 +0200
tdf#166811: let CHILDREN_ON_DEMAND entries draw collapsed in vcl/win
This broke after commit dad7593cf6bb91ecf95153e983723dd2cd03b469
(GetDontKnowNodeBmp is always empty, 2022-05-11), before which, the
value of `ButtonValue::DontKnow` was never set to entries. Of course,
if `GetDontKnowNodeBmp` had been implemented to return a value back
then, the problem would show there, too.
Change-Id: I13895fb83b8864adabdf4b66c81346c20d15c042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186106
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index e85b09979639..39a800b269bd 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1398,6 +1398,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME
hTheme, RECT rc,
iState = GLPS_OPENED;
break;
case ButtonValue::Off:
+ case ButtonValue::DontKnow: // SvTLEntryFlags::CHILDREN_ON_DEMAND
iState = GLPS_CLOSED;
break;
default:
