summaryrefslogtreecommitdiff
path: root/udm
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 12:09:40 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 12:09:40 +0000
commit8ad8106d36ef1086be3f8d959a7561b4ca5cfe38 (patch)
treeaa79c31e4e60df3971225d84c68f556d94d9001f /udm
parent5ade4a952b16b3461c148c82a413b67b3a5c10ea (diff)
INTEGRATION: CWS warnings01 (1.4.4); FILE MERGED
2005/10/04 09:47:25 np 1.4.4.2: #i53898# 2005/09/30 15:56:43 np 1.4.4.1: #i53898#
Diffstat (limited to 'udm')
-rw-r--r--udm/source/xml/xmlitem.cxx23
1 files changed, 11 insertions, 12 deletions
diff --git a/udm/source/xml/xmlitem.cxx b/udm/source/xml/xmlitem.cxx
index d4e2b02e20ce..8f80fe73e861 100644
--- a/udm/source/xml/xmlitem.cxx
+++ b/udm/source/xml/xmlitem.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: xmlitem.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 14:40:28 $
+ * last change: $Author: hr $ $Date: 2006-06-19 13:09:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -244,7 +244,7 @@ EmptyElement::inq_Content() const
const AttrList *
EmptyElement::inq_Attrs() const
{
- return &inq_RefAttrs();
+ return & const_cast< EmptyElement* >(this)->inq_RefAttrs();
}
@@ -271,7 +271,7 @@ PureElement::do_SetContent( DYN Item * let_dpItem )
const Item *
PureElement::inq_Content() const
{
- return inq_RefContent().Ptr();
+ return const_cast< PureElement* >(this)->inq_RefContent().Ptr();
}
const AttrList *
@@ -510,10 +510,12 @@ Text::~Text()
void
Text::do_WriteOut( csv::bostream & io_aFile ) const
{
- const char * pStart = sText.c_str();
- const char * pOut = 0;
+ const unsigned char *
+ pStart = reinterpret_cast< const unsigned char* >(sText.c_str());
+ const unsigned char *
+ pOut = pStart;
- for ( pOut = pStart ; *pOut != '\0'; ++pOut )
+ for ( ; *pOut != '\0'; ++pOut )
{
if ( cReplacable[*pOut] )
{
@@ -522,12 +524,12 @@ Text::do_WriteOut( csv::bostream & io_aFile ) const
io_aFile.write( pStart, pOut-pStart );
}
- switch (UINT8(*pOut))
+ switch (*pOut)
{
case '<': io_aFile.write("&lt;"); break;
case '>': io_aFile.write("&gt;"); break;
case '"': io_aFile.write("&quot;"); break;
- case '&': io_aFile.write("&amp;"); break;
+ case '&': io_aFile.write("&amp;"); break;
case 255: io_aFile.write("&nbsp;"); break;
}
@@ -618,6 +620,3 @@ StreamOut( Dyn< Item > & o_rContent,
} // namespace xml
} // namespace csi
-
-
-