diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:59:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:59:05 +0000 |
| commit | 7e7ba13a7449eb53f29b7d3f6ab84e0a9b269538 (patch) | |
| tree | f11facf0563b24a0cc187ea369117acfac686e15 /framework/source/uielement/generictoolbarcontroller.cxx | |
| parent | 835f4183a9e39db2db34a3537480b431046e609c (diff) | |
INTEGRATION: CWS obo30 (1.20.38); FILE MERGED
2008/06/05 14:55:32 obo 1.20.38.2: #i90100# missing EOL
2008/05/29 14:43:45 obo 1.20.38.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework/source/uielement/generictoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 0bfe6bdcc995..ac88f0277be5 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: generictoolbarcontroller.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.21 $ * * This file is part of OpenOffice.org. * @@ -65,7 +65,6 @@ #endif #include <tools/urlobj.hxx> -using namespace ::rtl; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -128,7 +127,7 @@ GenericToolbarController::GenericToolbarController( const Reference< XMultiServi const Reference< XFrame >& rFrame, ToolBox* pToolbar, USHORT nID, - const OUString& aCommand ) : + const ::rtl::OUString& aCommand ) : svt::ToolboxController( rServiceManager, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) @@ -160,7 +159,7 @@ throw ( RuntimeException ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; - OUString aCommandURL; + ::rtl::OUString aCommandURL; { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); @@ -300,3 +299,4 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI } } // namespace + |