From 877774c05731b7505a3d3a947a1dcb528f36df41 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 18 Oct 2016 14:55:26 +0200 Subject: loplugin:expandablemethodds in hwpfilter..linguistic Change-Id: If20fd4a6cf8a8e005804dbb7caf41cce73d587a5 Reviewed-on: https://gerrit.libreoffice.org/30016 Tested-by: Jenkins Reviewed-by: Noel Grandin --- l10ntools/inc/cfgmerge.hxx | 2 -- l10ntools/source/cfgmerge.cxx | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'l10ntools') diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index 2b43598a6d2f..3d2162ad4bfe 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -111,8 +111,6 @@ protected: virtual void Output(const OString & rOutput)=0; - static void Error(const OString &rError); - private: void ExecuteAnalyzedToken( int nToken, char *pToken ); void AddText( diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index 3ea923059392..20a6f0deac47 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -266,7 +266,7 @@ void CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) sError += sToken; sError += sInFile; sError += global::inputPathname; - Error( sError ); + yyerror(sError.getStr()); std::exit(EXIT_FAILURE); } } @@ -331,11 +331,6 @@ void CfgParser::Execute( int nToken, char * pToken ) ExecuteAnalyzedToken( nToken, pToken ); } -void CfgParser::Error(const OString& rError) -{ - yyerror(rError.getStr()); -} - // class CfgExport -- cgit