INTEGRATION: CWS ause083 (1.15.20); FILE MERGED

2007/07/23 11:36:38 hjs 1.15.20.2: RESYNC: (1.15-1.16); FILE MERGED
2007/07/17 22:29:23 mba 1.15.20.1: #i79470#: ambiguous Reference class

1 files changed, 50 insertions, 51 deletions

diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 4533432e4db5..fb93b0f48bc7 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unoimap.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: ihi $ $Date: 2007-07-10 15:20:01 $
+ *  last change: $Author: kz $ $Date: 2007-09-05 17:40:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -113,7 +113,6 @@
 #define MAP_LEN(x) x, sizeof(x)-1
 
 
-using namespace rtl;
 using namespace comphelper;
 using namespace cppu;
 using namespace com::sun::star;
@@ -171,9 +170,9 @@ public:
     virtual Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents(  ) throw(RuntimeException);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw( RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException );
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw( RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw( RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException );
+    virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw( RuntimeException );
 
 private:
     static PropertySetInfo* createPropertySetInfo( UINT16 nType );
@@ -181,11 +180,11 @@ private:
 
     UINT16 mnType;
 
-    OUString maURL;
-    OUString maAltText;
-    OUString maDesc;
-    OUString maTarget;
-    OUString maName;
+    ::rtl::OUString maURL;
+    ::rtl::OUString maAltText;
+    ::rtl::OUString maDesc;
+    ::rtl::OUString maTarget;
+    ::rtl::OUString maName;
     sal_Bool mbIsActive;
     awt::Rectangle maBoundary;
     awt::Point maCenter;
@@ -203,11 +202,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType )
         {
             static PropertyMapEntry aPolygonObj_Impl[] =
             {
-                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
                 { MAP_LEN( "IsActive" ),    HANDLE_ISACTIVE,    &::getBooleanCppuType(),                0, 0 },
                 { MAP_LEN( "Polygon" ),     HANDLE_POLYGON,     SEQTYPE(::getCppuType((const PointSequence*)0)),    0, 0 },
                 {0,0,0,0,0,0}
@@ -219,11 +218,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType )
         {
             static PropertyMapEntry aCircleObj_Impl[] =
             {
-                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Name" ),            HANDLE_NAME,        &::getCppuType((const OUString*)0),     0, 0 },
+                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Name" ),            HANDLE_NAME,        &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
                 { MAP_LEN( "IsActive" ),        HANDLE_ISACTIVE,    &::getBooleanCppuType(),                0, 0 },
                 { MAP_LEN( "Center" ),      HANDLE_CENTER,      &::getCppuType((const awt::Point*)0),   0, 0 },
                 { MAP_LEN( "Radius" ),      HANDLE_RADIUS,      &::getCppuType((const sal_Int32*)0),    0, 0 },
@@ -237,11 +236,11 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType )
         {
             static PropertyMapEntry aRectangleObj_Impl[] =
             {
-                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const OUString*)0), 0, 0 },
-                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const OUString*)0),     0, 0 },
-                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const OUString*)0), 0, 0 },
-                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const OUString*)0), 0, 0 },
-                { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const OUString*)0), 0, 0 },
+                { MAP_LEN( "URL" ),         HANDLE_URL,         &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+                { MAP_LEN( "Title" ),       HANDLE_TITLE,       &::getCppuType((const ::rtl::OUString*)0),     0, 0 },
+                { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+                { MAP_LEN( "Target" ),      HANDLE_TARGET,      &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+                { MAP_LEN( "Name" ),        HANDLE_NAME,        &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
                 { MAP_LEN( "IsActive" ),    HANDLE_ISACTIVE,    &::getBooleanCppuType(),            0, 0 },
                 { MAP_LEN( "Boundary" ),    HANDLE_BOUNDARY,    &::getCppuType((const awt::Rectangle*)0),   0, 0 },
                 {0,0,0,0,0,0}
@@ -445,10 +444,10 @@ uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId()
 
 // XServiceInfo
 
-sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const  OUString& ServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const  ::rtl::OUString& ServiceName ) throw(RuntimeException)
 {
-    const Sequence< OUString > aSNL( getSupportedServiceNames() );
-    const OUString * pArray = aSNL.getConstArray();
+    const Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString * pArray = aSNL.getConstArray();
 
     const sal_Int32 nCount = aSNL.getLength();
     for( sal_Int32 i = 0; i < nCount; i++ )
@@ -458,38 +457,38 @@ sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const  OUString& Service
     return sal_False;
 }
 
-Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames()
+Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames()
     throw(RuntimeException)
 {
-    Sequence< OUString > aSNS( 2 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapObject" ));
+    Sequence< ::rtl::OUString > aSNS( 2 );
+    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapObject" ));
     switch( mnType )
     {
     case IMAP_OBJ_POLYGON:
     default:
-        aSNS.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject" ));
         break;
     case IMAP_OBJ_RECTANGLE:
-        aSNS.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject" ));
         break;
     case IMAP_OBJ_CIRCLE:
-        aSNS.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject" ));
+        aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject" ));
         break;
     }
     return aSNS;
 }
 
-OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException)
+::rtl::OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException)
 {
     switch( mnType )
     {
     case IMAP_OBJ_POLYGON:
     default:
-        return OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapPolygonObject") );
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapPolygonObject") );
     case IMAP_OBJ_CIRCLE:
-        return OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapCircleObject") );
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapCircleObject") );
     case IMAP_OBJ_RECTANGLE:
-        return OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapRectangleObject") );
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svt.ImageMapRectangleObject") );
     }
 }
 
@@ -632,12 +631,12 @@ public:
     virtual sal_Bool SAL_CALL hasElements(  ) throw( RuntimeException );
 
     // XSerivceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw( RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException );
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw( RuntimeException );
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw( RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( RuntimeException );
+    virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw( RuntimeException );
 
 private:
-    OUString maName;
+    ::rtl::OUString maName;
 
     std::list< SvUnoImageMapObject* > maObjectList;
 };
@@ -779,17 +778,17 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements(  ) throw(RuntimeException)
 }
 
 // XSerivceInfo
-OUString SAL_CALL SvUnoImageMap::getImplementationName(  )
+::rtl::OUString SAL_CALL SvUnoImageMap::getImplementationName(  )
     throw(RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svt.SvUnoImageMap" ) );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svt.SvUnoImageMap" ) );
 }
 
-sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL SvUnoImageMap::supportsService( const ::rtl::OUString& ServiceName )
     throw(RuntimeException)
 {
-    const Sequence< OUString > aSNL( getSupportedServiceNames() );
-    const OUString * pArray = aSNL.getConstArray();
+    const Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() );
+    const ::rtl::OUString * pArray = aSNL.getConstArray();
 
     const sal_Int32 nCount = aSNL.getLength();
     for( sal_Int32 i = 0; i < nCount; i++ )
@@ -799,11 +798,11 @@ sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName )
     return sal_False;
 }
 
-Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames(  )
+Sequence< ::rtl::OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames(  )
     throw(RuntimeException)
 {
-    const OUString aSN( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.image.ImageMap" ) );
-    return Sequence< OUString >( &aSN, 1 );
+    const ::rtl::OUString aSN( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.image.ImageMap" ) );
+    return Sequence< ::rtl::OUString >( &aSN, 1 );
 }
 
 sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const