[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source

[Zolnai Tamás]

 l10ntools/inc/export.hxx    |    4 ----
 l10ntools/source/export.cxx |   17 -----------------
 l10ntools/source/merge.cxx  |    6 ------
 3 files changed, 27 deletions(-)

New commits:
commit 9e2d2822063729f450adb734f58106bb64695ce6
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sat Apr 20 09:36:16 2013 +0200

    Delete some unneeded member of ResData
    
    nChildIndex and bRestMerges are simple unused.
    nWidth is an obsolote attribute
    
    Change-Id: I669a17cefb3dc8628ce2c8d9db8abac630fc3cde

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 35f9772..2230569 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -111,8 +111,6 @@ public:
     ~ResData();
     sal_Bool SetId(const OString &rId, sal_uInt16 nLevel);
 
-    sal_Int32 nWidth;
-    sal_uInt16 nChildIndex;
     sal_uInt16 nIdLevel;
     sal_Bool bChild;
     sal_Bool bChildWithText;
@@ -123,8 +121,6 @@ public:
     sal_Bool bTitle;
     sal_Bool bList;
 
-    sal_Bool bRestMerged;
-
     OString sResTyp;
     OString sId;
     OString sGId;
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index bf1fbce..af97a4b 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -782,23 +782,6 @@ int Export::Execute( int nToken, const char * pToken )
         case APPFONTMAPPING:
         {
             bDontWriteOutput = sal_False;
-            // this is a AppfontMapping, so look if its a definition
-            // of field size
-            sal_Int32 n = 0;
-            OString sKey(
-                sToken.getToken(0, '=', n).replaceAll(" ", OString()).
-                replaceAll("\t", OString()));
-            OString sMapping = sToken.getToken(0, '=', n);
-            sMapping = sMapping.getToken(1, '(');
-            sMapping = sMapping.getToken(0, ')').
-                replaceAll(OString(' '), OString()).
-                replaceAll(OString('\t'), OString()).
-                toAsciiUpperCase();
-            if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("SIZE"))) {
-                pResData->nWidth = sMapping.getToken(0, ',').toInt32();
-            } else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("POSSIZE"))) {
-                pResData->nWidth = sMapping.getToken(2, ',').toInt32();
-            }
         }
         break;
         case RSCDEFINELEND:
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index f1b283f..1555adb 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -65,8 +65,6 @@ namespace
 
 ResData::ResData( const OString &rGId )
     :
-    nWidth( 0 ),
-    nChildIndex( 0 ),
     nIdLevel( ID_LEVEL_NULL ),
     bChild( sal_False ),
     bChildWithText( sal_False ),
@@ -75,7 +73,6 @@ ResData::ResData( const OString &rGId )
     bQuickHelpText( sal_False ),
     bTitle( sal_False ),
     bList( sal_False ),
-    bRestMerged( sal_False ),
     sGId( rGId ),
     nTextRefId( REFID_NONE ),
     nHelpTextRefId( REFID_NONE ),
@@ -93,8 +90,6 @@ ResData::ResData( const OString &rGId )
 
 ResData::ResData( const OString &rGId, const OString &rFilename)
     :
-    nWidth( 0 ),
-    nChildIndex( 0 ),
     nIdLevel( ID_LEVEL_NULL ),
     bChild( sal_False ),
     bChildWithText( sal_False ),
@@ -103,7 +98,6 @@ ResData::ResData( const OString &rGId, const OString &rFilename)
     bQuickHelpText( sal_False ),
     bTitle( sal_False ),
     bList( sal_False ),
-    bRestMerged( sal_False ),
     sGId( rGId ),
     sFilename( rFilename ),
     nTextRefId( REFID_NONE ),