[Libreoffice-commits] .: 4 commits - binfilter/bf_sc binfilter/bf_xmloff binfilter/filter binfilter/inc

Caolán McNamara caolan at kemper.freedesktop.org
Sun Dec 19 08:42:35 PST 2010


 binfilter/bf_sc/source/filter/xml/XMLConverter.hxx          |    3 
 binfilter/bf_sc/source/filter/xml/sc_XMLConverter.cxx       |    9 +-
 binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx           |    4 -
 binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx |    2 
 binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx          |   45 +++++-------
 binfilter/filter/source/bf_migrate/bf_migrateexports.cxx    |    9 +-
 binfilter/filter/source/bf_migrate/makefile.mk              |    2 
 binfilter/inc/bf_sfx2/sfxbasemodel.hxx                      |   14 +--
 binfilter/inc/bf_xmloff/numehelp.hxx                        |    2 
 binfilter/inc/bf_xmloff/txtflde.hxx                         |    8 --
 10 files changed, 49 insertions(+), 49 deletions(-)

New commits:
commit 61c501a4d1e92d22aebec2fb638d84d04872584a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 19 16:41:30 2010 +0000

    WaE, remove all warnings, toggle makefile as warning free

diff --git a/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
index 41f13fb..6209c1b 100644
--- a/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
@@ -48,7 +48,7 @@ extern "C"
 {
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName, uno_Environment** ppEnv)
+void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName, uno_Environment** /*ppEnv*/)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -60,8 +60,11 @@ sal_Bool SAL_CALL component_writeInfo(void* pServiceManager, void* pRegistryKey)
     {
         try
         {
-            sal_Bool bLegacySmgrWriteInfoDidWork(legacysmgr_component_writeInfo
-                ( reinterpret_cast<XMultiServiceFactory*>( pServiceManager), reinterpret_cast<XRegistryKey*> (pRegistryKey) ));
+#if OSL_DEBUG_LEVEL > 0
+            bool bLegacySmgrWriteInfoDidWork =
+#endif
+            legacysmgr_component_writeInfo
+                ( reinterpret_cast<XMultiServiceFactory*>( pServiceManager), reinterpret_cast<XRegistryKey*> (pRegistryKey) );
             OSL_ENSURE(bLegacySmgrWriteInfoDidWork, "### LegacyServiceManager writeInfo failed!" );
 
             Reference< XRegistryKey > xNewKey;
diff --git a/binfilter/filter/source/bf_migrate/makefile.mk b/binfilter/filter/source/bf_migrate/makefile.mk
index e15e215..14efae4 100644
--- a/binfilter/filter/source/bf_migrate/makefile.mk
+++ b/binfilter/filter/source/bf_migrate/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
 PRJ=..$/..$/..
 BFPRJ=..$/..
 
commit 59c0f0a219edc17765ac51b1f2e73b4b2d76439b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 19 16:37:19 2010 +0000

    WaE, silence some warnings

diff --git a/binfilter/bf_sc/source/filter/xml/XMLConverter.hxx b/binfilter/bf_sc/source/filter/xml/XMLConverter.hxx
index e438fbd..4d6e0ba 100644
--- a/binfilter/bf_sc/source/filter/xml/XMLConverter.hxx
+++ b/binfilter/bf_sc/source/filter/xml/XMLConverter.hxx
@@ -82,8 +82,7 @@ public:
     static void			GetTokenByOffset(
                             ::rtl::OUString& rToken,
                             const ::rtl::OUString& rString,
-                            sal_Int32& nOffset,
-                            sal_Unicode cQuote = '\'' );
+                            sal_Int32& nOffset);
 
     static ScDocument*	GetScDocument(
                             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel );
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLConverter.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLConverter.cxx
index 1e1c111..dc840ef 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLConverter.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLConverter.cxx
@@ -117,8 +117,7 @@ sal_Int32 ScXMLConverter::IndexOfDifferent(
 void ScXMLConverter::GetTokenByOffset(
         OUString& rToken,
         const OUString& rString,
-        sal_Int32& nOffset,
-        sal_Unicode cQuote )
+        sal_Int32& nOffset )
 {
     sal_Int32 nLength = rString.getLength();
     if( nOffset >= nLength )
@@ -494,6 +493,8 @@ void ScXMLConverter::GetStringFromFunction(
         case sheet::GeneralFunction_SUM:		sFuncStr = GetXMLToken( XML_SUM );			break;
         case sheet::GeneralFunction_VAR:		sFuncStr = GetXMLToken( XML_VAR );			break;
         case sheet::GeneralFunction_VARP:		sFuncStr = GetXMLToken( XML_VARP );			break;
+        default:
+            break;
     }
     AssignString( rString, sFuncStr, bAppendStr );
 }
@@ -565,6 +566,8 @@ void ScXMLConverter::GetStringFromOrientation(
         case sheet::DataPilotFieldOrientation_DATA:
             sOrientStr = GetXMLToken( XML_DATA );
         break;
+        default:
+        break;
     }
     AssignString( rString, sOrientStr, bAppendStr );
 }
@@ -620,6 +623,8 @@ void ScXMLConverter::GetStringFromDetObjType(
         case SC_DETOBJ_TOOTHERTAB:
             sTypeStr = GetXMLToken( XML_TO_ANOTHER_TABLE );
         break;
+        default:
+        break;
     }
     AssignString( rString, sTypeStr, bAppendStr );
 }
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
index df28554..4fcef2c 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
@@ -1739,7 +1739,7 @@ void ScXMLExport::_ExportAutoStyles()
                                         sal_Int32 nRow = 0;
                                         while ( /*nRow <= nRows && */nRow <= MAXROW)
                                         {
-                                            sal_Int32 nIndex;
+                                            sal_Int32 nIndex(0);
                                             uno::Any aRow = xTableRows->getByIndex(nRow);
                                             uno::Reference<table::XCellRange> xTableRow;
                                             if (aRow >>= xTableRow)
@@ -2099,6 +2099,8 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
             }
         }
         break;
+    default:
+        break;
     }
     ::rtl::OUString* pCellString = &sElemCell;
     if (aCell.bIsCovered)
diff --git a/binfilter/inc/bf_sfx2/sfxbasemodel.hxx b/binfilter/inc/bf_sfx2/sfxbasemodel.hxx
index 0f4850d..7e979aa 100644
--- a/binfilter/inc/bf_sfx2/sfxbasemodel.hxx
+++ b/binfilter/inc/bf_sfx2/sfxbasemodel.hxx
@@ -740,8 +740,8 @@ public:
     //	XPrintJobBroadcaster
     //____________________________________________________________________________________________________
 
-    virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener )throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& )throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& ) throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
     //____________________________________________________________________________________________________
     //	XPrintable
@@ -775,8 +775,8 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL setPrinter( const SEQUENCE< PROPERTYVALUE >& seqPrinter )
-    throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPrinter( const SEQUENCE< PROPERTYVALUE >& )
+    throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}
     /**___________________________________________________________________________________________________
         @short		-
         @descr		-
@@ -984,8 +984,8 @@ public:
         @onerror	-
     */
 
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const DATAFLAVOR& aFlavor )
-        throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");return false;}//STRIP001 throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const DATAFLAVOR& )
+        throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");return false;}
 
     //____________________________________________________________________________________________________
     //	XEventsSupplier
@@ -1119,7 +1119,7 @@ public:
     sal_Bool hasEventListeners() const;
 
 protected:
-    virtual void impl_setPrinter(const SEQUENCE< PROPERTYVALUE >& rPrinter,SfxPrinter*& pPrinter,sal_uInt16& nChangeFlags,SfxViewShell*& pViewSh){DBG_BF_ASSERT(0, "STRIP");}//STRIP001 virtual void impl_setPrinter(const SEQUENCE< PROPERTYVALUE >& rPrinter,SfxPrinter*& pPrinter,sal_uInt16& nChangeFlags,SfxViewShell*& pViewSh);
+    virtual void impl_setPrinter(const SEQUENCE< PROPERTYVALUE >&,SfxPrinter*&,sal_uInt16&,SfxViewShell*&){DBG_BF_ASSERT(0, "STRIP");}
 //________________________________________________________________________________________________________
 //	private methods
 //________________________________________________________________________________________________________
commit 1e319d2570bed34942c15d17fae9d50957529c6a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 19 16:18:53 2010 +0000

    WaE, remove some warnings

diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx
index 5c1f40c..7a8513a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx
@@ -584,7 +584,7 @@ void XMLSectionExport::ExportTableOfContentStart(
         // TOC specific index source attributes:
 
         // outline-level: 1..10
-        sal_Int16 nLevel;
+        sal_Int16 nLevel(0);
         if( rPropertySet->getPropertyValue(sLevel) >>= nLevel )
         {
             OUStringBuffer sBuffer;
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
index de9ffd5..ddea91c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
@@ -316,21 +316,21 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
           RTL_CONSTASCII_USTRINGPARAM("NumberingSeparator")),
       sPropertyNumberingType(
           RTL_CONSTASCII_USTRINGPARAM("NumberingType")),
-      sPropertyDateTimeValue(RTL_CONSTASCII_USTRINGPARAM("DateTimeValue")),
-      sPropertyUserText(RTL_CONSTASCII_USTRINGPARAM("UserText")),
-      sPropertyOffset(RTL_CONSTASCII_USTRINGPARAM("Offset")),
       sPropertyDataBaseName(RTL_CONSTASCII_USTRINGPARAM("DataBaseName")),
       sPropertyDataTableName(RTL_CONSTASCII_USTRINGPARAM("DataTableName")),
-      sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM("Condition")),
+      sPropertyDateTimeValue(RTL_CONSTASCII_USTRINGPARAM("DateTimeValue")),
+      sPropertyDataColumnName(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")),
       sPropertySetNumber(RTL_CONSTASCII_USTRINGPARAM("SetNumber")),
       sPropertyIsDataBaseFormat(RTL_CONSTASCII_USTRINGPARAM("DataBaseFormat")),
-      sPropertyDataColumnName(RTL_CONSTASCII_USTRINGPARAM("DataColumnName")),
+      sPropertyUserText(RTL_CONSTASCII_USTRINGPARAM("UserText")),
+      sPropertyOffset(RTL_CONSTASCII_USTRINGPARAM("Offset")),
+      sPropertyCondition(RTL_CONSTASCII_USTRINGPARAM("Condition")),
       sPropertyDateTime(RTL_CONSTASCII_USTRINGPARAM("DateTime")),
       sPropertyTrueContent(RTL_CONSTASCII_USTRINGPARAM("TrueContent")),
       sPropertyFalseContent(RTL_CONSTASCII_USTRINGPARAM("FalseContent")),
       sPropertyRevision(RTL_CONSTASCII_USTRINGPARAM("Revision")),
-      sPropertyFileFormat(RTL_CONSTASCII_USTRINGPARAM("FileFormat")),
       sPropertyChapterFormat(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")),
+      sPropertyFileFormat(RTL_CONSTASCII_USTRINGPARAM("FileFormat")),
       sPropertyLevel(RTL_CONSTASCII_USTRINGPARAM("Level")),
       sPropertyIsDate(RTL_CONSTASCII_USTRINGPARAM("IsDate")),
       sPropertyAdjust(RTL_CONSTASCII_USTRINGPARAM("Adjust")),
@@ -343,16 +343,16 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
       sPropertyReferenceFieldSource(
           RTL_CONSTASCII_USTRINGPARAM("ReferenceFieldSource")),
       sPropertySequenceNumber(RTL_CONSTASCII_USTRINGPARAM("SequenceNumber")),
-      sPropertySequenceValue(RTL_CONSTASCII_USTRINGPARAM("SequenceValue")),
       sPropertySourceName(RTL_CONSTASCII_USTRINGPARAM("SourceName")),
-      sPropertyDDECommandType(RTL_CONSTASCII_USTRINGPARAM("DDECommandType")),
-      sPropertyDDECommandFile(RTL_CONSTASCII_USTRINGPARAM("DDECommandFile")),
-      sPropertyDDECommandElement(
-          RTL_CONSTASCII_USTRINGPARAM("DDECommandElement")),
       sPropertyIsAutomaticUpdate(
           RTL_CONSTASCII_USTRINGPARAM("IsAutomaticUpdate")),
       sPropertyDependentTextFields(
           RTL_CONSTASCII_USTRINGPARAM("DependentTextFields")),
+      sPropertyDDECommandType(RTL_CONSTASCII_USTRINGPARAM("DDECommandType")),
+      sPropertyDDECommandFile(RTL_CONSTASCII_USTRINGPARAM("DDECommandFile")),
+      sPropertyDDECommandElement(
+          RTL_CONSTASCII_USTRINGPARAM("DDECommandElement")),
+      sPropertySequenceValue(RTL_CONSTASCII_USTRINGPARAM("SequenceValue")),
       sPropertyURL(RTL_CONSTASCII_USTRINGPARAM("URL")),
       sPropertyTargetFrame(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")),
       sPropertyFields(RTL_CONSTASCII_USTRINGPARAM("Fields")),
@@ -1024,7 +1024,7 @@ void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField )
                                   sal_False, sal_False);
 
         // finally, export the field itself
-        ExportFieldHelper( rTextField, xPropSet, xRangePropSet, nToken );
+        ExportFieldHelper( rTextField, xPropSet, nToken );
     }
 }
 
@@ -1032,7 +1032,6 @@ void XMLTextFieldExport::ExportField(const Reference<XTextField> & rTextField )
 void XMLTextFieldExport::ExportFieldHelper(
     const Reference<XTextField> & rTextField,
     const Reference<XPropertySet> & rPropSet,
-    const Reference<XPropertySet> & rRangePropSet,
     enum FieldIdEnum nToken)
 {
     // get property set info (because some attributes are not support
@@ -2322,8 +2321,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName,
 void XMLTextFieldExport::ProcessString(
     enum XMLTokenEnum eName, 
     enum XMLTokenEnum eValue, 
-    sal_Bool bOmitEmpty,
-    sal_uInt16 nPrefix) 
+    sal_Bool bOmitEmpty)
 {
     DBG_ASSERT( eName != XML_TOKEN_INVALID, "invalid element token" );
     DBG_ASSERT( bOmitEmpty || (eValue != XML_TOKEN_INVALID), 
@@ -2342,11 +2340,10 @@ void XMLTextFieldExport::ProcessString(
 void XMLTextFieldExport::ProcessString(
     enum XMLTokenEnum eName, 
     enum XMLTokenEnum eValue, 
-    enum XMLTokenEnum eDefault, 
-    sal_uInt16 nPrefix) 
+    enum XMLTokenEnum eDefault)
 {
     if ( eValue != eDefault )
-        ProcessString( eName, eValue, sal_False, nPrefix);
+        ProcessString( eName, eValue, sal_False );
 }
 
 
@@ -2549,7 +2546,7 @@ void XMLTextFieldExport::ProcessBibliographyData(
         if (aValues[i].Name.equalsAsciiL("BibiliographicType", 
                                          sizeof("BibiliographicType")-1))
         {
-            sal_Int16 nTypeId;
+            sal_Int16 nTypeId(0);
             aValues[i].Value >>= nTypeId;
             OUStringBuffer sBuf;
             
diff --git a/binfilter/inc/bf_xmloff/numehelp.hxx b/binfilter/inc/bf_xmloff/numehelp.hxx
index 979cb3e..bf2f86a 100644
--- a/binfilter/inc/bf_xmloff/numehelp.hxx
+++ b/binfilter/inc/bf_xmloff/numehelp.hxx
@@ -86,7 +86,7 @@ public :
     XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier,
                                             SvXMLExport& rExport, sal_uInt16 nNamespace);
     ~XMLNumberFormatAttributesExportHelper();
-    void SetExport(SvXMLExport* pExport) { this->pExport = pExport; }
+    void SetExport(SvXMLExport* pExport_) { pExport = pExport_; }
 
     sal_Int16 GetCellType(const sal_Int32 nNumberFormat, ::rtl::OUString& sCurrency, sal_Bool& bIsStandard);
 
diff --git a/binfilter/inc/bf_xmloff/txtflde.hxx b/binfilter/inc/bf_xmloff/txtflde.hxx
index 40f9eea..05d1ec8 100644
--- a/binfilter/inc/bf_xmloff/txtflde.hxx
+++ b/binfilter/inc/bf_xmloff/txtflde.hxx
@@ -230,8 +230,6 @@ protected:
                 ::com::sun::star::text::XTextField> & rTextField,
         const ::com::sun::star::uno::Reference<
                 ::com::sun::star::beans::XPropertySet> & rPropSet,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet> & rRangePropSet,
         enum FieldIdEnum nToken);
 
     /// export an empty element
@@ -285,15 +283,13 @@ protected:
     void ProcessString(
         enum ::binfilter::xmloff::token::XMLTokenEnum eXmlName,		/// attribute token (namespace text)
         enum ::binfilter::xmloff::token::XMLTokenEnum eValue,			/// attribute token
-        sal_Bool bOmitEmpty = sal_False, /// omit attribute, if value is empty
-        sal_uInt16 nPrefix = XML_NAMESPACE_TEXT);	/// attribute name prefix
+        sal_Bool bOmitEmpty = sal_False); /// omit attribute, if value is empty
 
     /// export a string attribute, omit if default
     void ProcessString(
         enum ::binfilter::xmloff::token::XMLTokenEnum eXmlName,		/// attribute token (namespace text)
         enum ::binfilter::xmloff::token::XMLTokenEnum eValue,			/// attribute value token
-        enum ::binfilter::xmloff::token::XMLTokenEnum eDefault,		/// default value token
-        sal_uInt16 nPrefix = XML_NAMESPACE_TEXT);	/// attribute name prefix
+        enum ::binfilter::xmloff::token::XMLTokenEnum eDefault);		/// default value token
 
     /// export a string as a sequence of paragraphs
     void ProcessParagraphSequence(
commit d99e5284913193460e377791a80b233df67a8862
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 19 15:49:30 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
index 56e3534..de9ffd5 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
@@ -1807,7 +1807,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
                 sal_Int32 i = 0;
                 for( set<OUString>::iterator aSetIter = rOurMasters.begin();
                      aSetIter != rOurMasters.end();
-                     aSetIter++, i++ )
+                     ++aSetIter, ++i )
                 {
                     aFieldMasters[i] = *aSetIter;
                 }
@@ -1889,7 +1889,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
 
         for (vector<OUString>::iterator aVarIter = aVarName.begin();
              aVarIter != aVarName.end();
-             aVarIter++) {
+             ++aVarIter) {
 
             OUString sName = *aVarIter;
 
@@ -1948,7 +1948,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
 
         for (vector<OUString>::iterator aSeqIter = aSeqName.begin();
              aSeqIter != aSeqName.end();
-             aSeqIter++) {
+             ++aSeqIter) {
 
             OUString sName = *aSeqIter;
 
@@ -1990,7 +1990,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
 
         for (vector<OUString>::iterator aUserIter = aUserName.begin();
              aUserIter != aUserName.end();
-             aUserIter++) {
+             ++aUserIter) {
 
             OUString sName = *aUserIter;
 
@@ -2039,7 +2039,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
 
         for (vector<OUString>::iterator aDdeIter = aDdeName.begin();
              aDdeIter != aDdeName.end();
-             aDdeIter++) 
+             ++aDdeIter)
         {
             OUString sName = *aDdeIter;
 


More information about the Libreoffice-commits mailing list