diff options
Diffstat (limited to 'sax')
-rw-r--r-- | sax/source/expatwrap/xml2utf.cxx | 2 | ||||
-rw-r--r-- | sax/source/fastparser/fastparser.cxx | 4 | ||||
-rw-r--r-- | sax/source/tools/converter.cxx | 24 | ||||
-rw-r--r-- | sax/source/tools/fastattribs.cxx | 8 | ||||
-rw-r--r-- | sax/source/tools/fastserializer.cxx | 6 | ||||
-rw-r--r-- | sax/test/sax/testsax.cxx | 2 | ||||
-rw-r--r-- | sax/test/sax/testwriter.cxx | 2 | ||||
-rw-r--r-- | sax/test/testcomponent.cxx | 2 |
8 files changed, 25 insertions, 25 deletions
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index 103ef46344cb..3e318d8827c3 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -476,7 +476,7 @@ Sequence<sal_Int8> Unicode2TextConverter::convert(const sal_Unicode *puSource , sal_Int32 nSeqSize = nSourceSize * 3; Sequence<sal_Int8> seqText( nSeqSize ); - sal_Char *pTarget = reinterpret_cast<char *>(seqText.getArray()); + char *pTarget = reinterpret_cast<char *>(seqText.getArray()); while( true ) { nTargetCount += rtl_convertUnicodeToText( diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 55e1a345f331..2b843d03c74f 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -50,7 +50,7 @@ #include <libxml/parser.h> // Inverse of libxml's BAD_CAST. -#define XML_CAST( str ) reinterpret_cast< const sal_Char* >( str ) +#define XML_CAST( str ) reinterpret_cast< const char* >( str ) using namespace std; using namespace ::osl; @@ -547,7 +547,7 @@ Event& Entity::getEvent( CallbackType aType ) OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, const OUString& sSystemId, sal_Int32 nLine ) { - const sal_Char* pMessage; + const char* pMessage; xmlErrorPtr error = xmlCtxtGetLastError( ctxt ); if( error && error->message ) pMessage = error->message; diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index b612f4d7b7e6..42fb660bbcdf 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -42,11 +42,11 @@ using namespace ::com::sun::star::i18n; namespace sax { -static const sal_Char* const gpsMM = "mm"; -static const sal_Char* const gpsCM = "cm"; -static const sal_Char* const gpsPT = "pt"; -static const sal_Char* const gpsINCH = "in"; -static const sal_Char* const gpsPC = "pc"; +static const char* const gpsMM = "mm"; +static const char* const gpsCM = "cm"; +static const char* const gpsPT = "pt"; +static const char* const gpsINCH = "in"; +static const char* const gpsPC = "pc"; const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 14; @@ -125,8 +125,8 @@ bool Converter::convertMeasure( sal_Int32& rValue, OSL_ENSURE( MeasureUnit::TWIP == nTargetUnit || MeasureUnit::POINT == nTargetUnit || MeasureUnit::MM_100TH == nTargetUnit || MeasureUnit::MM_10TH == nTargetUnit || MeasureUnit::PIXEL == nTargetUnit, "unit is not supported"); - const sal_Char *aCmpsL[3] = { nullptr, nullptr, nullptr }; - const sal_Char *aCmpsU[3] = { nullptr, nullptr, nullptr }; + const char *aCmpsL[3] = { nullptr, nullptr, nullptr }; + const char *aCmpsU[3] = { nullptr, nullptr, nullptr }; double aScales[3] = { 1., 1., 1. }; if( MeasureUnit::TWIP == nTargetUnit ) @@ -219,10 +219,10 @@ bool Converter::convertMeasure( sal_Int32& rValue, for( sal_uInt16 i= 0; i < 3; i++ ) { sal_Int32 nTmp = nPos; // come back to the initial position before each iteration - const sal_Char *pL = aCmpsL[i]; + const char *pL = aCmpsL[i]; if( pL ) { - const sal_Char *pU = aCmpsU[i]; + const char *pU = aCmpsU[i]; while( nTmp < nLen && *pL ) { sal_Unicode c = rString[nTmp]; @@ -291,7 +291,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, long nMul = 1000; long nDiv = 1; long nFac = 100; - const sal_Char* psUnit = nullptr; + const char* psUnit = nullptr; switch( nSourceUnit ) { case MeasureUnit::TWIP: @@ -492,7 +492,7 @@ bool Converter::convertColor( sal_Int32& rColor, const OUString& rValue ) return true; } -static const sal_Char aHexTab[] = "0123456789abcdef"; +static const char aHexTab[] = "0123456789abcdef"; /** convert color to string */ void Converter::convertColor( OUStringBuffer& rBuffer, sal_Int32 nColor ) @@ -1883,7 +1883,7 @@ double Converter::GetConversionFactor(OUStringBuffer& rUnit, sal_Int16 nSourceUn if(nSourceUnit != nTargetUnit) { - const sal_Char* psUnit = nullptr; + const char* psUnit = nullptr; switch(nSourceUnit) { diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index 91df59d05107..9b65718764fc 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -61,7 +61,7 @@ FastAttributeList::FastAttributeList( const css::uno::Reference< css::xml::sax:: { // random initial size of buffer to store attribute values mnChunkLength = 58; - mpChunk = static_cast<sal_Char *>(malloc( mnChunkLength )); + mpChunk = static_cast<char *>(malloc( mnChunkLength )); maAttributeValues.push_back( 0 ); } @@ -78,7 +78,7 @@ void FastAttributeList::clear() maUnknownAttributes.clear(); } -void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue, size_t nValueLength ) +void FastAttributeList::add( sal_Int32 nToken, const char* pValue, size_t nValueLength ) { assert(nToken != -1); maAttributeTokens.push_back( nToken ); @@ -87,7 +87,7 @@ void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue, size_t nV if (maAttributeValues.back() > mnChunkLength) { const sal_Int32 newLen = std::max(mnChunkLength * 2, maAttributeValues.back()); - if (auto p = static_cast<sal_Char*>(realloc(mpChunk, newLen))) + if (auto p = static_cast<char*>(realloc(mpChunk, newLen))) { mnChunkLength = newLen; mpChunk = p; @@ -99,7 +99,7 @@ void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue, size_t nV mpChunk[nWritePosition + nValueLength] = '\0'; } -void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue ) +void FastAttributeList::add( sal_Int32 nToken, const char* pValue ) { add( nToken, pValue, strlen( pValue )); } diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index a362ff438383..cd07e7425c71 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -315,13 +315,13 @@ namespace sax_fastparser { mxFastTokenHandler->getUTF8Identifier(NAMESPACE(nElement))); Sequence<sal_Int8> const name( mxFastTokenHandler->getUTF8Identifier(TOKEN(nElement))); - return OString(reinterpret_cast<sal_Char const*>(ns.getConstArray()), ns.getLength()) + return OString(reinterpret_cast<char const*>(ns.getConstArray()), ns.getLength()) + OString(sColon, N_CHARS(sColon)) - + OString(reinterpret_cast<sal_Char const*>(name.getConstArray()), name.getLength()); + + OString(reinterpret_cast<char const*>(name.getConstArray()), name.getLength()); } else { Sequence<sal_Int8> const name( mxFastTokenHandler->getUTF8Identifier(nElement)); - return OString(reinterpret_cast<sal_Char const*>(name.getConstArray()), name.getLength()); + return OString(reinterpret_cast<char const*>(name.getConstArray()), name.getLength()); } } #endif diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index 06b0421c248b..882a7a96dfa7 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -756,7 +756,7 @@ sal_Bool SAL_CALL component_writeInfo( } SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx index 505e3d8a410f..2a5d3706d48f 100644 --- a/sax/test/sax/testwriter.cxx +++ b/sax/test/sax/testwriter.cxx @@ -470,7 +470,7 @@ void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r // Test added for mib. Tests if errors during conversions occurs r->ignorableWhitespace( OUString() ); - sal_Char array[256]; + char array[256]; for( sal_Int32 n = 32 ; n < 254 ; n ++ ) { array[n-32] = n; } diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx index 9b6091fb9cae..51f8f244e062 100644 --- a/sax/test/testcomponent.cxx +++ b/sax/test/testcomponent.cxx @@ -76,7 +76,7 @@ int main (int argc, char **argv) exit(1); } - sal_Char szBuf[1024]; + char szBuf[1024]; OString sTestName; try |