From e8c15a9c2050dc24f451eea1426b65df0fecd5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 19 Oct 2013 15:09:21 +0100 Subject: [PATCH] SetS only used once with constant values Change-Id: I2223c22da5bee6d9f9741c96eafe4d65e15dcb55 --- filter/source/graphicfilter/idxf/dxfgrprd.cxx | 20 +++---------------- filter/source/graphicfilter/idxf/dxfgrprd.hxx | 2 +- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index 895f88bd8a0e..2056653803a1 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -162,7 +162,7 @@ sal_uInt16 DXFGroupReader::Read() else { nG = 0; - SetS( 0, "EOF" ); + SetS(); if ( nGCount != 0xffffffff ) { // InfoBox(NULL,String("Fehler ab Gruppe Nr ")+String(nGCount)).Execute(); @@ -241,23 +241,9 @@ void DXFGroupReader::SetF(sal_uInt16 nG, double fF) } -void DXFGroupReader::SetS(sal_uInt16 nG, const char * sS) +void DXFGroupReader::SetS() { - char* pPtr = NULL; - if ( nG < 10 ) - pPtr = S0_9[ nG ]; - else if ( nG == 100 ) - pPtr = S100; - else if ( nG == 102 ) - pPtr = S102; - else - { - nG -= 999; - if ( nG < 11 ) - pPtr = S999_1009[ nG ]; - } - if ( pPtr ) - strncpy( pPtr, sS, DXF_MAX_STRING_LEN + 1 ); + strncpy(S0_9[0], "EOF", DXF_MAX_STRING_LEN + 1 ); } diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx index e83d958df4f4..0d16edbf69ef 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx @@ -77,7 +77,7 @@ public: // (e.g. to set default values, before 'blindly' reading lots of groups) void SetF(sal_uInt16 nG, double fF); - void SetS(sal_uInt16 nG, const char * sS); // (will be copied) + void SetS(); // (will be copied) private: