You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/03/17 04:40:50 UTC
svn commit: r637711 - in /xalan/c/trunk/src/xalanc:
NLS/en_US/XalanMsg_en_US.xlf PlatformSupport/XalanTranscodingServices.hpp
XMLSupport/XalanFormatterWriter.hpp XMLSupport/XalanOtherEncodingWriter.hpp
XMLSupport/XalanXMLSerializerFactory.cpp
Author: dbertoni
Date: Sun Mar 16 20:40:49 2008
New Revision: 637711
URL: http://svn.apache.org/viewvc?rev=637711&view=rev
Log:
Patch for XALANC-669.
Modified:
xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf
xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerFactory.cpp
Modified: xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf?rev=637711&r1=637710&r2=637711&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf (original)
+++ xalan/c/trunk/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf Sun Mar 16 20:40:49 2008
@@ -929,8 +929,8 @@
</trans-unit>
<trans-unit id="UnrepresentableCharacter_2Param">
- <source>The Unicode character U+{0} cannot be represented in the encoding '{1}'.</source>
- <target>The Unicode character U+{0} cannot be represented in the encoding '{1}'.</target>
+ <source>The Unicode code point U+{0} cannot be represented in the encoding '{1}'.</source>
+ <target>The Unicode code point U+{0} cannot be represented in the encoding '{1}'.</target>
</trans-unit>
<trans-unit id="InvalidScalar_1Param">
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp?rev=637711&r1=637710&r2=637711&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp Sun Mar 16 20:40:49 2008
@@ -293,7 +293,7 @@
const XalanDOMString& theEncoding,
XalanDOMString& theBuffer);
- UnrepresentableCharacterException(const UnrepresentableCharacterException&);
+ UnrepresentableCharacterException(const UnrepresentableCharacterException& theSource);
virtual
~UnrepresentableCharacterException();
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp?rev=637711&r1=637710&r2=637711&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp Sun Mar 16 20:40:49 2008
@@ -264,6 +264,22 @@
throw SAXException(c_wstr(theMessage), &theManager);
}
+ void
+ throwUnrepresentableCharacterException(
+ unsigned int ch,
+ MemoryManager& theManager)
+ {
+ XalanDOMString theBuffer(theManager);
+
+ const XalanOutputStream* const theStream =
+ m_writer.getStream();
+
+ throw XalanTranscodingServices::UnrepresentableCharacterException(
+ ch,
+ theStream->getOutputEncoding(),
+ theBuffer);
+ }
+
static void
throwInvalidUTF16SurrogateException(
XalanDOMChar ch,
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp?rev=637711&r1=637710&r2=637711&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp Sun Mar 16 20:40:49 2008
@@ -68,7 +68,7 @@
void
operator()(unsigned int value) const
{
- m_writer.throwInvalidCharacterException(value, m_writer.getMemoryManager());
+ m_writer.throwUnrepresentableCharacterException(value, m_writer.getMemoryManager());
}
private:
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerFactory.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerFactory.cpp?rev=637711&r1=637710&r2=637711&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerFactory.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerFactory.cpp Sun Mar 16 20:40:49 2008
@@ -383,17 +383,17 @@
assert (theFormatter != 0);
return theFormatter;
+}
-}
void
XalanXMLSerializerFactory::setEncoding(
- MemoryManager& theManager,
- Writer& theWriter,
- XalanDOMString& theEncoding)
+ MemoryManager& theManager,
+ Writer& theWriter,
+ XalanDOMString& theEncoding)
{
- XalanOutputStream* stream = theWriter.getStream();
+ XalanOutputStream* const stream = theWriter.getStream();
if(stream != 0)
{
@@ -418,9 +418,9 @@
theEncoding = XalanTranscodingServices::s_utf8String;
}
}
-
}
}
+
XALAN_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org