diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:40:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:40:04 +0000 |
| commit | 15dcb54b7af359c638a4a058b27b6bafae6f4263 (patch) | |
| tree | 3f9631d82a490097ea025bec0fe0c12454209af7 | |
| parent | d5cc99aab6d47122831442a87f7cc8e31dea9c9f (diff) | |
INTEGRATION: CWS ause083 (1.12.20); FILE MERGED
2007/07/17 22:29:23 mba 1.12.20.1: #i79470#: ambiguous Reference class
| -rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 21a974353bc7..791e5cd70c2b 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:02:33 $ + * last change: $Author: kz $ $Date: 2007-09-05 17:40:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,7 +83,6 @@ #include <vcl/toolbox.hxx> #endif -using namespace ::rtl; using namespace ::cppu; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; @@ -104,7 +103,7 @@ struct ToolboxController_Impl ToolboxController::ToolboxController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, - const OUString& aCommandURL ) : + const ::rtl::OUString& aCommandURL ) : OWeakObject() , m_bInitialized( sal_False ) , m_bDisposed( sal_False ) @@ -165,7 +164,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const { try { - xLayoutManager.set(xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))),UNO_QUERY); + xLayoutManager.set(xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))),UNO_QUERY); } catch ( Exception& ) { @@ -365,7 +364,7 @@ void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException) { Reference< XDispatch > xDispatch; - OUString aCommandURL; + ::rtl::OUString aCommandURL; { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); |