From 1a64ddfe1d1deeb1779dfa73a4fc8aad089dc968 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Fri, 14 Jan 2011 12:13:45 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from extensions

---
 extensions/source/resource/resource.cxx | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'extensions/source/resource')

diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 73cb48d479a9..c939baf668c5 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -70,7 +70,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL           getImplementationName() throw();
-    BOOL     SAL_CALL           supportsService(const OUString& ServiceName) throw();
+    sal_Bool     SAL_CALL           supportsService(const OUString& ServiceName) throw();
     Sequence< OUString > SAL_CALL   getSupportedServiceNames(void) throw();
 
     static Sequence< OUString > getSupportedServiceNames_Static(void) throw();
@@ -88,8 +88,8 @@ public:
     Any  SAL_CALL               invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException);
     void  SAL_CALL              setValue(const OUString& PropertyName, const Any& Value) throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException);
     Any  SAL_CALL               getValue(const OUString& PropertyName) throw(UnknownPropertyException, RuntimeException);
-    BOOL  SAL_CALL              hasMethod(const OUString& Name)  throw(RuntimeException);
-    BOOL  SAL_CALL              hasProperty(const OUString& Name)  throw(RuntimeException);
+    sal_Bool  SAL_CALL              hasMethod(const OUString& Name)  throw(RuntimeException);
+    sal_Bool  SAL_CALL              hasProperty(const OUString& Name)  throw(RuntimeException);
 private:
     Reference< XTypeConverter >         getTypeConverter() const;
     Reference< XInvocation >            getDefaultInvocation() const;
@@ -129,14 +129,14 @@ OUString ResourceService::getImplementationName() throw()
 }
 
 // XServiceInfo
-BOOL SAL_CALL ResourceService::supportsService(const OUString& ServiceName) throw()
+sal_Bool SAL_CALL ResourceService::supportsService(const OUString& ServiceName) throw()
 {
     Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 // XServiceInfo
@@ -273,7 +273,7 @@ Any SAL_CALL ResourceService::invoke
 
             if( bGetBranch )
             {
-                ResId aId( (USHORT)nId, *pResMgr );
+                ResId aId( (sal_uInt16)nId, *pResMgr );
                 aId.SetRT( RSC_STRING );
                 if( pResMgr->IsAvailable( aId ) )
                 {
@@ -288,7 +288,7 @@ Any SAL_CALL ResourceService::invoke
                 sal_Bool bRet = sal_False;
                 if( pResMgr )
                 {
-                    ResId aId( (USHORT)nId, *pResMgr );
+                    ResId aId( (sal_uInt16)nId, *pResMgr );
                     aId.SetRT( RSC_STRING );
                     bRet = pResMgr->IsAvailable( aId );
                 }
@@ -324,7 +324,7 @@ Any SAL_CALL ResourceService::invoke
 
         if( FunctionName.equalsAscii("getStringList") )
         {
-            ResId aId( (USHORT)nId, *pResMgr );
+            ResId aId( (sal_uInt16)nId, *pResMgr );
             aId.SetRT( RSC_STRINGARRAY );
             if( pResMgr->IsAvailable( aId ) )
             {
@@ -349,7 +349,7 @@ Any SAL_CALL ResourceService::invoke
             sal_Bool bRet = sal_False;
             if( pResMgr )
             {
-                ResId aId( (USHORT)nId, *pResMgr );
+                ResId aId( (sal_uInt16)nId, *pResMgr );
                 aId.SetRT( RSC_STRINGARRAY );
                 bRet = pResMgr->IsAvailable( aId );
             }
@@ -420,7 +420,7 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName)
 }
 
 // XInvokation
-BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
+sal_Bool SAL_CALL ResourceService::hasMethod(const OUString& Name)
     throw(RuntimeException)
 {
     if( Name.equalsAscii("getString")     ||
@@ -430,30 +430,30 @@ BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
         Name.equalsAscii("getStringList") ||
         Name.equalsAscii("hasStringList")
         )
-        return TRUE;
+        return sal_True;
     else
     {
         Reference< XInvocation > xI = getDefaultInvocation();
         if( xI.is() )
             return xI->hasMethod( Name );
         else
-            return FALSE;
+            return sal_False;
     }
 }
 
 // XInvokation
-BOOL SAL_CALL ResourceService::hasProperty(const OUString& Name)
+sal_Bool SAL_CALL ResourceService::hasProperty(const OUString& Name)
     throw(RuntimeException)
 {
     if( Name.equalsAscii("FileName") )
-        return TRUE;
+        return sal_True;
     else
     {
         Reference< XInvocation > xI = getDefaultInvocation();
         if( xI.is() )
             return xI->hasProperty( Name );
         else
-            return FALSE;
+            return sal_False;
     }
 }
 
-- 
cgit