INTEGRATION: CWS sb59 (1.7.46); FILE MERGED

2006/08/10 08:16:27 sb 1.7.46.1: #i67487# Made code warning-free (wntmsci10).

framework/source/xml/menudocumenthandler.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: menudocumenthandler.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:30:43 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 10:44:28 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -408,7 +408,7 @@ throw( SAXException, RuntimeException )
         if ( xSubItemContainer.is() )
         {
             // read attributes for menu
-            for ( int i=0; i< xAttrList->getLength(); i++ )
+            for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
             {
                 OUString aName = xAttrList->getNameByIndex( i );
                 OUString aValue = xAttrList->getValueByIndex( i );
@@ -632,7 +632,7 @@ throw( SAXException, RuntimeException )
             xSubItemContainer = Reference< XIndexContainer >( m_xContainerFactory->createInstanceWithContext( xComponentContext ), UNO_QUERY );
 
         // read attributes for menu
-        for ( int i=0; i< xAttrList->getLength(); i++ )
+        for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
         {
             OUString aName = xAttrList->getNameByIndex( i );
             OUString aValue = xAttrList->getValueByIndex( i );
@@ -678,7 +678,7 @@ throw( SAXException, RuntimeException )
         OUString aLabel;
 
         // read attributes for menu item
-        for ( int i=0; i< xAttrList->getLength(); i++ )
+        for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
         {
             OUString aName = xAttrList->getNameByIndex( i );
             OUString aValue = xAttrList->getValueByIndex( i );

framework/source/xml/statusbardocumenthandler.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: statusbardocumenthandler.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:31:26 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 10:44:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -310,7 +310,7 @@ throw(  SAXException, RuntimeException )
                 sal_Bool    bCommandURL( sal_False );
 
                 m_bStatusBarItemStartFound = sal_True;
-                for ( int n = 0; n < xAttribs->getLength(); n++ )
+                for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
                 {
                     pStatusBarEntry = m_aStatusBarMap.find( xAttribs->getNameByIndex( n ) );
                     if ( pStatusBarEntry != m_aStatusBarMap.end() )