INTEGRATION: CWS warnings01 (1.16.10); FILE MERGED

2006/04/06 14:48:34 ab 1.16.10.3: #i55991# warning-free code
2006/01/25 20:43:22 sb 1.16.10.2: RESYNC: (1.16-1.17); FILE MERGED
2005/12/15 16:36:48 ab 1.16.10.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro

1 files changed, 18 insertions, 15 deletions

diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 166e81dd06d7..496ac09098f7 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -39,9 +39,9 @@ namespace treeview {
     public:
 
         TVDom( TVDom* arent = 0 )
-            : parent( arent ),
-              childs( 0 ),
-              kind( other )
+            : kind( other ),
+              parent( arent ),
+              childs( 0 )
         {
         }
 
@@ -413,7 +413,7 @@ TVRead::hasByHierarchicalName( const rtl::OUString& aName )
 
 
 
-void start_handler(void *userData,
+extern "C" void start_handler(void *userData,
                    const XML_Char *name,
                    const XML_Char **atts)
 {
@@ -451,15 +451,17 @@ void start_handler(void *userData,
 }
 
 
-void end_handler(void *userData,
+extern "C" void end_handler(void *userData,
                  const XML_Char *name )
 {
+    (void)name;
+
     TVDom **tvDom = static_cast< TVDom** >( userData );
     *tvDom = (*tvDom)->getParent();
 }
 
 
-void data_handler( void *userData,
+extern "C" void data_handler( void *userData,
                    const XML_Char *s,
                    int len)
 {
@@ -517,6 +519,7 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF )
         XML_SetUserData( parser,&pTVDom ); // does not return this
 
         int parsed = XML_Parse( parser,s,int( len ),j==0 );
+        (void)parsed;
 
         XML_ParserFree( parser );
         delete[] s;
@@ -712,7 +715,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     osl::FileStatus aFileStatus( FileStatusMask_FileName | FileStatusMask_FileSize | FileStatusMask_FileURL );
     if( osl::Directory::E_None == aDirectory.open() )
     {
-        int idx = 0,j = 0;
+        int idx_ = 0,j = 0;
         rtl::OUString aFileUrl, aFileName;
         while( aDirectory.getNextItem( aDirItem ) == osl::FileBase::E_None &&
                aDirItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None &&
@@ -721,23 +724,23 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
           {
             aFileUrl = aFileStatus.getFileURL();
             aFileName = aFileStatus.getFileName();
-            idx = aFileName.lastIndexOf( sal_Unicode( '.' ) );
-            if( idx == -1 )
+            idx_ = aFileName.lastIndexOf( sal_Unicode( '.' ) );
+            if( idx_ == -1 )
               continue;
 
             const sal_Unicode* str = aFileName.getStr();
 
-            if( aFileName.getLength() == idx + 5                   &&
-                ( str[idx + 1] == 't' || str[idx + 1] == 'T' )    &&
-                ( str[idx + 2] == 'r' || str[idx + 2] == 'R' )    &&
-                ( str[idx + 3] == 'e' || str[idx + 3] == 'E' )    &&
-                ( str[idx + 4] == 'e' || str[idx + 4] == 'E' ) )
+            if( aFileName.getLength() == idx_ + 5                   &&
+                ( str[idx_ + 1] == 't' || str[idx_ + 1] == 'T' )    &&
+                ( str[idx_ + 2] == 'r' || str[idx_ + 2] == 'R' )    &&
+                ( str[idx_ + 3] == 'e' || str[idx_ + 3] == 'E' )    &&
+                ( str[idx_ + 4] == 'e' || str[idx_ + 4] == 'E' ) )
               {
                 OSL_ENSURE( j < MAX_MODULE_COUNT,"too many modules installed" );
                 OSL_ENSURE( aFileStatus.isValid( FileStatusMask_FileSize ),
                             "invalid file size" );
 
-                rtl::OUString baseName = aFileName.copy(0,idx).toAsciiLowerCase();
+                rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
                 if(! showBasic && baseName.compareToAscii("sbasic") == 0 )
                   continue;