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

[Noel Grandin]

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

New commits:
commit f4b8b9ad1109b63afea6d8111a2e0799399a2fb2
Author: Noel Grandin <n...@peralex.com>
Date:   Fri Apr 22 13:51:47 2016 +0200

    rename EDcr_Impl to DynamicErrorInfo_Impl
    
    Change-Id: Id184df4e4466930ba75e47e257ceb75be2fab34b
    Reviewed-on: https://gerrit.libreoffice.org/24309
    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 28c1c26..390de61 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -31,7 +31,7 @@
 // FIXME: horrible legacy dependency on VCL from tools.
 namespace vcl { class Window; }
 
-class EDcr_Impl;
+class DynamicErrorInfo_Impl;
 class ErrHdl_Impl;
 
 class TOOLS_DLLPUBLIC ErrorInfo
@@ -52,10 +52,10 @@ public:
 
 class TOOLS_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
 {
-    friend class EDcr_Impl;
+    friend class DynamicErrorInfo_Impl;
 
 private:
-    std::unique_ptr<EDcr_Impl>   pImpl;
+    std::unique_ptr<DynamicErrorInfo_Impl>   pImpl;
 
 public:
 
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 5e589ba..97f0616 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -45,7 +45,7 @@ public:
 
 struct TheEDcrData: public rtl::Static<EDcrData, TheEDcrData> {};
 
-class EDcr_Impl
+class DynamicErrorInfo_Impl
 {
     sal_uIntPtr                 lErrId;
     sal_uInt16                  nMask;
@@ -69,7 +69,7 @@ EDcrData::EDcrData()
         ppDcr[n]=nullptr;
 }
 
-void EDcr_Impl::RegisterEDcr(DynamicErrorInfo *pDcr)
+void DynamicErrorInfo_Impl::RegisterEDcr(DynamicErrorInfo *pDcr)
 {
     // Register dynamic identifier
     EDcrData& pData=TheEDcrData::get();
@@ -87,7 +87,7 @@ void EDcr_Impl::RegisterEDcr(DynamicErrorInfo *pDcr)
         pData.nNextDcr=0;
 }
 
-void EDcr_Impl::UnRegisterEDcr(DynamicErrorInfo *pDcr)
+void DynamicErrorInfo_Impl::UnRegisterEDcr(DynamicErrorInfo *pDcr)
 {
     DynamicErrorInfo **ppDcr=TheEDcrData::get().ppDcr;
     sal_uIntPtr lIdx=(
@@ -105,7 +105,7 @@ ErrorInfo::~ErrorInfo()
 ErrorInfo *ErrorInfo::GetErrorInfo(sal_uIntPtr lId)
 {
     if(lId & ERRCODE_DYNAMIC_MASK)
-        return EDcr_Impl::GetDynamicErrorInfo(lId);
+        return DynamicErrorInfo_Impl::GetDynamicErrorInfo(lId);
     else
         return new ErrorInfo(lId);
 }
@@ -117,7 +117,7 @@ DynamicErrorInfo::operator sal_uIntPtr() const
 
 DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr lArgUserId, sal_uInt16 nMask)
 : ErrorInfo(lArgUserId),
-  pImpl(new EDcr_Impl)
+  pImpl(new DynamicErrorInfo_Impl)
 {
     pImpl->RegisterEDcr(this);
     pImpl->nMask=nMask;
@@ -125,10 +125,10 @@ DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr 
lArgUserId, sal_uInt16 nMask)
 
 DynamicErrorInfo::~DynamicErrorInfo()
 {
-    EDcr_Impl::UnRegisterEDcr(this);
+    DynamicErrorInfo_Impl::UnRegisterEDcr(this);
 }
 
-ErrorInfo* EDcr_Impl::GetDynamicErrorInfo(sal_uIntPtr lId)
+ErrorInfo* DynamicErrorInfo_Impl::GetDynamicErrorInfo(sal_uIntPtr lId)
 {
     sal_uIntPtr lIdx=((lId & ERRCODE_DYNAMIC_MASK)>>ERRCODE_DYNAMIC_SHIFT)-1;
     DynamicErrorInfo* pDcr=TheEDcrData::get().ppDcr[lIdx];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits