diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:13:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:13:13 +0000 |
| commit | 0f0d1a2393c805cb2ebe5ef382c17f622ab59a5b (patch) | |
| tree | c0ce5d7233d0384202a230155cd2eaf655e43b4a /sfx2 | |
| parent | fcfe5a2f6928dc82406547390fbdf6e20cee01fa (diff) | |
INTEGRATION: CWS obo30 (1.36.60); FILE MERGED
2008/06/06 07:33:25 obo 1.36.60.2: #i90100# EOL missing
2008/05/30 14:53:20 obo 1.36.60.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/inet/inettbc.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index abae0733cf62..d6ce65c96b6d 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: inettbc.cxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.37 $ * * This file is part of OpenOffice.org. * @@ -74,7 +74,6 @@ #include "sfxtypes.hxx" #include "helper.hxx" -using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; @@ -137,18 +136,18 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, BOOL /*bNew*/ ) co if ( xDispatch.is() ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString::createFromAscii( "Referer" ); + aArgs[0].Name = ::rtl::OUString::createFromAscii( "Referer" ); aArgs[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER )); - aArgs[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" )); - aArgs[1].Value = makeAny( OUString( aName )); + aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" )); + aArgs[1].Value = makeAny( ::rtl::OUString( aName )); if ( aFilter.Len() ) { aArgs.realloc( 4 ); - aArgs[2].Name = OUString::createFromAscii( "FilterOptions" ); - aArgs[2].Value = makeAny( OUString( aOptions )); - aArgs[3].Name = OUString::createFromAscii( "FilterName" ); - aArgs[3].Value = makeAny( OUString( aFilter )); + aArgs[2].Name = ::rtl::OUString::createFromAscii( "FilterOptions" ); + aArgs[2].Value = makeAny( ::rtl::OUString( aOptions )); + aArgs[3].Name = ::rtl::OUString::createFromAscii( "FilterName" ); + aArgs[3].Value = makeAny( ::rtl::OUString( aFilter )); } SfxURLToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new SfxURLToolBoxControl_Impl::ExecuteInfo; @@ -208,7 +207,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, OpenHdl, void*, EMPTYARG ) if ( m_xServiceManager.is() ) { Reference< XFramesSupplier > xDesktop( m_xServiceManager->createInstance( - OUString::createFromAscii( "com.sun.star.frame.Desktop" )), + ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" )), UNO_QUERY ); Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY ); if ( xFrame.is() ) @@ -404,3 +403,4 @@ void SfxCancelToolBoxControl_Impl::StateChanged //SfxToolBoxControl::StateChanged( nSID, eState, pState ? &aVoidItem : 0 ); SfxToolBoxControl::StateChanged( nSID, eState, pState ); } + |