Kaydet (Commit) 713dc2fc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix various warnings in --disable-liblangtag code

Change-Id: I4dbc7ead359fc4cae0ac9d5eb98523590dd8954e
üst 04ab8aeb
......@@ -102,12 +102,12 @@ void TestLanguageTag::testAllTags()
#else
CPPUNIT_ASSERT( klingon.getBcp47() == s_klingon );
CPPUNIT_ASSERT( aLocale.Language == "qlt" );
CPPUNIT_ASSERT( aLocale.Country == "" );
CPPUNIT_ASSERT_EQUAL( OUString(), aLocale.Country );
CPPUNIT_ASSERT( aLocale.Variant == s_klingon );
CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( klingon.getLanguageType()) );
CPPUNIT_ASSERT( klingon.isValidBcp47() == true );
CPPUNIT_ASSERT( klingon.isIsoLocale() == false );
CPPUNIT_ASSERT( klingon.isIsoODF() == false );
CPPUNIT_ASSERT( klingon.isValidBcp47() );
CPPUNIT_ASSERT( !klingon.isIsoLocale() );
CPPUNIT_ASSERT( !klingon.isIsoODF() );
LanguageType nLang = klingon.getLanguageType();
LanguageTag klingon_id( nLang);
CPPUNIT_ASSERT( klingon_id.getBcp47() == s_klingon );
......
......@@ -245,13 +245,13 @@ struct my_t_list : public my_t_impl
mpList = pList;
return *this;
}
virtual void append( const char* str, const char* stop )
virtual void append( const char* str, const char* stop ) override
{
lt_list_t* p = new lt_list_t;
p->assign( str, stop);
my_appendToList( &mpList, p);
}
virtual void zero()
virtual void zero() override
{
my_t_impl::zero();
my_unrefList( mpList);
......@@ -398,7 +398,7 @@ static int lt_tag_parse(lt_tag_t *tag,
// allowed, store first as language and return ok.
// For i-* simply assume the same.
(*ppSub)->append( pStart-1, p);
return !0; // ok
return 1; // ok
}
else if (nLen == 3)
{
......@@ -514,7 +514,7 @@ static int lt_tag_parse(lt_tag_t *tag,
pStart = p+1;
}
}
return !0;
return 1;
}
static char* lt_tag_canonicalize(lt_tag_t *tag,
......
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