From c0ee5231c9d7a3186fe39e0955320b2bf14f0e50 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 Jan 2017 15:12:42 +0200 Subject: Probably makes more sense to return DONTKNOW if the element is DONTKNOW ... ... and not the namespace token without any element token ORed in. DONTKNOW is what the two callers look for. Does not break any unit test. (Does not fix the bug I am investigating either, though.) Change-Id: Ibd75ee06797d7b62476d4bf2302338b2bb3266d4 --- unoxml/source/dom/node.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'unoxml/source/dom/node.cxx') diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index c863a0eee1bb..3617d1f45d5d 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -120,7 +120,9 @@ namespace DOM { nNamespaceToken = aIter->mnToken; sal_Int32 nNameToken = getToken( rContext, pName ); - if( nNameToken != FastToken::DONTKNOW ) + if( nNameToken == FastToken::DONTKNOW ) + nNamespaceToken = FastToken::DONTKNOW; + else nNamespaceToken |= nNameToken; } -- cgit