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

LeMoyne Castle (via Code Review) gerrit at gerrit.libreoffice.org
Wed Jan 2 02:16:39 PST 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1531

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/1531/1

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
---
M linguistic/source/lngsvcmgr.cxx
1 file changed, 7 insertions(+), 7 deletions(-)



diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 4f68407..a8e9763 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -744,7 +744,7 @@
         const OUString *pNodeName = aNodeNames.getConstArray();
         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 > aAvailSvcs( getAvailableServices( aService, aLocale ));
 
@@ -763,7 +763,7 @@
         const Locale *pAvailLocale = aAvailLocales.getConstArray();
         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] ));
 
@@ -863,7 +863,7 @@
         if (0 == rName.compareTo( aSpellCheckerList, aSpellCheckerList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-			clearSvcInfoArray(pAvailSpellSvcs);
+            clearSvcInfoArray(pAvailSpellSvcs);
 
             OUString aNode( aSpellCheckerList );
             if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText ))
@@ -888,7 +888,7 @@
         else if (0 == rName.compareTo( aGrammarCheckerList, aGrammarCheckerList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-			clearSvcInfoArray(pAvailGrammarSvcs);
+            clearSvcInfoArray(pAvailGrammarSvcs);
 
             OUString aNode( aGrammarCheckerList );
             if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText ))
@@ -916,7 +916,7 @@
         else if (0 == rName.compareTo( aHyphenatorList, aHyphenatorList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-			clearSvcInfoArray(pAvailHyphSvcs);
+            clearSvcInfoArray(pAvailHyphSvcs);
 
             OUString aNode( aHyphenatorList );
             if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText ))
@@ -941,7 +941,7 @@
         else if (0 == rName.compareTo( aThesaurusList, aThesaurusList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-			clearSvcInfoArray(pAvailThesSvcs);
+            clearSvcInfoArray(pAvailThesSvcs);
 
             OUString aNode( aThesaurusList );
             if (lcl_SeqHasString( aThesaurusListEntries, aKeyText ))
@@ -1840,7 +1840,7 @@
             aCfgAny <<= aSvcImplNames;
             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->Name  = aNodeName;
             pValue->Name += OUString::valueOf( (sal_Unicode) '/' );

-- 
To view, visit https://gerrit.libreoffice.org/1531
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d8b979df0fc827758b1e9a336031671425486ea
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: LeMoyne Castle <lemoyne.castle at gmail.com>



More information about the LibreOffice mailing list