diff options
-rw-r--r-- | include/tools/errinf.hxx | 6 | ||||
-rw-r--r-- | tools/source/ref/errinf.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index 390de61e389b..1f9946bce920 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -32,7 +32,7 @@ namespace vcl { class Window; } class DynamicErrorInfo_Impl; -class ErrHdl_Impl; +class ErrorHandler_Impl; class TOOLS_DLLPUBLIC ErrorInfo { @@ -138,10 +138,10 @@ typedef void BasicDisplayErrorFunc( class TOOLS_DLLPUBLIC ErrorHandler { - friend class ErrHdl_Impl; + friend class ErrorHandler_Impl; private: - std::unique_ptr<ErrHdl_Impl> pImpl; + std::unique_ptr<ErrorHandler_Impl> pImpl; static sal_uInt16 HandleError_Impl( sal_uIntPtr lId, sal_uInt16 nFlags, diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 97f0616d85bf..5d7af962575e 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -149,7 +149,7 @@ StringErrorInfo::StringErrorInfo( { } -class ErrHdl_Impl +class ErrorHandler_Impl { public: ErrorHandler *pNext; @@ -197,7 +197,7 @@ ErrorContext *ErrorContext::GetContext() } ErrorHandler::ErrorHandler() - : pImpl(new ErrHdl_Impl) + : pImpl(new ErrorHandler_Impl) { EDcrData &pData=TheEDcrData::get(); ErrorHandler *&pHdl=pData.pFirstHdl; @@ -289,7 +289,7 @@ sal_uInt16 ErrorHandler::HandleError_Impl( nErrFlags = nDynFlags; } - if(ErrHdl_Impl::CreateString(pData.pFirstHdl,pInfo,aErr,nErrFlags)) + if(ErrorHandler_Impl::CreateString(pData.pFirstHdl,pInfo,aErr,nErrFlags)) { if (bJustCreateString) { @@ -354,7 +354,7 @@ sal_uInt16 ErrorHandler::HandleError(sal_uIntPtr lId, sal_uInt16 nFlags) return HandleError_Impl( lId, nFlags, false, aDummy ); } -bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart, +bool ErrorHandler_Impl::CreateString( const ErrorHandler *pStart, const ErrorInfo* pInfo, OUString& pStr, sal_uInt16 &rFlags) { |