diff options
54 files changed, 185 insertions, 185 deletions
diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index 3dd3be21f6fa..ce55e01e22ff 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.hxx @@ -51,7 +51,7 @@ namespace ooo } /// @throws css::uno::Exception - inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell const * pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) + inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell const * pShell, const char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) { OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" ); OUString sVarName( OUString::createFromAscii( _pAsciiName ) ); diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 0b4c9ba681df..f1bf3a805da9 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -112,7 +112,7 @@ protected: void registerEventHandler( sal_Int32 nEventId, sal_Int32 nModuleType, - const sal_Char* pcMacroName, + const char* pcMacroName, sal_Int32 nCancelIndex = -1, const css::uno::Any& rUserData = css::uno::Any() ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index a3743c2f2c39..d5c942e4d984 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -252,7 +252,7 @@ private: DockingWindow & operator= (const DockingWindow &) = delete; protected: - SAL_DLLPRIVATE void SetIdleDebugName( const sal_Char *pDebugName ); + SAL_DLLPRIVATE void SetIdleDebugName( const char *pDebugName ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); @@ -369,7 +369,7 @@ inline void DockingWindow::SetFloatingPos( const Point& rNewPos ) maFloatPos = rNewPos; } -inline void DockingWindow::SetIdleDebugName( const sal_Char *pDebugName ) +inline void DockingWindow::SetIdleDebugName( const char *pDebugName ) { maLayoutIdle.SetDebugName( pDebugName ); } diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index 7bbd52d41f3b..ebbeb160cf41 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -37,10 +37,10 @@ private: protected: virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; - Idle( bool bAuto, const sal_Char *pDebugName ); + Idle( bool bAuto, const char *pDebugName ); public: - Idle( const sal_Char *pDebugName = nullptr ); + Idle( const char *pDebugName = nullptr ); virtual void Start() override; }; @@ -57,7 +57,7 @@ public: class VCL_DLLPUBLIC AutoIdle : public Idle { public: - AutoIdle( const sal_Char *pDebugName ); + AutoIdle( const char *pDebugName ); }; diff --git a/include/vcl/strhelper.hxx b/include/vcl/strhelper.hxx index 61cd9aa29cea..5b04e788d08d 100644 --- a/include/vcl/strhelper.hxx +++ b/include/vcl/strhelper.hxx @@ -51,7 +51,7 @@ namespace psp inline double StringToDouble(const OString& rStr) { - return rtl::math::stringToDouble(rStr, '.', static_cast<sal_Char>(0)); + return rtl::math::stringToDouble(rStr, '.', static_cast<char>(0)); } // fills a character buffer with the string representation of a double diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 9e0ea674ba5b..f1cb60015d4c 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -114,7 +114,7 @@ protected: SAL_DLLPRIVATE void DoInitialLayout(); - SAL_DLLPRIVATE void SetIdleDebugName( const sal_Char *pDebugName ); + SAL_DLLPRIVATE void SetIdleDebugName( const char *pDebugName ); public: virtual ~SystemWindow() override; @@ -220,7 +220,7 @@ public: void createScreenshot(VirtualDevice& rOutput); }; -inline void SystemWindow::SetIdleDebugName( const sal_Char *pDebugName ) +inline void SystemWindow::SetIdleDebugName( const char *pDebugName ) { maLayoutIdle.SetDebugName( pDebugName ); } diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx index 0fc124de7a65..35efe4825bbc 100644 --- a/include/vcl/task.hxx +++ b/include/vcl/task.hxx @@ -44,7 +44,7 @@ class VCL_DLLPUBLIC Task friend struct ImplSchedulerData; ImplSchedulerData *mpSchedulerData; ///< Pointer to the element in scheduler list - const sal_Char *mpDebugName; ///< Useful for debugging + const char *mpDebugName; ///< Useful for debugging TaskPriority mePriority; ///< Task priority bool mbActive; ///< Currently in the scheduler bool mbStatic; ///< Is a static object @@ -70,7 +70,7 @@ protected: virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const = 0; public: - Task( const sal_Char *pDebugName ); + Task( const char *pDebugName ); Task( const Task& rTask ); virtual ~Task() COVERITY_NOEXCEPT_FALSE; Task& operator=( const Task& rTask ); @@ -78,7 +78,7 @@ public: void SetPriority(TaskPriority ePriority); TaskPriority GetPriority() const { return mePriority; } - void SetDebugName( const sal_Char *pDebugName ) { mpDebugName = pDebugName; } + void SetDebugName( const char *pDebugName ) { mpDebugName = pDebugName; } const char *GetDebugName() const { return mpDebugName; } // Call handler diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 088a1e50e9c9..d9ad82ee5729 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -33,10 +33,10 @@ protected: virtual void SetDeletionFlags() override; virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nTimeNow ) const override; - Timer( bool bAuto, const sal_Char *pDebugName ); + Timer( bool bAuto, const char *pDebugName ); public: - Timer( const sal_Char *pDebugName = nullptr ); + Timer( const char *pDebugName = nullptr ); Timer( const Timer& rTimer ); virtual ~Timer() override; Timer& operator=( const Timer& rTimer ); @@ -72,7 +72,7 @@ public: class VCL_DLLPUBLIC AutoTimer : public Timer { public: - AutoTimer( const sal_Char *pDebugName = nullptr ); + AutoTimer( const char *pDebugName = nullptr ); }; /// Value suitable as a timeout user input into an EditBox to an expensive update diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index 1c1ba0e7db90..188e78132380 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -501,7 +501,7 @@ public: void CopyString( SotClipboardFormatId nFmt, const OUString& rStr ); void CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr ); - void CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen ); + void CopyAnyData( SotClipboardFormatId nFormatId, const char* pData, sal_uLong nLen ); bool HasAnyData() const; diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 6430da3dcf87..a3ba8ad6e849 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; -extern "C" SAL_DLLPUBLIC_EXPORT void * uui_component_getFactory(sal_Char const * pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * uui_component_getFactory(char const * pImplName, void * pServiceManager, void *) { diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 1014966f323a..b3a86a66ea14 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -32,7 +32,7 @@ namespace sdecl = comphelper::service_decl; extern "C" { SAL_DLLPUBLIC_EXPORT void * msforms_component_getFactory( - const sal_Char * pImplName, void *, void *) + const char * pImplName, void *, void *) { SAL_INFO("vbahelper", "In component_getFactory for " << pImplName ); void* pRet = sdecl::component_getFactoryHelper( diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index 454568b40b95..83b047ea836c 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -204,7 +204,7 @@ void VbaEventsHelperBase::processVbaEventNoThrow( sal_Int32 nEventId, const uno: // protected ------------------------------------------------------------------ void VbaEventsHelperBase::registerEventHandler( sal_Int32 nEventId, sal_Int32 nModuleType, - const sal_Char* pcMacroName, sal_Int32 nCancelIndex, const uno::Any& rUserData ) + const char* pcMacroName, sal_Int32 nCancelIndex, const uno::Any& rUserData ) { EventHandlerInfo& rInfo = maEventInfos[ nEventId ]; rInfo.mnEventId = nEventId; diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx index d093e94a9d58..fcb8a9241fd8 100644 --- a/vcl/inc/unx/printergfx.hxx +++ b/vcl/inc/unx/printergfx.hxx @@ -248,7 +248,7 @@ public: void PSMoveTo (const Point& rPoint); void PSScale (double fScaleX, double fScaleY); void PSLineTo(const Point& rPoint ); - void PSPointOp (const Point& rPoint, const sal_Char* pOperator); + void PSPointOp (const Point& rPoint, const char* pOperator); void PSHexString (const unsigned char* pString, sal_Int16 nLen); void PSShowGlyph (const unsigned char nGlyphId); diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 0e657e15ed95..5eb5a0fc2c4d 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -187,7 +187,7 @@ void ImplSalPostDispatchMsg( const MSG* pMsg ); void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, vcl::Font& rFont ); rtl_TextEncoding ImplSalGetSystemEncoding(); -OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 nLen = -1); +OUString ImplSalGetUniString(const char* pStr, sal_Int32 nLen = -1); int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); #define SAL_FRAME_WNDEXTRA sizeof( DWORD ) diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx index 2978e64afa4e..88b0e6199818 100644 --- a/vcl/ios/DataFlavorMapping.cxx +++ b/vcl/ios/DataFlavorMapping.cxx @@ -227,8 +227,8 @@ Any UniDataProvider::getOOoData() if (mSystemData) { - oOOData <<= OUString(static_cast<const sal_Char*>([mSystemData bytes]), - [mSystemData length], RTL_TEXTENCODING_UTF8); + oOOData <<= OUString(static_cast<const char*>([mSystemData bytes]), [mSystemData length], + RTL_TEXTENCODING_UTF8); } else { diff --git a/vcl/ios/HtmlFmtFlt.cxx b/vcl/ios/HtmlFmtFlt.cxx index 2f3c57f98452..4f90ced3bc1a 100644 --- a/vcl/ios/HtmlFmtFlt.cxx +++ b/vcl/ios/HtmlFmtFlt.cxx @@ -93,8 +93,8 @@ Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8> const& aText std::string dummyHtmlHeader = GetHtmlFormatHeader(0, 0, 0, 0); size_t lHtmlFormatHeader = dummyHtmlHeader.length(); - std::string textHtml(reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()), - reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()) + std::string textHtml(reinterpret_cast<const char*>(aTextHtml.getConstArray()), + reinterpret_cast<const char*>(aTextHtml.getConstArray()) + aTextHtml.getLength()); std::string::size_type nStartHtml = textHtml.find(TAG_HTML) + lHtmlFormatHeader @@ -129,9 +129,9 @@ Sequence<sal_Int8> HTMLFormatToTextHtml(const Sequence<sal_Int8>& aHTMLFormat) assert(isHTMLFormat(aHTMLFormat) && "No HTML Format provided"); Sequence<sal_Int8>& nonconstHTMLFormatRef = const_cast<Sequence<sal_Int8>&>(aHTMLFormat); - sal_Char* dataStart = reinterpret_cast<sal_Char*>(nonconstHTMLFormatRef.getArray()); - sal_Char* dataEnd = dataStart + nonconstHTMLFormatRef.getLength() - 1; - const sal_Char* htmlStartTag = strcasestr(dataStart, HtmlStartTag); + char* dataStart = reinterpret_cast<char*>(nonconstHTMLFormatRef.getArray()); + char* dataEnd = dataStart + nonconstHTMLFormatRef.getLength() - 1; + const char* htmlStartTag = strcasestr(dataStart, HtmlStartTag); assert(htmlStartTag && "Seems to be no HTML at all"); @@ -165,7 +165,7 @@ bool isHTMLFormat(const Sequence<sal_Int8>& aHtmlSequence) return rtl_str_compareIgnoreAsciiCase_WithLength( HtmlFormatStart, HtmlFormatStartLen, - reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()), HtmlFormatStartLen) + reinterpret_cast<const char*>(aHtmlSequence.getConstArray()), HtmlFormatStartLen) == 0; } diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index c63bc3321d16..dfba27d20e31 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -226,7 +226,7 @@ Any UniDataProvider::getOOoData() if (mSystemData) { - oOOData <<= OUString(static_cast<const sal_Char*>([mSystemData bytes]), + oOOData <<= OUString(static_cast<const char*>([mSystemData bytes]), [mSystemData length], RTL_TEXTENCODING_UTF8); } diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index e6abfed4fc62..940bf90cbb87 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -90,8 +90,8 @@ Sequence<sal_Int8> TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml) size_t lHtmlFormatHeader = dummyHtmlHeader.length(); std::string textHtml( - reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()), - reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()) + aTextHtml.getLength()); + reinterpret_cast<const char*>(aTextHtml.getConstArray()), + reinterpret_cast<const char*>(aTextHtml.getConstArray()) + aTextHtml.getLength()); std::string::size_type nStartHtml = textHtml.find(TAG_HTML) + lHtmlFormatHeader - 1; // we start one before '<HTML>' Word 2000 does also so std::string::size_type nEndHtml = textHtml.find(TAG_END_HTML) + lHtmlFormatHeader + TAG_END_HTML.length() + 1; // our SOffice 5.2 wants 2 behind </HTML>? @@ -122,9 +122,9 @@ Sequence<sal_Int8> HTMLFormatToTextHtml(const Sequence<sal_Int8>& aHTMLFormat) assert(isHTMLFormat(aHTMLFormat) && "No HTML Format provided"); Sequence<sal_Int8>& nonconstHTMLFormatRef = const_cast< Sequence<sal_Int8>& >(aHTMLFormat); - sal_Char* dataStart = reinterpret_cast<sal_Char*>(nonconstHTMLFormatRef.getArray()); - sal_Char* dataEnd = dataStart + nonconstHTMLFormatRef.getLength() - 1; - const sal_Char* htmlStartTag = strcasestr(dataStart, HtmlStartTag); + char* dataStart = reinterpret_cast<char*>(nonconstHTMLFormatRef.getArray()); + char* dataEnd = dataStart + nonconstHTMLFormatRef.getLength() - 1; + const char* htmlStartTag = strcasestr(dataStart, HtmlStartTag); assert(htmlStartTag && "Seems to be no HTML at all"); @@ -158,7 +158,7 @@ bool isHTMLFormat(const Sequence<sal_Int8>& aHtmlSequence) return rtl_str_compareIgnoreAsciiCase_WithLength(HtmlFormatStart, HtmlFormatStartLen, - reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()), + reinterpret_cast<const char*>(aHtmlSequence.getConstArray()), HtmlFormatStartLen) == 0; } diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 03f295943ea1..a7f5044bb11e 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -472,7 +472,7 @@ class IdleSerializer : public Idle sal_uInt32 const mnPosition; sal_uInt32 &mrProcesed; public: - IdleSerializer(const sal_Char *pDebugName, TaskPriority ePrio, + IdleSerializer(const char *pDebugName, TaskPriority ePrio, sal_uInt32 nPosition, sal_uInt32 &rProcesed) : Idle( pDebugName ) , mnPosition( nPosition ) @@ -526,7 +526,7 @@ class TestAutoIdleRR : public AutoIdle public: TestAutoIdleRR( sal_uInt32 &rCount, - const sal_Char *pDebugName ) + const char *pDebugName ) : AutoIdle( pDebugName ) , mrCount( rCount ) { diff --git a/vcl/qt5/Qt5Transferable.cxx b/vcl/qt5/Qt5Transferable.cxx index 81a47871f411..65cf98897ac2 100644 --- a/vcl/qt5/Qt5Transferable.cxx +++ b/vcl/qt5/Qt5Transferable.cxx @@ -136,8 +136,8 @@ Qt5Transferable::getTransferData(const css::datatransfer::DataFlavor& rFlavor) if (m_bConvertFromLocale) { QByteArray aByteData(m_pMimeData->data(QStringLiteral("text/plain"))); - aString = OUString(reinterpret_cast<const sal_Char*>(aByteData.data()), - aByteData.size(), osl_getThreadTextEncoding()); + aString = OUString(reinterpret_cast<const char*>(aByteData.data()), aByteData.size(), + osl_getThreadTextEncoding()); } else { diff --git a/vcl/source/app/idle.cxx b/vcl/source/app/idle.cxx index 301cbb0bb727..26e1e5f22210 100644 --- a/vcl/source/app/idle.cxx +++ b/vcl/source/app/idle.cxx @@ -20,13 +20,13 @@ #include <vcl/idle.hxx> #include <vcl/scheduler.hxx> -Idle::Idle( bool bAuto, const sal_Char *pDebugName ) +Idle::Idle( bool bAuto, const char *pDebugName ) : Timer( bAuto, pDebugName ) { SetPriority( TaskPriority::DEFAULT_IDLE ); } -Idle::Idle( const sal_Char *pDebugName ) +Idle::Idle( const char *pDebugName ) : Idle( false, pDebugName ) { } @@ -57,7 +57,7 @@ sal_uInt64 Idle::UpdateMinPeriod( sal_uInt64 /* nTimeNow */ ) const return Scheduler::ImmediateTimeoutMs; } -AutoIdle::AutoIdle( const sal_Char *pDebugName ) +AutoIdle::AutoIdle( const char *pDebugName ) : Idle( true, pDebugName ) { } diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index 7081383545ec..aa716f88b763 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -47,7 +47,7 @@ std::basic_ostream<charT, traits> & operator <<( std::basic_ostream<charT, traits> & stream, const Task& task ) { stream << "a: " << task.IsActive() << " p: " << static_cast<int>(task.GetPriority()); - const sal_Char *name = task.GetDebugName(); + const char *name = task.GetDebugName(); if( nullptr == name ) return stream << " (nullptr)"; else @@ -68,7 +68,7 @@ std::basic_ostream<charT, traits> & operator <<( bool bIsIdle = (dynamic_cast<const Idle*>( &timer ) != nullptr); stream << (bIsIdle ? "Idle " : "Timer") << " a: " << timer.IsActive() << " p: " << static_cast<int>(timer.GetPriority()); - const sal_Char *name = timer.GetDebugName(); + const char *name = timer.GetDebugName(); if ( nullptr == name ) stream << " (nullptr)"; else @@ -624,7 +624,7 @@ Task& Task::operator=( const Task& rTask ) return *this; } -Task::Task( const sal_Char *pDebugName ) +Task::Task( const char *pDebugName ) : mpSchedulerData( nullptr ) , mpDebugName( pDebugName ) , mePriority( TaskPriority::DEFAULT ) diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index f46ea2933287..82321c295be4 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -111,7 +111,7 @@ namespace DECL_LINK(implTimeoutHdl, Timer *, void); public: - SystemDependentDataBuffer(const sal_Char* pDebugName) + SystemDependentDataBuffer(const char* pDebugName) : basegfx::SystemDependentDataManager(), maTimer(std::make_unique<AutoTimer>(pDebugName)) { diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 6b1a9c790ac3..75a97d867195 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -36,7 +36,7 @@ sal_uInt64 Timer::UpdateMinPeriod( sal_uInt64 nTimeNow ) const ? Scheduler::ImmediateTimeoutMs : nWakeupTime - nTimeNow; } -Timer::Timer( bool bAuto, const sal_Char *pDebugName ) +Timer::Timer( bool bAuto, const char *pDebugName ) : Task( pDebugName ) , mnTimeout( Scheduler::ImmediateTimeoutMs ) , mbAuto( bAuto ) @@ -44,7 +44,7 @@ Timer::Timer( bool bAuto, const sal_Char *pDebugName ) SetPriority( TaskPriority::DEFAULT ); } -Timer::Timer( const sal_Char *pDebugName ) +Timer::Timer( const char *pDebugName ) : Timer( false, pDebugName ) { } @@ -94,7 +94,7 @@ void Timer::SetTimeout( sal_uInt64 nNewTimeout ) StartTimer( mnTimeout ); } -AutoTimer::AutoTimer( const sal_Char *pDebugName ) +AutoTimer::AutoTimer( const char *pDebugName ) : Timer( true, pDebugName ) { } diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 7bfa54f7a84e..a82c71435453 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::lang; extern "C" { VCL_DLLPUBLIC void* vcl_component_getFactory( - const sal_Char* pImplementationName, + const char* pImplementationName, void* pXUnoSMgr, void* /*pXUnoKey*/ ) diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index e703f20ffb20..347dbc05f6bd 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -146,7 +146,7 @@ static void ImplSkipDelimiters( const sal_Unicode*& rpBuf ) } } -static bool ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask ) +static bool ImplIsPatternChar( sal_Unicode cChar, char cEditMask ) { sal_Int32 nType = 0; @@ -193,7 +193,7 @@ static bool ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask ) return true; } -static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask ) +static sal_Unicode ImplPatternChar( sal_Unicode cChar, char cEditMask ) { if ( ImplIsPatternChar( cChar, cEditMask ) ) { @@ -233,7 +233,7 @@ static OUString ImplPatternReformat( const OUString& rStr, sal_Unicode cTempChar; sal_Unicode cChar; sal_Unicode cLiteral; - sal_Char cMask; + char cMask; sal_Int32 nStrIndex = 0; sal_Int32 i = 0; sal_Int32 n; @@ -734,10 +734,10 @@ void PatternFormatter::ImplSetMask(const OString& rEditMask, const OUString& rLi // Strict mode allows only the input mode if only equal characters are allowed as mask and if // only spaces are specified which are not allowed by the mask sal_Int32 i = 0; - sal_Char c = 0; + char c = 0; while ( i < rEditMask.getLength() ) { - sal_Char cTemp = rEditMask[i]; + char cTemp = rEditMask[i]; if ( cTemp != EDITMASK_LITERAL ) { if ( (cTemp == EDITMASK_ALLCHAR) || diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index a60d9fbc6668..4f58d42fd3ca 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -177,7 +177,7 @@ void Throbber::setImageList( ::std::vector< Image > const& i_images ) { ::std::vector< OUString > aImageURLs; - sal_Char const* const pResolutions[] = { "16", "32", "64" }; + char const* const pResolutions[] = { "16", "32", "64" }; size_t const nImageCounts[] = { 6, 12, 12 }; size_t index = 0; diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 9b279e5cdb15..f6a4a8e94528 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -57,7 +57,7 @@ class XBMReader : public GraphicReader void InitTable(); OString FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2 ); - int ParseDefine( const sal_Char* pDefine ); + int ParseDefine( const char* pDefine ); void ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ); public: @@ -154,7 +154,7 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, return aRet; } -int XBMReader::ParseDefine( const sal_Char* pDefine ) +int XBMReader::ParseDefine( const char* pDefine ) { sal_Int32 nRet = 0; const char* pTmp = pDefine; diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 170193979008..c82896c4c269 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -284,7 +284,7 @@ bool XPMReader::ImplGetColor() if (mnStringSize < mnCpp) return false; - OString aKey(reinterpret_cast<sal_Char*>(pString), mnCpp); + OString aKey(reinterpret_cast<char*>(pString), mnCpp); colordata aValue; bool bStatus = ImplGetColSub(aValue); if (bStatus) @@ -318,7 +318,7 @@ bool XPMReader::ImplGetScanLine( sal_uLong nY ) Scanline pMaskScanline = mpMaskAcc ? mpMaskAcc->GetScanline(nY) : nullptr; for (sal_uLong i = 0; i < mnWidth; ++i) { - OString aKey(reinterpret_cast<sal_Char*>(pString), mnCpp); + OString aKey(reinterpret_cast<char*>(pString), mnCpp); auto it = maColMap.find(aKey); if (it != maColMap.end()) { diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 25536eb80e65..d9fa0d61ffe1 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -361,7 +361,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont) OString aFontName(OUStringToOString(rFont.GetFamilyName(), eFontNameEncoding)); for ( i = 0; i < W_LF_FACESIZE; i++ ) { - sal_Char nChar = ( i < aFontName.getLength() ) ? aFontName[i] : 0; + char nChar = ( i < aFontName.getLength() ) ? aFontName[i] : 0; pWMF->WriteChar( nChar ); } UpdateRecordHeader(); @@ -1887,7 +1887,7 @@ void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sa .WriteUInt32( nRemainingSize ) // remaining size of data in following records, missing in MSDN documentation .WriteUInt32( nTotalSize ); // total size of EMF stream - pWMF->WriteBytes(static_cast<const sal_Char*>(rStream.GetData()) + rStream.Tell(), nCurSize); + pWMF->WriteBytes(static_cast<const char*>(rStream.GetData()) + rStream.Tell(), nCurSize); rStream.SeekRel( nCurSize ); UpdateRecordHeader(); } diff --git a/vcl/source/font/Feature.cxx b/vcl/source/font/Feature.cxx index 25a9e6b41fa3..bace78ec4377 100644 --- a/vcl/source/font/Feature.cxx +++ b/vcl/source/font/Feature.cxx @@ -20,11 +20,11 @@ namespace font { OUString featureCodeAsString(uint32_t nFeature) { - std::vector<sal_Char> aString(5, 0); - aString[0] = sal_Char(nFeature >> 24 & 0xff); - aString[1] = sal_Char(nFeature >> 16 & 0xff); - aString[2] = sal_Char(nFeature >> 8 & 0xff); - aString[3] = sal_Char(nFeature >> 0 & 0xff); + std::vector<char> aString(5, 0); + aString[0] = char(nFeature >> 24 & 0xff); + aString[1] = char(nFeature >> 16 & 0xff); + aString[2] = char(nFeature >> 8 & 0xff); + aString[3] = char(nFeature >> 0 & 0xff); return OStringToOUString(aString.data(), RTL_TEXTENCODING_ASCII_US); } diff --git a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx index 9a7b2993a7c1..7b9aadfc01d2 100644 --- a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx +++ b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx @@ -127,20 +127,20 @@ namespace { bool isCharacterVariantCode(sal_uInt32 nFeatureCode) { - return sal_Char((sal_uInt32(nFeatureCode) >> 24) & 0xFF) == 'c' - && sal_Char((sal_uInt32(nFeatureCode) >> 16) & 0xFF) == 'v'; + return char((sal_uInt32(nFeatureCode) >> 24) & 0xFF) == 'c' + && char((sal_uInt32(nFeatureCode) >> 16) & 0xFF) == 'v'; } bool isStylisticSetCode(sal_uInt32 nFeatureCode) { - return sal_Char((sal_uInt32(nFeatureCode) >> 24) & 0xFF) == 's' - && sal_Char((sal_uInt32(nFeatureCode) >> 16) & 0xFF) == 's'; + return char((sal_uInt32(nFeatureCode) >> 24) & 0xFF) == 's' + && char((sal_uInt32(nFeatureCode) >> 16) & 0xFF) == 's'; } OUString getNumericLowerPart(sal_uInt32 nFeatureCode) { - sal_Char cChar1((sal_uInt32(nFeatureCode) >> 8) & 0xFF); - sal_Char cChar2((sal_uInt32(nFeatureCode) >> 0) & 0xFF); + char cChar1((sal_uInt32(nFeatureCode) >> 8) & 0xFF); + char cChar2((sal_uInt32(nFeatureCode) >> 0) & 0xFF); if (rtl::isAsciiDigit(static_cast<unsigned char>(cChar1)) && rtl::isAsciiDigit(static_cast<unsigned char>(cChar2))) diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 9c8b54682041..f8c95e796b20 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -311,7 +311,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) static const int NINSIZE = 64; static const int NOUTSIZE = 64; - sal_Char cCharsInp[ NINSIZE ]; + char cCharsInp[ NINSIZE ]; sal_Unicode cCharsOut[ NOUTSIZE ]; sal_UCS4* pCP = pCodePairs; for( int i = 0; i < nRangeCount; ++i ) @@ -324,9 +324,9 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) for(; (cMin < cEnd) && (j < NINSIZE); ++cMin ) { if( cMin >= 0x0100 ) - cCharsInp[ j++ ] = static_cast<sal_Char>(cMin >> 8); + cCharsInp[ j++ ] = static_cast<char>(cMin >> 8); if( (cMin >= 0x0100) || (cMin < 0x00A0) ) - cCharsInp[ j++ ] = static_cast<sal_Char>(cMin); + cCharsInp[ j++ ] = static_cast<char>(cMin); } sal_uInt32 nCvtInfo; diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index b326ccaf0bb1..b7966f27988e 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -88,7 +88,7 @@ sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar ) ensureConverter( nSelect ); sal_Unicode aUCS2Char = aChar; - sal_Char aTempArray[8]; + char aTempArray[8]; sal_Size nTempSize; sal_uInt32 nCvtInfo; diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx index 85ce583142c0..7d3fb7c4c8f3 100644 --- a/vcl/source/gdi/WidgetDefinitionReader.cxx +++ b/vcl/source/gdi/WidgetDefinitionReader.cxx @@ -26,7 +26,7 @@ bool lcl_fileExists(OUString const& sFilename) return osl::FileBase::E_None == eRC; } -int lcl_gethex(sal_Char aChar) +int lcl_gethex(char aChar) { if (aChar >= '0' && aChar <= '9') return aChar - '0'; @@ -43,7 +43,7 @@ bool readColor(OString const& rString, Color& rColor) if (rString.getLength() != 7) return false; - const sal_Char aChar(rString[0]); + const char aChar(rString[0]); if (aChar != '#') return false; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index b267f75dd436..f5fb555b1f56 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -127,7 +127,7 @@ const sal_uInt8 PDFWriterImpl::s_nPadString[32] = static void appendHex( sal_Int8 nInt, OStringBuffer& rBuffer ) { - static const sal_Char pHexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', + static const char pHexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; rBuffer.append( pHexDigits[ (nInt >> 4) & 15 ] ); rBuffer.append( pHexDigits[ nInt & 15 ] ); @@ -163,7 +163,7 @@ static void appendName( const OUString& rStr, OStringBuffer& rBuffer ) } } -static void appendName( const sal_Char* pStr, OStringBuffer& rBuffer ) +static void appendName( const char* pStr, OStringBuffer& rBuffer ) { // FIXME i59651 see above while( pStr && *pStr ) @@ -185,7 +185,7 @@ static void appendName( const sal_Char* pStr, OStringBuffer& rBuffer ) } //used only to emit encoded passwords -static void appendLiteralString( const sal_Char* pStr, sal_Int32 nLength, OStringBuffer& rBuffer ) +static void appendLiteralString( const char* pStr, sal_Int32 nLength, OStringBuffer& rBuffer ) { while( nLength ) { @@ -210,10 +210,10 @@ static void appendLiteralString( const sal_Char* pStr, sal_Int32 nLength, OStrin case ')' : case '\\' : rBuffer.append( "\\" ); - rBuffer.append( static_cast<sal_Char>(*pStr) ); + rBuffer.append( static_cast<char>(*pStr) ); break; default: - rBuffer.append( static_cast<sal_Char>(*pStr) ); + rBuffer.append( static_cast<char>(*pStr) ); break; } pStr++; @@ -256,7 +256,7 @@ static void appendDestinationName( const OUString& rString, OStringBuffer& rBuff (aChar >= 'A' && aChar <= 'Z' ) || aChar == '-' ) { - rBuffer.append(static_cast<sal_Char>(aChar)); + rBuffer.append(static_cast<char>(aChar)); } else { @@ -1437,20 +1437,20 @@ OString PDFWriter::GetDateTime() osl_getLocalTimeFromSystemTime(&aGMT, &aTVal); osl_getDateTimeFromTimeValue(&aTVal, &aDT); aRet.append("D:"); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Year / 1000) % 10))); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Year / 100) % 10))); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Year / 10) % 10))); - aRet.append(static_cast<sal_Char>('0' + (aDT.Year % 10))); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Month / 10) % 10))); - aRet.append(static_cast<sal_Char>('0' + (aDT.Month % 10))); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Day / 10) % 10))); - aRet.append(static_cast<sal_Char>('0' + (aDT.Day % 10))); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Hours / 10) % 10))); - aRet.append(static_cast<sal_Char>('0' + (aDT.Hours % 10))); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Minutes / 10) % 10))); - aRet.append(static_cast<sal_Char>('0' + (aDT.Minutes % 10))); - aRet.append(static_cast<sal_Char>('0' + ((aDT.Seconds / 10) % 10))); - aRet.append(static_cast<sal_Char>('0' + (aDT.Seconds % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Year / 1000) % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Year / 100) % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Year / 10) % 10))); + aRet.append(static_cast<char>('0' + (aDT.Year % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Month / 10) % 10))); + aRet.append(static_cast<char>('0' + (aDT.Month % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Day / 10) % 10))); + aRet.append(static_cast<char>('0' + (aDT.Day % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Hours / 10) % 10))); + aRet.append(static_cast<char>('0' + (aDT.Hours % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Minutes / 10) % 10))); + aRet.append(static_cast<char>('0' + (aDT.Minutes % 10))); + aRet.append(static_cast<char>('0' + ((aDT.Seconds / 10) % 10))); + aRet.append(static_cast<char>('0' + (aDT.Seconds % 10))); sal_uInt32 nDelta = 0; if (aGMT.Seconds > aTVal.Seconds) @@ -1468,11 +1468,11 @@ OString PDFWriter::GetDateTime() if (nDelta) { - aRet.append(static_cast<sal_Char>('0' + ((nDelta / 36000) % 10))); - aRet.append(static_cast<sal_Char>('0' + ((nDelta / 3600) % 10))); + aRet.append(static_cast<char>('0' + ((nDelta / 36000) % 10))); + aRet.append(static_cast<char>('0' + ((nDelta / 3600) % 10))); aRet.append("'"); - aRet.append(static_cast<sal_Char>('0' + ((nDelta / 600) % 6))); - aRet.append(static_cast<sal_Char>('0' + ((nDelta / 60) % 10))); + aRet.append(static_cast<char>('0' + ((nDelta / 600) % 6))); + aRet.append(static_cast<char>('0' + ((nDelta / 60) % 10))); } aRet.append( "'" ); @@ -1516,25 +1516,25 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden // to use the localtime notation only // according to a recommendation in XMP Specification (Jan 2004, page 75) // the Acrobat way seems the right approach - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Year/1000)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Year/100)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Year/10)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Year)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Year/1000)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Year/100)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Year/10)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Year)%10)) ); aCreationMetaDateString.append( "-" ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Month/10)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Month)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Month/10)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Month)%10)) ); aCreationMetaDateString.append( "-" ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Day/10)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Day)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Day/10)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Day)%10)) ); aCreationMetaDateString.append( "T" ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Hours/10)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Hours)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Hours/10)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Hours)%10)) ); aCreationMetaDateString.append( ":" ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Minutes/10)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Minutes)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Minutes/10)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Minutes)%10)) ); aCreationMetaDateString.append( ":" ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Seconds/10)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((aDT.Seconds)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Seconds/10)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Seconds)%10)) ); sal_uInt32 nDelta = 0; if( aGMT.Seconds > aTVal.Seconds ) @@ -1554,11 +1554,11 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden } if( nDelta ) { - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((nDelta/36000)%10)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((nDelta/3600)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((nDelta/36000)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((nDelta/3600)%10)) ); aCreationMetaDateString.append( ":" ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((nDelta/600)%6)) ); - aCreationMetaDateString.append( static_cast<sal_Char>('0' + ((nDelta/60)%10)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((nDelta/600)%6)) ); + aCreationMetaDateString.append( static_cast<char>('0' + ((nDelta/60)%10)) ); } aID.append( i_rCString1.getStr(), i_rCString1.getLength() ); @@ -1620,7 +1620,7 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer const & rIn //encrypt the string in a buffer, then append it enableStringEncryption( nInObjectNumber ); rtl_cipher_encodeARCFOUR( m_aCipher, rInString.getStr(), nChars, m_vEncryptionBuffer.data(), nChars ); - appendLiteralString( reinterpret_cast<sal_Char*>(m_vEncryptionBuffer.data()), nChars, rOutBuffer ); + appendLiteralString( reinterpret_cast<char*>(m_vEncryptionBuffer.data()), nChars, rOutBuffer ); } else appendLiteralString( rInString.getStr(), nChars , rOutBuffer ); @@ -1638,7 +1638,7 @@ void PDFWriterImpl::appendLiteralStringEncrypt( const OUString& rInString, const OString aBufferString( OUStringToOString( rInString, nEnc ) ); sal_Int32 nLen = aBufferString.getLength(); OStringBuffer aBuf( nLen ); - const sal_Char* pT = aBufferString.getStr(); + const char* pT = aBufferString.getStr(); for( sal_Int32 i = 0; i < nLen; i++, pT++ ) { @@ -1884,7 +1884,7 @@ sal_Int32 PDFWriterImpl::emitStructParentTree( sal_Int32 nObject ) return nObject; } -const sal_Char* PDFWriterImpl::getAttributeTag( PDFWriter::StructAttribute eAttr ) +const char* PDFWriterImpl::getAttributeTag( PDFWriter::StructAttribute eAttr ) { static std::map< PDFWriter::StructAttribute, const char* > aAttributeStrings; // fill maps once @@ -1920,7 +1920,7 @@ const sal_Char* PDFWriterImpl::getAttributeTag( PDFWriter::StructAttribute eAttr return it != aAttributeStrings.end() ? it->second : ""; } -const sal_Char* PDFWriterImpl::getAttributeValueTag( PDFWriter::StructAttributeValue eVal ) +const char* PDFWriterImpl::getAttributeValueTag( PDFWriter::StructAttributeValue eVal ) { static std::map< PDFWriter::StructAttributeValue, const char* > aValueStrings; @@ -2527,7 +2527,7 @@ static void appendSubsetName( int nSubsetID, const OUString& rPSName, OStringBuf { int nOffset = nSubsetID % 26; nSubsetID /= 26; - rBuffer.append( static_cast<sal_Char>('A'+nOffset) ); + rBuffer.append( static_cast<char>('A'+nOffset) ); } rBuffer.append( '+' ); } @@ -8573,7 +8573,7 @@ sal_Int32 PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter else // Previous reference end -> reference start. nOffset = nCopyStart; - aLine.append(static_cast<const sal_Char*>(rDocBuffer.GetData()) + nOffset, nReferenceStart - nOffset); + aLine.append(static_cast<const char*>(rDocBuffer.GetData()) + nOffset, nReferenceStart - nOffset); // Write the updated reference. aLine.append(" "); aLine.append(nRef); @@ -8594,11 +8594,11 @@ sal_Int32 PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter if (nLen < 0) SAL_WARN("vcl.pdfwriter", "copyExternalResource() failed"); else - aLine.append(static_cast<const sal_Char*>(rDocBuffer.GetData()) + nCopyStart, nLen); + aLine.append(static_cast<const char*>(rDocBuffer.GetData()) + nCopyStart, nLen); } else // Can copy it as-is. - aLine.append(static_cast<const sal_Char*>(rDocBuffer.GetData()) + rObject.GetDictionaryOffset(), rObject.GetDictionaryLength()); + aLine.append(static_cast<const char*>(rDocBuffer.GetData()) + rObject.GetDictionaryOffset(), rObject.GetDictionaryLength()); aLine.append(">>\n"); } @@ -8607,7 +8607,7 @@ sal_Int32 PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter { aLine.append("stream\n"); SvMemoryStream& rStream = pStream->GetMemory(); - aLine.append(static_cast<const sal_Char*>(rStream.GetData()), rStream.GetSize()); + aLine.append(static_cast<const char*>(rStream.GetData()), rStream.GetSize()); aLine.append("\nendstream\n"); } @@ -8639,7 +8639,7 @@ sal_Int32 PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter else // Previous reference end -> reference start. nOffset = nCopyStart; - aLine.append(static_cast<const sal_Char*>(rDocBuffer.GetData()) + nOffset, nReferenceStart - nOffset); + aLine.append(static_cast<const char*>(rDocBuffer.GetData()) + nOffset, nReferenceStart - nOffset); // Write the updated reference. aLine.append(" "); @@ -8661,11 +8661,11 @@ sal_Int32 PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter if (nLen < 0) SAL_WARN("vcl.pdfwriter", "copyExternalResource() failed"); else - aLine.append(static_cast<const sal_Char*>(rDocBuffer.GetData()) + nCopyStart, nLen); + aLine.append(static_cast<const char*>(rDocBuffer.GetData()) + nCopyStart, nLen); } else // Can copy it as-is. - aLine.append(static_cast<const sal_Char*>(rDocBuffer.GetData()) + rObject.GetArrayOffset(), rObject.GetArrayLength()); + aLine.append(static_cast<const char*>(rDocBuffer.GetData()) + rObject.GetArrayOffset(), rObject.GetArrayLength()); aLine.append("]\n"); } @@ -8673,7 +8673,7 @@ sal_Int32 PDFWriterImpl::copyExternalResource(SvMemoryStream& rDocBuffer, filter // If the object has a number element outside a dictionary or array, copy that. if (filter::PDFNumberElement* pNumber = rObject.GetNumberElement()) { - aLine.append(static_cast<const sal_Char*>(rDocBuffer.GetData()) + pNumber->GetLocation(), pNumber->GetLength()); + aLine.append(static_cast<const char*>(rDocBuffer.GetData()) + pNumber->GetLocation(), pNumber->GetLength()); aLine.append("\n"); } @@ -8934,7 +8934,7 @@ void PDFWriterImpl::writeReferenceXObject(ReferenceXObjectEmit& rEmit) aLine.append(">>\nstream\n"); // Copy the original page streams to the form XObject stream. - aLine.append(static_cast<const sal_Char*>(aStream.GetData()), aStream.GetSize()); + aLine.append(static_cast<const char*>(aStream.GetData()), aStream.GetSize()); aLine.append("\nendstream\nendobj\n\n"); if (!updateObject(nWrappedFormObject)) return; @@ -10275,7 +10275,7 @@ void PDFWriterImpl::setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID ) m_aOutline[nItem].m_nDestID = nDestID; } -const sal_Char* PDFWriterImpl::getStructureTag( PDFWriter::StructElement eType ) +const char* PDFWriterImpl::getStructureTag( PDFWriter::StructElement eType ) { static std::map< PDFWriter::StructElement, const char* > aTagStrings; if( aTagStrings.empty() ) diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 0a0a8fc3517d..6316b7daa92d 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -581,9 +581,9 @@ public: {} }; - static const sal_Char* getStructureTag( PDFWriter::StructElement ); - static const sal_Char* getAttributeTag( PDFWriter::StructAttribute eAtr ); - static const sal_Char* getAttributeValueTag( PDFWriter::StructAttributeValue eVal ); + static const char* getStructureTag( PDFWriter::StructElement ); + static const char* getAttributeTag( PDFWriter::StructAttribute eAtr ); + static const char* getAttributeValueTag( PDFWriter::StructAttributeValue eVal ); // returns true if compression was done // else false diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index afb464367832..c959dac4db55 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -240,7 +240,7 @@ static OUString getGLString(GLenum eGlEnum) const GLubyte* pString = glGetString(eGlEnum); if (pString) { - sString = OUString::createFromAscii(reinterpret_cast<const sal_Char*>(pString)); + sString = OUString::createFromAscii(reinterpret_cast<const char*>(pString)); } CHECK_GL_ERROR(); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index ec0711eb101d..b2e52e5d8375 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1910,7 +1910,7 @@ tools::Rectangle OutputDevice::GetTextRect( const tools::Rectangle& rRect, return aRect; } -static bool ImplIsCharIn( sal_Unicode c, const sal_Char* pStr ) +static bool ImplIsCharIn( sal_Unicode c, const char* pStr ) { while ( *pStr ) { @@ -1977,7 +1977,7 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, } else if ( nStyle & DrawTextFlags::NewsEllipsis ) { - static sal_Char const pSepChars[] = "."; + static char const pSepChars[] = "."; // Determine last section sal_Int32 nLastContent = aStr.getLength(); while ( nLastContent ) diff --git a/vcl/source/treelist/inetimg.cxx b/vcl/source/treelist/inetimg.cxx index 9c7329e3065c..c7bc99ebb20a 100644 --- a/vcl/source/treelist/inetimg.cxx +++ b/vcl/source/treelist/inetimg.cxx @@ -44,7 +44,7 @@ void INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const RTL_TEXTENCODING_UTF8)); rOStm.WriteBytes(sOut.getStr(), sOut.getLength()); - static const sal_Char aEndChar[2] = { 0 }; + static const char aEndChar[2] = { 0 }; rOStm.WriteBytes(aEndChar, sizeof(aEndChar)); } break; @@ -91,7 +91,7 @@ bool INetImage::Read( SvStream& rIStm, SotClipboardFormatId nFormat ) int iAltOffset; // (alternate text?) int iAnchorOffset; // HREF in image int iExtraHTML_Offset; // Extra HTML (stored in CImageElement) - sal_Char pImageURL[1]; // Append all variable-length strings starting here + char pImageURL[1]; // Append all variable-length strings starting here */ rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding(); sal_Int32 nVal, nAnchorOffset, nAltOffset; diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx index ec157133e7d6..445e0d2da5aa 100644 --- a/vcl/source/treelist/transfer.cxx +++ b/vcl/source/treelist/transfer.cxx @@ -893,7 +893,7 @@ bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjectId, // writes now UTF16 format into the stream //JP 6.8.2001: and now it writes UTF8 because then exist no problem with // little / big endians! - Bug 88121 - maAny <<= OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); + maAny <<= OUString( reinterpret_cast< const char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); } else maAny <<= aSeq; @@ -1497,7 +1497,7 @@ bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rSt else if( aAny >>= aSeq ) { - const sal_Char* pChars = reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ); + const char* pChars = reinterpret_cast< const char* >( aSeq.getConstArray() ); sal_Int32 nLen = aSeq.getLength(); //JP 10.10.2001: 92930 - don't copy the last zero character into the string. @@ -1895,8 +1895,8 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo if (2048 == aSeq.getLength()) { - const sal_Char* p1 = reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ); - const sal_Char* p2 = reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024; + const char* p1 = reinterpret_cast< const char* >( aSeq.getConstArray() ); + const char* p2 = reinterpret_cast< const char* >( aSeq.getConstArray() ) + 1024; rBmk = INetBookmark( OUString( p1, strlen(p1), osl_getThreadTextEncoding() ), OUString( p2, strlen(p2), osl_getThreadTextEncoding() ) ); bRet = true; diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx index 367e6c84f5e2..0a6f7528b252 100644 --- a/vcl/source/treelist/transfer2.cxx +++ b/vcl/source/treelist/transfer2.cxx @@ -397,7 +397,7 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, - const sal_Char* pData, sal_uLong nLen ) + const char* pData, sal_uLong nLen ) { if( nLen ) { diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 91e30d1baf66..8211c6069c78 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -3608,7 +3608,7 @@ namespace return vcl::KeyCode(KEY_DELETE, bShift, bMod1, bMod2, bMod3); assert (rKey.first.getLength() == 1); - sal_Char cChar = rKey.first.toChar(); + char cChar = rKey.first.toChar(); if (cChar >= 'a' && cChar <= 'z') return vcl::KeyCode(KEY_A + (cChar - 'a'), bShift, bMod1, bMod2, bMod3); diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index e9861dca51d8..5d3ba88eb782 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -469,7 +469,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data) if( call_data->data.text ) { // XIM with text - sal_Char* pMBString = nullptr; + char* pMBString = nullptr; size_t nLength = 0; if( call_data->data.text->encoding_is_wchar ) { @@ -477,7 +477,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data) { wchar_t* pWString = call_data->data.text->string.wide_char; size_t nBytes = wcstombs( nullptr, pWString, 1024 ); - pMBString = static_cast<sal_Char*>(alloca( nBytes+1 )); + pMBString = static_cast<char*>(alloca( nBytes+1 )); nLength = wcstombs( pMBString, pWString, nBytes+1 ); } } diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index c9513b060056..b42f672a4260 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -649,7 +649,7 @@ bool SelectionManager::convertData( OUString aString; aValue >>= aString; OString aByteString( bCompoundText ? convertToCompound( aString ) : OUStringToOString( aString, aEncoding ) ); - rData = Sequence< sal_Int8 >( reinterpret_cast<sal_Int8 const *>(aByteString.getStr()), aByteString.getLength() * sizeof( sal_Char ) ); + rData = Sequence< sal_Int8 >( reinterpret_cast<sal_Int8 const *>(aByteString.getStr()), aByteString.getLength() * sizeof( char ) ); bSuccess = true; } } diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index baaae5211fbf..3370f829916e 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -344,7 +344,7 @@ OUString PrintFontManager::convertSfntName( void* pRecord ) for(int n = 0; n < pNameRecord->slen/2; n++ ) { sal_Unicode aCode = static_cast<sal_Unicode>(getUInt16BE( pNameBuffer )); - sal_Char aChar = aCode >> 8; + char aChar = aCode >> 8; if( aChar ) aName.append( aChar ); aChar = aCode & 0x00ff; diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index 0d33c76393ff..669064ae31d8 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -474,7 +474,7 @@ void PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const PolyFlags* pFlgAry) { const sal_uInt32 nBezString= 1024; - sal_Char pString[nBezString]; + char pString[nBezString]; if ( nPoints > 1 && maLineColor.Is() && pPath ) { @@ -525,7 +525,7 @@ void PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const PolyFlags* pFlgAry) { const sal_uInt32 nBezString = 1024; - sal_Char pString[nBezString]; + char pString[nBezString]; // premature end of operation if (nPoints <= 0 || (pPath == nullptr) || !(maFillColor.Is() || maLineColor.Is())) return; @@ -581,7 +581,7 @@ void PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, const Point* const * pPtAry, const PolyFlags* const* pFlgAry) { const sal_uInt32 nBezString = 1024; - sal_Char pString[nBezString]; + char pString[nBezString]; if ( !nPoly || !pPtAry || !pPoints || !(maFillColor.Is() || maLineColor.Is())) return; @@ -814,7 +814,7 @@ PrinterGfx::PSRotate (sal_Int32 nAngle) } void -PrinterGfx::PSPointOp (const Point& rPoint, const sal_Char* pOperator) +PrinterGfx::PSPointOp (const Point& rPoint, const char* pOperator) { OStringBuffer pPSCommand; @@ -919,7 +919,7 @@ PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld, // build the command, it is a char with bit representation 000cxxyy // c represents the char, xx and yy repr. the field width of the dx and dy shift, // dx and dy represent the number of bytes to read after the opcode - sal_Char cCmd = (eType == lineto ? sal_Char(0x00) : sal_Char(0x10)); + char cCmd = (eType == lineto ? char(0x00) : char(0x10)); switch (nYPrec) { case 2: break; @@ -1010,7 +1010,7 @@ PrinterGfx::PSShowGlyph (const unsigned char nGlyphId) PSRotate (mnTextAngle); } - sal_Char pBuffer[256]; + char pBuffer[256]; if( maVirtualStatus.mbArtBold ) { sal_Int32 nLW = maVirtualStatus.mnTextWidth; diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx index 6985ecf78c9f..5a5bc6d9e6b3 100644 --- a/vcl/unx/generic/print/printerjob.cxx +++ b/vcl/unx/generic/print/printerjob.cxx @@ -828,7 +828,7 @@ void PrinterJob::writeProlog (osl::File* pFile, const JobData& rJobData ) // JobPatchFile feature needs to be emitted at begin of prolog writeJobPatch( pFile, rJobData ); - static const sal_Char pProlog[] = { + static const char pProlog[] = { "%%BeginResource: procset PSPrint-Prolog 1.0 0\n" "/ISO1252Encoding [\n" "/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef\n" diff --git a/vcl/unx/generic/print/psputil.cxx b/vcl/unx/generic/print/psputil.cxx index eefbc23d4353..91e986dbd28e 100644 --- a/vcl/unx/generic/print/psputil.cxx +++ b/vcl/unx/generic/print/psputil.cxx @@ -29,7 +29,7 @@ namespace psp { sal_Int32 getHexValueOf (sal_Int32 nValue, OStringBuffer& pBuffer) { - const static sal_Char pHex [0x10] = { + const static char pHex [0x10] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; @@ -109,7 +109,7 @@ getValueOf (sal_Int32 nValue, OStringBuffer& pBuffer) return nChar; } - sal_Char pInvBuffer [32]; + char pInvBuffer [32]; sal_Int32 nInvChar = 0; while (nValue > 0) { @@ -126,7 +126,7 @@ getValueOf (sal_Int32 nValue, OStringBuffer& pBuffer) } sal_Int32 -appendStr (const sal_Char* pSrc, OStringBuffer& pDst) +appendStr (const char* pSrc, OStringBuffer& pDst) { sal_Int32 nBytes = strlen (pSrc); pDst.append(pSrc, nBytes); @@ -139,7 +139,7 @@ appendStr (const sal_Char* pSrc, OStringBuffer& pDst) */ bool -WritePS (osl::File* pFile, const sal_Char* pString) +WritePS (osl::File* pFile, const char* pString) { sal_uInt64 nInLength = rtl_str_getLength (pString); sal_uInt64 nOutLength = 0; @@ -151,7 +151,7 @@ WritePS (osl::File* pFile, const sal_Char* pString) } bool -WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength) +WritePS (osl::File* pFile, const char* pString, sal_uInt64 nInLength) { sal_uInt64 nOutLength = 0; diff --git a/vcl/unx/generic/print/psputil.hxx b/vcl/unx/generic/print/psputil.hxx index 5195c50440cf..1a5ec620d9ba 100644 --- a/vcl/unx/generic/print/psputil.hxx +++ b/vcl/unx/generic/print/psputil.hxx @@ -35,15 +35,15 @@ namespace psp { sal_Int32 getHexValueOf (sal_Int32 nValue, OStringBuffer& pBuffer); sal_Int32 getAlignedHexValueOf (sal_Int32 nValue, OStringBuffer& pBuffer); sal_Int32 getValueOf (sal_Int32 nValue, OStringBuffer& pBuffer); -sal_Int32 appendStr (const sal_Char* pSrc, OStringBuffer& pDst); +sal_Int32 appendStr (const char* pSrc, OStringBuffer& pDst); inline void getValueOfDouble( OStringBuffer& pBuffer, double f, int nPrecision = 0) { pBuffer.append(rtl::math::doubleToString( f, rtl_math_StringFormat_G, nPrecision, '.', true )); } -bool WritePS (osl::File* pFile, const sal_Char* pString); -bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength); +bool WritePS (osl::File* pFile, const char* pString); +bool WritePS (osl::File* pFile, const char* pString, sal_uInt64 nInLength); bool WritePS (osl::File* pFile, const OString &rString); bool WritePS (osl::File* pFile, const OUString &rString); diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 0dd380d7c8f7..6fb3911f9aee 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -376,7 +376,7 @@ void PPDParser::scanPPDDir( const OUString& rDir ) { static struct suffix_t { - const sal_Char* pSuffix; + const char* pSuffix; const sal_Int32 nSuffixLen; } const pSuffixes[] = { { ".PS", 3 }, { ".PPD", 4 }, { ".PS.GZ", 6 }, { ".PPD.GZ", 7 } }; @@ -896,7 +896,7 @@ bool PPDParser::hasKey( const PPDKey* pKey ) const return pKey && ( m_aKeys.find( pKey->getKey() ) != m_aKeys.end() ); } -static sal_uInt8 getNibble( sal_Char cChar ) +static sal_uInt8 getNibble( char cChar ) { sal_uInt8 nRet = 0; if( cChar >= '0' && cChar <= '9' ) @@ -912,14 +912,14 @@ OUString PPDParser::handleTranslation(const OString& i_rString, bool bIsGlobaliz { sal_Int32 nOrigLen = i_rString.getLength(); OStringBuffer aTrans( nOrigLen ); - const sal_Char* pStr = i_rString.getStr(); - const sal_Char* pEnd = pStr + nOrigLen; + const char* pStr = i_rString.getStr(); + const char* pEnd = pStr + nOrigLen; while( pStr < pEnd ) { if( *pStr == '<' ) { pStr++; - sal_Char cChar; + char cChar; while( *pStr != '>' && pStr < pEnd-1 ) { cChar = getNibble( *pStr++ ) << 4; diff --git a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx index 14a172fe6ae3..fa9d096606e6 100644 --- a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx +++ b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx @@ -177,10 +177,10 @@ appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rBuffer.append("<Alt>"); if( ( rKeyStroke.KeyCode >= awt::Key::A ) && ( rKeyStroke.KeyCode <= awt::Key::Z ) ) - rBuffer.append( static_cast<sal_Char>( 'a' + ( rKeyStroke.KeyCode - awt::Key::A ) ) ); + rBuffer.append( static_cast<char>( 'a' + ( rKeyStroke.KeyCode - awt::Key::A ) ) ); else { - sal_Char c = '\0'; + char c = '\0'; switch( rKeyStroke.KeyCode ) { diff --git a/vcl/win/app/saldata.cxx b/vcl/win/app/saldata.cxx index c71954ea9ca8..31fa661636f8 100644 --- a/vcl/win/app/saldata.cxx +++ b/vcl/win/app/saldata.cxx @@ -40,7 +40,7 @@ rtl_TextEncoding ImplSalGetSystemEncoding() return eEncoding; } -OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen) +OUString ImplSalGetUniString(const char* pStr, sal_Int32 const nLen) { return OUString( pStr, (-1 == nLen) ? strlen(pStr) : nLen, ImplSalGetSystemEncoding(), diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 4ff89546cfeb..12d37a792def 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -2235,7 +2235,7 @@ void WinSalFrame::EndExtTextInput( EndExtTextInputFlags nFlags ) static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, UINT& rCount, UINT nMaxSize, - const sal_Char* pReplace ) + const char* pReplace ) { static_assert( sizeof( WCHAR ) == sizeof( sal_Unicode ), "must be the same size" ); @@ -2333,9 +2333,9 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) sal_uInt16 nCode = nKeyCode & 0x0FFF; sal_uLong nSysCode2 = 0; - const sal_Char* pReplace = nullptr; + const char* pReplace = nullptr; sal_Unicode cSVCode = 0; - sal_Char aFBuf[4]; + char aFBuf[4]; nSysCode = 0; if ( (nCode >= KEY_0) && (nCode <= KEY_9) ) @@ -2348,19 +2348,19 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) aFBuf[0] = 'F'; if (nCode <= KEY_F9) { - aFBuf[1] = sal::static_int_cast<sal_Char>('1' + (nCode - KEY_F1)); + aFBuf[1] = sal::static_int_cast<char>('1' + (nCode - KEY_F1)); aFBuf[2] = 0; } else if (nCode <= KEY_F19) { aFBuf[1] = '1'; - aFBuf[2] = sal::static_int_cast<sal_Char>('0' + (nCode - KEY_F10)); + aFBuf[2] = sal::static_int_cast<char>('0' + (nCode - KEY_F10)); aFBuf[3] = 0; } else { aFBuf[1] = '2'; - aFBuf[2] = sal::static_int_cast<sal_Char>('0' + (nCode - KEY_F20)); + aFBuf[2] = sal::static_int_cast<char>('0' + (nCode - KEY_F20)); aFBuf[3] = 0; } pReplace = aFBuf; |