INTEGRATION: CWS obo30 (1.5.40); FILE MERGED

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

1 files changed, 16 insertions, 16 deletions

diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index f337cdd209..b65d52581a 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.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: edittoolbarcontroller.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -66,7 +66,6 @@
 #endif
 #include <tools/urlobj.hxx>
 
-using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -146,29 +145,29 @@ long EditControl::PreNotify( NotifyEvent& rNEvt )
         nRet = m_pEditListener->PreNotify( rNEvt );
     if ( nRet == 0 )
         nRet = Edit::PreNotify( rNEvt );
-    
+
     return nRet;
 }
 
 // ------------------------------------------------------------------
 
-EditToolbarController::EditToolbarController( 
+EditToolbarController::EditToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
     USHORT                                   nID,
     sal_Int32                                nWidth,
-    const OUString&                          aCommand ) :
+    const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
     ,   m_pEditControl( 0 )
 {
     m_pEditControl = new EditControl( m_pToolbar, WB_BORDER, this );
     if ( nWidth == 0 )
         nWidth = 100;
-    
+
     // Calculate height of the edit field according to the application font height
     sal_Int32 nHeight = getFontSizePixel( m_pEditControl ) + 6 + 1;
-    
+
     m_pEditControl->SetSizePixel( ::Size( nWidth, nHeight ));
     m_pToolbar->SetItemWindow( m_nID, m_pEditControl );
 }
@@ -188,10 +187,10 @@ throw ( RuntimeException )
 
     m_pToolbar->SetItemWindow( m_nID, 0 );
     delete m_pEditControl;
-    
+
     ComplexToolbarController::dispose();
 
-    m_pEditControl = 0;    
+    m_pEditControl = 0;
 }
 
 // ------------------------------------------------------------------
@@ -201,8 +200,8 @@ throw ( RuntimeException )
 {
     Reference< XDispatch >       xDispatch;
     Reference< XURLTransformer > xURLTransformer;
-    OUString                     aCommandURL;
-    OUString                     aSelectedText;
+    ::rtl::OUString                     aCommandURL;
+    ::rtl::OUString                     aSelectedText;
     ::com::sun::star::util::URL  aTargetURL;
 
     {
@@ -221,7 +220,7 @@ throw ( RuntimeException )
             aCommandURL = m_aCommandURL;
             aTargetURL = getInitializedURL();
             aSelectedText = m_pEditControl->GetText();
-        }        
+        }
     }
 
     if ( xDispatch.is() && aTargetURL.Complete.getLength() > 0 )
@@ -267,11 +266,11 @@ void EditToolbarController::LoseFocus()
 long EditToolbarController::PreNotify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetType() == EVENT_KEYINPUT )
-    {        
+    {
         const ::KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
         const KeyCode& rKeyCode = pKeyEvent->GetKeyCode();
         if(( rKeyCode.GetModifier() | rKeyCode.GetCode()) == KEY_RETURN )
-        {        
+        {
             // Call execute only with non-empty text
             if ( m_pEditControl->GetText().Len() > 0 )
                 execute( rKeyCode.GetModifier() );
@@ -295,7 +294,7 @@ void EditToolbarController::executeControlCommand( const ::com::sun::star::frame
                 rtl::OUString aText;
                 rControlCommand.Arguments[i].Value >>= aText;
                 m_pEditControl->SetText( aText );
-                
+
                 // send notification
                 notifyTextChanged( aText );
                 break;
@@ -305,3 +304,4 @@ void EditToolbarController::executeControlCommand( const ::com::sun::star::frame
 }
 
 } // namespace
+