[Libreoffice-commits] core.git: include/tools tools/source

[Noel Grandin]

 include/tools/errinf.hxx    |    6 +++---
 tools/source/ref/errinf.cxx |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d848960a3e77a8608a48f3ba394928c955f1e2d9
Author: Noel Grandin <n...@peralex.com>
Date:   Fri Apr 22 13:53:12 2016 +0200

    rename Errhdl_Impl to ErrorHandler_Impl
    
    Change-Id: I2405c74487a869def2436f19917937f69ab32916
    Reviewed-on: https://gerrit.libreoffice.org/24310
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index 390de61..1f9946b 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 97f0616..5d7af96 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)
 {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits