diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:59:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:59:45 +0000 |
| commit | d20e96a7e4c9c57db00f4b218828cac57a838ccf (patch) | |
| tree | 0e21852cfd39ad8e4412cc4a5b77a6ba15de7bde /framework/source/uielement/imagebuttontoolbarcontroller.cxx | |
| parent | 7e7ba13a7449eb53f29b7d3f6ab84e0a9b269538 (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:45 obo 1.7.40.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework/source/uielement/imagebuttontoolbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/imagebuttontoolbarcontroller.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 60ce9c59399a..588fccf8b526 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: imagebuttontoolbarcontroller.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -72,7 +72,6 @@ #include <svtools/filter.hxx> #include <svtools/miscopt.hxx> -using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; @@ -108,7 +107,7 @@ uno::Reference< util::XMacroExpander > GetMacroExpander() if ( xContext.is() ) { m_xMacroExpander = Reference< com::sun::star::util::XMacroExpander >( xContext->getValueByName( - OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander"))), UNO_QUERY ); xMacroExpander = m_xMacroExpander; } @@ -127,7 +126,7 @@ static void SubstituteVariables( ::rtl::OUString& aURL ) // cut protocol rtl::OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) ); // decode uric class chars - aMacro = Uri::decode( aMacro, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); + aMacro = ::rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); // expand macro string aURL = xMacroExpander->expandMacros( aMacro ); } @@ -140,7 +139,7 @@ ImageButtonToolbarController::ImageButtonToolbarController( const Reference< XFrame >& rFrame, ToolBox* pToolbar, USHORT nID, - const OUString& aCommand ) : + const ::rtl::OUString& aCommand ) : ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) { sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); @@ -214,7 +213,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star } } -sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, const OUString& aImageURL, Image& aImage ) +sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, const ::rtl::OUString& aImageURL, Image& aImage ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ); if ( pStream && ( pStream->GetErrorCode() == 0 )) @@ -245,3 +244,4 @@ sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, con } } // namespace + |