diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 13:15:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 19:17:40 +0100 |
| commit | 7c18da2dc6963b6f3f74a72fc4f6a3eedd8f9eb7 (patch) | |
| tree | bf9b5cf5f648936e5c12c51a7a643059c5bcb6a5 | |
| parent | f22044a49a56e585e2e9f419a1b77aba263b2afe (diff) | |
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>
34 files changed, 173 insertions, 173 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 1895c2f2aad6..f2f95224cf61 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -102,12 +102,12 @@ class OOX_DLLPUBLIC Shape { public: - explicit Shape( const sal_Char* pServiceType = nullptr, bool bDefaultHeight = true ); + explicit Shape( const char* pServiceType = nullptr, bool bDefaultHeight = true ); explicit Shape( const ShapePtr& pSourceShape ); virtual ~Shape(); OUString& getServiceName(){ return msServiceName; } - void setServiceName( const sal_Char* pServiceName ); + void setServiceName( const char* pServiceName ); PropertyMap& getShapeProperties(){ return maShapeProperties; } diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 32dea6fca6f3..bab76313fe69 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -377,11 +377,11 @@ class String : public OUString public: String() {} /*implicit*/ String( const OUString& rStr ) : OUString( rStr ) {} - /*implicit*/ String( const sal_Char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {} + /*implicit*/ String( const char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {} /*implicit*/ String( sal_Unicode cChar ) : OUString( cChar ) {} bool has() const { return getLength() > 0; } - OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); } + OUString operator()( const char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); } }; static const String EMPTY_STRING; @@ -722,7 +722,7 @@ class NameListWrapper public: NameListWrapper() {} /*implicit*/ NameListWrapper( const OUString& rListName ) : maName( rListName ) {} - /*implicit*/ NameListWrapper( const sal_Char* pcListName ) : maName( pcListName ) {} + /*implicit*/ NameListWrapper( const char* pcListName ) : maName( pcListName ) {} /*implicit*/ NameListWrapper( const NameListRef& rxList ) : mxList( rxList ) {} bool isEmpty() const { return !mxList && !maName.has(); } @@ -833,10 +833,10 @@ class Config : public Base { public: explicit Config( - const sal_Char* pcEnvVar, + const char* pcEnvVar, const ::oox::core::FilterBase& rFilter ); explicit Config( - const sal_Char* pcEnvVar, + const char* pcEnvVar, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName ); @@ -875,10 +875,10 @@ public: protected: Config() {} void construct( - const sal_Char* pcEnvVar, + const char* pcEnvVar, const ::oox::core::FilterBase& rFilter ); void construct( - const sal_Char* pcEnvVar, + const char* pcEnvVar, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const StorageRef& rxRootStrg, const OUString& rSysFileName ); @@ -954,7 +954,7 @@ public: void endMultiItems(); void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 ); - void writeAscii( const sal_Char* pcStr ); + void writeAscii( const char* pcStr ); void writeString( const OUString& rStr ); void writeArray( const sal_uInt8* pnData, std::size_t nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); void writeBool( bool bData ); diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index 6fdcc2ba5bd2..c1c4e78d357f 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -322,7 +322,7 @@ protected: sal_uInt8 dumpImageSizeModeProperty() { return dumpDecProperty< sal_uInt8 >( 0, "AX-IMAGESIZEMODE" ); } sal_uInt8 dumpImageAlignProperty() { return dumpDecProperty< sal_uInt8 >( 2, "AX-IMAGEALIGN" ); } - sal_uInt32 dumpFlagsProperty( sal_uInt32 nDefault, const sal_Char* pcNameList = "AX-FLAGS" ); + sal_uInt32 dumpFlagsProperty( sal_uInt32 nDefault, const char* pcNameList = "AX-FLAGS" ); sal_uInt32 dumpColorProperty( sal_uInt32 nDefault ); sal_Unicode dumpUnicodeProperty(); void dumpUnknownProperty(); diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx index 0d13043cc718..2c2bab5f71bd 100644 --- a/include/oox/ppt/pptfilterhelpers.hxx +++ b/include/oox/ppt/pptfilterhelpers.hxx @@ -52,7 +52,7 @@ namespace oox { namespace ppt { struct OOX_DLLPUBLIC transition { - const sal_Char* mpName; + const char* mpName; sal_Int16 const mnType; sal_Int16 const mnSubType; bool const mbDirection; // true: default geometric direction @@ -64,7 +64,7 @@ namespace oox { namespace ppt { struct OOX_DLLPUBLIC convert_subtype { sal_Int32 const mnID; - const sal_Char* mpStrSubType; + const char* mpStrSubType; static const convert_subtype* getList(); }; @@ -73,7 +73,7 @@ namespace oox { namespace ppt { { sal_Int32 mnPresetClass; sal_Int32 mnPresetId; - const sal_Char* mpStrPresetId; + const char* mpStrPresetId; static const preset_mapping* getList(); }; diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index fac28f7616c3..040851494cde 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -55,7 +55,7 @@ class PPTShape final : public oox::drawingml::Shape public: PPTShape( const oox::ppt::ShapeLocation eShapeLocation, - const sal_Char* pServiceType ); + const char* pServiceType ); virtual ~PPTShape() override; using oox::drawingml::Shape::addShape; diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index b5c14f20749b..91fa5cdb0967 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -66,7 +66,7 @@ public: // 50% of OOXML tokens are primarily 1 lower-case character, a-z if( nLength == 1) { - sal_Char c = pToken[0]; + char c = pToken[0]; if (c >= 'a' && c <= 'z') return mnAlphaTokens[ c - 'a' ]; } 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( ' ' ); diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 56b5ea47d038..aa14db7d7c6f 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::packages; * @return a component factory (generic uno interface) */ extern "C" SAL_DLLPUBLIC_EXPORT void * package2_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; uno::Reference< XMultiServiceFactory > xSMgr( diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx index 95490dd8865e..b4220ac28581 100644 --- a/package/source/xstor/register.cxx +++ b/package/source/xstor/register.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void * xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * xstor_component_getFactory( const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 8f1a0f6a89a3..b2a89749b98d 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -289,7 +289,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * pythonloader_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index d7baabe008da..e14a88ec2576 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -313,7 +313,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal writeINT32(pBuffer.get()+VALUE_HEADEROFFSET, *static_cast<sal_Int32*>(value)); break; case RegValueType::STRING: - writeUtf8(pBuffer.get()+VALUE_HEADEROFFSET, static_cast<const sal_Char*>(value)); + writeUtf8(pBuffer.get()+VALUE_HEADEROFFSET, static_cast<const char*>(value)); break; case RegValueType::UNICODE: writeString(pBuffer.get()+VALUE_HEADEROFFSET, static_cast<const sal_Unicode*>(value)); @@ -398,7 +398,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32 const * // setStringListValue -RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValueList, sal_uInt32 len) +RegError ORegKey::setStringListValue(const OUString& valueName, char** pValueList, sal_uInt32 len) { OStoreStream rValue; std::unique_ptr<sal_uInt8[]> pBuffer; @@ -589,7 +589,7 @@ RegError ORegKey::getValue(const OUString& valueName, RegValue value) const readINT32(pBuffer.get(), *static_cast<sal_Int32*>(value)); break; case RegValueType::STRING: - readUtf8(pBuffer.get(), static_cast<sal_Char*>(value), valueSize); + readUtf8(pBuffer.get(), static_cast<char*>(value), valueSize); break; case RegValueType::UNICODE: readString(pBuffer.get(), static_cast<sal_Unicode*>(value), valueSize); @@ -714,7 +714,7 @@ RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValue // getStringListValue -RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pValueList, sal_uInt32* pLen) const +RegError ORegKey::getStringListValue(const OUString& valueName, char*** pValueList, sal_uInt32* pLen) const { OStoreStream rValue; std::unique_ptr<sal_uInt8[]> pBuffer; @@ -785,19 +785,19 @@ RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pVal readUINT32(pBuffer.get(), len); *pLen = len; - sal_Char** pVList = static_cast<sal_Char**>(rtl_allocateZeroMemory(len * sizeof(sal_Char*))); + char** pVList = static_cast<char**>(rtl_allocateZeroMemory(len * sizeof(char*))); sal_uInt32 offset = 4; // initial 4 bytes for the size of the array; sal_uInt32 sLen = 0; - sal_Char *pValue; + char *pValue; for (sal_uInt32 i=0; i < len; i++) { readUINT32(pBuffer.get()+offset, sLen); offset += 4; - pValue = static_cast<sal_Char*>(std::malloc(sLen)); + pValue = static_cast<char*>(std::malloc(sLen)); readUtf8(pBuffer.get()+offset, pValue, sLen); pVList[i] = pValue; diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx index a964866d68bd..cf31c77a91af 100644 --- a/registry/source/keyimpl.hxx +++ b/registry/source/keyimpl.hxx @@ -68,7 +68,7 @@ public: sal_uInt32 len); RegError setStringListValue(const OUString& valueName, - sal_Char** pValueList, + char** pValueList, sal_uInt32 len); RegError setUnicodeListValue(const OUString& valueName, @@ -82,7 +82,7 @@ public: sal_uInt32* pLen) const; RegError getStringListValue(const OUString& valueName, - sal_Char*** pValueList, + char*** pValueList, sal_uInt32* pLen) const; RegError getUnicodeListValue(const OUString& valueName, diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx index 2fff0ca7340e..2254b94b511e 100644 --- a/registry/source/reflcnst.hxx +++ b/registry/source/reflcnst.hxx @@ -191,7 +191,7 @@ inline sal_uInt32 writeUINT64(sal_uInt8* buffer, sal_uInt64 v) return sizeof(sal_uInt64); } -inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const sal_Char* v) +inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const char* v) { sal_uInt32 size = strlen(v) + 1; @@ -200,7 +200,7 @@ inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const sal_Char* v) return size; } -inline sal_uInt32 readUtf8(const sal_uInt8* buffer, sal_Char* v, sal_uInt32 maxSize) +inline sal_uInt32 readUtf8(const sal_uInt8* buffer, char* v, sal_uInt32 maxSize) { sal_uInt32 size = strlen(reinterpret_cast<const char*>(buffer)) + 1; if(size > maxSize) diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 501ad3096804..3e3da9d089a2 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -37,7 +37,7 @@ #include <cstddef> -static const sal_Char NULL_STRING[1] = { 0 }; +static const char NULL_STRING[1] = { 0 }; static const sal_Unicode NULL_WSTRING[1] = { 0 }; const sal_uInt32 magic = 0x12345678; @@ -237,7 +237,7 @@ public: CPInfoTag readTag(sal_uInt16 index) const; - const sal_Char* readUTF8NameConstant(sal_uInt16 index) const; + const char* readUTF8NameConstant(sal_uInt16 index) const; bool readBOOLConstant(sal_uInt16 index) const; sal_Int8 readBYTEConstant(sal_uInt16 index) const; sal_Int16 readINT16Constant(sal_uInt16 index) const; @@ -303,9 +303,9 @@ CPInfoTag ConstantPool::readTag(sal_uInt16 index) const return tag; } -const sal_Char* ConstantPool::readUTF8NameConstant(sal_uInt16 index) const +const char* ConstantPool::readUTF8NameConstant(sal_uInt16 index) const { - const sal_Char* aName = NULL_STRING; + const char* aName = NULL_STRING; if (m_pIndex && (index > 0) && (index <= m_numOfEntries)) { @@ -563,20 +563,20 @@ public: sal_uInt32 parseIndex() const { return ((m_numOfEntries ? sizeof(sal_uInt16) : 0) + (m_numOfEntries * m_FIELD_ENTRY_SIZE));} - const sal_Char* getFieldName(sal_uInt16 index) const; - const sal_Char* getFieldType(sal_uInt16 index) const; + const char* getFieldName(sal_uInt16 index) const; + const char* getFieldType(sal_uInt16 index) const; RTFieldAccess getFieldAccess(sal_uInt16 index) const; RTValueType getFieldConstValue(sal_uInt16 index, RTConstValueUnion* value) const; // throws std::bad_alloc - const sal_Char* getFieldDoku(sal_uInt16 index) const; - const sal_Char* getFieldFileName(sal_uInt16 index) const; + const char* getFieldDoku(sal_uInt16 index) const; + const char* getFieldFileName(sal_uInt16 index) const; }; } -const sal_Char* FieldList::getFieldName(sal_uInt16 index) const +const char* FieldList::getFieldName(sal_uInt16 index) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -590,9 +590,9 @@ const sal_Char* FieldList::getFieldName(sal_uInt16 index) const return aName; } -const sal_Char* FieldList::getFieldType(sal_uInt16 index) const +const char* FieldList::getFieldType(sal_uInt16 index) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -685,9 +685,9 @@ RTValueType FieldList::getFieldConstValue(sal_uInt16 index, RTConstValueUnion* v return ret; } -const sal_Char* FieldList::getFieldDoku(sal_uInt16 index) const +const char* FieldList::getFieldDoku(sal_uInt16 index) const { - const sal_Char* aDoku = nullptr; + const char* aDoku = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -701,9 +701,9 @@ const sal_Char* FieldList::getFieldDoku(sal_uInt16 index) const return aDoku; } -const sal_Char* FieldList::getFieldFileName(sal_uInt16 index) const +const char* FieldList::getFieldFileName(sal_uInt16 index) const { - const sal_Char* aFileName = nullptr; + const char* aFileName = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -748,17 +748,17 @@ public: } } - const sal_Char* getReferenceName(sal_uInt16 index) const; + const char* getReferenceName(sal_uInt16 index) const; RTReferenceType getReferenceType(sal_uInt16 index) const; - const sal_Char* getReferenceDoku(sal_uInt16 index) const; + const char* getReferenceDoku(sal_uInt16 index) const; RTFieldAccess getReferenceAccess(sal_uInt16 index) const; }; } -const sal_Char* ReferenceList::getReferenceName(sal_uInt16 index) const +const char* ReferenceList::getReferenceName(sal_uInt16 index) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -788,9 +788,9 @@ RTReferenceType ReferenceList::getReferenceType(sal_uInt16 index) const return refType; } -const sal_Char* ReferenceList::getReferenceDoku(sal_uInt16 index) const +const char* ReferenceList::getReferenceDoku(sal_uInt16 index) const { - const sal_Char* aDoku = nullptr; + const char* aDoku = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -855,16 +855,16 @@ public: sal_uInt32 parseIndex(); // throws std::bad_alloc - const sal_Char* getMethodName(sal_uInt16 index) const; + const char* getMethodName(sal_uInt16 index) const; sal_uInt16 getMethodParamCount(sal_uInt16 index) const; - const sal_Char* getMethodParamType(sal_uInt16 index, sal_uInt16 paramIndex) const; - const sal_Char* getMethodParamName(sal_uInt16 index, sal_uInt16 paramIndex) const; + const char* getMethodParamType(sal_uInt16 index, sal_uInt16 paramIndex) const; + const char* getMethodParamName(sal_uInt16 index, sal_uInt16 paramIndex) const; RTParamMode getMethodParamMode(sal_uInt16 index, sal_uInt16 paramIndex) const; sal_uInt16 getMethodExcCount(sal_uInt16 index) const; - const sal_Char* getMethodExcType(sal_uInt16 index, sal_uInt16 excIndex) const; - const sal_Char* getMethodReturnType(sal_uInt16 index) const; + const char* getMethodExcType(sal_uInt16 index, sal_uInt16 excIndex) const; + const char* getMethodReturnType(sal_uInt16 index) const; RTMethodMode getMethodMode(sal_uInt16 index) const; - const sal_Char* getMethodDoku(sal_uInt16 index) const; + const char* getMethodDoku(sal_uInt16 index) const; private: sal_uInt16 calcMethodParamIndex( const sal_uInt16 index ) const; @@ -899,9 +899,9 @@ sal_uInt32 MethodList::parseIndex() return offset; } -const sal_Char* MethodList::getMethodName(sal_uInt16 index) const +const char* MethodList::getMethodName(sal_uInt16 index) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -931,9 +931,9 @@ sal_uInt16 MethodList::getMethodParamCount(sal_uInt16 index) const return aCount; } -const sal_Char* MethodList::getMethodParamType(sal_uInt16 index, sal_uInt16 paramIndex) const +const char* MethodList::getMethodParamType(sal_uInt16 index, sal_uInt16 paramIndex) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; try { if ((m_numOfEntries > 0) && (index <= m_numOfEntries) && @@ -951,9 +951,9 @@ const sal_Char* MethodList::getMethodParamType(sal_uInt16 index, sal_uInt16 para return aName; } -const sal_Char* MethodList::getMethodParamName(sal_uInt16 index, sal_uInt16 paramIndex) const +const char* MethodList::getMethodParamName(sal_uInt16 index, sal_uInt16 paramIndex) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; try { if ((m_numOfEntries > 0) && (index <= m_numOfEntries) && @@ -1013,9 +1013,9 @@ sal_uInt16 MethodList::getMethodExcCount(sal_uInt16 index) const return aCount; } -const sal_Char* MethodList::getMethodExcType(sal_uInt16 index, sal_uInt16 excIndex) const +const char* MethodList::getMethodExcType(sal_uInt16 index, sal_uInt16 excIndex) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -1037,9 +1037,9 @@ const sal_Char* MethodList::getMethodExcType(sal_uInt16 index, sal_uInt16 excInd return aName; } -const sal_Char* MethodList::getMethodReturnType(sal_uInt16 index) const +const char* MethodList::getMethodReturnType(sal_uInt16 index) const { - const sal_Char* aName = nullptr; + const char* aName = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -1069,9 +1069,9 @@ RTMethodMode MethodList::getMethodMode(sal_uInt16 index) const return aMode; } -const sal_Char* MethodList::getMethodDoku(sal_uInt16 index) const +const char* MethodList::getMethodDoku(sal_uInt16 index) const { - const sal_Char* aDoku = nullptr; + const char* aDoku = nullptr; if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { @@ -1281,7 +1281,7 @@ void TYPEREG_CALLTYPE typereg_reader_getTypeName(void * hEntry, rtl_uString** pT TypeRegistryEntry* pEntry = static_cast<TypeRegistryEntry*>(hEntry); if (pEntry != nullptr) { try { - const sal_Char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(OFFSET_THIS_TYPE)); + const char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(OFFSET_THIS_TYPE)); rtl_string2UString( pTypeName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1299,7 +1299,7 @@ static void TYPEREG_CALLTYPE getSuperTypeName(TypeReaderImpl hEntry, rtl_uString TypeRegistryEntry* pEntry = static_cast<TypeRegistryEntry*>(hEntry); if (pEntry != nullptr && pEntry->m_nSuperTypes != 0) { try { - const sal_Char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(pEntry->m_offset_SUPERTYPES )); //+ (index * sizeof(sal_uInt16)))); + const char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(pEntry->m_offset_SUPERTYPES )); //+ (index * sizeof(sal_uInt16)))); rtl_string2UString( pSuperTypeName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1316,7 +1316,7 @@ void TYPEREG_CALLTYPE typereg_reader_getDocumentation(void * hEntry, rtl_uString TypeRegistryEntry* pEntry = static_cast<TypeRegistryEntry*>(hEntry); if (pEntry != nullptr) { try { - const sal_Char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(OFFSET_DOKU)); + const char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(OFFSET_DOKU)); rtl_string2UString( pDoku, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1333,7 +1333,7 @@ void TYPEREG_CALLTYPE typereg_reader_getFileName(void * hEntry, rtl_uString** pF TypeRegistryEntry* pEntry = static_cast<TypeRegistryEntry*>(hEntry); if (pEntry != nullptr) { try { - const sal_Char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(OFFSET_FILENAME)); + const char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(OFFSET_FILENAME)); rtl_string2UString( pFileName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1369,7 +1369,7 @@ void TYPEREG_CALLTYPE typereg_reader_getFieldName(void * hEntry, rtl_uString** p rtl_uString_new(pFieldName); return; } - const sal_Char* pTmp = pEntry->m_pFields->getFieldName(index); + const char* pTmp = pEntry->m_pFields->getFieldName(index); rtl_string2UString( pFieldName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1385,7 +1385,7 @@ void TYPEREG_CALLTYPE typereg_reader_getFieldTypeName(void * hEntry, rtl_uString return; } - const sal_Char* pTmp = pEntry->m_pFields->getFieldType(index); + const char* pTmp = pEntry->m_pFields->getFieldType(index); rtl_string2UString( pFieldType, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1436,7 +1436,7 @@ void TYPEREG_CALLTYPE typereg_reader_getFieldDocumentation(void * hEntry, rtl_uS return; } - const sal_Char* pTmp = pEntry->m_pFields->getFieldDoku(index); + const char* pTmp = pEntry->m_pFields->getFieldDoku(index); rtl_string2UString( pDoku, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1452,7 +1452,7 @@ void TYPEREG_CALLTYPE typereg_reader_getFieldFileName(void * hEntry, rtl_uString return; } - const sal_Char* pTmp = pEntry->m_pFields->getFieldFileName(index); + const char* pTmp = pEntry->m_pFields->getFieldFileName(index); rtl_string2UString( pFieldFileName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1478,7 +1478,7 @@ void TYPEREG_CALLTYPE typereg_reader_getMethodName(void * hEntry, rtl_uString** return; } - const sal_Char* pTmp = pEntry->m_pMethods->getMethodName(index); + const char* pTmp = pEntry->m_pMethods->getMethodName(index); rtl_string2UString( pMethodName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1504,7 +1504,7 @@ void TYPEREG_CALLTYPE typereg_reader_getMethodParameterTypeName(void * hEntry, r return; } - const sal_Char* pTmp = pEntry->m_pMethods->getMethodParamType(index, paramIndex); + const char* pTmp = pEntry->m_pMethods->getMethodParamType(index, paramIndex); rtl_string2UString( pMethodParamType, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1520,7 +1520,7 @@ void TYPEREG_CALLTYPE typereg_reader_getMethodParameterName(void * hEntry, rtl_u return; } - const sal_Char* pTmp = pEntry->m_pMethods->getMethodParamName(index, paramIndex); + const char* pTmp = pEntry->m_pMethods->getMethodParamName(index, paramIndex); rtl_string2UString( pMethodParamName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1555,7 +1555,7 @@ void TYPEREG_CALLTYPE typereg_reader_getMethodExceptionTypeName(void * hEntry, r return; } - const sal_Char* pTmp = pEntry->m_pMethods->getMethodExcType(index, excIndex); + const char* pTmp = pEntry->m_pMethods->getMethodExcType(index, excIndex); rtl_string2UString( pMethodExcpType, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1571,7 +1571,7 @@ void TYPEREG_CALLTYPE typereg_reader_getMethodReturnTypeName(void * hEntry, rtl_ return; } - const sal_Char* pTmp = pEntry->m_pMethods->getMethodReturnType(index); + const char* pTmp = pEntry->m_pMethods->getMethodReturnType(index); rtl_string2UString( pMethodReturnType, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1596,7 +1596,7 @@ void TYPEREG_CALLTYPE typereg_reader_getMethodDocumentation(void * hEntry, rtl_u return; } - const sal_Char* pTmp = pEntry->m_pMethods->getMethodDoku(index); + const char* pTmp = pEntry->m_pMethods->getMethodDoku(index); rtl_string2UString( pMethodDoku, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1621,7 +1621,7 @@ void TYPEREG_CALLTYPE typereg_reader_getReferenceTypeName(void * hEntry, rtl_uSt return; } - const sal_Char* pTmp = pEntry->m_pReferences->getReferenceName(index); + const char* pTmp = pEntry->m_pReferences->getReferenceName(index); rtl_string2UString( pReferenceName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1646,7 +1646,7 @@ void TYPEREG_CALLTYPE typereg_reader_getReferenceDocumentation(void * hEntry, rt return; } - const sal_Char* pTmp = pEntry->m_pReferences->getReferenceDoku(index); + const char* pTmp = pEntry->m_pReferences->getReferenceDoku(index); rtl_string2UString( pReferenceDoku, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); @@ -1677,7 +1677,7 @@ void TYPEREG_CALLTYPE typereg_reader_getSuperTypeName( if (pEntry != nullptr) { try { OSL_ASSERT(index < pEntry->m_nSuperTypes); - const sal_Char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(pEntry->m_offset_SUPERTYPES + (index * sizeof(sal_uInt16)))); + const char* pTmp = pEntry->m_pCP->readUTF8NameConstant(pEntry->readUINT16(pEntry->m_offset_SUPERTYPES + (index * sizeof(sal_uInt16)))); rtl_string2UString( pSuperTypeName, pTmp, pTmp == nullptr ? 0 : rtl_str_getLength(pTmp), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS); diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index 25937eea8f8d..0d2f7160d472 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -177,7 +177,7 @@ struct CPInfo { union { - const sal_Char* aUtf8; + const char* aUtf8; RTUik* aUik; RTConstValueUnion aConst; } m_value; diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 43e12cb8f375..e58e99b4cdf7 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -1338,7 +1338,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_ return RegError::INVALID_VALUE; } - const sal_Char* indent = sIndent.getStr(); + const char* indent = sIndent.getStr(); switch (valueType) { case RegValueType::NOT_DEFINED: @@ -1359,7 +1359,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_ break; case RegValueType::STRING: { - sal_Char* value = static_cast<sal_Char*>(std::malloc(valueSize)); + char* value = static_cast<char*>(std::malloc(valueSize)); readUtf8(aBuffer.data(), value, valueSize); fprintf(stdout, "%sValue: Type = RegValueType::STRING\n", indent); fprintf( @@ -1452,7 +1452,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_ offset += 4; // 4 bytes (sal_uInt32) for the string size - sal_Char *pValue = static_cast<sal_Char*>(std::malloc(sLen)); + char *pValue = static_cast<char*>(std::malloc(sLen)); readUtf8(aBuffer.data() + offset, pValue, sLen); if (offset > 8) diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index b63bb5ccf1e1..55b0bc80924e 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -278,7 +278,7 @@ RegError REGISTRY_CALLTYPE setLongListValue(RegKeyHandle hKey, RegError REGISTRY_CALLTYPE setStringListValue(RegKeyHandle hKey, rtl_uString* keyName, - sal_Char** pValueList, + char** pValueList, sal_uInt32 len) { ORegKey* pKey = static_cast< ORegKey* >(hKey); @@ -490,7 +490,7 @@ RegError REGISTRY_CALLTYPE getLongListValue(RegKeyHandle hKey, RegError REGISTRY_CALLTYPE getStringListValue(RegKeyHandle hKey, rtl_uString* keyName, - sal_Char*** pValueList, + char*** pValueList, sal_uInt32* pLen) { OSL_PRECOND((pValueList != nullptr) && (pLen != nullptr), "registry::getStringListValue(): invalid parameter"); @@ -579,7 +579,7 @@ RegError REGISTRY_CALLTYPE freeValueList(RegValueType valueType, break; case RegValueType::STRINGLIST: { - sal_Char** pVList = static_cast<sal_Char**>(pValueList); + char** pVList = static_cast<char**>(pValueList); for (sal_uInt32 i=0; i < len; i++) { std::free(pVList[i]); diff --git a/registry/source/regkey.hxx b/registry/source/regkey.hxx index 45c55cee93a7..76e8c2993c18 100644 --- a/registry/source/regkey.hxx +++ b/registry/source/regkey.hxx @@ -43,7 +43,7 @@ RegError REGISTRY_CALLTYPE setValue( RegError REGISTRY_CALLTYPE setLongListValue( RegKeyHandle, rtl_uString*, sal_Int32 const *, sal_uInt32); RegError REGISTRY_CALLTYPE setStringListValue( - RegKeyHandle, rtl_uString*, sal_Char**, sal_uInt32); + RegKeyHandle, rtl_uString*, char**, sal_uInt32); RegError REGISTRY_CALLTYPE setUnicodeListValue( RegKeyHandle, rtl_uString*, sal_Unicode**, sal_uInt32); RegError REGISTRY_CALLTYPE getValueInfo( @@ -52,7 +52,7 @@ RegError REGISTRY_CALLTYPE getValue(RegKeyHandle, rtl_uString*, RegValue); RegError REGISTRY_CALLTYPE getLongListValue( RegKeyHandle, rtl_uString*, sal_Int32**, sal_uInt32*); RegError REGISTRY_CALLTYPE getStringListValue( - RegKeyHandle, rtl_uString*, sal_Char***, sal_uInt32*); + RegKeyHandle, rtl_uString*, char***, sal_uInt32*); RegError REGISTRY_CALLTYPE getUnicodeListValue( RegKeyHandle, rtl_uString*, sal_Unicode***, sal_uInt32*); RegError REGISTRY_CALLTYPE freeValueList(RegValueType, RegValue, sal_uInt32); diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx index cd480534abc5..2e8cbbcc59cc 100644 --- a/registry/test/testmerge.cxx +++ b/registry/test/testmerge.cxx @@ -37,7 +37,7 @@ sal_Int32 lValue1 = 123456789; sal_Int32 lValue2 = 54321; sal_Int32 lValue3 = 111333111; sal_Int32 lValue4 = 333111333; -sal_Char* sValue = (sal_Char*)"string Value"; +char* sValue = (char*)"string Value"; OUString wValue("unicode Value"); @@ -302,7 +302,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 76"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), (RegValue)Value), "testMerge error 76.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 76.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 76.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 77"); @@ -316,14 +316,14 @@ void test_merge() REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 27, "testMerge error 80"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 80.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)"); + REG_ENSURE(strcmp((const char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 81"); REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 11, "testMerge error 82"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 82.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, "1234567890") == 0, "testMerge error 82.b)"); + REG_ENSURE(strcmp((const char*)Value, "1234567890") == 0, "testMerge error 82.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 83"); @@ -337,7 +337,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 86"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), (RegValue)Value), "testMerge error 86.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 86.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 86.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 87"); @@ -354,7 +354,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 92"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), (RegValue)Value), "testMerge error 92.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 92.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 92.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 93"); @@ -368,7 +368,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::BINARY && valueSize == 19, "testMerge error 96"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 96.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)"); + REG_ENSURE(strcmp((const char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 97"); @@ -380,7 +380,7 @@ void test_merge() REG_ENSURE(valueType == RegValueType::STRING && valueSize == strlen(sValue)+1, "testMerge error 100"); Value = new sal_uInt8[valueSize]; REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), (RegValue)Value), "testMerge error 100.a)"); - REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 100.b)"); + REG_ENSURE(strcmp((const char*)Value, sValue) == 0, "testMerge error 100.b)"); delete [] Value; REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 101"); diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index 064eb40137a2..8b9531194c9b 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -491,15 +491,15 @@ void test_registry_CppApi() REG_ENSURE(!key8.closeKey(), "test_registry_CppApi error 8d"); - sal_Char* Value=(sal_Char*)"My first value"; + char* Value=(char*)"My first value"; REG_ENSURE(!rootKey.setValue(OUString("mySecondKey"), RegValueType::STRING, Value, 18), "test_registry_CppApi error 9"); RegValueType valueType; sal_uInt32 valueSize; - sal_Char* readValue; + char* readValue; REG_ENSURE(!rootKey.getValueInfo(OUString("mySecondKey"), &valueType, &valueSize), "test_registry_CppApi error 9a"); - readValue = (sal_Char*)std::malloc(valueSize); + readValue = (char*)std::malloc(valueSize); REG_ENSURE(!key2.getValue(OUString(), readValue), "test_registry_CppApi error 10"); REG_ENSURE(valueType == RegValueType::STRING, "test_registry_CppApi error 11"); @@ -507,18 +507,18 @@ void test_registry_CppApi() REG_ENSURE(strcmp(readValue, Value) == 0, "test_registry_CppApi error 13"); std::free(readValue); - const sal_Char* pList[3]; - const sal_Char* n1= "Hello"; - const sal_Char* n2= "now I"; - const sal_Char* n3= "come"; + const char* pList[3]; + const char* n1= "Hello"; + const char* n2= "now I"; + const char* n3= "come"; pList[0]=n1; pList[1]=n2; pList[2]=n3; - REG_ENSURE(!rootKey.setStringListValue(OUString("myFourthKey"), (sal_Char**)pList, 3), "test_registry_CppApi error 13a"); + REG_ENSURE(!rootKey.setStringListValue(OUString("myFourthKey"), (char**)pList, 3), "test_registry_CppApi error 13a"); - RegistryValueList<sal_Char*> valueList; + RegistryValueList<char*> valueList; REG_ENSURE(!rootKey.getStringListValue(OUString("myFourthKey"), valueList), "test_registry_CppApi error 13b"); REG_ENSURE(strcmp(n1, valueList.getElement(0)) == 0, "test_registry_CppApi error 13c"); |