sal_Char->char in oox..registry

Change-Id: Icc7f2a32696c30317c1ee77ef39d682d5f5a80b9
Reviewed-on: https://gerrit.libreoffice.org/85512
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

15 files changed, 60 insertions, 60 deletions

diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx
index 9ab86c8aa241..df7523f78412 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -77,7 +77,7 @@ struct TypeGroupInfo
 {
     TypeId              meTypeId;               /// Unique chart type identifier.
     TypeCategory        meTypeCategory;         /// Category this chart type belongs to.
-    const sal_Char*     mpcServiceName;         /// Service name of the type.
+    const char*         mpcServiceName;         /// Service name of the type.
     VarPointMode        meVarPointMode;         /// Mode for varying point colors.
     sal_Int32           mnDefLabelPos;          /// Default data label position (API constant).
     bool                mbPolarCoordSystem;     /// True = polar, false = cartesian.
diff --git a/oox/qa/unit/CryptoTest.cxx b/oox/qa/unit/CryptoTest.cxx
index 47d567fab34b..e1a4781d234c 100644
--- a/oox/qa/unit/CryptoTest.cxx
+++ b/oox/qa/unit/CryptoTest.cxx
@@ -160,7 +160,7 @@ void CryptoTest::testStandard2007()
         aBinaryOutputStream.close();
         aBinaryInputStream.close();
 
-        const sal_Char* pData = static_cast<const sal_Char*>(aUnencryptedOutput.GetData());
+        const char* pData = static_cast<const char*>(aUnencryptedOutput.GetData());
         sal_uInt64 nSize = aUnencryptedOutput.GetSize();
 
         CPPUNIT_ASSERT_EQUAL(sal_uInt64(18), nSize);
@@ -411,7 +411,7 @@ void CryptoTest::testAgileEncryptingAndDecrypting()
         // Check decrypted output
         CPPUNIT_ASSERT_EQUAL(sal_uInt64(19), aUnencryptedOutput.GetSize());
 
-        OString aString(static_cast<const sal_Char*>(aUnencryptedOutput.GetData()));
+        OString aString(static_cast<const char*>(aUnencryptedOutput.GetData()));
         CPPUNIT_ASSERT_EQUAL(aTestString, aString);
 
         // Check data integrity
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 1b6b20865a48..671aa2bd4cb4 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -55,16 +55,16 @@ using namespace ::com::sun::star::uno;
 namespace {
 
 // chart type service names
-const sal_Char SERVICE_CHART2_AREA[]      = "com.sun.star.chart2.AreaChartType";
-const sal_Char SERVICE_CHART2_CANDLE[]    = "com.sun.star.chart2.CandleStickChartType";
-const sal_Char SERVICE_CHART2_COLUMN[]    = "com.sun.star.chart2.ColumnChartType";
-const sal_Char SERVICE_CHART2_LINE[]      = "com.sun.star.chart2.LineChartType";
-const sal_Char SERVICE_CHART2_NET[]       = "com.sun.star.chart2.NetChartType";
-const sal_Char SERVICE_CHART2_FILLEDNET[] = "com.sun.star.chart2.FilledNetChartType";
-const sal_Char SERVICE_CHART2_PIE[]       = "com.sun.star.chart2.PieChartType";
-const sal_Char SERVICE_CHART2_SCATTER[]   = "com.sun.star.chart2.ScatterChartType";
-const sal_Char SERVICE_CHART2_BUBBLE[]    = "com.sun.star.chart2.BubbleChartType";
-const sal_Char SERVICE_CHART2_SURFACE[]   = "com.sun.star.chart2.ColumnChartType";    // Todo
+const char SERVICE_CHART2_AREA[]      = "com.sun.star.chart2.AreaChartType";
+const char SERVICE_CHART2_CANDLE[]    = "com.sun.star.chart2.CandleStickChartType";
+const char SERVICE_CHART2_COLUMN[]    = "com.sun.star.chart2.ColumnChartType";
+const char SERVICE_CHART2_LINE[]      = "com.sun.star.chart2.LineChartType";
+const char SERVICE_CHART2_NET[]       = "com.sun.star.chart2.NetChartType";
+const char SERVICE_CHART2_FILLEDNET[] = "com.sun.star.chart2.FilledNetChartType";
+const char SERVICE_CHART2_PIE[]       = "com.sun.star.chart2.PieChartType";
+const char SERVICE_CHART2_SCATTER[]   = "com.sun.star.chart2.ScatterChartType";
+const char SERVICE_CHART2_BUBBLE[]    = "com.sun.star.chart2.BubbleChartType";
+const char SERVICE_CHART2_SURFACE[]   = "com.sun.star.chart2.ColumnChartType";    // Todo
 
 namespace csscd = ::com::sun::star::chart::DataLabelPlacement;
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2b6ecf6f9fcb..a99b403829fe 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -115,7 +115,7 @@ using namespace ::com::sun::star::style;
 
 namespace oox { namespace drawingml {
 
-Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
+Shape::Shape( const char* pServiceName, bool bDefaultHeight )
 : mpLinePropertiesPtr( new LineProperties )
 , mpShapeRefLinePropPtr( new LineProperties )
 , mpFillPropertiesPtr( new FillProperties )
@@ -253,7 +253,7 @@ void Shape::setTableType()
     mnSubType = 0;
 }
 
-void Shape::setServiceName( const sal_Char* pServiceName )
+void Shape::setServiceName( const char* pServiceName )
 {
     if ( pServiceName )
         msServiceName = OUString::createFromAscii( pServiceName );
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 6c03e14bb7f8..dc02a1fa498b 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -55,7 +55,7 @@ bool DffStreamObject::implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_In
 
 void DffStreamObject::implWriteExtHeader()
 {
-    const sal_Char* pcListName = "DFF-RECORD-INST";
+    const char* pcListName = "DFF-RECORD-INST";
     switch( getRecId() )
     {
         case DFF_ID_BSE:                pcListName = "DFFBSE-RECORD-INST";          break;  // BLIP type
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 9f4d18165f10..5c44e54600b8 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1387,12 +1387,12 @@ void SharedConfigData::createUnitConverter( const OUString& rData )
     }
 }
 
-Config::Config( const sal_Char* pcEnvVar, const FilterBase& rFilter )
+Config::Config( const char* pcEnvVar, const FilterBase& rFilter )
 {
     construct( pcEnvVar, rFilter );
 }
 
-Config::Config( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
+Config::Config( const char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
 {
     construct( pcEnvVar, rxContext, rxRootStrg, rSysFileName );
 }
@@ -1401,16 +1401,16 @@ Config::~Config()
 {
 }
 
-void Config::construct( const sal_Char* pcEnvVar, const FilterBase& rFilter )
+void Config::construct( const char* pcEnvVar, const FilterBase& rFilter )
 {
     if( !rFilter.getFileUrl().isEmpty() )
         construct( pcEnvVar, rFilter.getComponentContext(), rFilter.getStorage(), rFilter.getFileUrl() );
 }
 
-void Config::construct( const sal_Char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
+void Config::construct( const char* pcEnvVar, const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName )
 {
     if( pcEnvVar && rxRootStrg.get() && !rSysFileName.isEmpty() )
-        if( const sal_Char* pcFileName = ::getenv( pcEnvVar ) )
+        if( const char* pcFileName = ::getenv( pcEnvVar ) )
             mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName ) );
 }
 
@@ -1627,7 +1627,7 @@ void Output::writeChar( sal_Unicode cChar, sal_Int32 nCount )
     StringHelper::appendEncChar( maLine, cChar, nCount );
 }
 
-void Output::writeAscii( const sal_Char* pcStr )
+void Output::writeAscii( const char* pcStr )
 {
     if( pcStr )
         maLine.appendAscii( pcStr );
@@ -2150,7 +2150,7 @@ OUString InputObjectBase::dumpCharArray( const String& rName, sal_Int32 nLen, rt
     OUString aString;
     if( nDumpSize > 0 )
     {
-        ::std::vector< sal_Char > aBuffer( static_cast< std::size_t >( nLen ) + 1 );
+        ::std::vector< char > aBuffer( static_cast< std::size_t >( nLen ) + 1 );
         sal_Int32 nCharsRead = mxStrm->readMemory(aBuffer.data(), nLen);
         aBuffer[ nCharsRead ] = 0;
         aString = OStringToOUString(OString(aBuffer.data()), eTextEnc);
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 76b4ce61088d..f0ad198edef0 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -918,7 +918,7 @@ OUString AxPropertyObjectBase::getPropertyName() const
     return cfg().getName( mxPropNames, mnCurrProp );
 }
 
-sal_uInt32 AxPropertyObjectBase::dumpFlagsProperty( sal_uInt32 nDefault, const sal_Char* pcNameList )
+sal_uInt32 AxPropertyObjectBase::dumpFlagsProperty( sal_uInt32 nDefault, const char* pcNameList )
 {
     if( startNextProperty() )
     {
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 84133f6cc6a6..7bfec5ace97c 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -66,7 +66,7 @@ OString BinaryInputStream::readCharArray( sal_Int32 nChars )
     // NUL characters are replaced by question marks.
     ::std::replace( aBuffer.begin(), aBuffer.end(), '\0', '?' );
 
-    return OString(reinterpret_cast<sal_Char*>(aBuffer.data()), nCharsRead);
+    return OString(reinterpret_cast<char*>(aBuffer.data()), nCharsRead);
 }
 
 OUString BinaryInputStream::readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding eTextEnc )
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index 178962340467..dc1d1b4a901c 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -293,7 +293,7 @@ const preset_mapping* preset_mapping::getList()
 
 OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType )
 {
-    const sal_Char* pStr = nullptr;
+    const char* pStr = nullptr;
 
     if( (nPresetClass == EffectPresetClass::ENTRANCE) || (nPresetClass == EffectPresetClass::EXIT) )
     {
diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx
index cc4ebfba1e4c..c794cdba297a 100644
--- a/oox/source/ppt/pptfilterhelpers.cxx
+++ b/oox/source/ppt/pptfilterhelpers.cxx
@@ -146,8 +146,8 @@ namespace oox { namespace ppt {
     {
         bool bRet = false;
 
-        const sal_Char* pSource[] = { "ppt_x", "ppt_y", "ppt_w", "ppt_h", nullptr };
-        const sal_Char* pDest[] = { "x", "y", "width", "height", nullptr };
+        const char* pSource[] = { "ppt_x", "ppt_y", "ppt_w", "ppt_h", nullptr };
+        const char* pDest[] = { "x", "y", "width", "height", nullptr };
 
         /* here we want to substitute all occurrences of
          * [#]ppt_[xyhw] with
@@ -155,8 +155,8 @@ namespace oox { namespace ppt {
          */
         sal_Int32 nIndex = 0;
 
-        const sal_Char** ps = pSource;
-        const sal_Char** pd = pDest;
+        const char** ps = pSource;
+        const char** pd = pDest;
 
         while (*ps)
         {
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 0088c1e51673..9b4f93378ef0 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::drawing;
 
 namespace oox { namespace ppt {
 
-PPTShape::PPTShape( const oox::ppt::ShapeLocation eShapeLocation, const sal_Char* pServiceName )
+PPTShape::PPTShape( const oox::ppt::ShapeLocation eShapeLocation, const char* pServiceName )
 : Shape( pServiceName )
 , meShapeLocation( eShapeLocation )
 , mbReferenced( false )
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 247831677dfd..f8bd76846404 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -275,8 +275,8 @@ void SlidePersist::applyTextStyles( const XmlFilterBase& rFilterBase )
                                         for ( int nLevel = 1; nLevel < 5; nLevel++ )
                                         {
                                             {
-                                                sal_Char pOutline[ 9 ] = "outline1";
-                                                pOutline[ 7 ] = static_cast< sal_Char >( '0' + nLevel );
+                                                char pOutline[ 9 ] = "outline1";
+                                                pOutline[ 7 ] = static_cast< char >( '0' + nLevel );
                                                 OUString sOutlineStyle( OUString::createFromAscii( pOutline ) );
                                                 if ( xFamilies->hasByName( sOutlineStyle ) )
                                                 {
diff --git a/oox/source/token/propertynames.cxx b/oox/source/token/propertynames.cxx
index 024042294d54..c286431817b3 100644
--- a/oox/source/token/propertynames.cxx
+++ b/oox/source/token/propertynames.cxx
@@ -23,7 +23,7 @@ namespace oox {
 
 PropertyNameVector::PropertyNameVector()
 {
-    static const sal_Char* sppcPropertyNames[] =
+    static const char* sppcPropertyNames[] =
     {
         // include auto-generated C array with property names as C strings
 #include <propertynames.inc>
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index ebddedaa6a33..185bc1afcab2 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -48,14 +48,14 @@ const css::uno::Sequence< sal_Int8 > TokenMap::EMPTY_BYTE_SEQ;
 TokenMap::TokenMap() :
     maTokenNames( static_cast< size_t >( XML_TOKEN_COUNT ) )
 {
-    static const sal_Char* sppcTokenNames[] =
+    static const char* sppcTokenNames[] =
     {
 // include auto-generated C array with token names as C strings
 #include <tokennames.inc>
         ""
     };
 
-    const sal_Char* const* ppcTokenName = sppcTokenNames;
+    const char* const* ppcTokenName = sppcTokenNames;
     for (auto & tokenName : maTokenNames)
     {
         OString aUtf8Token( *ppcTokenName );
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 2fc17ee84ea7..c2ab0fa2d914 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -36,18 +36,18 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar )
+const char* lclFindCharacter( const char* pcBeg, const char* pcEnd, char cChar )
 {
     sal_Int32 nIndex = rtl_str_indexOfChar_WithLength( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ), cChar );
     return (nIndex < 0) ? pcEnd : (pcBeg + nIndex);
 }
 
-bool lclIsWhiteSpace( sal_Char cChar )
+bool lclIsWhiteSpace( char cChar )
 {
     return cChar <= 32;
 }
 
-const sal_Char* lclFindWhiteSpace( const sal_Char* pcBeg, const sal_Char* pcEnd )
+const char* lclFindWhiteSpace( const char* pcBeg, const char* pcEnd )
 {
     for( ; pcBeg < pcEnd; ++pcBeg )
         if( lclIsWhiteSpace( *pcBeg ) )
@@ -55,7 +55,7 @@ const sal_Char* lclFindWhiteSpace( const sal_Char* pcBeg, const sal_Char* pcEnd
     return pcEnd;
 }
 
-const sal_Char* lclFindNonWhiteSpace( const sal_Char* pcBeg, const sal_Char* pcEnd )
+const char* lclFindNonWhiteSpace( const char* pcBeg, const char* pcEnd )
 {
     for( ; pcBeg < pcEnd; ++pcBeg )
         if( !lclIsWhiteSpace( *pcBeg ) )
@@ -63,52 +63,52 @@ const sal_Char* lclFindNonWhiteSpace( const sal_Char* pcBeg, const sal_Char* pcE
     return pcEnd;
 }
 
-const sal_Char* lclTrimWhiteSpaceFromEnd( const sal_Char* pcBeg, const sal_Char* pcEnd )
+const char* lclTrimWhiteSpaceFromEnd( const char* pcBeg, const char* pcEnd )
 {
     while( (pcBeg < pcEnd) && lclIsWhiteSpace( pcEnd[ -1 ] ) )
         --pcEnd;
     return pcEnd;
 }
 
-void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
+void lclAppendToBuffer( OStringBuffer& rBuffer, const char* pcBeg, const char* pcEnd )
 {
     rBuffer.append( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ) );
 }
 
-void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
+void lclProcessAttribs( OStringBuffer& rBuffer, const char* pcBeg, const char* pcEnd )
 {
     /*  Map attribute names to char-pointer of all attributes. This map is used
         to find multiple occurrences of attributes with the same name. The
         mapped pointers are used as map key in the next map below. */
-    typedef ::std::map< OString, const sal_Char* > AttributeNameMap;
+    typedef ::std::map< OString, const char* > AttributeNameMap;
     AttributeNameMap aAttributeNames;
 
     /*  Map the char-pointers of all attributes to the full attribute definition
         string. This preserves the original order of the used attributes. */
-    typedef ::std::map< const sal_Char*, OString > AttributeDataMap;
+    typedef ::std::map< const char*, OString > AttributeDataMap;
     AttributeDataMap aAttributes;
 
     bool bOk = true;
-    const sal_Char* pcNameBeg = pcBeg;
+    const char* pcNameBeg = pcBeg;
     while( bOk && (pcNameBeg < pcEnd) )
     {
         // pcNameBeg points to begin of attribute name, find equality sign
-        const sal_Char* pcEqualSign = lclFindCharacter( pcNameBeg, pcEnd, '=' );
+        const char* pcEqualSign = lclFindCharacter( pcNameBeg, pcEnd, '=' );
         bOk = (pcEqualSign < pcEnd);
         if (bOk)
         {
             // find end of attribute name (ignore whitespace between name and equality sign)
-            const sal_Char* pcNameEnd = lclTrimWhiteSpaceFromEnd( pcNameBeg, pcEqualSign );
+            const char* pcNameEnd = lclTrimWhiteSpaceFromEnd( pcNameBeg, pcEqualSign );
             bOk = (pcNameBeg < pcNameEnd);
             if( bOk )
             {
                 // find begin of attribute value (must be single or double quote)
-                const sal_Char* pcValueBeg = lclFindNonWhiteSpace( pcEqualSign + 1, pcEnd );
+                const char* pcValueBeg = lclFindNonWhiteSpace( pcEqualSign + 1, pcEnd );
                 bOk = (pcValueBeg < pcEnd) && ((*pcValueBeg == '\'') || (*pcValueBeg == '"'));
                 if( bOk )
                 {
                     // find end of attribute value (matching quote character)
-                    const sal_Char* pcValueEnd = lclFindCharacter( pcValueBeg + 1, pcEnd, *pcValueBeg );
+                    const char* pcValueEnd = lclFindCharacter( pcValueBeg + 1, pcEnd, *pcValueBeg );
                     bOk = (pcValueEnd < pcEnd);
                     if( bOk )
                     {
@@ -153,8 +153,8 @@ void lclProcessElement( OStringBuffer& rBuffer, const OString& rElement )
     if( nElementLen == 0 )
         return;
 
-    const sal_Char* pcOpen = rElement.getStr();
-    const sal_Char* pcClose = pcOpen + nElementLen - 1;
+    const char* pcOpen = rElement.getStr();
+    const char* pcClose = pcOpen + nElementLen - 1;
 
     // no complete element found
     if( (pcOpen >= pcClose) || (*pcOpen != '<') || (*pcClose != '>') )
@@ -185,14 +185,14 @@ void lclProcessElement( OStringBuffer& rBuffer, const OString& rElement )
     else if( pcOpen[ 1 ] != '/' )
     {
         // find positions of text content inside brackets, exclude '/' in '<simpleelement/>'
-        const sal_Char* pcContentBeg = pcOpen + 1;
+        const char* pcContentBeg = pcOpen + 1;
         bool bIsEmptyElement = pcClose[ -1 ] == '/';
-        const sal_Char* pcContentEnd = bIsEmptyElement ? (pcClose - 1) : pcClose;
+        const char* pcContentEnd = bIsEmptyElement ? (pcClose - 1) : pcClose;
         // append opening bracket and element name to buffer
-        const sal_Char* pcWhiteSpace = lclFindWhiteSpace( pcContentBeg, pcContentEnd );
+        const char* pcWhiteSpace = lclFindWhiteSpace( pcContentBeg, pcContentEnd );
         lclAppendToBuffer( rBuffer, pcOpen, pcWhiteSpace );
         // find begin of attributes, and process all attributes
-        const sal_Char* pcAttribBeg = lclFindNonWhiteSpace( pcWhiteSpace, pcContentEnd );
+        const char* pcAttribBeg = lclFindNonWhiteSpace( pcWhiteSpace, pcContentEnd );
         if( pcAttribBeg < pcContentEnd )
             lclProcessAttribs( rBuffer, pcAttribBeg, pcContentEnd );
         // close the element
@@ -244,16 +244,16 @@ bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars )
      */
 
     // passed string ends with the leading opening bracket of an XML element
-    const sal_Char* pcBeg = rChars.getStr();
-    const sal_Char* pcEnd = pcBeg + rChars.getLength();
+    const char* pcBeg = rChars.getStr();
+    const char* pcEnd = pcBeg + rChars.getLength();
     bool bHasBracket = (pcBeg < pcEnd) && (pcEnd[ -1 ] == '<');
     if( bHasBracket ) --pcEnd;
 
     // skip leading whitespace
-    const sal_Char* pcContentsBeg = lclFindNonWhiteSpace( pcBeg, pcEnd );
+    const char* pcContentsBeg = lclFindNonWhiteSpace( pcBeg, pcEnd );
     while( pcContentsBeg < pcEnd )
     {
-        const sal_Char* pcWhitespaceBeg = lclFindWhiteSpace( pcContentsBeg + 1, pcEnd );
+        const char* pcWhitespaceBeg = lclFindWhiteSpace( pcContentsBeg + 1, pcEnd );
         lclAppendToBuffer( rBuffer, pcContentsBeg, pcWhitespaceBeg );
         if( pcWhitespaceBeg < pcEnd )
             rBuffer.append( ' ' );