Kaydet (Commit) 25213655 authored tarafından LeMoyne Castle's avatar LeMoyne Castle Kaydeden (comit) Tor Lillqvist

Paren fix for Ubu 10.04 build (and fdo#58417 ?)

The form: OuterCtor( InnerCtor(array[i]).method() )
with explicit ctor(s), unused optional arg on ctor+method
--> error 'parameter can not have variably modified type'
gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5.1).
Min fix: force precedence/associativity in type resolution.
fdo#58417 BTs inside 1 of these ctor calls.

Change-Id: I4d8b979df0fc827758b1e9a336031671425486ea
Reviewed-on: https://gerrit.libreoffice.org/1531Reviewed-by: 's avatarTor Lillqvist <tml@iki.fi>
Tested-by: 's avatarTor Lillqvist <tml@iki.fi>
üst 73731b01
...@@ -744,7 +744,7 @@ void LngSvcMgr::UpdateAll() ...@@ -744,7 +744,7 @@ void LngSvcMgr::UpdateAll()
const OUString *pNodeName = aNodeNames.getConstArray(); const OUString *pNodeName = aNodeNames.getConstArray();
for (i = 0; i < nNodeNames; ++i) for (i = 0; i < nNodeNames; ++i)
{ {
Locale aLocale( LanguageTag( pNodeName[i]).getLocale() ); Locale aLocale( (LanguageTag(pNodeName[i])).getLocale() );
Sequence< OUString > aCfgSvcs( getConfiguredServices( aService, aLocale )); Sequence< OUString > aCfgSvcs( getConfiguredServices( aService, aLocale ));
Sequence< OUString > aAvailSvcs( getAvailableServices( aService, aLocale )); Sequence< OUString > aAvailSvcs( getAvailableServices( aService, aLocale ));
...@@ -763,7 +763,7 @@ void LngSvcMgr::UpdateAll() ...@@ -763,7 +763,7 @@ void LngSvcMgr::UpdateAll()
const Locale *pAvailLocale = aAvailLocales.getConstArray(); const Locale *pAvailLocale = aAvailLocales.getConstArray();
for (i = 0; i < nAvailLocales; ++i) for (i = 0; i < nAvailLocales; ++i)
{ {
OUString aCfgLocaleStr( LanguageTag( pAvailLocale[i] ).getBcp47() ); OUString aCfgLocaleStr( (LanguageTag(pAvailLocale[i])).getBcp47() );
Sequence< OUString > aAvailSvcs( getAvailableServices( aService, pAvailLocale[i] )); Sequence< OUString > aAvailSvcs( getAvailableServices( aService, pAvailLocale[i] ));
...@@ -863,7 +863,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) ...@@ -863,7 +863,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
if (0 == rName.compareTo( aSpellCheckerList, aSpellCheckerList.getLength() )) if (0 == rName.compareTo( aSpellCheckerList, aSpellCheckerList.getLength() ))
{ {
// delete old cached data, needs to be acquired new on demand // delete old cached data, needs to be acquired new on demand
clearSvcInfoArray(pAvailSpellSvcs); clearSvcInfoArray(pAvailSpellSvcs);
OUString aNode( aSpellCheckerList ); OUString aNode( aSpellCheckerList );
if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText )) if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText ))
...@@ -888,7 +888,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) ...@@ -888,7 +888,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
else if (0 == rName.compareTo( aGrammarCheckerList, aGrammarCheckerList.getLength() )) else if (0 == rName.compareTo( aGrammarCheckerList, aGrammarCheckerList.getLength() ))
{ {
// delete old cached data, needs to be acquired new on demand // delete old cached data, needs to be acquired new on demand
clearSvcInfoArray(pAvailGrammarSvcs); clearSvcInfoArray(pAvailGrammarSvcs);
OUString aNode( aGrammarCheckerList ); OUString aNode( aGrammarCheckerList );
if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText )) if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText ))
...@@ -916,7 +916,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) ...@@ -916,7 +916,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
else if (0 == rName.compareTo( aHyphenatorList, aHyphenatorList.getLength() )) else if (0 == rName.compareTo( aHyphenatorList, aHyphenatorList.getLength() ))
{ {
// delete old cached data, needs to be acquired new on demand // delete old cached data, needs to be acquired new on demand
clearSvcInfoArray(pAvailHyphSvcs); clearSvcInfoArray(pAvailHyphSvcs);
OUString aNode( aHyphenatorList ); OUString aNode( aHyphenatorList );
if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText )) if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText ))
...@@ -941,7 +941,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) ...@@ -941,7 +941,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
else if (0 == rName.compareTo( aThesaurusList, aThesaurusList.getLength() )) else if (0 == rName.compareTo( aThesaurusList, aThesaurusList.getLength() ))
{ {
// delete old cached data, needs to be acquired new on demand // delete old cached data, needs to be acquired new on demand
clearSvcInfoArray(pAvailThesSvcs); clearSvcInfoArray(pAvailThesSvcs);
OUString aNode( aThesaurusList ); OUString aNode( aThesaurusList );
if (lcl_SeqHasString( aThesaurusListEntries, aKeyText )) if (lcl_SeqHasString( aThesaurusListEntries, aKeyText ))
...@@ -1840,7 +1840,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName ) ...@@ -1840,7 +1840,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
aCfgAny <<= aSvcImplNames; aCfgAny <<= aSvcImplNames;
DBG_ASSERT( aCfgAny.hasValue(), "missing value for 'Any' type" ); DBG_ASSERT( aCfgAny.hasValue(), "missing value for 'Any' type" );
OUString aCfgLocaleStr( LanguageTag( pLocale[i] ).getBcp47() ); OUString aCfgLocaleStr( (LanguageTag(pLocale[i])).getBcp47() );
pValue->Value = aCfgAny; pValue->Value = aCfgAny;
pValue->Name = aNodeName; pValue->Name = aNodeName;
pValue->Name += OUString::valueOf( (sal_Unicode) '/' ); pValue->Name += OUString::valueOf( (sal_Unicode) '/' );
......
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