INTEGRATION: CWS warnings01 (1.3.2); FILE MERGED

2006/04/20 14:25:56 sb 1.3.2.4: #i53898# Made code warning-free again after resync to SRC680m162.
2006/04/07 20:04:22 sb 1.3.2.3: RESYNC: (1.4-1.5); FILE MERGED
2006/01/25 20:44:11 sb 1.3.2.2: RESYNC: (1.3-1.4); FILE MERGED
2005/11/09 11:51:19 pl 1.3.2.1: #i53898# removed warnings

1 files changed, 12 insertions, 6 deletions

diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index b74c3acb2969..ad4ce8070924 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cpptypemaker.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2006-03-15 09:18:18 $
+ *  last change: $Author: hr $ $Date: 2006-06-20 00:50:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -68,6 +68,12 @@ void printType(std::ostream & o,
         case codemaker::UnoType::SORT_DOUBLE:
             o << "0";
             return;
+        case codemaker::UnoType::SORT_VOID:
+        case codemaker::UnoType::SORT_STRING:
+        case codemaker::UnoType::SORT_TYPE:
+        case codemaker::UnoType::SORT_ANY:
+        case codemaker::UnoType::SORT_COMPLEX:
+            break;
         }
     }
 
@@ -101,7 +107,7 @@ void printType(std::ostream & o,
               "::com::sun::star::uno::Reference< ");
     }
 
-    o << scopedCppName(manager, codemaker::cpp::translateUnoToCppType(
+    o << scopedCppName(codemaker::cpp::translateUnoToCppType(
                            sort, typeClass, name, false),
                        false, options.shortnames && referenceType > 0);
 
@@ -389,17 +395,17 @@ void printMethods(std::ostream & o,
         if ( type.equals("com/sun/star/beans/XPropertySet")) {
             generated.add(type);
             generateXPropertySetBodies(
-                o, classname, scopedCppName(manager, propertyhelper, false, true));
+                o, classname, scopedCppName(propertyhelper, false, true));
             return;
         } else if ( type.equals("com/sun/star/beans/XFastPropertySet")) {
             generated.add(type);
             generateXFastPropertySetBodies(
-                o, classname, scopedCppName(manager, propertyhelper, false, true));
+                o, classname, scopedCppName(propertyhelper, false, true));
             return;
         } else if ( type.equals("com/sun/star/beans/XPropertyAccess")) {
             generated.add(type);
             generateXPropertyAccessBodies(
-                o, classname, scopedCppName(manager, propertyhelper, false, true));
+                o, classname, scopedCppName(propertyhelper, false, true));
             return;
         }
     }