Kaydet (Commit) 9f049630 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.19.92); FILE MERGED

2006/02/14 10:17:46 cd 1.19.92.4: #i55991# Fix warnings for ms c++ compiler
2005/11/01 12:47:46 cd 1.19.92.3: #i53898# Warning free code for sun solaris compiler
2005/09/22 17:55:04 sb 1.19.92.2: RESYNC: (1.19-1.20); FILE MERGED
2005/09/06 12:27:46 cd 1.19.92.1: #i53898# Make code warning free
üst a8b23ceb
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: valueconverter.cxx,v $ * $RCSfile: valueconverter.cxx,v $
* *
* $Revision: 1.20 $ * $Revision: 1.21 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 04:42:42 $ * last change: $Author: hr $ $Date: 2006-06-19 23:37:17 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -126,7 +126,7 @@ void parseHexBinary(OUString const& aHexString_, uno::Sequence<sal_Int8>& rBinar ...@@ -126,7 +126,7 @@ void parseHexBinary(OUString const& aHexString_, uno::Sequence<sal_Int8>& rBinar
while (nCount--) while (nCount--)
{ {
*pBinary++ = readHexByte(pHex); *pBinary++ = static_cast<sal_Int8>(readHexByte(pHex));
} }
} }
...@@ -294,6 +294,7 @@ uno::Any ValueConverter::convertListToAny(uno::Sequence< OUString > const& aCont ...@@ -294,6 +294,7 @@ uno::Any ValueConverter::convertListToAny(uno::Sequence< OUString > const& aCont
bool convertListToSequence(StringList const& aStringList, uno::Sequence< uno::Sequence<sal_Int8> >& rSequence, uno::TypeClass aElementTypeClass, ValueConverter const& rParser ) bool convertListToSequence(StringList const& aStringList, uno::Sequence< uno::Sequence<sal_Int8> >& rSequence, uno::TypeClass aElementTypeClass, ValueConverter const& rParser )
CFG_UNO_THROW1 ( script::CannotConvertException ) CFG_UNO_THROW1 ( script::CannotConvertException )
{ {
{ (void)aElementTypeClass; }
OSL_ASSERT(aElementTypeClass == uno::TypeClass_SEQUENCE); OSL_ASSERT(aElementTypeClass == uno::TypeClass_SEQUENCE);
rSequence.realloc(aStringList.size()); rSequence.realloc(aStringList.size());
...@@ -313,9 +314,10 @@ bool convertListToSequence(StringList const& aStringList, uno::Sequence< uno::Se ...@@ -313,9 +314,10 @@ bool convertListToSequence(StringList const& aStringList, uno::Sequence< uno::Se
// special overload for string sequence // special overload for string sequence
// template<> // use an explicit specialization // template<> // use an explicit specialization
bool convertListToSequence(StringList const& aStringList, uno::Sequence< OUString >& rSequence, uno::TypeClass aElementTypeClass, ValueConverter const& rParser ) bool convertListToSequence(StringList const& aStringList, uno::Sequence< OUString >& rSequence, uno::TypeClass aElementTypeClass, ValueConverter const& /*rParser*/ )
CFG_UNO_THROW1 ( script::CannotConvertException ) CFG_UNO_THROW1 ( script::CannotConvertException )
{ {
{ (void)aElementTypeClass; }
OSL_ASSERT(aElementTypeClass == uno::TypeClass_STRING); OSL_ASSERT(aElementTypeClass == uno::TypeClass_STRING);
stringListToSequence(rSequence, aStringList); stringListToSequence(rSequence, aStringList);
...@@ -433,7 +435,7 @@ namespace ...@@ -433,7 +435,7 @@ namespace
OSL_PRECOND(sSeparator.trim().getLength() > 0, "Invalid empty separator string"); OSL_PRECOND(sSeparator.trim().getLength() > 0, "Invalid empty separator string");
} }
sal_Int32 findFirstTokenStart(OUString const& sText) const CFG_NOTHROW() sal_Int32 findFirstTokenStart(OUString const& /*sText*/) const CFG_NOTHROW()
{ {
return 0; return 0;
} }
...@@ -488,18 +490,13 @@ namespace ...@@ -488,18 +490,13 @@ namespace
void ValueConverter::splitListData(OUString const& aContent, StringList& rContentList) const void ValueConverter::splitListData(OUString const& aContent, StringList& rContentList) const
CFG_NOTHROW( ) CFG_NOTHROW( )
{ {
static const char SEPARATOR_WHITESPACE[] = " ";
OUString sSeparator = m_sSeparator; OUString sSeparator = m_sSeparator;
bool bSeparateByWhitespace = (sSeparator.trim().getLength() == 0); bool bSeparateByWhitespace = (sSeparator.trim().getLength() == 0);
OSL_ENSURE( bSeparateByWhitespace == (!sSeparator.getLength() || sSeparator.equalsAscii(SEPARATOR_WHITESPACE)),
"Unexpected whitespace-only separator");
if (bSeparateByWhitespace) if (bSeparateByWhitespace)
{ {
OSL_ENSURE( sSeparator.getLength()==0 || sSeparator.equalsAscii(SEPARATOR_WHITESPACE), OSL_ENSURE( sSeparator.getLength()==0 || sSeparator.equalsAscii(" "),
"Unexpected whitespace-only separator"); "Unexpected whitespace-only separator");
tokenizeListData( OTokenizeByWhitespace(), aContent, rContentList ); tokenizeListData( OTokenizeByWhitespace(), aContent, rContentList );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment