diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:39:52 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:39:52 +0000 |
commit | d5cc99aab6d47122831442a87f7cc8e31dea9c9f (patch) | |
tree | c5e3bbcac4921a506ce77474927f111174d856df /svtools/source/uno | |
parent | b3998c08fde5bb03304900cdd647aa58276220aa (diff) |
INTEGRATION: CWS ause083 (1.9.20); FILE MERGED
2007/07/17 22:29:23 mba 1.9.20.1: #i79470#: ambiguous Reference class
Diffstat (limited to 'svtools/source/uno')
-rw-r--r-- | svtools/source/uno/statusbarcontroller.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index e03d471dbad2..5b446e1cee8c 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: statusbarcontroller.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:02:21 $ + * last change: $Author: kz $ $Date: 2007-09-05 17:39:52 $ * * 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 <toolkit/unohlp.hxx> #endif -using namespace ::rtl; using namespace ::cppu; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; @@ -94,7 +93,7 @@ namespace svt StatusbarController::StatusbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, - const OUString& aCommandURL, + const ::rtl::OUString& aCommandURL, unsigned short nID ) : OWeakObject() , m_bInitialized( sal_False ) @@ -142,7 +141,7 @@ Reference< XLayoutManager > StatusbarController::getLayoutManager() const try { Any a; - a = xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); + a = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); a >>= xLayoutManager; } catch ( Exception& ) |