INTEGRATION: CWS obo30 (1.5.40); FILE MERGED

2008/06/06 06:06:44 obo 1.5.40.2: #i90100# EOL missing
2008/05/29 14:43:43 obo 1.5.40.1: #i90100# ambigous Reference during ENABLE_PCH build

1 files changed, 22 insertions, 22 deletions

diff --git a/framework/source/classes/actiontriggercontainer.cxx b/framework/source/classes/actiontriggercontainer.cxx
index a7d222f510..95649fabd4 100644
--- a/framework/source/classes/actiontriggercontainer.cxx
+++ b/framework/source/classes/actiontriggercontainer.cxx
@@ -1,13 +1,13 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: actiontriggercontainer.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -36,7 +36,6 @@
 #include <classes/actiontriggerpropertyset.hxx>
 #include <classes/actiontriggerseparatorpropertyset.hxx>
 
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -56,19 +55,19 @@ ActionTriggerContainer::~ActionTriggerContainer()
 }
 
 // XInterface
-Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType ) 
+Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType )
 throw ( RuntimeException )
 {
-    Any a = ::cppu::queryInterface( 
+    Any a = ::cppu::queryInterface(
                 aType ,
                 SAL_STATIC_CAST( XMultiServiceFactory*, this ),
                 SAL_STATIC_CAST( XServiceInfo* ,  this ));
-    
+
     if( a.hasValue() )
     {
         return a;
     }
-        
+
     return PropertySetContainer::queryInterface( aType );
 }
 
@@ -84,7 +83,7 @@ void ActionTriggerContainer::release() throw()
 
 
 // XMultiServiceFactory
-Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const ::rtl::OUString& aServiceSpecifier ) 
+Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const ::rtl::OUString& aServiceSpecifier )
 throw ( ::com::sun::star::uno::Exception, RuntimeException)
 {
     if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER ))
@@ -94,51 +93,51 @@ throw ( ::com::sun::star::uno::Exception, RuntimeException)
     else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR ))
         return (OWeakObject *)( new ActionTriggerSeparatorPropertySet( m_xServiceManager ));
     else
-        throw com::sun::star::uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this );
+        throw com::sun::star::uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this );
 }
 
 
-Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) 
+Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
 throw ( Exception, RuntimeException)
 {
     return createInstance( ServiceSpecifier );
 }
 
 
-Sequence< ::rtl::OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames() 
+Sequence< ::rtl::OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames()
 throw ( RuntimeException )
 {
     Sequence< ::rtl::OUString > aSeq( 3 );
 
-    aSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGER ));
-    aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
-    aSeq[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR ));
+    aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGER ));
+    aSeq[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
+    aSeq[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR ));
 
     return aSeq;
 }
 
 // XServiceInfo
-::rtl::OUString SAL_CALL ActionTriggerContainer::getImplementationName() 
+::rtl::OUString SAL_CALL ActionTriggerContainer::getImplementationName()
 throw ( RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER ));	
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER ));
 }
 
-sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const ::rtl::OUString& ServiceName ) 
+sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const ::rtl::OUString& ServiceName )
 throw ( RuntimeException )
 {
     if ( ServiceName.equalsAscii( SERVICENAME_ACTIONTRIGGERCONTAINER ))
         return sal_True;
-    
+
     return sal_False;
 }
 
-Sequence< ::rtl::OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames() 
+Sequence< ::rtl::OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames()
 throw ( RuntimeException )
 {
     Sequence< ::rtl::OUString > seqServiceNames( 1 );
-    
-    seqServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
+
+    seqServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
     return seqServiceNames;
 }
 
@@ -159,7 +158,7 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
         if ( pTypeCollection == NULL )
         {
             // Create a static typecollection ...
-            static ::cppu::OTypeCollection aTypeCollection(	
+            static ::cppu::OTypeCollection aTypeCollection(
                         ::getCppuType(( const Reference< XMultiServiceFactory	>*)NULL ) ,
                         ::getCppuType(( const Reference< XIndexContainer		>*)NULL ) ,
                         ::getCppuType(( const Reference< XIndexAccess			>*)NULL ) ,
@@ -204,3 +203,4 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() thro
 }
 
 }
+