diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:02:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:02:48 +0000 |
| commit | 0693fef7fef7af9e6ed31fdb83b3d0ef164a6d9e (patch) | |
| tree | e6c24d0f4ca55314b369b1a2aa503f2ca14eb927 /framework | |
| parent | 5cf614e67440fde7fefd065ef594b835188d3eec (diff) | |
INTEGRATION: CWS obo30 (1.7.40); FILE MERGED
2008/06/05 14:55:32 obo 1.7.40.2: #i90100# missing EOL
2008/05/29 14:43:46 obo 1.7.40.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/statusbarwrapper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index dcc8d9688005..9d325ddcb830 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: statusbarwrapper.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -66,7 +66,6 @@ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::frame; @@ -215,7 +214,7 @@ void SAL_CALL StatusBarWrapper::setSettings( const Reference< XIndexAccess >& xS if ( m_xConfigSource.is() && m_bPersistent ) { - OUString aResourceURL( m_aResourceURL ); + ::rtl::OUString aResourceURL( m_aResourceURL ); Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource ); aLock.unlock(); @@ -263,3 +262,4 @@ Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( Ru } } // namespace framework + |