diff options
22 files changed, 68 insertions, 68 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 9e7cf05aa91c..36c1356487f1 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -43,7 +43,7 @@ using namespace sca::analysis; using namespace std; extern "C" SAL_DLLPUBLIC_EXPORT void* analysis_component_getFactory( - const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) + const char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { void* pRet = nullptr; @@ -319,8 +319,8 @@ OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName( const OUString& aProgra return aRet; } -static const sal_Char* pLang[] = { "de", "en" }; -static const sal_Char* pCoun[] = { "DE", "US" }; +static const char* pLang[] = { "de", "en" }; +static const char* pCoun[] = { "DE", "US" }; static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS(pLang); void AnalysisAddIn::InitDefLocales() diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 799f1b801f0e..55520469728c 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -687,9 +687,9 @@ double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim } -static sal_Char GetMaxChar( sal_uInt16 nBase ) +static char GetMaxChar( sal_uInt16 nBase ) { - const sal_Char* const c = "--123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + const char* const c = "--123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; return c[ nBase ]; } @@ -722,7 +722,7 @@ OUString ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase else if( ( bNeg && nLen < nMaxPlaces ) || ( !bNeg && nLen < nPlaces ) ) { sal_Int32 nLeft = nPlaces - nLen; - std::unique_ptr<sal_Char[]> p( new sal_Char[ nLeft + 1 ] ); + std::unique_ptr<char[]> p( new char[ nLeft + 1 ] ); memset( p.get(), bNeg ? GetMaxChar( nBase ) : '0', nLeft ); p[ nLeft ] = 0x00; aRet = OUString( p.get(), nLeft, RTL_TEXTENCODING_MS_1252 ) + aRet; @@ -944,7 +944,7 @@ bool ParseDouble( const sal_Unicode*& rp, double& rRet ) OUString GetString( double f, bool bLeadingSign, sal_uInt16 nMaxDig ) { const int nBuff = 256; - sal_Char aBuff[ nBuff + 1 ]; + char aBuff[ nBuff + 1 ]; const char* pFormStr = bLeadingSign? "%+.*g" : "%.*g"; int nLen = snprintf( aBuff, nBuff, pFormStr, int( nMaxDig ), f ); // you never know which underlying implementation you get ... @@ -2040,7 +2040,7 @@ void ComplexList::Append( const uno::Sequence< uno::Any >& aMultPars ) } } -ConvertData::ConvertData(const sal_Char p[], double fC, ConvertDataClass e, bool bPrefSupport) +ConvertData::ConvertData(const char p[], double fC, ConvertDataClass e, bool bPrefSupport) : fConst(fC) , aName(p, strlen(p), RTL_TEXTENCODING_MS_1252) , eClass(e) diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 99a840a95678..73064ebf7cc7 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -188,7 +188,7 @@ enum class FDCategory struct FuncDataBase { - const sal_Char* pIntName; + const char* pIntName; const char* pUINameID; // resource ID to UI name const char** pDescrID; // resource ID to description, parameter names and ~ description bool const bDouble; // name already exist in Calc @@ -509,7 +509,7 @@ protected: bool const bPrefixSupport; public: ConvertData( - const sal_Char pUnitName[], + const char pUnitName[], double fConvertConstant, ConvertDataClass eClass, bool bPrefSupport = false ); @@ -536,7 +536,7 @@ class ConvertDataLinear final : public ConvertData double const fOffs; public: inline ConvertDataLinear( - const sal_Char pUnitName[], + const char pUnitName[], double fConvertConstant, double fConvertOffset, ConvertDataClass eClass, @@ -718,7 +718,7 @@ inline ConvertDataClass ConvertData::Class() const return eClass; } -inline ConvertDataLinear::ConvertDataLinear( const sal_Char p[], double fC, double fO, ConvertDataClass e, +inline ConvertDataLinear::ConvertDataLinear( const char p[], double fC, double fO, ConvertDataClass e, bool bPrefSupport ) : ConvertData( p, fC, e, bPrefSupport ), fOffs( fO ) diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index f566f3055b6a..b924908a2ec6 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -94,7 +94,7 @@ static uno::Reference< uno::XInterface > ScaDateAddIn_CreateInstance( extern "C" { SAL_DLLPUBLIC_EXPORT void * date_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = nullptr; @@ -124,8 +124,8 @@ ScaDateAddIn::ScaDateAddIn() { } -static const sal_Char* pLang[] = { "de", "en" }; -static const sal_Char* pCoun[] = { "DE", "US" }; +static const char* pLang[] = { "de", "en" }; +static const char* pCoun[] = { "DE", "US" }; static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang ); void ScaDateAddIn::InitDefLocales() diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index b034ba26e2eb..ab49a1bf30c7 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -46,7 +46,7 @@ enum class ScaCategory struct ScaFuncDataBase { - const sal_Char* pIntName; // internal name (get***) + const char* pIntName; // internal name (get***) const char* pUINameID; // resource ID to UI name const char** pDescrID; // resource ID to description, parameter names and ~ description const char** pCompListID; // list of valid names diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index 97d9401cdc1d..32f4414dd0a0 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -96,7 +96,7 @@ static uno::Reference< uno::XInterface > ScaPricingAddIn_CreateInstance( extern "C" { SAL_DLLPUBLIC_EXPORT void * pricing_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = nullptr; @@ -130,8 +130,8 @@ ScaPricingAddIn::~ScaPricingAddIn() { } -static const sal_Char* pLang[] = { "de", "en" }; -static const sal_Char* pCoun[] = { "DE", "US" }; +static const char* pLang[] = { "de", "en" }; +static const char* pCoun[] = { "DE", "US" }; static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang ); void ScaPricingAddIn::InitDefLocales() diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 874a842a740e..1ce75c1756e1 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -57,7 +57,7 @@ enum class ScaCategory struct ScaFuncDataBase { - const sal_Char* pIntName; // internal name (get***) + const char* pIntName; // internal name (get***) const char* pUINameID; // resource ID to UI name const char** pDescrID; // resource ID to description, parameter names and ~ description // pCompName was originally meant to be able to load Excel documents that for diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index f4cad3372572..ad990dbd4863 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -517,7 +517,7 @@ namespace basprov extern "C" { SAL_DLLPUBLIC_EXPORT void * basprov_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index ef5673bafbfd..8b9a289b95e6 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -753,7 +753,7 @@ namespace dlgprov extern "C" { SAL_DLLPUBLIC_EXPORT void * dlgprov_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index c167fb3c42d8..3b3fe4e307ef 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -469,7 +469,7 @@ const Reference< XMultiServiceFactory >& xServiceManager ) extern "C" { - SAL_DLLPUBLIC_EXPORT void* protocolhandler_component_getFactory( const sal_Char * pImplementationName , + SAL_DLLPUBLIC_EXPORT void* protocolhandler_component_getFactory( const char * pImplementationName , void * pServiceManager , void * ) { diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 41d64c0704f2..75cf2ff33fbd 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -757,7 +757,7 @@ extern "C" * @return a component factory */ SAL_DLLPUBLIC_EXPORT void * scriptframe_component_getFactory( - const sal_Char * pImplName, + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 266737de056a..e6daf55f28db 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -283,7 +283,7 @@ Sequence< Locale > StringResourceImpl::getLocales( ) // XStringResourceManager -void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) +void StringResourceImpl::implCheckReadOnly( const char* pExceptionMsg ) { if( m_bReadOnly ) { @@ -2694,7 +2694,7 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { SAL_DLLPUBLIC_EXPORT void * stringresource_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 5e65f06f09b3..81c558fd7b99 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -114,7 +114,7 @@ protected: // Checks read only status and throws exception if it's true /// @throws css::lang::NoSupportException - void implCheckReadOnly( const sal_Char* pExceptionMsg ); + void implCheckReadOnly( const char* pExceptionMsg ); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method compares the locales exactly, no closest match search is performed diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index b191462eef15..95d083ab9439 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -98,7 +98,7 @@ void OdfEmitter::write( const OUString& rText ) const OString aStr = OUStringToOString(rText,RTL_TEXTENCODING_UTF8); const sal_Int32 nLen( aStr.getLength() ); m_aBuf.realloc( nLen ); - const sal_Char* pStr = aStr.getStr(); + const char* pStr = aStr.getStr(); std::copy(pStr,pStr+nLen,m_aBuf.getArray()); m_xOutput->writeBytes(m_aBuf); diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index f164ac0a5ae7..88cb3e1789ab 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -157,27 +157,27 @@ PDFEntry* PDFName::clone() const OUString PDFName::getFilteredName() const { OStringBuffer aFilter( m_aName.getLength() ); - const sal_Char* pStr = m_aName.getStr(); + const char* pStr = m_aName.getStr(); unsigned int nLen = m_aName.getLength(); for( unsigned int i = 0; i < nLen; i++ ) { if( (i < nLen - 3) && pStr[i] == '#' ) { - sal_Char rResult = 0; + char rResult = 0; i++; if( pStr[i] >= '0' && pStr[i] <= '9' ) - rResult = sal_Char( pStr[i]-'0' ) << 4; + rResult = char( pStr[i]-'0' ) << 4; else if( pStr[i] >= 'a' && pStr[i] <= 'f' ) - rResult = sal_Char( pStr[i]-'a' + 10 ) << 4; + rResult = char( pStr[i]-'a' + 10 ) << 4; else if( pStr[i] >= 'A' && pStr[i] <= 'F' ) - rResult = sal_Char( pStr[i]-'A' + 10 ) << 4; + rResult = char( pStr[i]-'A' + 10 ) << 4; i++; if( pStr[i] >= '0' && pStr[i] <= '9' ) - rResult |= sal_Char( pStr[i]-'0' ); + rResult |= char( pStr[i]-'0' ); else if( pStr[i] >= 'a' && pStr[i] <= 'f' ) - rResult |= sal_Char( pStr[i]-'a' + 10 ); + rResult |= char( pStr[i]-'a' + 10 ); else if( pStr[i] >= 'A' && pStr[i] <= 'F' ) - rResult |= sal_Char( pStr[i]-'A' + 10 ); + rResult |= char( pStr[i]-'A' + 10 ); aFilter.append( rResult ); } else @@ -204,7 +204,7 @@ bool PDFString::emit( EmitContext& rWriteContext ) const reinterpret_cast<sal_uInt8 *>(const_cast<char *>(aFiltered.getStr())), pEData->m_nDecryptObject, pEData->m_nDecryptGeneration ); // check for string or hex string - const sal_Char* pStr = aFiltered.getStr(); + const char* pStr = aFiltered.getStr(); if( aFiltered.getLength() > 1 && ( (static_cast<unsigned char>(pStr[0]) == 0xff && static_cast<unsigned char>(pStr[1]) == 0xfe) || (static_cast<unsigned char>(pStr[0]) == 0xfe && static_cast<unsigned char>(pStr[1]) == 0xff) ) ) @@ -247,10 +247,10 @@ OString PDFString::getFilteredString() const int nLen = m_aString.getLength(); OStringBuffer aBuf( nLen ); - const sal_Char* pStr = m_aString.getStr(); + const char* pStr = m_aString.getStr(); if( *pStr == '(' ) { - const sal_Char* pRun = pStr+1; + const char* pRun = pStr+1; while( pRun - pStr < nLen-1 ) { if( *pRun == '\\' ) @@ -258,7 +258,7 @@ OString PDFString::getFilteredString() const pRun++; if( pRun - pStr < nLen ) { - sal_Char aEsc = 0; + char aEsc = 0; if( *pRun == 'n' ) aEsc = '\n'; else if( *pRun == 'r' ) @@ -306,25 +306,25 @@ OString PDFString::getFilteredString() const } else if( *pStr == '<' ) { - const sal_Char* pRun = pStr+1; + const char* pRun = pStr+1; while( *pRun != '>' && pRun - pStr < nLen ) { - sal_Char rResult = 0; + char rResult = 0; if( *pRun >= '0' && *pRun <= '9' ) - rResult = sal_Char( ( *pRun-'0' ) << 4 ); + rResult = char( ( *pRun-'0' ) << 4 ); else if( *pRun >= 'a' && *pRun <= 'f' ) - rResult = sal_Char( ( *pRun-'a' + 10 ) << 4 ); + rResult = char( ( *pRun-'a' + 10 ) << 4 ); else if( *pRun >= 'A' && *pRun <= 'F' ) - rResult = sal_Char( ( *pRun-'A' + 10 ) << 4 ); + rResult = char( ( *pRun-'A' + 10 ) << 4 ); pRun++; if( *pRun != '>' && pRun - pStr < nLen ) { if( *pRun >= '0' && *pRun <= '9' ) - rResult |= sal_Char( *pRun-'0' ); + rResult |= char( *pRun-'0' ); else if( *pRun >= 'a' && *pRun <= 'f' ) - rResult |= sal_Char( *pRun-'a' + 10 ); + rResult |= char( *pRun-'a' + 10 ); else if( *pRun >= 'A' && *pRun <= 'F' ) - rResult |= sal_Char( *pRun-'A' + 10 ); + rResult |= char( *pRun-'A' + 10 ); } pRun++; aBuf.append( rResult ); @@ -1101,12 +1101,12 @@ static const sal_uInt8 nPadString[32] = 0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A }; -static void pad_or_truncate_to_32( const OString& rStr, sal_Char* pBuffer ) +static void pad_or_truncate_to_32( const OString& rStr, char* pBuffer ) { int nLen = rStr.getLength(); if( nLen > 32 ) nLen = 32; - const sal_Char* pStr = rStr.getStr(); + const char* pStr = rStr.getStr(); memcpy( pBuffer, pStr, nLen ); int i = 0; while( nLen < 32 ) @@ -1118,7 +1118,7 @@ static sal_uInt32 password_to_key( const OString& rPwd, sal_uInt8* pOutKey, PDFF { // see PDF reference 1.4 Algorithm 3.2 // encrypt pad string - sal_Char aPadPwd[ENCRYPTION_BUF_LEN]; + char aPadPwd[ENCRYPTION_BUF_LEN]; pad_or_truncate_to_32( rPwd, aPadPwd ); ::comphelper::Hash aDigest(::comphelper::HashType::MD5); aDigest.update(reinterpret_cast<unsigned char const*>(aPadPwd), sizeof(aPadPwd)); diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 03dd5aca4dea..f973e24931c0 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -62,7 +62,7 @@ class StringEmitContext : public EmitContext virtual bool write( const void* pBuf, unsigned int nLen ) throw() override { - m_aBuf.append( static_cast<const sal_Char*>(pBuf), nLen ); + m_aBuf.append( static_cast<const char*>(pBuf), nLen ); return true; } virtual unsigned int getCurPos() throw() override { return m_aBuf.getLength(); } diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 410776e5011c..ee3282c5521e 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -77,8 +77,8 @@ namespace struct ComponentDescription { - const sal_Char* pAsciiServiceName; - const sal_Char* pAsciiImplementationName; + const char* pAsciiServiceName; + const char* pAsciiImplementationName; ComponentFactory const pFactory; ComponentDescription() @@ -87,7 +87,7 @@ namespace ,pFactory( nullptr ) { } - ComponentDescription( const sal_Char* _pAsciiServiceName, const sal_Char* _pAsciiImplementationName, ComponentFactory _pFactory ) + ComponentDescription( const char* _pAsciiServiceName, const char* _pAsciiImplementationName, ComponentFactory _pFactory ) :pAsciiServiceName( _pAsciiServiceName ) ,pAsciiImplementationName( _pAsciiImplementationName ) ,pFactory( _pFactory ) @@ -110,7 +110,7 @@ namespace } extern "C" SAL_DLLPUBLIC_EXPORT void* pdfimport_component_getFactory( - const sal_Char* pImplementationName, + const char* pImplementationName, SAL_UNUSED_PARAMETER void* /*pServiceManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) { diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index bd9fddc5cd56..a171b5a3bdac 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -74,7 +74,7 @@ typedef ::cppu::WeakComponentImplHelper< virtual void SAL_CALL writeBytes(const css::uno::Sequence< ::sal_Int8 >& aData) override { - maBuffer.append(reinterpret_cast<const sal_Char *>(aData.getConstArray()), aData.getLength()); + maBuffer.append(reinterpret_cast<const char *>(aData.getConstArray()), aData.getLength()); } virtual void SAL_CALL flush() override diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 87a831d82ba1..2be33dcede42 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -36,7 +36,7 @@ namespace pdfi namespace { -static const sal_Char aBase64EncodeTable[] = +static const char aBase64EncodeTable[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 5074258605a5..e8932f16f3b7 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -204,15 +204,15 @@ public: OString lcl_unescapeLineFeeds(const OString& i_rStr) { const size_t nOrigLen(sal::static_int_cast<size_t>(i_rStr.getLength())); - const sal_Char* const pOrig(i_rStr.getStr()); - std::unique_ptr<sal_Char[]> pBuffer(new sal_Char[nOrigLen + 1]); + const char* const pOrig(i_rStr.getStr()); + std::unique_ptr<char[]> pBuffer(new char[nOrigLen + 1]); - const sal_Char* pRead(pOrig); - sal_Char* pWrite(pBuffer.get()); - const sal_Char* pCur(pOrig); + const char* pRead(pOrig); + char* pWrite(pBuffer.get()); + const char* pCur(pOrig); while ((pCur = strchr(pCur, '\\')) != nullptr) { - const sal_Char cNext(pCur[1]); + const char cNext(pCur[1]); if (cNext == 'n' || cNext == 'r' || cNext == '\\') { const size_t nLen(pCur - pRead); diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index fc99cd56fceb..2d8fb4ce6353 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -48,7 +48,7 @@ static const struct ImplementationEntry gServiceEntries[] = }; extern "C" SAL_DLLPUBLIC_EXPORT void * presenter_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries); } diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 70e3f57291c6..346e2847f3a7 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -610,8 +610,8 @@ void LineDescriptorList::SplitText ( const OUString& rsText, vector<OUString>& rTextParts) { - const sal_Char cQuote ('\''); - const sal_Char cSeparator (','); + const char cQuote ('\''); + const char cSeparator (','); sal_Int32 nIndex (0); sal_Int32 nStart (0); @@ -663,7 +663,7 @@ void LineDescriptorList::FormatText ( if (PresenterCanvasHelper::GetTextSize( rxFont, *iPart).Width > nMaximalWidth) { - const sal_Char cSpace (' '); + const char cSpace (' '); sal_Int32 nIndex (0); sal_Int32 nStart (0); |