INTEGRATION: CWS obo30 (1.33.12); FILE MERGED

2008/06/20 09:53:23 obo 1.33.12.3: RESYNC: (1.33-1.34); FILE MERGED
2008/06/06 07:01:37 obo 1.33.12.2: #i90100# EOL missing
2008/05/30 09:44:45 obo 1.33.12.1: #i90100# ambigous Reference during ENABLE_PCH build

1 files changed, 26 insertions, 26 deletions

diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 102cc7233e..5107eb22a3 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.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: eventatt.cxx,v $
- * $Revision: 1.34 $
+ * $Revision: 1.35 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -85,7 +85,6 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::io;
 using namespace ::cppu;
 using namespace ::osl;
-using namespace ::rtl;
 
 
 
@@ -96,7 +95,7 @@ Any sbxToUnoValue( SbxVariable* pVar );
 
 Reference< frame::XModel >  getModelFromBasic( SbxObject* pBasic )
 {
-    Reference< frame::XModel > xModel;            
+    Reference< frame::XModel > xModel;
 
     SbxObject* basicChosen = pBasic;
 
@@ -119,7 +118,7 @@ Reference< frame::XModel >  getModelFromBasic( SbxObject* pBasic )
     }
 
 
-    Any aModel; 
+    Any aModel;
     SbxVariable *pCompVar = basicChosen->Find(  UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
 
     if ( pCompVar )
@@ -171,7 +170,7 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere
                 {
                     Reference< provider::XScriptProviderFactory > xFactory(
                         xContext->getValueByName(
-                        ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ) ), 
+                        ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ) ),
                         UNO_QUERY );
                     OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" );
                     if ( xFactory.is() )
@@ -193,8 +192,8 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere
             Sequence< sal_Int16 > outIndex;
 
             // get Arguments for script
-            inArgs = aScriptEvent.Arguments; 
-         
+            inArgs = aScriptEvent.Arguments;
+
             Reference< provider::XScript > xScript = xScriptProvider->getScript( aScriptEvent.ScriptCode );
 
             if ( !xScript.is() )
@@ -235,15 +234,15 @@ class BasicScriptListener_Impl : public WeakImplHelper1< XScriptListener >
 public:
     BasicScriptListener_Impl( StarBASIC* pBasic, const Reference< frame::XModel >& xModel )
         : maBasicRef( pBasic ), m_xModel( xModel ) {}
-    
+
     // Methoden von XAllListener
-    virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) 
+    virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent)
         throw( RuntimeException );
-    virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) 
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent)
         throw( InvocationTargetException, RuntimeException );
 
     // Methoden von XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) 
+    virtual void SAL_CALL disposing(const EventObject& Source)
         throw( RuntimeException );
 };
 
@@ -253,7 +252,7 @@ void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw (
     firing_impl( aScriptEvent, NULL );
 }
 
-Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent ) 
+Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
     throw ( InvocationTargetException, RuntimeException )
 {
     Any aRetAny;
@@ -283,7 +282,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
         if( aMacro.GetTokenCount( '.' ) == 3 )
         {
             sal_uInt16 nLast = 0;
-            OUString aFullLibName = aMacro.GetToken( 0, '.', nLast );
+            ::rtl::OUString aFullLibName = aMacro.GetToken( 0, '.', nLast );
 
             sal_Int32 nIndex = aFullLibName.indexOf( (sal_Unicode)':' );
             if (nIndex >= 0)
@@ -403,7 +402,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
         {
             //callBasic via scripting framework
             SFURL_firing_impl( aScriptEvent, pRet, m_xModel );
-            
+
         }
 }
 
@@ -422,8 +421,8 @@ Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic )
         OSL_ENSURE( xDlgLibContNameAccess.is(), "implFindDialogLibForDialog: no lib container for the given dialog!" );
         if( xDlgLibContNameAccess.is() )
         {
-            Sequence< OUString > aLibNames = xDlgLibContNameAccess->getElementNames();
-            const OUString* pLibNames = aLibNames.getConstArray();
+            Sequence< ::rtl::OUString > aLibNames = xDlgLibContNameAccess->getElementNames();
+            const ::rtl::OUString* pLibNames = aLibNames.getConstArray();
             sal_Int32 nLibNameCount = aLibNames.getLength();
 
             for( sal_Int32 iLib = 0 ; iLib < nLibNameCount ; iLib++ )
@@ -438,8 +437,8 @@ Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic )
                 OSL_ENSURE( xDlgLibNameAccess.is(), "implFindDialogLibForDialog: invalid dialog lib!" );
                 if( xDlgLibNameAccess.is() )
                 {
-                    Sequence< OUString > aDlgNames = xDlgLibNameAccess->getElementNames();
-                    const OUString* pDlgNames = aDlgNames.getConstArray();
+                    Sequence< ::rtl::OUString > aDlgNames = xDlgLibNameAccess->getElementNames();
+                    const ::rtl::OUString* pDlgNames = aDlgNames.getConstArray();
                     sal_Int32 nDlgNameCount = aDlgNames.getLength();
 
                     for( sal_Int32 iDlg = 0 ; iDlg < nDlgNameCount ; iDlg++ )
@@ -466,11 +465,11 @@ static ::rtl::OUString aTitlePropName =
 
 void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 {
-    static OUString aResourceResolverPropName = OUString::createFromAscii( "ResourceResolver" );
+    static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAscii( "ResourceResolver" );
 
     (void)pBasic;
     (void)bWrite;
-    
+
     Reference< XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory() );
     if( !xMSF.is() )
         return;
@@ -501,7 +500,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // Create new uno dialog
     Reference< XNameContainer > xDialogModel( xMSF->createInstance
-        ( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), 
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ),
             UNO_QUERY );
     if( !xDialogModel.is() )
         return;
@@ -566,7 +565,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
 
     OSL_TRACE("About to try get a hold of ThisComponent");
-    Reference< frame::XModel > xModel = getModelFromBasic( pStartedBasic ) ;            
+    Reference< frame::XModel > xModel = getModelFromBasic( pStartedBasic ) ;
     Reference< XScriptListener > xScriptListener = new BasicScriptListener_Impl( pBasic, xModel );
 
     Sequence< Any > aArgs( 4 );
@@ -578,7 +577,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
         Reference< XControl > xCntrl;
         try
         {
-        Reference< XDialogProvider >  xDlgProv( xMSF->createInstanceWithArguments( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.scripting.DialogProvider" ) ), aArgs ), UNO_QUERY );
+        Reference< XDialogProvider >  xDlgProv( xMSF->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.scripting.DialogProvider" ) ), aArgs ), UNO_QUERY );
             xCntrl.set( xDlgProv->createDialog( rtl::OUString() ), UNO_QUERY_THROW );
            // Add dialog model to dispose vector
            Reference< XComponent > xDlgComponent( xCntrl->getModel(), UNO_QUERY );
@@ -586,8 +585,8 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
            // need ThisCompoent from calling script
         }
         // preserve existing bad behaviour, it's possible... but probably
-        // illegal to open 2 dialogs ( they ARE modal ) when this happens, sometimes 
-        // create dialog fails.  So, in this case let's not throw, just leave basic 
+        // illegal to open 2 dialogs ( they ARE modal ) when this happens, sometimes
+        // create dialog fails.  So, in this case let's not throw, just leave basic
         // detect the unset object.
         catch( uno::Exception& )
         {
@@ -602,3 +601,4 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
 
 //===================================================================
+