Kaydet (Commit) e0097fea authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:checkunusedparams in i18nlangtag and l10ntools

Change-Id: If7c7404b1cc1cf9445a2af8106f7326b76524388
Reviewed-on: https://gerrit.libreoffice.org/36883Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst f7477977
......@@ -205,8 +205,8 @@ void SAL_CALL ProgressMonitor::addText(
{
// Safe impossible cases
// Check valid call of this method.
DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress ) , "ProgressMonitor::addText()\nCall without valid parameters!\n");
DBG_ASSERT ( !(impl_searchTopic ( rTopic, bbeforeProgress ) != nullptr ) , "ProgressMonitor::addText()\nThe text already exist.\n" );
DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText ), "ProgressMonitor::addText()\nCall without valid parameters!\n");
DBG_ASSERT ( !(impl_searchTopic ( rTopic, bbeforeProgress ) != nullptr ), "ProgressMonitor::addText()\nThe text already exist.\n" );
// Do nothing (in Release), if topic already exist.
if ( impl_searchTopic ( rTopic, bbeforeProgress ) != nullptr )
......@@ -244,7 +244,7 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
{
// Safe impossible cases
// Check valid call of this method.
DBG_ASSERT ( impl_debug_checkParameter ( rTopic, bbeforeProgress ), "ProgressMonitor::removeText()\nCall without valid parameters!\n" );
DBG_ASSERT ( impl_debug_checkParameter ( rTopic ), "ProgressMonitor::removeText()\nCall without valid parameters!\n" );
// Search the topic ...
IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress );
......@@ -287,7 +287,7 @@ void SAL_CALL ProgressMonitor::updateText (
{
// Safe impossible cases
// Check valid call of this method.
DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress ), "ProgressMonitor::updateText()\nCall without valid parameters!\n" );
DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText ), "ProgressMonitor::updateText()\nCall without valid parameters!\n" );
// Search topic ...
IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress );
......@@ -863,26 +863,21 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, b
// addText, updateText
bool ProgressMonitor::impl_debug_checkParameter (
const OUString& rTopic,
const OUString& rText,
bool /*bbeforeProgress*/
const OUString& rText
) {
if ( rTopic.isEmpty() ) return false; // ""
if ( rText.isEmpty() ) return false; // ""
// "bbeforeProgress" is valid in everyway!
// Parameter OK ... return true.
return true;
}
// removeText
bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, bool /*bbeforeProgress*/ )
bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic )
{
if ( rTopic.isEmpty() ) return false; // ""
// "bbeforeProgress" is valid in everyway!
// Parameter OK ... return true.
return true;
}
......
......@@ -278,8 +278,8 @@ private:
private:
static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText, bool bbeforeProgress ); // addText, updateText
static bool impl_debug_checkParameter( const OUString& rTopic, bool bbeforeProgress ); // removeText
static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText ); // addText, updateText
static bool impl_debug_checkParameter( const OUString& rTopic ); // removeText
// private variables
......
......@@ -1156,7 +1156,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
OUString aUILang = m_sSystemDefaultString +
" - " +
SvtLanguageTable::GetLanguageString(GetInstalledLocaleForSystemUILanguage().getLanguageType(), true);
SvtLanguageTable::GetLanguageString(GetInstalledLocaleForSystemUILanguage().getLanguageType());
m_pUserInterfaceLB->InsertEntry(aUILang);
m_pUserInterfaceLB->SetEntryData(0, nullptr);
......@@ -1180,8 +1180,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
aLang = LanguageTag::convertToLanguageTypeWithFallback(seqInstalledLanguages[i]);
if (aLang != LANGUAGE_DONTKNOW)
{
//sal_uInt16 p = m_pUserInterfaceLB->InsertLanguage(aLang);
OUString aLangStr( SvtLanguageTable::GetLanguageString( aLang, true ) );
OUString aLangStr( SvtLanguageTable::GetLanguageString( aLang ) );
const sal_Int32 p = m_pUserInterfaceLB->InsertEntry(aLangStr);
m_pUserInterfaceLB->SetEntryData(p, reinterpret_cast<void*>(i+1));
}
......
......@@ -518,7 +518,7 @@ bool MsLangId::isLegacy( LanguageType nLang )
// static
LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, bool /*bUserInterfaceSelection*/ )
LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
{
switch (nLang)
{
......
......@@ -163,14 +163,8 @@ public:
Also used to map UI localizations using reserved ISO codes to something
"official" but not identical in order to not pollute documents with
invalid ISO codes.
@param bUserInterfaceSelection
If TRUE, don't replace such UI-only locale. Only use for
Tools->Options->LanguageSettings->UserInterface listbox.
If FALSE, do replace.
*/
static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang,
bool bUserInterfaceSelection = false );
static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang );
/** Whether locale is legacy, i.e. country ot confederation doesn't exist anymore. */
static bool isLegacy( LanguageType nLang );
......
......@@ -35,15 +35,6 @@ public:
static sal_uInt32 GetLanguageEntryCount();
static LanguageType GetLanguageTypeAtIndex( sal_uInt32 nIndex );
/**
@param bUserInterfaceSelection
If TRUE, don't replace an UI-only locale. Only use for
Tools->Options->LanguageSettings->UserInterface listbox.
If FALSE, do replace; same as GetLanguageString() without bool
parameter.
*/
static OUString GetLanguageString( const LanguageType eType, bool bUserInterfaceSelection );
/** Add a language tag to the table.
@param rString
......
......@@ -345,7 +345,7 @@ private:
void StartElement( const XML_Char *name, const XML_Char **atts );
void EndElement( const XML_Char *name );
void EndElement();
void CharacterData( const XML_Char *s, int len );
void Comment( const XML_Char *data );
void Default( const XML_Char *s, int len );
......
......@@ -788,10 +788,10 @@ SimpleXMLParser::SimpleXMLParser()
{
m_aParser = XML_ParserCreate( nullptr );
XML_SetUserData( m_aParser, this );
XML_SetElementHandler( m_aParser, reinterpret_cast<XML_StartElementHandler>(StartElementHandler), reinterpret_cast<XML_EndElementHandler>(EndElementHandler) );
XML_SetCharacterDataHandler( m_aParser, reinterpret_cast<XML_CharacterDataHandler>(CharacterDataHandler) );
XML_SetCommentHandler( m_aParser, reinterpret_cast<XML_CommentHandler>(CommentHandler) );
XML_SetDefaultHandler( m_aParser, reinterpret_cast<XML_DefaultHandler>(DefaultHandler) );
XML_SetElementHandler( m_aParser, StartElementHandler, EndElementHandler );
XML_SetCharacterDataHandler( m_aParser, CharacterDataHandler );
XML_SetCommentHandler( m_aParser, CommentHandler );
XML_SetDefaultHandler( m_aParser, DefaultHandler );
}
SimpleXMLParser::~SimpleXMLParser()
......@@ -806,9 +806,9 @@ void SimpleXMLParser::StartElementHandler(
}
void SimpleXMLParser::EndElementHandler(
void *userData, const XML_Char *name )
void *userData, const XML_Char * /*name*/ )
{
static_cast<SimpleXMLParser *>(userData)->EndElement( name );
static_cast<SimpleXMLParser *>(userData)->EndElement();
}
void SimpleXMLParser::CharacterDataHandler(
......@@ -844,7 +844,7 @@ void SimpleXMLParser::StartElement(
}
}
void SimpleXMLParser::EndElement( const XML_Char * /*name*/ )
void SimpleXMLParser::EndElement()
{
m_pCurNode = m_pCurNode->GetParent();
m_pCurData = nullptr;
......
......@@ -44,7 +44,7 @@ public:
virtual ~SvtLanguageTableImpl();
bool HasType( const LanguageType eType ) const;
const OUString GetString( const LanguageType eType, bool bUserInterfaceSelection ) const;
const OUString GetString( const LanguageType eType ) const;
LanguageType GetType( const OUString& rStr ) const;
sal_uInt32 GetEntryCount() const;
LanguageType GetTypeAtIndex( sal_uInt32 nIndex ) const;
......@@ -187,9 +187,9 @@ OUString lcl_getDescription( const OUString& rBcp47 )
return "{" + rBcp47 + "}";
}
const OUString SvtLanguageTableImpl::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const
const OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const
{
LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType, bUserInterfaceSelection);
LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType );
sal_uInt32 nPos = FindIndex( eLang );
if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
......@@ -212,15 +212,9 @@ const OUString SvtLanguageTableImpl::GetString( const LanguageType eType, bool b
OUString SvtLanguageTable::GetLanguageString( const LanguageType eType )
{
return theLanguageTable::get().GetString( eType, false );
return theLanguageTable::get().GetString( eType );
}
OUString SvtLanguageTable::GetLanguageString( const LanguageType eType, bool bUserInterfaceSelection )
{
return theLanguageTable::get().GetString( eType, bUserInterfaceSelection );
}
LanguageType SvtLanguageTableImpl::GetType( const OUString& rStr ) const
{
LanguageType eType = LANGUAGE_DONTKNOW;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment