diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl/source/gdi | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'vcl/source/gdi')
29 files changed, 436 insertions, 448 deletions
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 442af4ada75f..22f82249ef43 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -732,7 +732,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // Unused rOStm << nDummy32; // Unused rOStm << nDummy32; // Unused - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, rtl::OString()); // dummy + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); // dummy rOStm << nRest; // Count of remaining structures } } diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx index fe620e72367f..7f9165258944 100644 --- a/vcl/source/gdi/base14.cxx +++ b/vcl/source/gdi/base14.cxx @@ -23,8 +23,6 @@ using namespace vcl; -using ::rtl::OString; -using ::rtl::OStringBuffer; OString PDFWriterImpl::BuiltinFont::getNameObject() const { diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 6f7147792804..8ea7a832c4c8 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -89,14 +89,14 @@ BitmapEx::BitmapEx( const ResId& rResId ) : pResMgr->ReadLong(); const String aFileName( pResMgr->ReadString() ); - ::rtl::OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); if( !aImageTree->loadImage( aFileName, aCurrentSymbolsStyle, *this, true ) ) { #ifdef DBG_UTIL - rtl::OStringBuffer aErrorStr( + OStringBuffer aErrorStr( "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <"); - aErrorStr.append(rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>'); + aErrorStr.append(OUStringToOString(aFileName, RTL_TEXTENCODING_ASCII_US)).append('>'); OSL_FAIL(aErrorStr.getStr()); #endif } diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx index f76035df87dc..e42a28e1c3b5 100644 --- a/vcl/source/gdi/bmpconv.cxx +++ b/vcl/source/gdi/bmpconv.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::reflection; using namespace com::sun::star::awt; -using ::rtl::OUString; namespace vcl { diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index e8614e028d96..30b6f463f38c 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -using ::rtl::OUString; #define SETTINGS_CONFIGNODE "VCL/Settings" @@ -65,7 +64,7 @@ void SettingsConfigItem::Commit() if( ! IsValidConfigMgr() ) return; - boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group; + boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group; for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group ) { @@ -145,7 +144,7 @@ void SettingsConfigItem::getValues() const OUString& SettingsConfigItem::getValue( const OUString& rGroup, const OUString& rKey ) const { - ::boost::unordered_map< OUString, SmallOUStrMap, rtl::OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); + ::boost::unordered_map< OUString, SmallOUStrMap, OUStringHash >::const_iterator group = m_aSettings.find( rGroup ); if( group == m_aSettings.end() || group->second.find( rKey ) == group->second.end() ) { static OUString aEmpty; diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 0b669f10e28a..bdc23db0293a 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -199,7 +199,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont, char aName[32]; short nWeight; - rtl::OString aByteName(rtl::OUStringToOString(rFont.GetName(), + OString aByteName(OUStringToOString(rFont.GetName(), rOStm.GetStreamCharSet())); strncpy( aName, aByteName.getStr(), 32 ); @@ -849,12 +849,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); - OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet)); + OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if( nAryLen > 0L ) { @@ -912,12 +912,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); - OUString aStr(rtl::OStringToOUString(aByteStr, eActualCharSet)); + OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if ( nUnicodeCommentActionNumber == i ) ImplReadUnicodeComment( nUnicodeCommentStreamPos, rIStm, aStr ); rMtf.AddAction( new MetaStretchTextAction( aPt, nWidth, aStr, (sal_uInt16) nIndex, (sal_uInt16) nLen ) ); @@ -1278,7 +1278,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); + OString aComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -1678,7 +1678,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaTextAction* pAct = (MetaTextAction*) pAction; String aUniText( pAct->GetText() ); - rtl::OString aText(rtl::OUStringToOString(aUniText, + OString aText(OUStringToOString(aUniText, rActualCharSet)); const sal_uLong nStrLen = aText.getLength(); @@ -1699,7 +1699,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_TEXTARRAY_ACTION ): { MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction; - rtl::OString aText(rtl::OUStringToOString(pAct->GetText(), + OString aText(OUStringToOString(pAct->GetText(), rActualCharSet)); String aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() ); sal_uLong nAryLen; @@ -1743,7 +1743,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction; String aUniText( pAct->GetText() ); - rtl::OString aText(rtl::OUStringToOString(aUniText, + OString aText(OUStringToOString(aUniText, rActualCharSet)); const sal_uLong nStrLen = aText.getLength(); @@ -2406,7 +2406,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, #ifdef DBG_UTIL default: { - rtl::OStringBuffer aStr("Missing implementation for Action#: "); + OStringBuffer aStr("Missing implementation for Action#: "); aStr.append(static_cast<sal_Int32>(pAction->GetType())); aStr.append('!'); OSL_FAIL(aStr.getStr()); diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 50c105dc3ca9..4d313c5f1d43 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -334,7 +334,7 @@ void Font::SetAlign( FontAlign eAlign ) } } -void Font::SetName( const rtl::OUString& rFamilyName ) +void Font::SetName( const OUString& rFamilyName ) { DBG_CHKTHIS( Font, NULL ); @@ -783,7 +783,7 @@ namespace if( aInfo.ufamily ) o_rResult.SetName( aInfo.ufamily ); else if( aInfo.family ) - o_rResult.SetName( rtl::OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetName( OStringToOUString( aInfo.family, RTL_TEXTENCODING_ASCII_US ) ); // set weight if( aInfo.weight ) { @@ -838,9 +838,9 @@ namespace // set style name if( aInfo.usubfamily ) - o_rResult.SetStyleName( rtl::OUString( aInfo.usubfamily ) ); + o_rResult.SetStyleName( OUString( aInfo.usubfamily ) ); else if( aInfo.subfamily ) - o_rResult.SetStyleName( rtl::OUString::createFromAscii( aInfo.subfamily ) ); + o_rResult.SetStyleName( OUString::createFromAscii( aInfo.subfamily ) ); // cleanup CloseTTFont( pTTF ); @@ -898,7 +898,7 @@ namespace pClose++; if( pClose - pOpen > 1 ) { - o_rResult.SetName( rtl::OStringToOUString( rtl::OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); + o_rResult.SetName( OStringToOUString( OString( pOpen+1, pClose-pOpen-1 ), RTL_TEXTENCODING_ASCII_US ) ); } } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index da87d3174044..da38c34e68fc 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -417,7 +417,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S if( xBitmapCanvas.is() ) { args[0] = uno::Any( xBitmapCanvas ); - xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString("com.sun.star.rendering.MtfRenderer"), + xMtfRenderer.set( xFactory->createInstanceWithArguments( OUString("com.sun.star.rendering.MtfRenderer"), args ), uno::UNO_QUERY ); if( xMtfRenderer.is() ) @@ -484,15 +484,15 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, if( !pData ) return; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; while( pData<pEndData && *pData ) aBuffer.append(static_cast<sal_Unicode>(*pData++)); - const ::rtl::OUString aRendererServiceName=aBuffer.makeStringAndClear(); + const OUString aRendererServiceName=aBuffer.makeStringAndClear(); ++pData; while( pData<pEndData && *pData ) aBuffer.append(static_cast<sal_Unicode>(*pData++)); - const ::rtl::OUString aGraphicServiceName=aBuffer.makeStringAndClear(); + const OUString aGraphicServiceName=aBuffer.makeStringAndClear(); ++pData; uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); @@ -1602,7 +1602,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai MetaTextLineAction* pAct = (MetaTextLineAction*) pAction; // measure a test string to get ascend and descent right static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 }; - rtl::OUString aStr( pStr ); + OUString aStr( pStr ); Rectangle aRect; aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength(), 0, NULL ); @@ -3000,19 +3000,19 @@ void GDIMetaFile::UseCanvas( sal_Bool _bUseCanvas ) bUseCanvas = _bUseCanvas; } -MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererServiceName, - const rtl::OUString& rGraphicServiceName, +MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, + const OUString& rGraphicServiceName, const void* _pData, sal_uInt32 nDataSize ) { const sal_uInt8* pData=(sal_uInt8*)_pData; // FIXME: Data gets copied twice, unfortunately - rtl::OString aRendererServiceName( + OString aRendererServiceName( rRendererServiceName.getStr(), rRendererServiceName.getLength(), RTL_TEXTENCODING_ASCII_US); - rtl::OString aGraphicServiceName( + OString aGraphicServiceName( rGraphicServiceName.getStr(), rGraphicServiceName.getLength(), RTL_TEXTENCODING_ASCII_US); diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 415ae1413c88..11cb3b6c3268 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -329,7 +329,7 @@ ImageList::ImageList( const ResId& rResId ) : BitmapEx aEmpty; for( sal_Int32 i = 0; i < nCount; ++i ) { - rtl::OUString aName = pResMgr->ReadString(); + OUString aName = pResMgr->ReadString(); sal_uInt16 nId = static_cast< sal_uInt16 >( pResMgr->ReadLong() ); mpImplData->AddImage( aName, nId, aEmpty ); } @@ -339,8 +339,8 @@ ImageList::ImageList( const ResId& rResId ) : } } -ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector, - const ::rtl::OUString& rPrefix, +ImageList::ImageList( const ::std::vector< OUString >& rNameVector, + const OUString& rPrefix, const Color* ) : mpImplData( NULL ), mnInitSize( 1 ), @@ -386,15 +386,15 @@ void ImageList::ImplInit( sal_uInt16 nItems, const Size &rSize ) mpImplData->maImageSize = rSize; } -void ImageAryData::Load(const rtl::OUString &rPrefix) +void ImageAryData::Load(const OUString &rPrefix) { static ImplImageTreeSingletonRef aImageTree; - ::rtl::OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString aSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); BitmapEx aBmpEx; - rtl::OUString aFileName = rPrefix; + OUString aFileName = rPrefix; aFileName += maName; #if OSL_DEBUG_LEVEL > 0 bool bSuccess = @@ -403,9 +403,9 @@ void ImageAryData::Load(const rtl::OUString &rPrefix) #if OSL_DEBUG_LEVEL > 0 if ( !bSuccess ) { - ::rtl::OStringBuffer aMessage; + OStringBuffer aMessage; aMessage.append( "ImageAryData::Load: failed to load image '" ); - aMessage.append( ::rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() ); + aMessage.append( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() ); aMessage.append( "'" ); OSL_FAIL( aMessage.makeStringAndClear().getStr() ); } @@ -452,7 +452,7 @@ BitmapEx ImageList::GetAsHorizontalStrip() const } void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, - const std::vector< rtl::OUString > &rNameVector ) + const std::vector< OUString > &rNameVector ) { sal_uInt16 nItems = sal::static_int_cast< sal_uInt16 >( rNameVector.size() ); @@ -490,11 +490,11 @@ void ImageList::InsertFromHorizontalBitmap( const ResId& rResId, if ( nColorCount && pSearchColors && pReplaceColors ) aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount ); - std::vector< rtl::OUString > aNames( nCount ); + std::vector< OUString > aNames( nCount ); InsertFromHorizontalStrip( aBmpEx, aNames ); } -sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const +sal_uInt16 ImageList::ImplGetImageId( const OUString& rImageName ) const { DBG_CHKTHIS( ImageList, NULL ); @@ -505,7 +505,7 @@ sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const return 0; } -void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage ) +void ImageList::AddImage( const OUString& rImageName, const Image& rImage ) { DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" ); @@ -516,7 +516,7 @@ void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage rImage.GetBitmapEx() ); } -void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ) +void ImageList::ReplaceImage( const OUString& rImageName, const Image& rImage ) { const sal_uInt16 nId = ImplGetImageId( rImageName ); @@ -577,7 +577,7 @@ Image ImageList::GetImage( sal_uInt16 nId ) const return aRet; } -Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const +Image ImageList::GetImage( const OUString& rImageName ) const { if( mpImplData ) { @@ -622,7 +622,7 @@ bool ImageList::HasImageAtPos( sal_uInt16 nId ) const return GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND; } -sal_uInt16 ImageList::GetImagePos( const ::rtl::OUString& rImageName ) const +sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const { DBG_CHKTHIS( ImageList, NULL ); @@ -648,29 +648,29 @@ sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const return 0; } -::rtl::OUString ImageList::GetImageName( sal_uInt16 nPos ) const +OUString ImageList::GetImageName( sal_uInt16 nPos ) const { DBG_CHKTHIS( ImageList, NULL ); if( mpImplData && (nPos < GetImageCount()) ) return mpImplData->maImages[ nPos ]->maName; - return ::rtl::OUString(); + return OUString(); } -void ImageList::GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const +void ImageList::GetImageNames( ::std::vector< OUString >& rNames ) const { RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::GetImageNames" ); DBG_CHKTHIS( ImageList, NULL ); - rNames = ::std::vector< ::rtl::OUString >(); + rNames = ::std::vector< OUString >(); if( mpImplData ) { for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); i++ ) { - const rtl::OUString& rName( mpImplData->maImages[ i ]->maName ); + const OUString& rName( mpImplData->maImages[ i ]->maName ); if( !rName.isEmpty()) rNames.push_back( rName ); } diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index b201a263a70a..63aee8a202a0 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -32,9 +32,9 @@ namespace vcl //= ImageRepository //==================================================================== //-------------------------------------------------------------------- - bool ImageRepository::loadImage( const ::rtl::OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing ) + bool ImageRepository::loadImage( const OUString& _rName, BitmapEx& _out_rImage, bool _bSearchLanguageDependent, bool loadMissing ) { - ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); ImplImageTreeSingletonRef aImplImageTree; return aImplImageTree->loadImage( _rName, sCurrentSymbolsStyle, _out_rImage, _bSearchLanguageDependent, loadMissing ); @@ -42,7 +42,7 @@ namespace vcl bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage) { - ::rtl::OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); + OUString sCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); ImplImageTreeSingletonRef aImplImageTree; return aImplImageTree->loadDefaultImage( sCurrentSymbolsStyle,_out_rImage); } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 2e90cf7d29a2..d980fc5f09c4 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -368,7 +368,7 @@ void ImpGraphic::ImplClear() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1096,7 +1096,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1286,7 +1286,7 @@ sal_Bool ImpGraphic::ImplSwapOut() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1392,7 +1392,7 @@ sal_Bool ImpGraphic::ImplSwapIn() ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), + aCnt.executeCommand( OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) @@ -1655,7 +1655,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) if(mnSvgDataArrayLength) { SvgDataArray aNewData(new sal_uInt8[mnSvgDataArrayLength]); - rtl::OUString aPath; + OUString aPath; rIStm.Read(aNewData.get(), mnSvgDataArrayLength); aPath = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); @@ -1666,7 +1666,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) new SvgData( aNewData, mnSvgDataArrayLength, - rtl::OUString(aPath))); + OUString(aPath))); rImpGraphic = aSvgDataPtr; } diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 7bb76da3f510..f61a34588f27 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -38,7 +38,7 @@ ImageAryData::ImageAryData( const ImageAryData& rData ) : { } -ImageAryData::ImageAryData( const rtl::OUString &aName, +ImageAryData::ImageAryData( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmap ) : maName( aName ), mnId( nId ), maBitmapEx( aBitmap ) { @@ -82,7 +82,7 @@ ImplImageList::~ImplImageList() delete *aIt; } -void ImplImageList::AddImage( const ::rtl::OUString &aName, +void ImplImageList::AddImage( const OUString &aName, sal_uInt16 nId, const BitmapEx &aBitmapEx ) { ImageAryData *pImg = new ImageAryData( aName, nId, aBitmapEx ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 4b4cc078558a..29f3e7a1e2a9 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -63,10 +63,10 @@ namespace { -rtl::OUString createPath( - rtl::OUString const & name, sal_Int32 pos, rtl::OUString const & locale) +OUString createPath( + OUString const & name, sal_Int32 pos, OUString const & locale) { - rtl::OUStringBuffer b(name.copy(0, pos + 1)); + OUStringBuffer b(name.copy(0, pos + 1)); b.append(locale); b.append(name.copy(pos)); return b.makeStringAndClear(); @@ -94,7 +94,7 @@ boost::shared_ptr< SvStream > wrapFile(osl::File & file) void loadFromFile( osl::File & file, - rtl::OUString const & path, BitmapEx & bitmap) + OUString const & path, BitmapEx & bitmap) { boost::shared_ptr< SvStream > s(wrapFile(file)); if (path.endsWith(".png")) @@ -131,7 +131,7 @@ boost::shared_ptr< SvStream > wrapStream( void loadFromStream( css::uno::Reference< css::io::XInputStream > const & stream, - rtl::OUString const & path, BitmapEx & bitmap) + OUString const & path, BitmapEx & bitmap) { boost::shared_ptr< SvStream > s(wrapStream(stream)); if (path.endsWith(".png")) @@ -150,7 +150,7 @@ ImplImageTree::ImplImageTree() { m_cacheIcons = true; } ImplImageTree::~ImplImageTree() {} -bool ImplImageTree::checkStyle(rtl::OUString const & style) +bool ImplImageTree::checkStyle(OUString const & style) { bool exists; @@ -163,9 +163,9 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) setStyle(style); exists = false; - const rtl::OUString sBrandURLSuffix("_brand"); + const OUString sBrandURLSuffix("_brand"); for (Paths::iterator i(m_paths.begin()); i != m_paths.end() && !exists; ++i) { - ::rtl::OUString aURL = i->first; + OUString aURL = i->first; sal_Int32 nFromIndex = aURL.getLength() - sBrandURLSuffix.getLength(); // skip brand-specific icon themes; they are incomplete and thus not useful for this check if (nFromIndex < 0 || !aURL.match(sBrandURLSuffix, nFromIndex)) { @@ -190,7 +190,7 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style) } bool ImplImageTree::loadImage( - rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized, bool loadMissing ) { bool found = false; @@ -210,17 +210,17 @@ bool ImplImageTree::loadImage( } bool ImplImageTree::loadDefaultImage( - rtl::OUString const & style, + OUString const & style, BitmapEx& bitmap) { return doLoadImage( - rtl::OUString("res/grafikde.png"), + OUString("res/grafikde.png"), style, bitmap, false); } bool ImplImageTree::doLoadImage( - rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap, + OUString const & name, OUString const & style, BitmapEx & bitmap, bool localized) { setStyle(style); @@ -230,7 +230,7 @@ bool ImplImageTree::doLoadImage( if (!bitmap.IsEmpty()) { bitmap.SetEmpty(); } - std::vector< rtl::OUString > paths; + std::vector< OUString > paths; paths.push_back(name); if (localized) { sal_Int32 pos = name.lastIndexOf('/'); @@ -240,10 +240,10 @@ bool ImplImageTree::doLoadImage( Application::GetSettings().GetUILanguageTag().getLocale(); paths.push_back(createPath(name, pos, loc.Language)); if (!loc.Country.isEmpty()) { - rtl::OUStringBuffer b(loc.Language); + OUStringBuffer b(loc.Language); b.append(sal_Unicode('-')); b.append(loc.Country); - rtl::OUString p(createPath(name, pos, b.makeStringAndClear())); + OUString p(createPath(name, pos, b.makeStringAndClear())); paths.push_back(p); if (!loc.Variant.isEmpty()) { b.append(p); @@ -270,14 +270,14 @@ bool ImplImageTree::doLoadImage( } void ImplImageTree::shutDown() { - m_style = rtl::OUString(); + m_style = OUString(); // for safety; empty m_style means "not initialized" m_paths.clear(); m_iconCache.clear(); m_checkStyleCache.clear(); } -void ImplImageTree::setStyle(rtl::OUString const & style) { +void ImplImageTree::setStyle(OUString const & style) { OSL_ASSERT(!style.isEmpty()); // empty m_style means "not initialized" if (style != m_style) { m_style = style; @@ -289,7 +289,7 @@ void ImplImageTree::setStyle(rtl::OUString const & style) { void ImplImageTree::resetPaths() { m_paths.clear(); { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/program/edition/images"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); @@ -300,12 +300,12 @@ void ImplImageTree::resetPaths() { css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); - rtl::OUStringBuffer b; + OUStringBuffer b; b.appendAscii("images_"); b.append(m_style); b.appendAscii("_brand"); @@ -317,19 +317,19 @@ void ImplImageTree::resetPaths() { css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images_brand"); + OUString url( "$BRAND_BASE_DIR/share/config/images_brand"); rtl::Bootstrap::expandMacros(url); m_paths.push_back( std::make_pair( url, css::uno::Reference< css::container::XNameAccess >())); } { - rtl::OUString url( + OUString url( "$BRAND_BASE_DIR/share/config"); rtl::Bootstrap::expandMacros(url); INetURLObject u(url); OSL_ASSERT(!u.HasError()); - rtl::OUStringBuffer b; + OUStringBuffer b; b.appendAscii("images_"); b.append(m_style); bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL); @@ -341,7 +341,7 @@ void ImplImageTree::resetPaths() { } if ( m_style == "default" ) { - rtl::OUString url( "$BRAND_BASE_DIR/share/config/images"); + OUString url( "$BRAND_BASE_DIR/share/config/images"); rtl::Bootstrap::expandMacros(url); m_paths.push_back( std::make_pair( @@ -350,7 +350,7 @@ void ImplImageTree::resetPaths() { } bool ImplImageTree::checkStyleCacheLookup( - rtl::OUString const & style, bool &exists) + OUString const & style, bool &exists) { CheckStyleCache::iterator i(m_checkStyleCache.find(style)); if (i != m_checkStyleCache.end()) { @@ -362,7 +362,7 @@ bool ImplImageTree::checkStyleCacheLookup( } bool ImplImageTree::iconCacheLookup( - rtl::OUString const & name, bool localized, BitmapEx & bitmap) + OUString const & name, bool localized, BitmapEx & bitmap) { IconCache::iterator i(m_iconCache.find(name)); if (i != m_iconCache.end() && i->second.first == localized) { @@ -374,11 +374,11 @@ bool ImplImageTree::iconCacheLookup( } bool ImplImageTree::find( - std::vector< rtl::OUString > const & paths, BitmapEx & bitmap) + std::vector< OUString > const & paths, BitmapEx & bitmap) { if (!m_cacheIcons) { for (Paths::iterator i(m_paths.begin()); i != m_paths.end(); ++i) { - for (std::vector< rtl::OUString >::const_reverse_iterator j( + for (std::vector< OUString >::const_reverse_iterator j( paths.rbegin()); j != paths.rend(); ++j) { @@ -399,7 +399,7 @@ bool ImplImageTree::find( try { i->second.set( comphelper::getProcessServiceFactory()->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.zip.ZipFileAccess"), + OUString( "com.sun.star.packages.zip.ZipFileAccess"), args), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { @@ -411,7 +411,7 @@ bool ImplImageTree::find( continue; } } - for (std::vector< rtl::OUString >::const_reverse_iterator j( + for (std::vector< OUString >::const_reverse_iterator j( paths.rbegin()); j != paths.rend(); ++j) { diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 9b9b960c5cba..9ec7cf07f743 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -150,23 +150,23 @@ JobSetup::~JobSetup() } } -rtl::OUString JobSetup::GetPrinterName() const +OUString JobSetup::GetPrinterName() const { if ( mpData ) return mpData->maPrinterName; else - return rtl::OUString(); + return OUString(); } -rtl::OUString JobSetup::GetDriverName() const +OUString JobSetup::GetDriverName() const { if ( mpData ) return mpData->maDriver; else - return rtl::OUString(); + return OUString(); } -void JobSetup::SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue ) +void JobSetup::SetValue( const OUString& rKey, const OUString& rValue ) { if( ! mpData ) mpData = new ImplJobSetup(); @@ -349,9 +349,9 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ImplOldJobSetupData aOldData; memset( &aOldData, 0, sizeof( aOldData ) ); - rtl::OString aPrnByteName(rtl::OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8)); + OString aPrnByteName(OUStringToOString(rJobSetup.GetPrinterName(), RTL_TEXTENCODING_UTF8)); strncpy( aOldData.cPrinterName, aPrnByteName.getStr(), 63 ); - rtl::OString aDriverByteName(rtl::OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8)); + OString aDriverByteName(OUStringToOString(rJobSetup.GetDriverName(), RTL_TEXTENCODING_UTF8)); strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 ); // nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen; int nPos = rOStream.Tell(); @@ -360,7 +360,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.Write( (char*)&aOldData, sizeof( aOldData ) ); rOStream.Write( (char*)&aOldJobData, nOldJobDataSize ); rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen ); - ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; + ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->first, RTL_TEXTENCODING_UTF8); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index c9c5e086e170..ef702cc969cd 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1181,7 +1181,7 @@ IMPL_META_ACTION( Text, META_TEXT_ACTION ) // ------------------------------------------------------------------------ -MetaTextAction::MetaTextAction( const Point& rPt, const rtl::OUString& rStr, +MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ) : MetaAction ( META_TEXT_ACTION ), maPt ( rPt ), @@ -1291,7 +1291,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : // ------------------------------------------------------------------------ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, - const rtl::OUString& rStr, + const OUString& rStr, const sal_Int32* pDXAry, sal_uInt16 nIndex, sal_uInt16 nLen ) : @@ -1452,7 +1452,7 @@ IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) // ------------------------------------------------------------------------ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, - const rtl::OUString& rStr, + const OUString& rStr, sal_uInt16 nIndex, sal_uInt16 nLen ) : MetaAction ( META_STRETCHTEXT_ACTION ), maPt ( rPt ), @@ -1541,7 +1541,7 @@ IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) // ------------------------------------------------------------------------ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, - const rtl::OUString& rStr, sal_uInt16 nStyle ) : + const OUString& rStr, sal_uInt16 nStyle ) : MetaAction ( META_TEXTRECT_ACTION ), maRect ( rRect ), maStr ( rStr ), @@ -3956,7 +3956,7 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : // ------------------------------------------------------------------------ -MetaCommentAction::MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : +MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( META_COMMENT_ACTION ), maComment ( rComment ), mnValue ( nValue ) diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index cfe02e9ea513..e47acb0afa66 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -1283,7 +1283,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const } ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& rFontSelData, - rtl::OUString& rMissingCodes, int nFallbackLevel ) const + OUString& rMissingCodes, int nFallbackLevel ) const { ImplDevFontListData* pFallbackData = NULL; @@ -1318,11 +1318,11 @@ ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r if( !bCached || (rFontSelData.maSearchName != aFontName) ) pRemainingCodes[ nRemainingLength++ ] = cChar; } - rMissingCodes = rtl::OUString( pRemainingCodes, nRemainingLength ); + rMissingCodes = OUString( pRemainingCodes, nRemainingLength ); } else { - rtl::OUString aOldMissingCodes = rMissingCodes; + OUString aOldMissingCodes = rMissingCodes; // call the hook to query the best matching glyph fallback font if( mpFallbackHook->FindFontSubstitute( rFontSelData, rMissingCodes ) ) // apply outdev3.cxx specific fontname normalization @@ -1417,8 +1417,8 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const OUString& rSea return pFoundData; } -ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const rtl::OUString& rSearchName, - const rtl::OUString& rShortName) const +ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const OUString& rSearchName, + const OUString& rShortName) const { // short circuit for impossible font name alias if (rSearchName.isEmpty()) @@ -1462,7 +1462,7 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName ) return pFound; } -ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const rtl::OUString& rTokenStr) const +ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const OUString& rTokenStr) const { ImplDevFontListData* pFoundData = NULL; @@ -1536,7 +1536,7 @@ void ImplDevFontList::InitMatchData() const ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchType, FontWeight eSearchWeight, FontWidth eSearchWidth, - FontItalic eSearchItalic, const rtl::OUString& rSearchFamilyName ) const + FontItalic eSearchItalic, const OUString& rSearchFamilyName ) const { if( (eSearchItalic != ITALIC_NONE) && (eSearchItalic != ITALIC_DONTKNOW) ) nSearchType |= IMPL_FONT_ATTR_ITALIC; @@ -2316,7 +2316,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, namespace { - rtl::OUString stripCharSetFromName(rtl::OUString aName) + OUString stripCharSetFromName(OUString aName) { //I worry that someone will have a font which *does* have //e.g. "Greek" legitimately at the end of its name :-( @@ -2439,7 +2439,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, //Win 3.1/Win95 style fontnames which attempt to put the //charset encoding into the filename //http://www.webcenter.ru/~kazarn/eng/fonts_ttf.htm - rtl::OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName); + OUString sStrippedName = stripCharSetFromName(rFSD.maTargetName); if (!sStrippedName.equals(rFSD.maTargetName)) { rFSD.maTargetName = sStrippedName; @@ -2672,7 +2672,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, } ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList, - FontSelectPattern& rFontSelData, int nFallbackLevel, rtl::OUString& rMissingCodes ) + FontSelectPattern& rFontSelData, int nFallbackLevel, OUString& rMissingCodes ) { // get a candidate font for glyph fallback // unless the previously selected font got a device specific substitution @@ -3938,7 +3938,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind... for( int i = 0; i < nTestStrLen; ++i) aChars[i] = cStrikeoutChar; - const rtl::OUString aStrikeoutTest(aChars, nTestStrLen); + const OUString aStrikeoutTest(aChars, nTestStrLen); // calculate approximation of strikeout atom size long nStrikeoutWidth = 0; @@ -3958,7 +3958,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, // build the strikeout string for( int i = nTestStrLen; i < nStrikeStrLen; ++i) aChars[i] = cStrikeoutChar; - const rtl::OUString aStrikeoutText(aChars, nStrikeStrLen); + const OUString aStrikeoutText(aChars, nStrikeStrLen); if( mpFontEntry->mnOrientation ) ImplRotatePos( 0, 0, nDistX, nDistY, mpFontEntry->mnOrientation ); @@ -4699,7 +4699,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, rLineInfo.Clear(); if ( !rStr.isEmpty() && (nWidth > 0) ) { - ::rtl::OUString aText( rStr ); + OUString aText( rStr ); uno::Reference < i18n::XBreakIterator > xBI; // get service provider uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); @@ -5992,11 +5992,11 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay // get list of unicodes that need glyph fallback int nCharPos = -1; bool bRTL = false; - rtl::OUStringBuffer aMissingCodeBuf; + OUStringBuffer aMissingCodeBuf; while( rLayoutArgs.GetNextPos( &nCharPos, &bRTL) ) aMissingCodeBuf.append( rLayoutArgs.mpStr[ nCharPos ] ); rLayoutArgs.ResetPos(); - rtl::OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear(); + OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear(); FontSelectPattern aFontSelData = mpFontEntry->maFontSelData; @@ -6142,7 +6142,7 @@ xub_StrLen OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, xub_StrLen nRetVal = sal::static_int_cast<xub_StrLen>(pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor )); // calculate hyphenated break position - rtl::OUString aHyphenatorStr(nHyphenatorChar); + OUString aHyphenatorStr(nHyphenatorChar); sal_Int32 nTempLen = 1; SalLayout* pHyphenatorLayout = ImplLayout( aHyphenatorStr, 0, nTempLen ); if( pHyphenatorLayout ) @@ -6712,8 +6712,8 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice, } else if ( nStyle & TEXT_DRAW_PATHELLIPSIS ) { - rtl::OUString aPath( rOrigStr ); - rtl::OUString aAbbreviatedPath; + OUString aPath( rOrigStr ); + OUString aAbbreviatedPath; osl_abbreviateSystemPath( aPath.pData, &aAbbreviatedPath.pData, nIndex, NULL ); aStr = aAbbreviatedPath; } diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 685f33e9f506..8e9535bece34 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -1126,7 +1126,7 @@ void OutputDevice::Erase() if( pWindow->IsEnabled() ) nState |= CTRL_STATE_ENABLED; bNativeOK = pWindow->DrawNativeControl( CTRL_WINDOW_BACKGROUND, aCtrlPart, aCtrlRegion, - nState, aControlValue, rtl::OUString() ); + nState, aControlValue, OUString() ); } } diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index 449af1b598f0..4727ba6dedef 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -268,7 +268,7 @@ sal_Bool OutputDevice::DrawNativeControl( ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption ) + OUString aCaption ) { if( !lcl_enableNativeWidget( *this ) ) return sal_False; @@ -310,7 +310,7 @@ sal_Bool OutputDevice::GetNativeControlRegion( ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - ::rtl::OUString aCaption, + OUString aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) const { diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 45eb7ed3de70..9895867062b4 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -81,7 +81,7 @@ struct SAL_DLLPRIVATE GlobalSyncData std::deque< Rectangle > mParaRects; std::deque< sal_Int32 > mParaInts; std::deque< sal_uInt32 > mParauInts; - std::deque< rtl::OUString > mParaOUStrings; + std::deque< OUString > mParaOUStrings; std::deque< PDFWriter::DestAreaType > mParaDestAreaTypes; std::deque< PDFNote > mParaPDFNotes; std::deque< PDFWriter::PageTransition > mParaPageTransitions; @@ -290,7 +290,7 @@ struct SAL_DLLPRIVATE PageSyncData std::deque< PDFExtOutDevDataSync > mActions; std::deque< Rectangle > mParaRects; std::deque< sal_Int32 > mParaInts; - std::deque< rtl::OUString > mParaOUStrings; + std::deque< OUString > mParaOUStrings; std::deque< PDFWriter::StructElement > mParaStructElements; std::deque< PDFWriter::StructAttribute > mParaStructAttributes; std::deque< PDFWriter::StructAttributeValue > mParaStructAttributeValues; @@ -691,14 +691,14 @@ sal_Int32 PDFExtOutDevData::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) mpGlobalSyncData->mParaInts.push_back( nDestId ); return 0; } -sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ) +sal_Int32 PDFExtOutDevData::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetLinkURL ); mpGlobalSyncData->mParaInts.push_back( nLinkId ); mpGlobalSyncData->mParaOUStrings.push_back( rURL ); return 0; } -sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID ) +sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID ) { mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateOutlineItem ); mpGlobalSyncData->mParaInts.push_back( nParent ); @@ -724,7 +724,7 @@ void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_u /* local (page), actions have to be played synchroniously to the actions of of the recorded metafile (created by each xRenderable->render()) */ - sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) + sal_Int32 PDFExtOutDevData::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::BeginStructureElement ); mpPageSyncData->mParaStructElements.push_back( eType ); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 855e844caa1b..21ed0cc8e664 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -326,7 +326,7 @@ sal_Int32 PDFWriter::RegisterDestReference( sal_Int32 nDestId, const Rectangle& return pImplementation->registerDestReference( nDestId, rRect, nPageNr, eType ); } //--->i56629 -sal_Int32 PDFWriter::CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +sal_Int32 PDFWriter::CreateNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { return pImplementation->createNamedDest( sDestName, rRect, nPageNr, eType ); } @@ -340,7 +340,7 @@ sal_Int32 PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ) return pImplementation->setLinkDest( nLinkId, nDestId ); } -sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ) +sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL ) { return pImplementation->setLinkURL( nLinkId, rURL ); } @@ -350,7 +350,7 @@ void PDFWriter::SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyId ) pImplementation->setLinkPropertyId( nLinkId, nPropertyId ); } -sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const rtl::OUString& rText, sal_Int32 nDestID ) +sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID ) { return pImplementation->createOutlineItem( nParent, rText, nDestID ); } @@ -360,7 +360,7 @@ sal_Int32 PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent return pImplementation->setOutlineItemParent( nItem, nNewParent ); } -sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ) +sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText ) { return pImplementation->setOutlineItemText( nItem, rText ); } @@ -375,7 +375,7 @@ void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_In pImplementation->createNote( rRect, rNote, nPageNr ); } -sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) +sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { return pImplementation->beginStructureElement( eType, rAlias ); } @@ -445,8 +445,8 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors() } com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > -PDFWriter::InitEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, +PDFWriter::InitEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index c7cf75b32adf..6eefa3c1b5f7 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -85,13 +85,6 @@ using namespace vcl; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; -using ::rtl::OStringHash; -using ::rtl::OUStringHash; -using ::rtl::OStringBuffer; -using ::rtl::OUStringBuffer; #if (OSL_DEBUG_LEVEL < 3) #define COMPRESS_PAGES @@ -129,9 +122,9 @@ void PDFTestOutputStream::write( const com::sun::star::uno::Reference< com::sun: void doTestCode() { static const char* pHome = getenv( "HOME" ); - rtl::OUString aTestFile( "file://" ); - aTestFile += rtl::OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); - aTestFile += rtl::OUString( "/pdf_export_test.pdf" ); + OUString aTestFile( "file://" ); + aTestFile += OUString( pHome, strlen( pHome ), RTL_TEXTENCODING_MS_1252 ); + aTestFile += OUString( "/pdf_export_test.pdf" ); PDFWriter::PDFWriterContext aContext; aContext.URL = aTestFile; @@ -620,7 +613,7 @@ static void appendLiteralString( const sal_Char* pStr, sal_Int32 nLength, OStrin * Fhurter limitation: it is advisable to use standard ASCII characters for * OOo bookmarks. */ -static void appendDestinationName( const rtl::OUString& rString, OStringBuffer& rBuffer ) +static void appendDestinationName( const OUString& rString, OStringBuffer& rBuffer ) { const sal_Unicode* pStr = rString.getStr(); sal_Int32 nLen = rString.getLength(); @@ -645,7 +638,7 @@ static void appendDestinationName( const rtl::OUString& rString, OStringBuffer& } //<--- i56629 -static void appendUnicodeTextString( const rtl::OUString& rString, OStringBuffer& rBuffer ) +static void appendUnicodeTextString( const OUString& rString, OStringBuffer& rBuffer ) { rBuffer.append( "FEFF" ); const sal_Unicode* pStr = rString.getStr(); @@ -700,7 +693,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // find or create a hierarchical field // first find the fully qualified name up to this field aDomain = aFullName.copy( 0, nTokenIndex-1 ); - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it == m_aFieldNameMap.end() ) { // create new hierarchy field @@ -761,7 +754,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr // insert widget into its hierarchy field if( !aDomain.isEmpty() ) { - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); + boost::unordered_map< OString, sal_Int32, OStringHash >::const_iterator it = m_aFieldNameMap.find( aDomain ); if( it != m_aFieldNameMap.end() ) { OSL_ENSURE( it->second >= 0 && it->second < sal_Int32( m_aWidgets.size() ), "invalid field index" ); @@ -1874,14 +1867,14 @@ void PDFWriterImpl::setupDocInfo() void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier, const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - rtl::OString& o_rCString1, - rtl::OString& o_rCString2 + OString& o_rCString1, + OString& o_rCString2 ) { o_rIdentifier.clear(); //build the document id - rtl::OString aInfoValuesOut; + OString aInfoValuesOut; OStringBuffer aID( 1024 ); if( i_rDocInfo.Title.Len() ) appendUnicodeTextString( i_rDocInfo.Title, aID ); @@ -1901,7 +1894,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden osl_getSystemTime( &aGMT ); osl_getLocalTimeFromSystemTime( &aGMT, &aTVal ); osl_getDateTimeFromTimeValue( &aTVal, &aDT ); - rtl::OStringBuffer aCreationDateString(64), aCreationMetaDateString(64); + OStringBuffer aCreationDateString(64), aCreationMetaDateString(64); aCreationDateString.append( "D:" ); aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) ); aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) ); @@ -2006,7 +1999,7 @@ void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIden check if the Unicode string must be encrypted or not, perform the requested task, append the string as unicode hex, encrypted if needed */ -inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { rOutBuffer.append( "<" ); if( m_aContext.Encryption.Encrypt() ) @@ -2041,7 +2034,7 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rOutBuffer.append( ">" ); } -inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { rOutBuffer.append( "(" ); sal_Int32 nChars = rInString.getLength(); @@ -2058,17 +2051,17 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInSt rOutBuffer.append( ")" ); } -inline void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ) +inline void PDFWriterImpl::appendLiteralStringEncrypt( const OString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ) { - rtl::OStringBuffer aBufferString( rInString ); + OStringBuffer aBufferString( rInString ); appendLiteralStringEncrypt( aBufferString, nInObjectNumber, rOutBuffer); } -void PDFWriterImpl::appendLiteralStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc ) +void PDFWriterImpl::appendLiteralStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc ) { - rtl::OString aBufferString( rtl::OUStringToOString( rInString, nEnc ) ); + OString aBufferString( OUStringToOString( rInString, nEnc ) ); sal_Int32 nLen = aBufferString.getLength(); - rtl::OStringBuffer aBuf( nLen ); + OStringBuffer aBuf( nLen ); const sal_Char* pT = aBufferString.getStr(); for( sal_Int32 i = 0; i < nLen; i++, pT++ ) @@ -2247,8 +2240,8 @@ inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFo static ImplDevFontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin ) { ImplDevFontAttributes aDFA; - aDFA.SetFamilyName( rtl::OUString::createFromAscii( rBuiltin.m_pName ) ); - aDFA.SetStyleName( rtl::OUString::createFromAscii( rBuiltin.m_pStyleName ) ); + aDFA.SetFamilyName( OUString::createFromAscii( rBuiltin.m_pName ) ); + aDFA.SetStyleName( OUString::createFromAscii( rBuiltin.m_pStyleName ) ); aDFA.SetFamilyType( rBuiltin.m_eFamily ); aDFA.SetSymbolFlag( rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 ); aDFA.SetPitch( rBuiltin.m_ePitch ); @@ -2336,7 +2329,7 @@ public: const PDFWriterImpl::BuiltinFont&, long nPixelPerEM, int nOrientation ); - void SetText( const rtl::OUString& rText ) { maOrigText = rText; } + void SetText( const OUString& rText ) { maOrigText = rText; } virtual bool LayoutText( ImplLayoutArgs& ); virtual void InitFont() const; virtual void DrawText( SalGraphics& ) const; @@ -2361,7 +2354,7 @@ PDFSalLayout::PDFSalLayout( PDFWriterImpl& rPDFWriterImpl, bool PDFSalLayout::LayoutText( ImplLayoutArgs& rArgs ) { - const rtl::OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos); + const OUString aText(rArgs.mpStr+rArgs.mnMinCharPos, rArgs.mnEndCharPos-rArgs.mnMinCharPos); SetText( aText ); SetUnitsPerPixel( 1000 ); @@ -3106,7 +3099,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo } sal_Int32 nFontDescriptor = 0; - rtl::OString aSubType( "/Type1" ); + OString aSubType( "/Type1" ); FontSubsetInfo aInfo; // fill in dummy values aInfo.m_nAscent = 1000; @@ -3136,7 +3129,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const PhysicalFo } else if( pFont->mbSubsettable ) { - aSubType = rtl::OString( "/TrueType" ); + aSubType = OString( "/TrueType" ); Int32Vector aGlyphWidths; Ucs2UIntMap aUnicodeMap; m_pReferenceDevice->mpGraphics->GetGlyphWidths( pFont, false, aGlyphWidths, aUnicodeMap ); @@ -3645,7 +3638,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical } else { - rtl::OStringBuffer aErrorComment( 256 ); + OStringBuffer aErrorComment( 256 ); aErrorComment.append( "GetEmbedFontData failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); @@ -3732,7 +3725,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical aUnicodes.clear(); for( std::vector< EmbedCode >::iterator str_it = enc_it->m_aEncVector.begin(); str_it != enc_it->m_aEncVector.end(); ++str_it ) { - rtl::OUString aStr( str_it->m_aUnicode ); + OUString aStr( str_it->m_aUnicode ); aEncWidths[nEncoded] = pRef->GetTextWidth( aStr ); nEncodedCodes[nEncoded] = str_it->m_aUnicode; nEncoding[nEncoded] = sal::static_int_cast<sal_uInt8>(nEncoded); @@ -4234,7 +4227,7 @@ bool PDFWriterImpl::emitFonts() else { const PhysicalFontFace* pFont = it->first; - rtl::OStringBuffer aErrorComment( 256 ); + OStringBuffer aErrorComment( 256 ); aErrorComment.append( "CreateFontSubset failed for font \"" ); aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); aErrorComment.append( '\"' ); @@ -4617,7 +4610,7 @@ we check in the following sequence: } } - rtl::OUString aFileExtension = aTargetURL.GetFileExtension(); + OUString aFileExtension = aTargetURL.GetFileExtension(); // Check if the URL ends in '/': if yes it's a directory, // it will be forced to a URI link. @@ -4631,21 +4624,21 @@ we check in the following sequence: { sal_Int32 bChangeFileExtensionToPDF = false; //examine the file type (.odm .odt. .odp, odg, ods) - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odm" ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odm" ) ) ) bChangeFileExtensionToPDF = true; - if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odt" ) ) ) + if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odt" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odp" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odp" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "odg" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odg" ) ) ) bChangeFileExtensionToPDF = true; - else if( aFileExtension.equalsIgnoreAsciiCase(rtl::OUString( "ods" ) ) ) + else if( aFileExtension.equalsIgnoreAsciiCase(OUString( "ods" ) ) ) bChangeFileExtensionToPDF = true; if( bChangeFileExtensionToPDF ) - aTargetURL.setExtension(rtl::OUString( "pdf" ) ); + aTargetURL.setExtension(OUString( "pdf" ) ); } //check if extension is pdf, see if GoToR should be forced - bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(rtl::OUString( "pdf" ) ); + bTargetHasPDFExtension = aTargetURL.GetFileExtension().equalsIgnoreAsciiCase(OUString( "pdf" ) ); if( m_aContext.ForcePDFAction && bTargetHasPDFExtension ) nSetGoToRMode++; } @@ -4668,7 +4661,7 @@ we check in the following sequence: if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INET_PROT_FILE ) bSetRelative = true; - rtl::OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is, + OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is, if( nSetGoToRMode == 0 ) { switch( m_aContext.DefaultLinkAction ) @@ -4703,7 +4696,7 @@ we check in the following sequence: if( nSetGoToRMode ) { //add the fragment - rtl::OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET ); + OUString aURLNoMark = aTargetURL.GetURLNoMark( INetURLObject::DECODE_WITH_CHARSET ); aLine.append("/GoToR"); aLine.append("/F"); bFileSpec = true; @@ -4729,7 +4722,7 @@ we check in the following sequence: //substitute the fragment aTargetURL.SetMark( aLineLoc.getStr() ); } - rtl::OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE ); + OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE ); appendLiteralStringEncrypt(bSetRelative ? INetURLObject::GetRelURL( m_aContext.BaseURL, aURL, INetURLObject::WAS_ENCODED, bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE @@ -5329,7 +5322,7 @@ bool PDFWriterImpl::emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDi { // TODO: check and insert default streams - rtl::OString aStandardAppearance; + OString aStandardAppearance; switch( rWidget.m_eType ) { case PDFWriter::CheckBox: @@ -5502,7 +5495,7 @@ bool PDFWriterImpl::emitWidgetAnnotations() appendUnicodeTextStringEncrypt( rWidget.m_aListEntries[ rWidget.m_aSelectedEntries[0] ], rWidget.m_nObject, aValue ); } else - appendUnicodeTextStringEncrypt( rtl::OUString(), rWidget.m_nObject, aValue ); + appendUnicodeTextStringEncrypt( OUString(), rWidget.m_nObject, aValue ); aLine.append( "Ch" ); break; case PDFWriter::ComboBox: @@ -6416,7 +6409,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations() OUString( "http://ahost.ax" ) ); //dummy location, won't be used aLocalURL.SetMark( rDest.m_aDestName ); - const rtl::OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as + const OUString aName = aLocalURL.GetMark( INetURLObject::NO_DECODE ); //same coding as // in link creation ( see PDFWriterImpl::emitLinkAnnotations ) const PDFPage& rDestPage = m_aPages[ rDest.m_nPage ]; @@ -6554,7 +6547,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() aLine.append( " 0 obj\n" "<</Type/OutputIntent/S/GTS_PDFA1/OutputConditionIdentifier"); - rtl::OUString aComment( "sRGB IEC61966-2.1" ); + OUString aComment( "sRGB IEC61966-2.1" ); appendLiteralStringEncrypt( aComment ,nOIObject, aLine ); aLine.append("/DestOutputProfile "); aLine.append( nICCObject ); @@ -6565,7 +6558,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() } // formats the string for the XML stream -static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue) +static void escapeStringXML( const OUString& rStr, OUString &rValue) { const sal_Unicode* pUni = rStr.getStr(); int nLen = rStr.getLength(); @@ -6574,22 +6567,22 @@ static void escapeStringXML( const rtl::OUString& rStr, rtl::OUString &rValue) switch( *pUni ) { case sal_Unicode('&'): - rValue += rtl::OUString( "&" ); + rValue += OUString( "&" ); break; case sal_Unicode('<'): - rValue += rtl::OUString( "<" ); + rValue += OUString( "<" ); break; case sal_Unicode('>'): - rValue += rtl::OUString( ">" ); + rValue += OUString( ">" ); break; case sal_Unicode('\''): - rValue += rtl::OUString( "'" ); + rValue += OUString( "'" ); break; case sal_Unicode('"'): - rValue += rtl::OUString( """ ); + rValue += OUString( """ ); break; default: - rValue += rtl::OUString( *pUni ); + rValue += OUString( *pUni ); break; } } @@ -6636,7 +6629,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " <dc:title>\n" ); aMetadataStream.append( " <rdf:Alt>\n" ); aMetadataStream.append( " <rdf:li xml:lang=\"x-default\">" ); - rtl::OUString aTitle; + OUString aTitle; escapeStringXML( m_aContext.DocumentInfo.Title, aTitle ); aMetadataStream.append( OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</rdf:li>\n" ); @@ -6648,7 +6641,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " <dc:creator>\n" ); aMetadataStream.append( " <rdf:Seq>\n" ); aMetadataStream.append( " <rdf:li>" ); - rtl::OUString aAuthor; + OUString aAuthor; escapeStringXML( m_aContext.DocumentInfo.Author, aAuthor ); aMetadataStream.append( OUStringToOString( aAuthor , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</rdf:li>\n" ); @@ -6661,7 +6654,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() aMetadataStream.append( " <dc:description>\n" ); aMetadataStream.append( " <rdf:Alt>\n" ); aMetadataStream.append( " <rdf:li xml:lang=\"x-default\">" ); - rtl::OUString aSubject; + OUString aSubject; escapeStringXML( m_aContext.DocumentInfo.Subject, aSubject ); aMetadataStream.append( OUStringToOString( aSubject , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</rdf:li>\n" ); @@ -6680,7 +6673,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Producer.Len() ) { aMetadataStream.append( " <pdf:Producer>" ); - rtl::OUString aProducer; + OUString aProducer; escapeStringXML( m_aContext.DocumentInfo.Producer, aProducer ); aMetadataStream.append( OUStringToOString( aProducer , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</pdf:Producer>\n" ); @@ -6688,7 +6681,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Keywords.Len() ) { aMetadataStream.append( " <pdf:Keywords>" ); - rtl::OUString aKeywords; + OUString aKeywords; escapeStringXML( m_aContext.DocumentInfo.Keywords, aKeywords ); aMetadataStream.append( OUStringToOString( aKeywords , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</pdf:Keywords>\n" ); @@ -6701,7 +6694,7 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata() if( m_aContext.DocumentInfo.Creator.Len() ) { aMetadataStream.append( " <xmp:CreatorTool>" ); - rtl::OUString aCreator; + OUString aCreator; escapeStringXML( m_aContext.DocumentInfo.Creator, aCreator ); aMetadataStream.append( OUStringToOString( aCreator , RTL_TEXTENCODING_UTF8 ) ); aMetadataStream.append( "</xmp:CreatorTool>\n" ); @@ -7328,7 +7321,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs, cChar -= 0xf000; else { - rtl::OString aChar(&cChar, 1, RTL_TEXTENCODING_MS_1252); + OString aChar(&cChar, 1, RTL_TEXTENCODING_MS_1252); cChar = ((sal_Ucs)aChar[0]) & 0x00ff; } } @@ -8116,7 +8109,7 @@ void PDFWriterImpl::drawText( const Rectangle& rRect, const String& rOrigStr, sa // multiline text if ( nStyle & TEXT_DRAW_MULTILINE ) { - rtl::OUString aLastLine; + OUString aLastLine; ImplMultiTextLineInfo aMultiLineInfo; ImplTextLineInfo* pLineInfo; xub_StrLen i; @@ -8580,7 +8573,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need //to tweak this - rtl::OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? rtl::OUString("/") : rtl::OUString("X"); + OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? OUString("/") : OUString("X"); String aStrikeout = aStrikeoutChar; while( m_pReferenceDevice->GetTextWidth( aStrikeout ) < nWidth ) aStrikeout.Append( aStrikeout ); @@ -10869,7 +10862,7 @@ sal_Int32 PDFWriterImpl::createLink( const Rectangle& rRect, sal_Int32 nPageNr ) } //--->i56629 -sal_Int32 PDFWriterImpl::createNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) +sal_Int32 PDFWriterImpl::createNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType ) { if( nPageNr < 0 ) nPageNr = m_nCurrentPage; @@ -11155,7 +11148,7 @@ bool PDFWriterImpl::checkEmitStructure() return bEmit; } -sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ) +sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ) { if( m_nCurrentPage < 0 ) return -1; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b9fd8f8d143e..81ccbf649341 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -92,12 +92,12 @@ public: FontItalic m_eItalic; // Italic int m_aWidths[256]; // character metrics - rtl::OString getNameObject() const; + OString getNameObject() const; }; enum ResourceKind { ResXObject, ResExtGState, ResShading, ResPattern }; - typedef std::map< rtl::OString, sal_Int32 > ResourceMap; + typedef std::map< OString, sal_Int32 > ResourceMap; struct ResourceDict { // note: handle fonts globally for performance @@ -106,7 +106,7 @@ public: ResourceMap m_aShadings; ResourceMap m_aPatterns; - void append( rtl::OStringBuffer&, sal_Int32 nFontDictObject ); + void append( OStringBuffer&, sal_Int32 nFontDictObject ); }; struct PDFPage @@ -140,35 +140,35 @@ public: // to page (useful for transformation matrices // if pOutPoint is set it will be updated to the emitted point // (in PDF map mode, that is 10th of point) - void appendPoint( const Point& rPoint, rtl::OStringBuffer& rBuffer, bool bNeg = false, Point* pOutPoint = NULL ) const; + void appendPoint( const Point& rPoint, OStringBuffer& rBuffer, bool bNeg = false, Point* pOutPoint = NULL ) const; // appends a B2DPoint without further transformation - void appendPixelPoint( const basegfx::B2DPoint& rPoint, rtl::OStringBuffer& rBuffer ) const; + void appendPixelPoint( const basegfx::B2DPoint& rPoint, OStringBuffer& rBuffer ) const; // appends a rectangle - void appendRect( const Rectangle& rRect, rtl::OStringBuffer& rBuffer ) const; + void appendRect( const Rectangle& rRect, OStringBuffer& rBuffer ) const; // converts a rectangle to 10th points page space void convertRect( Rectangle& rRect ) const; // appends a polygon optionally closing it - void appendPolygon( const Polygon& rPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolygon( const Polygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polygon optionally closing it - void appendPolygon( const basegfx::B2DPolygon& rPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolygon( const basegfx::B2DPolygon& rPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const PolyPolygon& rPolyPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const PolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // appends a polypolygon optionally closing the subpaths - void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, rtl::OStringBuffer& rBuffer, bool bClose = true ) const; + void appendPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPoly, OStringBuffer& rBuffer, bool bClose = true ) const; // converts a length (either vertical or horizontal; this // can be important if the source MapMode is not // symmetrical) to page length and appends it to the buffer // if pOutLength is set it will be updated to the emitted length // (in PDF map mode, that is 10th of point) - void appendMappedLength( sal_Int32 nLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL ) const; + void appendMappedLength( sal_Int32 nLength, OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL ) const; // the same for double values - void appendMappedLength( double fLength, rtl::OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL, sal_Int32 nPrecision = 5 ) const; + void appendMappedLength( double fLength, OStringBuffer& rBuffer, bool bVertical = true, sal_Int32* pOutLength = NULL, sal_Int32 nPrecision = 5 ) const; // appends LineInfo // returns false if too many dash array entry were created for // the implementation limits of some PDF readers - bool appendLineInfo( const LineInfo& rInfo, rtl::OStringBuffer& rBuffer ) const; + bool appendLineInfo( const LineInfo& rInfo, OStringBuffer& rBuffer ) const; // appends a horizontal waveline with vertical offset (helper for drawWaveLine) - void appendWaveLine( sal_Int32 nLength, sal_Int32 nYOffset, sal_Int32 nDelta, rtl::OStringBuffer& rBuffer ) const; + void appendWaveLine( sal_Int32 nLength, sal_Int32 nYOffset, sal_Int32 nDelta, OStringBuffer& rBuffer ) const; sal_Int32 getWidth() const { return m_nPageWidth ? m_nPageWidth : m_pWriter->m_nInheritedPageWidth; } sal_Int32 getHeight() const { return m_nPageHeight ? m_nPageHeight : m_pWriter->m_nInheritedPageHeight; } @@ -345,7 +345,7 @@ public: struct EmbedCode { sal_Ucs m_aUnicode; - rtl::OString m_aName; + OString m_aName; }; struct EmbedEncoding { @@ -372,7 +372,7 @@ public: //--->i56629 struct PDFNamedDest { - rtl::OUString m_aDestName; + OUString m_aDestName; sal_Int32 m_nPage; PDFWriter::DestAreaType m_eType; Rectangle m_aRect; @@ -386,7 +386,7 @@ public: sal_Int32 m_nNextObject; sal_Int32 m_nPrevObject; std::vector< sal_Int32 > m_aChildren; - rtl::OUString m_aTitle; + OUString m_aTitle; sal_Int32 m_nDestID; PDFOutlineEntry() @@ -414,7 +414,7 @@ public: struct PDFLink : public PDFAnnotation { sal_Int32 m_nDest; // set to -1 for URL, to a dest else - rtl::OUString m_aURL; + OUString m_aURL; sal_Int32 m_nStructParent; // struct parent entry PDFLink() @@ -431,21 +431,21 @@ public: {} }; - typedef boost::unordered_map< rtl::OString, SvMemoryStream*, rtl::OStringHash > PDFAppearanceStreams; - typedef boost::unordered_map< rtl::OString, PDFAppearanceStreams, rtl::OStringHash > PDFAppearanceMap; + typedef boost::unordered_map< OString, SvMemoryStream*, OStringHash > PDFAppearanceStreams; + typedef boost::unordered_map< OString, PDFAppearanceStreams, OStringHash > PDFAppearanceMap; struct PDFWidget : public PDFAnnotation { PDFWriter::WidgetType m_eType; - rtl::OString m_aName; - rtl::OUString m_aDescription; - rtl::OUString m_aText; + OString m_aName; + OUString m_aDescription; + OUString m_aText; sal_uInt16 m_nTextStyle; - rtl::OUString m_aValue; - rtl::OString m_aDAString; - rtl::OString m_aDRDict; - rtl::OString m_aMKDict; - rtl::OString m_aMKDictCAString; // i12626, added to be able to encrypt the /CA text string + OUString m_aValue; + OString m_aDAString; + OString m_aDRDict; + OString m_aMKDict; + OString m_aMKDictCAString; // i12626, added to be able to encrypt the /CA text string // since the object number is not known at the moment // of filling m_aMKDict, the string will be encrypted when emitted. // the /CA string MUST BE the last added to m_aMKDict @@ -454,14 +454,14 @@ public: sal_Int32 m_nParent; // if not 0, parent's object number std::vector<sal_Int32> m_aKids; // widget children, contains object numbers std::vector<sal_Int32> m_aKidsIndex; // widget children, contains index to m_aWidgets - rtl::OUString m_aOnValue; + OUString m_aOnValue; sal_Int32 m_nTabOrder; // lowest number gets first in tab order sal_Int32 m_nRadioGroup; sal_Int32 m_nMaxLen; bool m_bSubmit; bool m_bSubmitGet; sal_Int32 m_nDest; - std::vector<rtl::OUString> m_aListEntries; + std::vector<OUString> m_aListEntries; std::vector<sal_Int32> m_aSelectedEntries; PDFAppearanceMap m_aAppearances; PDFWidget() @@ -514,7 +514,7 @@ public: { sal_Int32 m_nObject; PDFWriter::StructElement m_eType; - rtl::OString m_aAlias; + OString m_aAlias; sal_Int32 m_nOwnElement; // index into structure vector sal_Int32 m_nParentElement; // index into structure vector sal_Int32 m_nFirstPageObject; @@ -523,8 +523,8 @@ public: std::list< PDFStructureElementKid > m_aKids; PDFStructAttributes m_aAttributes; Rectangle m_aBBox; - rtl::OUString m_aActualText; - rtl::OUString m_aAltText; + OUString m_aActualText; + OUString m_aAltText; com::sun::star::lang::Locale m_aLocale; // m_aContents contains the element's marked content sequence @@ -544,7 +544,7 @@ public: struct PDFAddStream { - rtl::OUString m_aMimeType; + OUString m_aMimeType; PDFOutputStream* m_pStream; sal_Int32 m_nStreamObject; bool m_bCompress; @@ -632,13 +632,13 @@ private: */ sal_Int32 m_nCurrentStructElement; /* structure parent tree */ - std::vector< rtl::OString > m_aStructParentTree; + std::vector< OString > m_aStructParentTree; /* emit strucure marks currently (aka. NonStructElement or not) */ bool m_bEmitStructure; bool m_bNewMCID; /* role map of struct tree root */ - boost::unordered_map< rtl::OString, rtl::OString, rtl::OStringHash > + boost::unordered_map< OString, OString, OStringHash > m_aRoleMap; /* contains all widgets used in the PDF @@ -647,7 +647,7 @@ private: /* maps radio group id to index of radio group control in m_aWidgets */ std::map< sal_Int32, sal_Int32 > m_aRadioGroupWidgets; /* boost::unordered_map for field names, used to ensure unique field names */ - boost::unordered_map< rtl::OString, sal_Int32, rtl::OStringHash > m_aFieldNameMap; + boost::unordered_map< OString, sal_Int32, OStringHash > m_aFieldNameMap; /* contains Bitmaps for gradient functions until they are written * to the file stream */ @@ -807,9 +807,9 @@ i12626 /* the numerical value of the access permissions, according to PDF spec, must be signed */ sal_Int32 m_nAccessPermissions; /* string to hold the PDF creation date */ - rtl::OString m_aCreationDateString; + OString m_aCreationDateString; /* string to hold the PDF creation date, for PDF/A metadata */ - rtl::OString m_aCreationMetaDateString; + OString m_aCreationMetaDateString; /* the buffer where the data are encrypted, dynamically allocated */ sal_uInt8 *m_pEncryptionBuffer; /* size of the buffer */ @@ -826,19 +826,19 @@ i12626 void enableStringEncryption( register sal_Int32 nObject ); // test if the encryption is active, if yes than encrypt the unicode string and add to the OStringBuffer parameter - void appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); + void appendUnicodeTextStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); - void appendLiteralStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc = RTL_TEXTENCODING_ASCII_US ); - void appendLiteralStringEncrypt( const rtl::OString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); - void appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer ); + void appendLiteralStringEncrypt( const OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc = RTL_TEXTENCODING_ASCII_US ); + void appendLiteralStringEncrypt( const OString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); + void appendLiteralStringEncrypt( OStringBuffer& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer ); /* creates fonts and subsets that will be emitted later */ void registerGlyphs( int nGlyphs, sal_GlyphId* pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const PhysicalFontFace* pFallbackFonts[] ); /* emits a text object according to the passed layout */ /* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */ - void drawVerticalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight ); - void drawHorizontalGlyphs( const std::vector<PDFGlyph>& rGlyphs, rtl::OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight ); + void drawVerticalGlyphs( const std::vector<PDFGlyph>& rGlyphs, OStringBuffer& rLine, const Point& rAlignOffset, const Matrix3& rRotScale, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight ); + void drawHorizontalGlyphs( const std::vector<PDFGlyph>& rGlyphs, OStringBuffer& rLine, const Point& rAlignOffset, double fAngle, double fXScale, double fSkew, sal_Int32 nFontHeight, sal_Int32 nPixelFontHeight ); void drawLayout( SalLayout& rLayout, const String& rText, bool bTextLines ); void drawRelief( SalLayout& rLayout, const String& rText, bool bTextLines ); void drawShadow( SalLayout& rLayout, const String& rText, bool bTextLines ); @@ -899,9 +899,9 @@ i12626 return m_nFontDictObject; } /* push resource into current (redirected) resource dict */ - void pushResource( ResourceKind eKind, const rtl::OString& rResource, sal_Int32 nObject ); + void pushResource( ResourceKind eKind, const OString& rResource, sal_Int32 nObject ); - void appendBuiltinFontsToDict( rtl::OStringBuffer& rDict ) const; + void appendBuiltinFontsToDict( OStringBuffer& rDict ) const; /* writes a the font dictionary and emits all font objects * returns object id of font directory (or 0 on error) */ @@ -911,13 +911,13 @@ i12626 */ sal_Int32 emitResources(); // appends a dest - bool appendDest( sal_Int32 nDestID, rtl::OStringBuffer& rBuffer ); + bool appendDest( sal_Int32 nDestID, OStringBuffer& rBuffer ); // write all links bool emitLinkAnnotations(); // write all notes bool emitNoteAnnotations(); // write the appearance streams of a widget - bool emitAppearances( PDFWidget& rWidget, rtl::OStringBuffer& rAnnotDict ); + bool emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDict ); // clean up radio button "On" values void ensureUniqueRadioOnValues(); // write all widgets @@ -932,7 +932,7 @@ i12626 sal_Int32 emitOutline(); // puts the attribute objects of a structure element into the returned string, // helper for emitStructure - rtl::OString emitStructureAttributes( PDFStructureElement& rEle ); + OString emitStructureAttributes( PDFStructureElement& rEle ); //--->i94258 // the maximum array elements allowed for PDF array object static const sal_uInt32 ncMaxPDFArraySize = 8191; @@ -1023,7 +1023,7 @@ i12626 methods for PDF security pad a password according algorithm 3.2, step 1 */ - static void padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW ); + static void padPassword( const OUString& i_rPassword, sal_uInt8* o_pPaddedPW ); /* algorithm 3.2: compute an encryption key */ static bool computeEncryptionKey( EncHashTransporter*, vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, @@ -1043,8 +1043,8 @@ i12626 static void computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier, const vcl::PDFWriter::PDFDocInfo& i_rDocInfo, - rtl::OString& o_rCString1, - rtl::OString& o_rCString2 + OString& o_rCString1, + OString& o_rCString2 ); static sal_Int32 computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties, sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength ); @@ -1063,15 +1063,15 @@ i12626 void writeG4Stream( BitmapReadAccess* i_pBitmap ); // color helper functions - void appendStrokingColor( const Color& rColor, rtl::OStringBuffer& rBuffer ); - void appendNonStrokingColor( const Color& rColor, rtl::OStringBuffer& rBuffer ); + void appendStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); + void appendNonStrokingColor( const Color& rColor, OStringBuffer& rBuffer ); public: PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >&, PDFWriter& ); ~PDFWriterImpl(); static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > - initEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, + initEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ); /* for OutputDevice so the reference device can have a list @@ -1217,9 +1217,9 @@ public: bool bTextLines = true ); void drawText( const Rectangle& rRect, const String& rOrigStr, sal_uInt16 nStyle, bool bTextLines = true ); void drawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bUnderlineAbove ); - void drawWaveTextLine( rtl::OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); - void drawStraightTextLine( rtl::OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); - void drawStrikeoutLine( rtl::OStringBuffer& aLine, long nWidth, FontStrikeout eStrikeout, Color aColor ); + void drawWaveTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); + void drawStraightTextLine( OStringBuffer& aLine, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); + void drawStrikeoutLine( OStringBuffer& aLine, long nWidth, FontStrikeout eStrikeout, Color aColor ); void drawStrikeoutChar( const Point& rPos, long nWidth, FontStrikeout eStrikeout ); void drawLine( const Point& rStart, const Point& rStop ); @@ -1251,7 +1251,7 @@ public: void emitComment( const char* pComment ); //--->i56629 named destinations - sal_Int32 createNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); + sal_Int32 createNamedDest( const OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); //--->i59651 //emits output intent @@ -1265,19 +1265,19 @@ public: sal_Int32 createDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); sal_Int32 registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ ); sal_Int32 setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ); - sal_Int32 setLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 setLinkURL( sal_Int32 nLinkId, const OUString& rURL ); void setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId ); // outline - sal_Int32 createOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 ); + sal_Int32 createOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 ); sal_Int32 setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent ); - sal_Int32 setOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ); + sal_Int32 setOutlineItemText( sal_Int32 nItem, const OUString& rText ); sal_Int32 setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID ); // notes void createNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 ); // structure elements - sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ); + sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias ); void endStructureElement(); bool setCurrentStructureElement( sal_Int32 nElement ); bool setStructureAttribute( enum PDFWriter::StructAttribute eAttr, enum PDFWriter::StructAttributeValue eVal ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 03401a3b99d9..1252a122e879 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -543,7 +543,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa { SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ ); sal_Bool bSkipSequence = sal_False; - rtl::OString sSeqEnd; + OString sSeqEnd; if( pA->GetComment() == "XPATHSTROKE_SEQ_BEGIN" ) { @@ -740,7 +740,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa pAction = aMtf.GetAction( i ); if ( pAction->GetType() == META_COMMENT_ACTION ) { - rtl::OString sComment( ((MetaCommentAction*)pAction)->GetComment() ); + OString sComment( ((MetaCommentAction*)pAction)->GetComment() ); if (sComment == sSeqEnd) break; } @@ -1185,8 +1185,8 @@ void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject ) 1. init the document id, used both for building the document id and for building the encryption key(s) 2. build the encryption key following algorithms described in the PDF specification */ -uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const rtl::OUString& i_rOwnerPassword, - const rtl::OUString& i_rUserPassword, +uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const OUString& i_rOwnerPassword, + const OUString& i_rUserPassword, bool b128Bit ) { @@ -1279,10 +1279,10 @@ begin i12626 methods Implements Algorithm 3.2, step 1 only */ -void PDFWriterImpl::padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW ) +void PDFWriterImpl::padPassword( const OUString& i_rPassword, sal_uInt8* o_pPaddedPW ) { // get ansi-1252 version of the password string CHECKIT ! i12626 - rtl::OString aString( rtl::OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) ); + OString aString( OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) ); //copy the string to the target sal_Int32 nToCopy = ( aString.getLength() < ENCRYPTED_PWD_SIZE ) ? aString.getLength() : ENCRYPTED_PWD_SIZE; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 920d8277ad46..12b184169036 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -160,15 +160,15 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile ) Sequence< Any > aArgs(1); PropertyValue aVal; - aVal.Name = rtl::OUString( "nodepath" ); + aVal.Name = OUString( "nodepath" ); if( i_bFile ) - aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/File" ); + aVal.Value <<= OUString( "/org.openoffice.Office.Common/Print/Option/File" ); else - aVal.Value <<= rtl::OUString( "/org.openoffice.Office.Common/Print/Option/Printer" ); + aVal.Value <<= OUString( "/org.openoffice.Office.Common/Print/Option/Printer" ); aArgs.getArray()[0] <<= aVal; xConfigAccess = Reference< XNameAccess >( xConfigProvider->createInstanceWithArguments( - rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), + OUString( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), UNO_QUERY ); if( xConfigAccess.is() ) { @@ -326,7 +326,7 @@ ImplPrnQueueList::~ImplPrnQueueList() void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) { - boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash >::iterator it = + boost::unordered_map< OUString, sal_Int32, OUStringHash >::iterator it = m_aNameToIndex.find( pData->maPrinterName ); if( it == m_aNameToIndex.end() ) { @@ -348,10 +348,10 @@ void ImplPrnQueueList::Add( SalPrinterQueueInfo* pData ) // ----------------------------------------------------------------------- -ImplPrnQueueData* ImplPrnQueueList::Get( const rtl::OUString& rPrinter ) +ImplPrnQueueData* ImplPrnQueueList::Get( const OUString& rPrinter ) { ImplPrnQueueData* pData = NULL; - boost::unordered_map<rtl::OUString,sal_Int32,rtl::OUStringHash>::iterator it = + boost::unordered_map<OUString,sal_Int32,OUStringHash>::iterator it = m_aNameToIndex.find( rPrinter ); if( it != m_aNameToIndex.end() ) pData = &m_aQueueInfos[it->second]; @@ -387,7 +387,7 @@ void ImplDeletePrnQueueList() // ----------------------------------------------------------------------- -const std::vector<rtl::OUString>& Printer::GetPrinterQueues() +const std::vector<OUString>& Printer::GetPrinterQueues() { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maGDIData.mpPrinterQueueList ) @@ -396,7 +396,7 @@ const std::vector<rtl::OUString>& Printer::GetPrinterQueues() } // ----------------------------------------------------------------------- -const QueueInfo* Printer::GetQueueInfo( const rtl::OUString& rPrinterName, bool bStatusUpdate ) +const QueueInfo* Printer::GetQueueInfo( const OUString& rPrinterName, bool bStatusUpdate ) { ImplSVData* pSVData = ImplGetSVData(); @@ -425,7 +425,7 @@ const QueueInfo* Printer::GetQueueInfo( const rtl::OUString& rPrinterName, bool // ----------------------------------------------------------------------- -rtl::OUString Printer::GetDefaultPrinterName() +OUString Printer::GetDefaultPrinterName() { static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" ); if( !pEnv || !*pEnv ) @@ -434,7 +434,7 @@ rtl::OUString Printer::GetDefaultPrinterName() return pSVData->mpDefInst->GetDefaultPrinter(); } - return rtl::OUString(); + return OUString(); } // ======================================================================= @@ -549,8 +549,8 @@ void Printer::ImplInitDisplay( const Window* pWindow ) // ----------------------------------------------------------------------- -SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const rtl::OUString& rPrinterName, - const rtl::OUString* pDriver ) +SalPrinterQueueInfo* Printer::ImplGetQueueInfo( const OUString& rPrinterName, + const OUString* pDriver ) { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maGDIData.mpPrinterQueueList ) @@ -666,7 +666,7 @@ Printer::Printer( const QueueInfo& rQueueInfo ) // ----------------------------------------------------------------------- -Printer::Printer( const rtl::OUString& rPrinterName ) +Printer::Printer( const OUString& rPrinterName ) { ImplInitData(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( rPrinterName, NULL ); @@ -934,7 +934,7 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter ) } // Neuen Printer bauen - rtl::OUString aDriver = pPrinter->GetDriverName(); + OUString aDriver = pPrinter->GetDriverName(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( pPrinter->GetName(), &aDriver ); if ( pInfo ) { @@ -1239,12 +1239,12 @@ int Printer::GetPaperInfoCount() const // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperName( Paper ePaper ) +OUString Printer::GetPaperName( Paper ePaper ) { ImplSVData* pSVData = ImplGetSVData(); if( ! pSVData->mpPaperNames ) { - pSVData->mpPaperNames = new boost::unordered_map< int, rtl::OUString >(); + pSVData->mpPaperNames = new boost::unordered_map< int, OUString >(); if( ImplGetResMgr() ) { ResStringArray aPaperStrings( VclResId( RID_STR_PAPERNAMES ) ); @@ -1265,19 +1265,19 @@ rtl::OUString Printer::GetPaperName( Paper ePaper ) } } - boost::unordered_map<int,rtl::OUString>::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); - return (it != pSVData->mpPaperNames->end()) ? it->second : rtl::OUString(); + boost::unordered_map<int,OUString>::const_iterator it = pSVData->mpPaperNames->find( (int)ePaper ); + return (it != pSVData->mpPaperNames->end()) ? it->second : OUString(); } // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperName( bool i_bPaperUser ) const +OUString Printer::GetPaperName( bool i_bPaperUser ) const { Size aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM ); Paper ePaper = ImplGetPaperFormat( aPageSize.Width(), aPageSize.Height() ); if( ePaper == PAPER_USER ) ePaper = ImplGetPaperFormat( aPageSize.Height(), aPageSize.Width() ); - return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : rtl::OUString(); + return (ePaper != PAPER_USER || i_bPaperUser ) ? GetPaperName( ePaper ) : OUString(); } // ----------------------------------------------------------------------- @@ -1356,7 +1356,7 @@ sal_uInt16 Printer::GetPaperBinCount() const // ----------------------------------------------------------------------- -rtl::OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const +OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const { if ( IsDisplayPrinter() ) return ImplGetSVEmptyStr(); @@ -1425,7 +1425,7 @@ sal_Bool Printer::EndJob() mbPrinting = sal_False; mnCurPrintPage = 0; - maJobName = rtl::OUString(); + maJobName = OUString(); mbDevOutput = sal_False; bRet = mpPrinter->EndJob(); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index c7ec909f1a1a..3d0e4b0390b5 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -130,15 +130,15 @@ class vcl::ImplPrinterControllerData public: struct ControlDependency { - rtl::OUString maDependsOnName; + OUString maDependsOnName; sal_Int32 mnDependsOnEntry; ControlDependency() : mnDependsOnEntry( -1 ) {} }; - typedef boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap; - typedef boost::unordered_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap; - typedef boost::unordered_map< rtl::OUString, Sequence< sal_Bool >, rtl::OUStringHash > ChoiceDisableMap; + typedef boost::unordered_map< OUString, size_t, OUStringHash > PropertyToIndexMap; + typedef boost::unordered_map< OUString, ControlDependency, OUStringHash > ControlDependencyMap; + typedef boost::unordered_map< OUString, Sequence< sal_Bool >, OUStringHash > ChoiceDisableMap; boost::shared_ptr<Printer> mpPrinter; Sequence< PropertyValue > maUIOptions; @@ -211,9 +211,9 @@ PrinterController::PrinterController( const boost::shared_ptr<Printer>& i_pPrint mpImplData->mpPrinter = i_pPrinter; } -static rtl::OUString queryFile( Printer* pPrinter ) +static OUString queryFile( Printer* pPrinter ) { - rtl::OUString aResult; + OUString aResult; uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker = ui::dialogs::FilePicker::createWithMode(xContext, ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION); @@ -236,7 +236,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) xFilePicker->appendFilter( OUString( "Portable Document Format" ), OUString( "*.pdf" ) ); #elif defined WNT (void)pPrinter; - xFilePicker->appendFilter( ::rtl::OUString( "*.PRN" ), ::rtl::OUString( "*.prn" ) ); + xFilePicker->appendFilter( OUString( "*.PRN" ), OUString( "*.prn" ) ); #endif // add arbitrary files xFilePicker->appendFilter(VclResId(SV_STDTEXT_ALLFILETYPES), "*.*"); @@ -248,7 +248,7 @@ static rtl::OUString queryFile( Printer* pPrinter ) if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK ) { - uno::Sequence< ::rtl::OUString > aPathSeq( xFilePicker->getFiles() ); + uno::Sequence< OUString > aPathSeq( xFilePicker->getFiles() ); INetURLObject aObj( aPathSeq[0] ); aResult = aObj.PathToFileName(); } @@ -284,7 +284,7 @@ void Printer::PrintJob( const boost::shared_ptr<PrinterController>& i_pControlle ) { sal_Bool bSynchronous = sal_False; - beans::PropertyValue* pVal = i_pController->getValue( rtl::OUString( "Wait" ) ); + beans::PropertyValue* pVal = i_pController->getValue( OUString( "Wait" ) ); if( pVal ) pVal->Value >>= bSynchronous; @@ -313,7 +313,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr ErrorBox aBox( NULL, VclResId( SV_PRINT_NOPRINTERWARNING ) ); aBox.Execute(); } - pController->setValue( rtl::OUString( "IsDirect" ), + pController->setValue( OUString( "IsDirect" ), makeAny( sal_False ) ); } @@ -323,7 +323,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr // if no specific printer is already set, create the default printer if( ! pController->getPrinter() ) { - rtl::OUString aPrinterName( i_rInitSetup.GetPrinterName() ); + OUString aPrinterName( i_rInitSetup.GetPrinterName() ); boost::shared_ptr<Printer> pPrinter( new Printer( aPrinterName ) ); pPrinter->SetJobSetup( i_rInitSetup ); pController->setPrinter( pPrinter ); @@ -350,7 +350,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr beans::PropertyValue* pPagesVal = i_pController->getValue( OUString( "Pages" ) ); if( pPagesVal ) { - rtl::OUString aPagesVal; + OUString aPagesVal; pPagesVal->Value >>= aPagesVal; if( !aPagesVal.isEmpty() ) { @@ -374,7 +374,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr { // do not overwrite PageRange if it is already set beans::PropertyValue* pRangeVal = i_pController->getValue( OUString( "PageRange" ) ); - rtl::OUString aRange; + OUString aRange; if( pRangeVal ) pRangeVal->Value >>= aRange; if( aRange.isEmpty() ) @@ -382,7 +382,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr sal_Int32 nPages = i_pController->getPageCount(); if( nPages > 0 ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.appendAscii( "1" ); if( nPages > 1 ) { @@ -405,35 +405,35 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr } // setup NUp printing from properties - sal_Int32 nRows = i_pController->getIntProperty( rtl::OUString( "NUpRows" ), 1 ); - sal_Int32 nCols = i_pController->getIntProperty( rtl::OUString( "NUpColumns" ), 1 ); + sal_Int32 nRows = i_pController->getIntProperty( OUString( "NUpRows" ), 1 ); + sal_Int32 nCols = i_pController->getIntProperty( OUString( "NUpColumns" ), 1 ); if( nRows > 1 || nCols > 1 ) { PrinterController::MultiPageSetup aMPS; aMPS.nRows = nRows > 1 ? nRows : 1; aMPS.nColumns = nCols > 1 ? nCols : 1; - sal_Int32 nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginLeft" ), aMPS.nLeftMargin ); + sal_Int32 nValue = i_pController->getIntProperty( OUString( "NUpPageMarginLeft" ), aMPS.nLeftMargin ); if( nValue >= 0 ) aMPS.nLeftMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginRight" ), aMPS.nRightMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginRight" ), aMPS.nRightMargin ); if( nValue >= 0 ) aMPS.nRightMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginTop" ), aMPS.nTopMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginTop" ), aMPS.nTopMargin ); if( nValue >= 0 ) aMPS.nTopMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin ); + nValue = i_pController->getIntProperty( OUString( "NUpPageMarginBottom" ), aMPS.nBottomMargin ); if( nValue >= 0 ) aMPS.nBottomMargin = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing ); + nValue = i_pController->getIntProperty( OUString( "NUpHorizontalSpacing" ), aMPS.nHorizontalSpacing ); if( nValue >= 0 ) aMPS.nHorizontalSpacing = nValue; - nValue = i_pController->getIntProperty( rtl::OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing ); + nValue = i_pController->getIntProperty( OUString( "NUpVerticalSpacing" ), aMPS.nVerticalSpacing ); if( nValue >= 0 ) aMPS.nVerticalSpacing = nValue; - aMPS.bDrawBorder = i_pController->getBoolProperty( rtl::OUString( "NUpDrawBorder" ), aMPS.bDrawBorder ); + aMPS.bDrawBorder = i_pController->getBoolProperty( OUString( "NUpDrawBorder" ), aMPS.bDrawBorder ); aMPS.nOrder = static_cast<PrinterController::NupOrderType>(i_pController->getIntProperty( OUString( "NUpSubPageOrder" ), aMPS.nOrder )); aMPS.aPaperSize = i_pController->getPrinter()->PixelToLogic( i_pController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ); - beans::PropertyValue* pPgSizeVal = i_pController->getValue( rtl::OUString( "NUpPaperSize" ) ); + beans::PropertyValue* pPgSizeVal = i_pController->getValue( OUString( "NUpPaperSize" ) ); awt::Size aSizeVal; if( pPgSizeVal && (pPgSizeVal->Value >>= aSizeVal) ) { @@ -473,18 +473,18 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr } if( aDlg.isPrintToFile() ) { - rtl::OUString aFile = queryFile( pController->getPrinter().get() ); + OUString aFile = queryFile( pController->getPrinter().get() ); if( aFile.isEmpty() ) { i_pController->abortJob(); return; } - pController->setValue( rtl::OUString( "LocalFileName" ), + pController->setValue( OUString( "LocalFileName" ), makeAny( aFile ) ); } else if( aDlg.isSingleJobs() ) { - pController->setValue( rtl::OUString( "PrintCollateAsSingleJobs" ), + pController->setValue( OUString( "PrintCollateAsSingleJobs" ), makeAny( sal_True ) ); } } @@ -495,8 +495,8 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr pController->pushPropertiesToPrinter(); - rtl::OUString aJobName; - beans::PropertyValue* pJobNameVal = pController->getValue( rtl::OUString( "JobName" ) ); + OUString aJobName; + beans::PropertyValue* pJobNameVal = pController->getValue( OUString( "JobName" ) ); if( pJobNameVal ) pJobNameVal->Value >>= aJobName; @@ -505,7 +505,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr pController->jobFinished( pController->getJobState() ); } -bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::PrinterController>& i_pController ) +bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::PrinterController>& i_pController ) { mnError = PRINTER_OK; @@ -547,16 +547,16 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl:: return sal_False; sal_Bool bSinglePrintJobs = sal_False; - beans::PropertyValue* pSingleValue = i_pController->getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) ); + beans::PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { pSingleValue->Value >>= bSinglePrintJobs; } - beans::PropertyValue* pFileValue = i_pController->getValue( rtl::OUString( "LocalFileName" ) ); + beans::PropertyValue* pFileValue = i_pController->getValue( OUString( "LocalFileName" ) ); if( pFileValue ) { - rtl::OUString aFile; + OUString aFile; pFileValue->Value >>= aFile; if( !aFile.isEmpty() ) { @@ -566,7 +566,7 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl:: } } - rtl::OUString* pPrintFile = NULL; + OUString* pPrintFile = NULL; if ( mbPrintFile ) pPrintFile = &maPrintFile; mpPrinterOptions->ReadFromConfig( mbPrintFile ); @@ -721,8 +721,8 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl:: if( i_pController->isShowDialogs() && ! i_pController->isDirectPrint() ) { SettingsConfigItem* pItem = SettingsConfigItem::get(); - pItem->setValue( rtl::OUString( "PrintDialog" ), - rtl::OUString( "LastPrinterUsed" ), + pItem->setValue( OUString( "PrintDialog" ), + OUString( "LastPrinterUsed" ), GetName() ); } @@ -753,8 +753,8 @@ const boost::shared_ptr<Printer>& PrinterController::getPrinter() const void PrinterController::setPrinter( const boost::shared_ptr<Printer>& i_rPrinter ) { mpImplData->mpPrinter = i_rPrinter; - setValue( rtl::OUString( "Name" ), - makeAny( rtl::OUString( i_rPrinter->GetName() ) ) ); + setValue( OUString( "Name" ), + makeAny( OUString( i_rPrinter->GetName() ) ) ); mpImplData->mnDefaultPaperBin = mpImplData->mpPrinter->GetPaperBin(); mpImplData->mnFixedPaperBin = -1; } @@ -791,7 +791,7 @@ bool PrinterController::setupPrinter( Window* i_pParent ) awt::Size aOverrideSize; aOverrideSize.Width = aNewPaperSize.Width(); aOverrideSize.Height = aNewPaperSize.Height(); - setValue( rtl::OUString( "OverridePageSize" ), + setValue( OUString( "OverridePageSize" ), makeAny( aOverrideSize ) ); mpImplData->mnFixedPaperBin = nNewPaperBin; } @@ -1286,7 +1286,7 @@ bool PrinterController::getReversePrint() const Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const { - boost::unordered_set< rtl::OUString, rtl::OUStringHash > aMergeSet; + boost::unordered_set< OUString, OUStringHash > aMergeSet; size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3; for( int i = 0; i < i_rMergeList.getLength(); i++ ) aMergeSet.insert( i_rMergeList[i].Name ); @@ -1301,26 +1301,26 @@ Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< P aResult[nCur++] = mpImplData->maUIProperties[i]; } // append IsFirstPage - if( aMergeSet.find( rtl::OUString( "IsFirstPage" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsFirstPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsFirstPage" ); + aVal.Name = OUString( "IsFirstPage" ); aVal.Value <<= mpImplData->mbFirstPage; aResult[nCur++] = aVal; } // append IsLastPage - if( aMergeSet.find( rtl::OUString( "IsLastPage" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsLastPage" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsLastPage" ); + aVal.Name = OUString( "IsLastPage" ); aVal.Value <<= mpImplData->mbLastPage; aResult[nCur++] = aVal; } // append IsPrinter - if( aMergeSet.find( rtl::OUString( "IsPrinter" ) ) == aMergeSet.end() ) + if( aMergeSet.find( OUString( "IsPrinter" ) ) == aMergeSet.end() ) { PropertyValue aVal; - aVal.Name = rtl::OUString( "IsPrinter" ); + aVal.Name = OUString( "IsPrinter" ); aVal.Value <<= sal_True; aResult[nCur++] = aVal; } @@ -1333,21 +1333,21 @@ const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const return mpImplData->maUIOptions; } -beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) +beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } -const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) const +const beans::PropertyValue* PrinterController::getValue( const OUString& i_rProperty ) const { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rProperty ); return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL; } -void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rValue ) +void PrinterController::setValue( const OUString& i_rName, const Any& i_rValue ) { beans::PropertyValue aVal; aVal.Name = i_rName; @@ -1358,7 +1358,7 @@ void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rVa void PrinterController::setValue( const beans::PropertyValue& i_rValue ) { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = mpImplData->maPropertyToIndex.find( i_rValue.Name ); if( it != mpImplData->maPropertyToIndex.end() ) mpImplData->maUIProperties[ it->second ] = i_rValue; @@ -1383,7 +1383,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ i_rOptions[i].Value >>= aOptProp; bool bIsEnabled = true; bool bHaveProperty = false; - rtl::OUString aPropName; + OUString aPropName; vcl::ImplPrinterControllerData::ControlDependency aDep; Sequence< sal_Bool > aChoicesDisabled; for( int n = 0; n < aOptProp.getLength(); n++ ) @@ -1435,10 +1435,10 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_ } } -bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) const +bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const { bool bEnabled = false; - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it = + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator prop_it = mpImplData->maPropertyToIndex.find( i_rProperty ); if( prop_it != mpImplData->maPropertyToIndex.end() ) { @@ -1489,7 +1489,7 @@ bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) co return bEnabled; } -bool PrinterController::isUIChoiceEnabled( const rtl::OUString& i_rProperty, sal_Int32 i_nValue ) const +bool PrinterController::isUIChoiceEnabled( const OUString& i_rProperty, sal_Int32 i_nValue ) const { bool bEnabled = true; ImplPrinterControllerData::ChoiceDisableMap::const_iterator it = @@ -1503,9 +1503,9 @@ bool PrinterController::isUIChoiceEnabled( const rtl::OUString& i_rProperty, sal return bEnabled; } -rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty ) const +OUString PrinterController::getDependency( const OUString& i_rProperty ) const { - rtl::OUString aDependency; + OUString aDependency; vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it = mpImplData->maControlDependencies.find( i_rProperty ); @@ -1515,9 +1515,9 @@ rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty return aDependency; } -rtl::OUString PrinterController::makeEnabled( const rtl::OUString& i_rProperty ) +OUString PrinterController::makeEnabled( const OUString& i_rProperty ) { - rtl::OUString aDependency; + OUString aDependency; vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it = mpImplData->maControlDependencies.find( i_rProperty ); @@ -1565,12 +1565,12 @@ void PrinterController::createProgressDialog() if( ! mpImplData->mpProgress ) { sal_Bool bShow = sal_True; - beans::PropertyValue* pMonitor = getValue( rtl::OUString( "MonitorVisible" ) ); + beans::PropertyValue* pMonitor = getValue( OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShow; else { - const com::sun::star::beans::PropertyValue* pVal = getValue( rtl::OUString( "IsApi" ) ); + const com::sun::star::beans::PropertyValue* pVal = getValue( OUString( "IsApi" ) ); if( pVal ) { sal_Bool bApi = sal_False; @@ -1608,17 +1608,17 @@ void PrinterController::pushPropertiesToPrinter() { sal_Int32 nCopyCount = 1; // set copycount and collate - const beans::PropertyValue* pVal = getValue( rtl::OUString( "CopyCount" ) ); + const beans::PropertyValue* pVal = getValue( OUString( "CopyCount" ) ); if( pVal ) pVal->Value >>= nCopyCount; sal_Bool bCollate = sal_False; - pVal = getValue( rtl::OUString( "Collate" ) ); + pVal = getValue( OUString( "Collate" ) ); if( pVal ) pVal->Value >>= bCollate; mpImplData->mpPrinter->SetCopyCount( static_cast<sal_uInt16>(nCopyCount), bCollate ); // duplex mode - pVal = getValue( rtl::OUString( "DuplexMode" ) ); + pVal = getValue( OUString( "DuplexMode" ) ); if( pVal ) { sal_Int16 nDuplex = view::DuplexMode::UNKNOWN; @@ -1634,17 +1634,17 @@ void PrinterController::pushPropertiesToPrinter() bool PrinterController::isShowDialogs() const { - sal_Bool bApi = getBoolProperty( rtl::OUString( "IsApi" ), sal_False ); + sal_Bool bApi = getBoolProperty( OUString( "IsApi" ), sal_False ); return ! bApi && ! Application::IsHeadlessModeEnabled(); } bool PrinterController::isDirectPrint() const { - sal_Bool bDirect = getBoolProperty( rtl::OUString( "IsDirect" ), sal_False ); + sal_Bool bDirect = getBoolProperty( OUString( "IsDirect" ), sal_False ); return bDirect == sal_True; } -sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, sal_Bool i_bFallback ) const +sal_Bool PrinterController::getBoolProperty( const OUString& i_rProperty, sal_Bool i_bFallback ) const { sal_Bool bRet = i_bFallback; const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty ); @@ -1653,7 +1653,7 @@ sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, s return bRet; } -sal_Int32 PrinterController::getIntProperty( const rtl::OUString& i_rProperty, sal_Int32 i_nFallback ) const +sal_Int32 PrinterController::getIntProperty( const OUString& i_rProperty, sal_Int32 i_nFallback ) const { sal_Int32 nRet = i_nFallback; const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty ); @@ -1665,39 +1665,39 @@ sal_Int32 PrinterController::getIntProperty( const rtl::OUString& i_rProperty, s /* * PrinterOptionsHelper **/ -Any PrinterOptionsHelper::getValue( const rtl::OUString& i_rPropertyName ) const +Any PrinterOptionsHelper::getValue( const OUString& i_rPropertyName ) const { Any aRet; - boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it = + boost::unordered_map< OUString, Any, OUStringHash >::const_iterator it = m_aPropertyMap.find( i_rPropertyName ); if( it != m_aPropertyMap.end() ) aRet = it->second; return aRet; } -sal_Bool PrinterOptionsHelper::getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault ) const +sal_Bool PrinterOptionsHelper::getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault ) const { sal_Bool bRet = sal_False; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= bRet) ? bRet : i_bDefault; } -sal_Int64 PrinterOptionsHelper::getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault ) const +sal_Int64 PrinterOptionsHelper::getIntValue( const OUString& i_rPropertyName, sal_Int64 i_nDefault ) const { sal_Int64 nRet = 0; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= nRet) ? nRet : i_nDefault; } -rtl::OUString PrinterOptionsHelper::getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault ) const +OUString PrinterOptionsHelper::getStringValue( const OUString& i_rPropertyName, const OUString& i_rDefault ) const { - rtl::OUString aRet; + OUString aRet; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= aRet) ? aRet : i_rDefault; } bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i_rNewProp, - std::set< rtl::OUString >* o_pChangeProp ) + std::set< OUString >* o_pChangeProp ) { bool bChanged = false; @@ -1710,7 +1710,7 @@ bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i for( sal_Int32 i = 0; i < nElements; i++ ) { bool bElementChanged = false; - boost::unordered_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it = + boost::unordered_map< OUString, Any, OUStringHash >::iterator it = m_aPropertyMap.find( pVals[ i ].Name ); if( it != m_aPropertyMap.end() ) { @@ -1738,16 +1738,16 @@ void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< beans::PropertyV sal_Int32 nIndex = io_rProps.getLength(); io_rProps.realloc( nIndex+1 ); PropertyValue aVal; - aVal.Name = rtl::OUString( "ExtraPrintUIOptions" ); + aVal.Name = OUString( "ExtraPrintUIOptions" ); aVal.Value = makeAny( m_aUIProperties ); io_rProps[ nIndex ] = aVal; } } -Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpIds, - const rtl::OUString& i_rType, +Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpIds, + const OUString& i_rType, const PropertyValue* i_pVal, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { @@ -1774,51 +1774,51 @@ Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< r sal_Int32 nUsed = 0; if( !i_rTitle.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "Text" ); + aCtrl[nUsed ].Name = OUString( "Text" ); aCtrl[nUsed++].Value = makeAny( i_rTitle ); } if( i_rHelpIds.getLength() ) { - aCtrl[nUsed ].Name = rtl::OUString( "HelpId" ); + aCtrl[nUsed ].Name = OUString( "HelpId" ); aCtrl[nUsed++].Value = makeAny( i_rHelpIds ); } - aCtrl[nUsed ].Name = rtl::OUString( "ControlType" ); + aCtrl[nUsed ].Name = OUString( "ControlType" ); aCtrl[nUsed++].Value = makeAny( i_rType ); - aCtrl[nUsed ].Name = rtl::OUString( "ID" ); + aCtrl[nUsed ].Name = OUString( "ID" ); aCtrl[nUsed++].Value = makeAny( i_rIDs ); if( i_pVal ) { - aCtrl[nUsed ].Name = rtl::OUString( "Property" ); + aCtrl[nUsed ].Name = OUString( "Property" ); aCtrl[nUsed++].Value = makeAny( *i_pVal ); } if( !i_rControlOptions.maDependsOnName.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "DependsOnName" ); + aCtrl[nUsed ].Name = OUString( "DependsOnName" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.maDependsOnName ); if( i_rControlOptions.mnDependsOnEntry != -1 ) { - aCtrl[nUsed ].Name = rtl::OUString( "DependsOnEntry" ); + aCtrl[nUsed ].Name = OUString( "DependsOnEntry" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mnDependsOnEntry ); } if( i_rControlOptions.mbAttachToDependency ) { - aCtrl[nUsed ].Name = rtl::OUString( "AttachToDependency" ); + aCtrl[nUsed ].Name = OUString( "AttachToDependency" ); aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mbAttachToDependency ); } } if( !i_rControlOptions.maGroupHint.isEmpty() ) { - aCtrl[nUsed ].Name = rtl::OUString( "GroupingHint" ); + aCtrl[nUsed ].Name = OUString( "GroupingHint" ); aCtrl[nUsed++].Value <<= i_rControlOptions.maGroupHint; } if( i_rControlOptions.mbInternalOnly ) { - aCtrl[nUsed ].Name = rtl::OUString( "InternalUIOnly" ); + aCtrl[nUsed ].Name = OUString( "InternalUIOnly" ); aCtrl[nUsed++].Value <<= sal_True; } if( ! i_rControlOptions.mbEnabled ) { - aCtrl[nUsed ].Name = rtl::OUString( "Enabled" ); + aCtrl[nUsed ].Name = OUString( "Enabled" ); aCtrl[nUsed++].Value <<= sal_False; } @@ -1831,45 +1831,45 @@ Any PrinterOptionsHelper::setUIControlOpt(const com::sun::star::uno::Sequence< r return makeAny( aCtrl ); } -Any PrinterOptionsHelper::setGroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId) +Any PrinterOptionsHelper::setGroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); *aHelpId.getArray() = i_rHelpId; } - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Group"); } -Any PrinterOptionsHelper::setSubgroupControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, +Any PrinterOptionsHelper::setSubgroupControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); *aHelpId.getArray() = i_rHelpId; } - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Subgroup", NULL, i_rControlOptions); } -Any PrinterOptionsHelper::setBoolControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, +Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Bool i_bValue, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1878,16 +1878,16 @@ Any PrinterOptionsHelper::setBoolControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_bValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Bool", &aVal, i_rControlOptions); } -Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const Sequence< rtl::OUString >& i_rChoices, +Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< OUString >& i_rIDs, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const Sequence< sal_Bool >& i_rDisabledChoices, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) @@ -1895,11 +1895,11 @@ Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::S UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = rtl::OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = rtl::OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } @@ -1909,11 +1909,11 @@ Any PrinterOptionsHelper::setChoiceRadiosControlOpt(const com::sun::star::uno::S return setUIControlOpt(i_rIDs, i_rTitle, i_rHelpId, "Radio", &aVal, aOpt); } -Any PrinterOptionsHelper::setChoiceListControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const Sequence< rtl::OUString >& i_rHelpId, - const rtl::OUString& i_rProperty, - const Sequence< rtl::OUString >& i_rChoices, +Any PrinterOptionsHelper::setChoiceListControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const Sequence< OUString >& i_rHelpId, + const OUString& i_rProperty, + const Sequence< OUString >& i_rChoices, sal_Int32 i_nValue, const Sequence< sal_Bool >& i_rDisabledChoices, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) @@ -1921,26 +1921,26 @@ Any PrinterOptionsHelper::setChoiceListControlOpt(const rtl::OUString& i_rID, UIControlOptions aOpt( i_rControlOptions ); sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 1 + (i_rDisabledChoices.getLength() ? 1 : 0) ); - aOpt.maAddProps[nUsed].Name = rtl::OUString( "Choices" ); + aOpt.maAddProps[nUsed].Name = OUString( "Choices" ); aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices ); if( i_rDisabledChoices.getLength() ) { - aOpt.maAddProps[nUsed+1].Name = rtl::OUString( "ChoicesDisabled" ); + aOpt.maAddProps[nUsed+1].Name = OUString( "ChoicesDisabled" ); aOpt.maAddProps[nUsed+1].Value = makeAny( i_rDisabledChoices ); } PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_nValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, i_rHelpId, "List", &aVal, aOpt); } -Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, +Any PrinterOptionsHelper::setRangeControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, sal_Int32 i_nValue, sal_Int32 i_nMinValue, sal_Int32 i_nMaxValue, @@ -1951,13 +1951,13 @@ Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, { sal_Int32 nUsed = aOpt.maAddProps.getLength(); aOpt.maAddProps.realloc( nUsed + 2 ); - aOpt.maAddProps[nUsed ].Name = rtl::OUString( "MinValue" ); + aOpt.maAddProps[nUsed ].Name = OUString( "MinValue" ); aOpt.maAddProps[nUsed++].Value = makeAny( i_nMinValue ); - aOpt.maAddProps[nUsed ].Name = rtl::OUString( "MaxValue" ); + aOpt.maAddProps[nUsed ].Name = OUString( "MaxValue" ); aOpt.maAddProps[nUsed++].Value = makeAny( i_nMaxValue ); } - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1966,19 +1966,19 @@ Any PrinterOptionsHelper::setRangeControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_nValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Range", &aVal, aOpt); } -Any PrinterOptionsHelper::setEditControlOpt(const rtl::OUString& i_rID, - const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpId, - const rtl::OUString& i_rProperty, - const rtl::OUString& i_rValue, +Any PrinterOptionsHelper::setEditControlOpt(const OUString& i_rID, + const OUString& i_rTitle, + const OUString& i_rHelpId, + const OUString& i_rProperty, + const OUString& i_rValue, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { - Sequence< rtl::OUString > aHelpId; + Sequence< OUString > aHelpId; if( !i_rHelpId.isEmpty() ) { aHelpId.realloc( 1 ); @@ -1987,7 +1987,7 @@ Any PrinterOptionsHelper::setEditControlOpt(const rtl::OUString& i_rID, PropertyValue aVal; aVal.Name = i_rProperty; aVal.Value = makeAny( i_rValue ); - Sequence< rtl::OUString > aIds(1); + Sequence< OUString > aIds(1); aIds[0] = i_rID; return setUIControlOpt(aIds, i_rTitle, aHelpId, "Edit", &aVal, i_rControlOptions); } diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 5b6ec445da52..01137b635ae2 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -752,7 +752,7 @@ bool SalGraphics::DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, return drawAlphaRect( nX, nY, nWidth, nHeight, nTransparency ); } -bool SalGraphics::filterText( const rtl::OUString&, rtl::OUString&, sal_Int32, sal_Int32&, sal_Int32&, sal_Int32& ) +bool SalGraphics::filterText( const OUString&, OUString&, sal_Int32, sal_Int32&, sal_Int32&, sal_Int32& ) { return false; } diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index dfbb40a4b792..13789539a4c3 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -20,7 +20,6 @@ #include <salgdi.hxx> -using ::rtl::OUString; /**************************************************************** * Placeholder for no native widgets diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 1db7c37e088a..e175edafcbb7 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -47,7 +47,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( // create replacement graphic from maSequence // create XPrimitive2DRenderer uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); + const OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); try { @@ -124,7 +124,7 @@ void SvgData::ensureSequenceAndRange() { // create SVG interpreter uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.SvgTools"); + const OUString aServiceName("com.sun.star.graphic.SvgTools"); try { @@ -170,7 +170,7 @@ void SvgData::ensureSequenceAndRange() ////////////////////////////////////////////////////////////////////////////// -SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const rtl::OUString& rPath) +SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), mnSvgDataArrayLength(nSvgDataArrayLength), maPath(rPath), diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 1e79f32731a9..a081188181ba 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -203,9 +203,9 @@ namespace vcl #if OSL_DEBUG_LEVEL > 1 if ( _pDXAry ) { - ::rtl::OStringBuffer aTrace; + OStringBuffer aTrace; aTrace.append( "ReferenceDeviceTextLayout::GetTextArray( " ); - aTrace.append( ::rtl::OUStringToOString( _rText, RTL_TEXTENCODING_UTF8 ) ); + aTrace.append( OUStringToOString( _rText, RTL_TEXTENCODING_UTF8 ) ); aTrace.append( " ): " ); aTrace.append( nTextWidth ); aTrace.append( " = ( " ); |