Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
e29a17ed
Kaydet (Commit)
e29a17ed
authored
May 20, 2015
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
xmloff: convert legacy assertions in SvXMLNamespaceMap
Change-Id: I9771bf3b727168bad6aeb07a2eb55eb08b1b6408
üst
a80da8e6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
nmspmap.cxx
xmloff/source/core/nmspmap.cxx
+5
-9
No files found.
xmloff/source/core/nmspmap.cxx
Dosyayı görüntüle @
e29a17ed
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
#include <sal/config.h>
#include <sal/config.h>
#include <tools/debug.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustrbuf.hxx>
...
@@ -103,8 +102,7 @@ sal_uInt16 SvXMLNamespaceMap::Add( const OUString& rPrefix, const OUString& rNam
...
@@ -103,8 +102,7 @@ sal_uInt16 SvXMLNamespaceMap::Add( const OUString& rPrefix, const OUString& rNam
if
(
XML_NAMESPACE_UNKNOWN
==
nKey
)
if
(
XML_NAMESPACE_UNKNOWN
==
nKey
)
nKey
=
GetKeyByName
(
rName
);
nKey
=
GetKeyByName
(
rName
);
DBG_ASSERT
(
XML_NAMESPACE_NONE
!=
nKey
,
assert
(
XML_NAMESPACE_NONE
!=
nKey
);
"SvXMLNamespaceMap::Add: invalid namespace key"
);
if
(
XML_NAMESPACE_NONE
==
nKey
)
if
(
XML_NAMESPACE_NONE
==
nKey
)
return
USHRT_MAX
;
return
USHRT_MAX
;
...
@@ -119,8 +117,7 @@ sal_uInt16 SvXMLNamespaceMap::AddIfKnown( const OUString& rPrefix, const OUStrin
...
@@ -119,8 +117,7 @@ sal_uInt16 SvXMLNamespaceMap::AddIfKnown( const OUString& rPrefix, const OUStrin
{
{
sal_uInt16
nKey
=
GetKeyByName
(
rName
);
sal_uInt16
nKey
=
GetKeyByName
(
rName
);
DBG_ASSERT
(
XML_NAMESPACE_NONE
!=
nKey
,
assert
(
XML_NAMESPACE_NONE
);
"SvXMLNamespaceMap::AddIfKnown: invalid namespace key"
);
if
(
XML_NAMESPACE_NONE
==
nKey
)
if
(
XML_NAMESPACE_NONE
==
nKey
)
return
XML_NAMESPACE_UNKNOWN
;
return
XML_NAMESPACE_UNKNOWN
;
...
@@ -197,7 +194,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
...
@@ -197,7 +194,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
{
{
case
XML_NAMESPACE_UNKNOWN
:
case
XML_NAMESPACE_UNKNOWN
:
// ...if it's a completely unknown namespace, assert and return the local name
// ...if it's a completely unknown namespace, assert and return the local name
DBG_ASSERT
(
false
,
"SvXMLNamespaceMap::GetQNameByKey: invalid namespace key"
);
assert
(
false
);
case
XML_NAMESPACE_NONE
:
case
XML_NAMESPACE_NONE
:
// ...if there isn't one, return the local name
// ...if there isn't one, return the local name
return
rLocalName
;
return
rLocalName
;
...
@@ -260,7 +257,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
...
@@ -260,7 +257,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
else
else
{
{
// ... if it isn't, this is a Bad Thing, assert and return the local name
// ... if it isn't, this is a Bad Thing, assert and return the local name
DBG_ASSERT
(
false
,
"SvXMLNamespaceMap::GetQNameByKey: invalid namespace key"
);
assert
(
false
);
return
rLocalName
;
return
rLocalName
;
}
}
}
}
...
@@ -387,8 +384,7 @@ bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix
...
@@ -387,8 +384,7 @@ bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix
if
(
XML_NAMESPACE_UNKNOWN
==
nKey
)
if
(
XML_NAMESPACE_UNKNOWN
==
nKey
)
nKey
=
GetKeyByName
(
rName
);
nKey
=
GetKeyByName
(
rName
);
DBG_ASSERT
(
XML_NAMESPACE_NONE
!=
nKey
,
assert
(
XML_NAMESPACE_NONE
!=
nKey
);
"SvXMLNamespaceMap::AddAtIndex: invalid namespace key"
);
if
(
XML_NAMESPACE_NONE
!=
nKey
&&
!
(
aNameHash
.
count
(
rPrefix
)
)
)
if
(
XML_NAMESPACE_NONE
!=
nKey
&&
!
(
aNameHash
.
count
(
rPrefix
)
)
)
{
{
_Add
(
rPrefix
,
rName
,
nKey
);
_Add
(
rPrefix
,
rName
,
nKey
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment