summaryrefslogtreecommitdiffstats
path: root/unoxml
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-01-24 15:12:42 +0200
committerTor Lillqvist <tml@collabora.com>2017-01-24 16:57:03 +0200
commitc0ee5231c9d7a3186fe39e0955320b2bf14f0e50 (patch)
treef1ea6eeb28f77118640b47ecd1f6bd07a5c8c601 /unoxml
parenttdf#105382 Set URL-decoded default filename for minimized presentation (diff)
downloadcore-c0ee5231c9d7a3186fe39e0955320b2bf14f0e50.tar.gz
core-c0ee5231c9d7a3186fe39e0955320b2bf14f0e50.zip
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
Diffstat (limited to 'unoxml')
-rw-r--r--unoxml/source/dom/node.cxx4
1 files changed, 3 insertions, 1 deletions
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;
}