[Libreoffice-commits] .: 2 commits - filter/source xmerge/source

[Caolán McNamara]

 filter/source/graphicfilter/idxf/dxf2mtf.cxx |   25 ++++---------------------
 filter/source/graphicfilter/idxf/dxf2mtf.hxx |    5 +----
 xmerge/source/activesync/XMergeSync.cpp      |    2 +-
 xmerge/source/activesync/XMergeSync.h        |    2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)

New commits:
commit ee4db5b93a731ee6dc349a23c8b5760a89c73db0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 23 21:28:57 2010 +0000

    MayCallback is empty, remove it, etc.

diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index b86c8d6..fb65c0f 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -48,21 +48,6 @@ ULONG DXF2GDIMetaFile::CountEntities(const DXFEntities & rEntities)
     return nRes;
 }
 
-
-void DXF2GDIMetaFile::MayCallback(ULONG /*nMainEntitiesProcessed*/)
-{
-    // ULONG nPercent;
-/*
-    if (pCallback!=NULL && nMainEntitiesCount!=0) {
-        nPercent=nMinPercent+(nMaxPercent-nMinPercent)*nMainEntitiesProcessed/nMainEntitiesCount;
-        if (nPercent>=nLastPercent+4) {
-            if (((*pCallback)(pCallerData,(USHORT)nPercent))==TRUE) bStatus=FALSE;
-            nLastPercent=nPercent;
-        }
-    }
-*/
-}
-
 Color DXF2GDIMetaFile::ConvertColor(BYTE nColor)
 {
     return Color(
@@ -506,7 +491,7 @@ void DXF2GDIMetaFile::DrawInsertEntity(const DXFInsertEntity & rE, const DXFTran
                 aParentLayerDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
             }
         }
-        DrawEntities(*pB,aT,FALSE);
+        DrawEntities(*pB,aT);
         aBlockDXFLineInfo=aSavedBlockDXFLineInfo;
         aParentLayerDXFLineInfo=aSavedParentLayerDXFLineInfo;
         nBlockColor=nSavedBlockColor;
@@ -757,7 +742,7 @@ void DXF2GDIMetaFile::DrawDimensionEntity(const DXFDimensionEntity & rE, const D
                 aParentLayerDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
             }
         }
-        DrawEntities(*pB,aT,FALSE);
+        DrawEntities(*pB,aT);
         aBlockDXFLineInfo=aSavedBlockDXFLineInfo;
         aParentLayerDXFLineInfo=aSavedParentLayerDXFLineInfo;
         nBlockColor=nSavedBlockColor;
@@ -767,8 +752,7 @@ void DXF2GDIMetaFile::DrawDimensionEntity(const DXFDimensionEntity & rE, const D
 
 
 void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
-                                   const DXFTransform & rTransform,
-                                   BOOL bTopEntities)
+                                   const DXFTransform & rTransform)
 {
     ULONG nCount=0;
     DXFTransform aET;
@@ -834,7 +818,6 @@ void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
         }
         pE=pE->pSucc;
         nCount++;
-        if (bTopEntities) MayCallback(nCount);
     }
 }
 
@@ -957,7 +940,7 @@ BOOL DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF
     }
 
     if (bStatus==TRUE)
-        DrawEntities(pDXF->aEntities,aTransform,TRUE);
+        DrawEntities(pDXF->aEntities,aTransform);
 
     rMTF.Stop();
 
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index 5ad27bd..ce3fe76 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -65,8 +65,6 @@ private:
 
     ULONG CountEntities(const DXFEntities & rEntities);
 
-    void MayCallback(ULONG nMainEntitiesProcessed);
-
     Color ConvertColor(BYTE nColor);
 
     long GetEntityColor(const DXFBasicEntity & rE);
@@ -111,8 +109,7 @@ private:
     void DrawHatchEntity( const DXFHatchEntity & rE, const DXFTransform & rTransform );
 
     void DrawEntities(const DXFEntities & rEntities,
-                      const DXFTransform & rTransform,
-                      BOOL bTopEntities);
+                      const DXFTransform & rTransform);
 
 public:
 
commit aa6361fbbd97ba001b1f630239f130c57f75a1ad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 23 21:20:10 2010 +0000

    cppcheck: This function can be const

diff --git a/xmerge/source/activesync/XMergeSync.cpp b/xmerge/source/activesync/XMergeSync.cpp
index e091dc0..119e0ad 100644
--- a/xmerge/source/activesync/XMergeSync.cpp
+++ b/xmerge/source/activesync/XMergeSync.cpp
@@ -831,7 +831,7 @@ long CXMergeSyncModule::LockServer(BOOL fLock)
         return ::InterlockedDecrement(&m_lLocks);
 }
 
-long CXMergeSyncModule::GetLockCount()
+long CXMergeSyncModule::GetLockCount() const
 {
     return m_lLocks + m_lObjs;
 }
diff --git a/xmerge/source/activesync/XMergeSync.h b/xmerge/source/activesync/XMergeSync.h
index b0fab94..0167121 100644
--- a/xmerge/source/activesync/XMergeSync.h
+++ b/xmerge/source/activesync/XMergeSync.h
@@ -20,7 +20,7 @@ protected:
     long  m_lObjs;
 
 public:
-    long GetLockCount();
+    long GetLockCount() const;
     long LockServer(BOOL fLock);
     HINSTANCE m_hInst;
     CXMergeSyncModule();