summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-24 09:05:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-24 11:02:19 +0200
commit3e4b0bde6252b80ccc99c8b9ae261d79456ba026 (patch)
tree2013dd4708bea9d1ae542704ef8bb85704e12573 /l10ntools
parent351202fd9bff1a9cf5b82d6aef5df14a4222a5e9 (diff)
loplugin:unusedfields some untouched fields
which lead to a whole bunch of dead code in vcl/.../i18n_status.cxx Change-Id: Id8eeadeb9cbc6107e1a0dac5801ce20b2b9ae6dc Reviewed-on: https://gerrit.libreoffice.org/40355 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'l10ntools')
-rw-r--r--l10ntools/inc/export.hxx51
-rw-r--r--l10ntools/source/merge.cxx27
2 files changed, 6 insertions, 72 deletions
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index b412f10df2a8..cbc4819f80b9 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -72,28 +72,12 @@ public:
ResData( const OString &rGId , const OString &rFilename );
bool SetId(const OString &rId, IdLevel nLevel);
- IdLevel nIdLevel;
- bool bChild;
- bool bChildWithText;
-
- bool bText;
- bool bQuickHelpText;
- bool bTitle;
-
OString sResTyp;
OString sId;
OString sGId;
OString sFilename;
OStringHashMap sText;
-
- OStringHashMap sQuickHelpText;
-
- OStringHashMap sTitle;
-
- OString sTextTyp;
-
- ExportList m_aList;
};
@@ -116,27 +100,7 @@ class ParserQueue;
class Export
{
private:
- union
- {
- std::ofstream* mSimple;
- PoOfstream* mPo;
-
- } aOutput;
-
- ResStack aResStack; ///< stack for parsing recursive
-
- bool bDefine; // cur. res. in a define?
- bool bNextMustBeDefineEOL; ///< define but no \ at lineend
- std::size_t nLevel; // res. recursive? how deep?
- ExportListType nList; ///< cur. res. is List
- std::size_t nListLevel;
- bool bMergeMode;
- OString sMergeSrc;
bool bError; // any errors while export?
- bool bReadOver;
- OString sFilename;
-
- std::vector<OString> aLanguages;
ParserQueue* pParseQueue;
@@ -277,13 +241,11 @@ class MergeData
friend class MergeDataHashMap;
public:
- OString sGID;
- OString sLID;
std::unique_ptr<MergeEntrys> pMergeEntrys;
private:
MergeDataHashMap::iterator m_aNextData;
public:
- MergeData( const OString &rGID, const OString &rLID );
+ MergeData();
~MergeData();
MergeEntrys* GetMergeEntries() { return pMergeEntrys.get();}
@@ -343,21 +305,10 @@ public:
~ParserQueue();
inline void Push( const QueueEntry& aEntry );
- bool bCurrentIsM; // public ?
- bool bNextIsM; // public ?
- bool bLastWasM; // public ?
- bool bMflag; // public ?
void Close();
private:
- std::queue<QueueEntry>* aQueueNext;
- std::queue<QueueEntry>* aQueueCur;
-
- Export& aExport;
- bool bStart;
-
inline void Pop( std::queue<QueueEntry>& aQueue );
-
};
#endif // INCLUDED_L10NTOOLS_INC_EXPORT_HXX
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index fa213224a533..af4ffb8d308c 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -60,29 +60,15 @@ namespace
ResData::ResData( const OString &rGId )
:
- nIdLevel( IdLevel::Null ),
- bChild( false ),
- bChildWithText( false ),
- bText( false ),
- bQuickHelpText( false ),
- bTitle( false ),
- sGId( rGId ),
- sTextTyp( "Text" )
+ sGId( rGId )
{
sGId = sGId.replaceAll("\r", OString());
}
ResData::ResData( const OString &rGId, const OString &rFilename)
:
- nIdLevel( IdLevel::Null ),
- bChild( false ),
- bChildWithText( false ),
- bText( false ),
- bQuickHelpText( false ),
- bTitle( false ),
sGId( rGId ),
- sFilename( rFilename ),
- sTextTyp( "Text" )
+ sFilename( rFilename )
{
sGId = sGId.replaceAll("\r", OString());
}
@@ -197,11 +183,8 @@ MergeDataHashMap::iterator const & MergeDataHashMap::find(const OString& rKey)
// class MergeData
-MergeData::MergeData(const OString &rGID,
- const OString &rLID )
- : sGID( rGID ),
- sLID( rLID ) ,
- pMergeEntrys( new MergeEntrys() )
+MergeData::MergeData()
+ : pMergeEntrys( new MergeEntrys() )
{
}
@@ -407,7 +390,7 @@ void MergeDataFile::InsertEntry(
if( !pData )
{
- pData = new MergeData( rGID, rLID );
+ pData = new MergeData;
aMap.insert( sKey, pData );
}