[Libreoffice-commits] core.git: filter/source

[Julien Nabet]

 filter/source/graphicfilter/idxf/dxf2mtf.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9a8281f05871b86bac15c54bcee01f3c40f7ee0d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Feb 13 21:26:44 2013 +0100

    Fix scope + member variables not initialized
    
    Change-Id: I0a2c14246a814859c9752f96aaad9f28f6d59c75

diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index c22e0a4..be2732c 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -115,7 +115,6 @@ DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
 DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const DXFBasicEntity & rE)
 {
     DXFLineInfo aDXFLineInfo;
-    const DXFLayer * pLayer;
 
     aDXFLineInfo.eStyle = LINE_SOLID;
     aDXFLineInfo.fWidth = 0;
@@ -128,7 +127,7 @@ DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const DXFBasicEntity & rE)
     if (strcmp(rE.sLineType,"BYLAYER")==0) {
         if (rE.sLayer[0]=='0' && rE.sLayer[1]==0) aDXFLineInfo=aParentLayerDXFLineInfo;
         else {
-            pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
+            const DXFLayer * pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
             if (pLayer!=NULL) aDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
             else aDXFLineInfo=aParentLayerDXFLineInfo;
         }
@@ -746,7 +745,7 @@ void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
 }
 
 
-DXF2GDIMetaFile::DXF2GDIMetaFile()
+DXF2GDIMetaFile::DXF2GDIMetaFile():pVirDev(NULL), pDXF(NULL), nBlockColor(0), nParentLayerColor(0)
 {
 }