diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:39:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:39:34 +0000 |
| commit | b3998c08fde5bb03304900cdd647aa58276220aa (patch) | |
| tree | a7d902c6f7cabd573a0d95c53908e228cda1fa6e | |
| parent | 69ea7b38c6e418cc0ec38a266de77754cf64a0fd (diff) | |
INTEGRATION: CWS ause083 (1.7.20); FILE MERGED
2007/07/17 22:29:23 mba 1.7.20.1: #i79470#: ambiguous Reference class
| -rw-r--r-- | svtools/source/uno/generictoolboxcontroller.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index d6b27c8486e6..7bbf57957966 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: generictoolboxcontroller.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:02:10 $ + * last change: $Author: kz $ $Date: 2007-09-05 17:39:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,7 +78,6 @@ #include <vcl/svapp.hxx> #endif -using namespace ::rtl; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -101,7 +100,7 @@ GenericToolboxController::GenericToolboxController( const Reference< XMultiServi const Reference< XFrame >& rFrame, ToolBox* pToolbox, USHORT nID, - const OUString& aCommand ) : + const ::rtl::OUString& aCommand ) : svt::ToolboxController( rServiceManager, rFrame, aCommand ) , m_pToolbox( pToolbox ) , m_nID( nID ) @@ -134,7 +133,7 @@ throw ( RuntimeException ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - OUString aCommandURL; + ::rtl::OUString aCommandURL; { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); |