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 /sdext | |
| 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 'sdext')
109 files changed, 729 insertions, 770 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 2a3421758bc3..50592c52737c 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -162,9 +162,9 @@ ConfigurationAccess::~ConfigurationAccess() { } -rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) +OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) { - rtl::OUString aPath; + OUString aPath; try { static const OUString sProtocol( "vnd.sun.star.expand:" ); @@ -173,7 +173,7 @@ rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) xSet->getByName( TKGet( eToken ) ) >>= aPath; if ( aPath.match( sProtocol, 0 ) ) { - rtl::OUString aTmp( aPath.copy( 20 ) ); + OUString aTmp( aPath.copy( 20 ) ); Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxMSF); aPath = xExpander->expandMacros( aTmp ); } @@ -184,10 +184,10 @@ rtl::OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) return aPath; } -rtl::OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const +OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const { - std::map< PPPOptimizerTokenEnum, rtl::OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) ); - return aIter != maStrings.end() ? ((*aIter).second) : rtl::OUString(); + std::map< PPPOptimizerTokenEnum, OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) ); + return aIter != maStrings.end() ? ((*aIter).second) : OUString(); } void ConfigurationAccess::LoadStrings() @@ -364,9 +364,9 @@ Reference< XInterface > ConfigurationAccess::GetConfigurationNode( catch (const Exception& rException) { OSL_TRACE ("caught exception while getting configuration node %s: %s", - ::rtl::OUStringToOString(sPathToNode, + OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); (void)rException; } @@ -501,7 +501,7 @@ Sequence< PropertyValue > ConfigurationAccess::GetConfigurationSequence() return aRet; } -std::vector< OptimizerSettings >::iterator ConfigurationAccess::GetOptimizerSettingsByName( const rtl::OUString& rName ) +std::vector< OptimizerSettings >::iterator ConfigurationAccess::GetOptimizerSettingsByName( const OUString& rName ) { std::vector< OptimizerSettings >::iterator aIter( maSettings.begin() + 1 ); const std::vector< OptimizerSettings >::const_iterator aEnd( maSettings.end() ); diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index bfe019be09dc..85af8b94a832 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -38,7 +38,7 @@ struct OptimizerSettings { - rtl::OUString maName; + OUString maName; sal_Bool mbJPEGCompression; sal_Int32 mnJPEGQuality; sal_Bool mbRemoveCropArea; @@ -49,10 +49,10 @@ struct OptimizerSettings sal_Bool mbDeleteUnusedMasterPages; sal_Bool mbDeleteHiddenSlides; sal_Bool mbDeleteNotesPages; - rtl::OUString maCustomShowName; + OUString maCustomShowName; sal_Bool mbSaveAs; - rtl::OUString maSaveAsURL; - rtl::OUString maFilterName; + OUString maSaveAsURL; + OUString maFilterName; sal_Bool mbOpenNewDocument; sal_Int64 mnEstimatedFileSize; @@ -87,8 +87,8 @@ class ConfigurationAccess ~ConfigurationAccess(); void SaveConfiguration(); - rtl::OUString getPath( const PPPOptimizerTokenEnum ); - rtl::OUString getString( const PPPOptimizerTokenEnum ) const; + OUString getPath( const PPPOptimizerTokenEnum ); + OUString getString( const PPPOptimizerTokenEnum ) const; // access to current OptimizerSettings (stored in the first entry of maSettings) com::sun::star::uno::Any GetConfigProperty( const PPPOptimizerTokenEnum ) const; @@ -102,7 +102,7 @@ class ConfigurationAccess // getting access to the OptimizerSettings list std::vector< OptimizerSettings >& GetOptimizerSettings() { return maSettings; }; - std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const rtl::OUString& rName ); + std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const OUString& rName ); private : @@ -113,7 +113,7 @@ class ConfigurationAccess return s1 < s2; } }; - std::map < PPPOptimizerTokenEnum, rtl::OUString, Compare > maStrings; + std::map < PPPOptimizerTokenEnum, OUString, Compare > maStrings; std::vector< OptimizerSettings > maSettings; std::vector< OptimizerSettings > maInitialSettings; @@ -124,7 +124,7 @@ class ConfigurationAccess void LoadConfiguration(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > OpenConfiguration( bool bReadOnly ); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetConfigurationNode( - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const rtl::OUString& sPathToNode ); + const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const OUString& sPathToNode ); }; #endif // _CONFIGURATION_ACCESS_HXX_ diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 3e30d216adc4..93f2cb76a702 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -92,7 +92,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext { case TK_DocumentService : { - rtl::OUString sDocumentService; + OUString sDocumentService; rProperty.Value >>= sDocumentService; if ( sDocumentService == "com.sun.star.presentation.PresentationDocument" ) bImpressFilter = sal_True; @@ -158,20 +158,20 @@ sal_Int16 FileOpenDialog::execute() { return mxFilePicker->execute(); } -void FileOpenDialog::setDefaultName( const rtl::OUString& rDefaultName ) +void FileOpenDialog::setDefaultName( const OUString& rDefaultName ) { mxFilePicker->setDefaultName( rDefaultName ); } -::rtl::OUString FileOpenDialog::getURL() const +OUString FileOpenDialog::getURL() const { Sequence< OUString > aFileSeq( mxFilePicker->getFiles() ); return aFileSeq.getLength() ? aFileSeq[ 0 ] : OUString(); }; -::rtl::OUString FileOpenDialog::getFilterName() const +OUString FileOpenDialog::getFilterName() const { - rtl::OUString aFilterName; + OUString aFilterName; Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW ); - rtl::OUString aUIName( xFilterManager->getCurrentFilter() ); + OUString aUIName( xFilterManager->getCurrentFilter() ); for( std::vector< FilterEntry >::const_iterator aIter(aFilterEntryList.begin()), aEnd(aFilterEntryList.end()); aIter != aEnd; ++aIter ) { if ( aIter->maUIName == aUIName ) diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx index 5611d29857eb..d8a735c66fab 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.hxx @@ -32,12 +32,12 @@ class FileOpenDialog // a list of filters that are provided within the SaveDialog struct FilterEntry { - rtl::OUString maName; - rtl::OUString maType; - rtl::OUString maUIName; - rtl::OUString maFilter; + OUString maName; + OUString maType; + OUString maUIName; + OUString maFilter; sal_Int32 maFlags; - com::sun::star::uno::Sequence< rtl::OUString > maExtensions; + com::sun::star::uno::Sequence< OUString > maExtensions; FilterEntry() : maFlags( 0 ) {} @@ -52,11 +52,11 @@ public : sal_Int16 execute(); - void setDefaultName( const rtl::OUString& ); -// void setDefaultDirectory( const rtl::OUString& ); + void setDefaultName( const OUString& ); +// void setDefaultDirectory( const OUString& ); - ::rtl::OUString getURL() const; - ::rtl::OUString getFilterName() const; + OUString getURL() const; + OUString getFilterName() const; }; #endif // _FILEOPEN_DIALOG_HXX_ diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 10558e2933e1..13fcff570d09 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -62,8 +62,8 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser ) { - const rtl::OUString aGraphicURL( rUser.maGraphicURL ); - const rtl::OUString sPackageURL( "vnd.sun.star.GraphicObject:" ); + const OUString aGraphicURL( rUser.maGraphicURL ); + const OUString sPackageURL( "vnd.sun.star.GraphicObject:" ); if ( rGraphicSettings.mbEmbedLinkedGraphics || (aGraphicURL.isEmpty() || aGraphicURL.match( sPackageURL, 0 ) ) ) { diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx index d8bff403eaaf..f0fca3cf9866 100644 --- a/sdext/source/minimizer/graphiccollector.hxx +++ b/sdext/source/minimizer/graphiccollector.hxx @@ -57,8 +57,8 @@ class GraphicCollector com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPagePropertySet; - rtl::OUString maGraphicURL; - rtl::OUString maGraphicStreamURL; + OUString maGraphicURL; + OUString maGraphicStreamURL; com::sun::star::text::GraphicCrop maGraphicCropLogic; com::sun::star::awt::Size maLogicalSize; sal_Bool mbFillBitmap; diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 4a496d57e6f2..d3350651310b 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -358,7 +358,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >& } else // this is a metafile { - rtl::OUString aDestMimeType( aSourceMimeType ); + OUString aDestMimeType( aSourceMimeType ); Reference< XStream > xTempFile( io::TempFile::create(rxMSF), UNO_QUERY_THROW ); Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() ); Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create( rxMSF ) ); @@ -424,7 +424,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont { if ( aGraphicUserIter->mxShape.is() ) { - rtl::OUString sEmptyGraphicURL; + OUString sEmptyGraphicURL; Reference< XPropertySet > xShapePropertySet( aGraphicUserIter->mxShape, UNO_QUERY_THROW ); xShapePropertySet->setPropertyValue( TKGet( TK_GraphicURL ), Any( sEmptyGraphicURL ) ); xShapePropertySet->setPropertyValue( TKGet( TK_Graphic ), Any( xNewGraphic ) ); diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx index 6e60970d2769..a07952d73a94 100644 --- a/sdext/source/minimizer/impoptimizer.hxx +++ b/sdext/source/minimizer/impoptimizer.hxx @@ -49,12 +49,12 @@ private: sal_Bool mbEmbedLinkedGraphics; sal_Bool mbOLEOptimization; sal_Int32 mnOLEOptimizationType; - rtl::OUString maCustomShowName; + OUString maCustomShowName; sal_Bool mbDeleteUnusedMasterPages; sal_Bool mbDeleteHiddenSlides; sal_Bool mbDeleteNotesPages; - rtl::OUString maSaveAsURL; - rtl::OUString maFilterName; + OUString maSaveAsURL; + OUString maFilterName; sal_Bool mbOpenNewDocument; com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog; diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 4e53ec01a932..92accb20a60b 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::container; // ----------------------------------------------------------------------------- -rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl::OUString& rControlName, const OUString& rLabel, +OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex ) { OUString pNames[] = { @@ -83,14 +83,14 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl: sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertFixedText( rControlName, aNames, aValues ); return rControlName; } -rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rURL, +OUString InsertImage( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rURL, sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) { OUString pNames[] = { @@ -112,14 +112,14 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString Any( nWidth ) }; sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertImage( rControlName, aNames, aValues ); return rControlName; } -rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString& rControlName, +OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -145,7 +145,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XCheckBox > xCheckBox( rInformationDialog.insertCheckBox( rControlName, aNames, aValues ) ); @@ -154,7 +154,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr return rControlName; } -rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, +OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, PPPOptimizerTokenEnum nResID ) { OUString pNames[] = { @@ -182,7 +182,7 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rInformationDialog.insertButton( rControlName, xActionListener, aNames, aValues ); @@ -195,7 +195,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal ) double fVal( static_cast<double>( rVal ) ); fVal /= ( 1 << 20 ); fVal += 0.05; - rtl::OUStringBuffer aVal( OUString::valueOf( fVal ) ); + OUStringBuffer aVal( OUString::valueOf( fVal ) ); sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) ); if ( nX > 0 ) aVal.setLength( nX + 2 ); @@ -204,7 +204,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal ) OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL ) { - rtl::OUString sURL; + OUString sURL; try { mxTempFile = Reference< XStream >( io::TempFile::create(mxMSF), UNO_QUERY_THROW ); @@ -263,7 +263,7 @@ void InformationDialog::InitDialog() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); @@ -290,20 +290,20 @@ void InformationDialog::InitDialog() nDest = mnApproxSize; } - rtl::OUString aTitle; + OUString aTitle; if ( !maSaveAsURL.isEmpty() ) { Reference< XURLTransformer > xURLTransformer( URLTransformer::create(mxMSF) ); util::URL aURL, aPresentationURL; aURL.Complete = maSaveAsURL; - xURLTransformer->parseSmart( aURL, rtl::OUString() ); + xURLTransformer->parseSmart( aURL, OUString() ); const OUString sFileProtocol( "file:///" ); aPresentationURL.Complete = sFileProtocol.concat( aURL.Name ); aTitle = xURLTransformer->getPresentation( aPresentationURL, sal_False ); if ( aTitle.match( sFileProtocol, 0 ) ) - aTitle = aTitle.replaceAt( 0, sFileProtocol.getLength(), rtl::OUString() ); + aTitle = aTitle.replaceAt( 0, sFileProtocol.getLength(), OUString() ); } OUString aInfoString( getString( eInfoString ) ); @@ -325,11 +325,11 @@ void InformationDialog::InitDialog() aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle ); com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; - InsertImage( *this, rtl::OUString("aboutimage"), ImpGetStandardImage( rtl::OUString("private:standardimage/query") ), 5, 5, 25, 25 ); - InsertFixedText( *this, rtl::OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); + InsertImage( *this, OUString("aboutimage"), ImpGetStandardImage( OUString("private:standardimage/query") ), 5, 5, 25, 25 ); + InsertFixedText( *this, OUString("fixedtext"), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 ); if ( !maSaveAsURL.isEmpty() ) InsertCheckBox( *this, TKGet( TK_OpenNewDocument ), xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 ); - InsertButton( *this, rtl::OUString("button"), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); + InsertButton( *this, OUString("button"), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK ); sal_Bool bOpenNewDocument = mrbOpenNewDocument; setControlProperty( TKGet( TK_OpenNewDocument ), TKGet( TK_State ), Any( (sal_Int16)bOpenNewDocument ) ); @@ -337,7 +337,7 @@ void InformationDialog::InitDialog() // ----------------------------------------------------------------------------- -InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame, const rtl::OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) : +InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMSF, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) : UnoDialog( rxMSF, rxFrame ), ConfigurationAccess( rxMSF, NULL ), mxMSF( rxMSF ), diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index b3331b4a46a0..8486de362c0a 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -47,7 +47,7 @@ class InformationDialog : public UnoDialog, public ConfigurationAccess public : InformationDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, - com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, const rtl::OUString& rSaveAsURL, + com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest ); ~InformationDialog(); @@ -61,14 +61,14 @@ private : com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener; - rtl::OUString ImpGetStandardImage( const rtl::OUString& rPrivateURL ); + OUString ImpGetStandardImage( const OUString& rPrivateURL ); void InitDialog(); sal_Int64 mnSourceSize; sal_Int64 mnDestSize; sal_Int64 mnApproxSize; sal_Bool& mrbOpenNewDocument; - const rtl::OUString& maSaveAsURL; + const OUString& maSaveAsURL; public : diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 9dcaf2990695..d6c73488725d 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -72,7 +72,7 @@ void OptimizerDialog::InitDialog() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); @@ -102,7 +102,7 @@ void OptimizerDialog::InitRoadmap() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); mxRoadmapControlModel = insertControlModel( OUString( "com.sun.star.awt.UnoControlRoadmapModel" ), @@ -117,9 +117,9 @@ void OptimizerDialog::InitRoadmap() InsertRoadmapItem( 3, sal_True, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION ); InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY ); - rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) ); - rtl::OUString sBitmap( "/minimizepresi_80.png" ); - rtl::OUString sURL( sBitmapPath += sBitmap ); + OUString sBitmapPath( getPath( TK_BitmapPath ) ); + OUString sBitmap( "/minimizepresi_80.png" ); + OUString sURL( sBitmapPath += sBitmap ); xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any( sURL ) ); xPropertySet->setPropertyValue( TKGet( TK_Activated ), Any( (sal_Bool)sal_True ) ); @@ -134,7 +134,7 @@ void OptimizerDialog::InitRoadmap() // ----------------------------------------------------------------------------- -void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const rtl::OUString& rLabel, const sal_Int32 nItemID ) +void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID ) { try { @@ -308,7 +308,7 @@ void OptimizerDialog::UpdateControlStates( sal_Int16 nPage ) // ----------------------------------------------------------------------------- -rtl::OUString OptimizerDialog::GetSelectedString( const PPPOptimizerTokenEnum eToken ) +OUString OptimizerDialog::GetSelectedString( const PPPOptimizerTokenEnum eToken ) { OUString aSelectedItem; Sequence< sal_Int16 > sSelectedItems; @@ -337,7 +337,7 @@ void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::su const Any* pVal( maStats.GetStatusValue( TK_Status ) ); if ( pVal ) { - rtl::OUString sStatus; + OUString sStatus; if ( *pVal >>= sStatus ) { setControlProperty( TKGet( TK_FixedText1Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) ); @@ -521,14 +521,14 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.getControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet( TK_State ) ) >>= nInt16; if ( nInt16 ) { - rtl::OUString aSaveAsURL; + OUString aSaveAsURL; FileOpenDialog aFileOpenDialog( ((UnoDialog&)mrOptimizerDialog).mxMSF ); // generating default file name Reference< XStorable > xStorable( mrOptimizerDialog.mxController->getModel(), UNO_QUERY ); if ( xStorable.is() && xStorable->hasLocation() ) { - rtl::OUString aLocation( xStorable->getLocation() ); + OUString aLocation( xStorable->getLocation() ); if ( !aLocation.isEmpty() ) { sal_Int32 nIndex = aLocation.lastIndexOf( '/', aLocation.getLength() - 1 ); @@ -685,7 +685,7 @@ void TextListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::Ev void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ ) throw ( com::sun::star::uno::RuntimeException ) { - rtl::OUString aString; + OUString aString; Any aAny = mrOptimizerDialog.getControlProperty( TKGet( TK_ComboBox0Pg1 ), TKGet( TK_Text ) ); if ( aAny >>= aString ) { diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index dab9a88613db..3bd5080ab6ca 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -87,7 +87,7 @@ private : com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener > mxSpinListenerFormattedField0Pg1; com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher; - std::vector< std::vector< rtl::OUString > > maControlPages; + std::vector< std::vector< OUString > > maControlPages; void InitDialog(); void InitRoadmap(); @@ -105,7 +105,7 @@ private : void ActivatePage( sal_Int16 nStep ); void DeactivatePage( sal_Int16 nStep ); - void InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const rtl::OUString& rLabel, const sal_Int32 nItemID ); + void InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID ); public : @@ -122,7 +122,7 @@ public : void SwitchPage( sal_Int16 nNewStep ); void UpdateControlStates( sal_Int16 nStep = -1 ); - rtl::OUString GetSelectedString( PPPOptimizerTokenEnum eListBox ); + OUString GetSelectedString( PPPOptimizerTokenEnum eListBox ); com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; }; com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; }; const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxMSF; }; diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 3eb04b098034..0c5445940103 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star::presentation; // ----------------------------------------------------------------------------- -void SetBold( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControl ) +void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl ) { FontDescriptor aFontDescriptor; if ( rOptimizerDialog.getControlProperty( rControl, TKGet( TK_FontDescriptor ) ) >>= aFontDescriptor ) @@ -60,7 +60,7 @@ void SetBold( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControl ) // ----------------------------------------------------------------------------- -rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation, +OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation, sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) { OUString pNames[] = { @@ -81,7 +81,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertControlModel( OUString( "com.sun.star.awt.UnoControlFixedLineModel" ), @@ -91,7 +91,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString // ----------------------------------------------------------------------------- -rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, +OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, sal_Bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType ) { OUString pNames[] = { @@ -119,7 +119,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertButton( rControlName, xActionListener, aNames, aValues ); @@ -128,7 +128,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r // ----------------------------------------------------------------------------- -rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControlName, const OUString& rLabel, +OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Bool bBold, sal_Int16 nTabIndex ) { OUString pNames[] = { @@ -153,7 +153,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); rOptimizerDialog.insertFixedText( rControlName, aNames, aValues ); @@ -164,7 +164,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS // ----------------------------------------------------------------------------- -rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -190,7 +190,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XCheckBox > xCheckBox( rOptimizerDialog.insertCheckBox( rControlName, aNames, aValues ) ); @@ -201,7 +201,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& // ----------------------------------------------------------------------------- -rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XTextListener > xTextListener, const Reference< XSpinListener > xSpinListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex ) { @@ -233,7 +233,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertFormattedField( rControlName, aNames, aValues ), UNO_QUERY_THROW ); @@ -249,7 +249,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS // ----------------------------------------------------------------------------- -rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XTextListener > xTextListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -279,7 +279,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertComboBox( rControlName, aNames, aValues ), UNO_QUERY_THROW ); @@ -290,7 +290,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& // ----------------------------------------------------------------------------- -rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::OUString& rControlName, const Reference< XItemListener > xItemListener, +OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex ) { OUString pNames[] = { @@ -315,7 +315,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XRadioButton > xRadioButton( rOptimizerDialog.insertRadioButton( rControlName, aNames, aValues ) ); @@ -326,7 +326,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O // ----------------------------------------------------------------------------- -rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, +OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XActionListener > xActionListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) { @@ -358,7 +358,7 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XListBox > xListBox( rOptimizerDialog.insertListBox( rControlName, aNames, aValues ) ); @@ -424,7 +424,7 @@ void OptimizerDialog::UpdateControlStatesPage0() void OptimizerDialog::InitPage0() { Sequence< OUString > aItemList; - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg0 ), getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText1Pg0 ), getString( STR_INTRODUCTION_T ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 100, sal_True, sal_False, mnTabIndex++ ) ); aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator1Pg0 ), 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ) ); @@ -459,7 +459,7 @@ void OptimizerDialog::InitPage1() if ( aXCont.is() ) aCustomShowList = aXCont->getElementNames(); } - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg3 ), getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox0Pg3 ), mxItemListener, getString( STR_DELETE_MASTER_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) ); aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox2Pg3 ), mxItemListener, getString( STR_DELETE_HIDDEN_SLIDES ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, mnTabIndex++ ) ); @@ -526,7 +526,7 @@ void OptimizerDialog::InitPage2() aResolutionItemList[ 2 ] = getString( STR_IMAGE_RESOLUTION_2 ).getToken( 1, ';', nI2 ); aResolutionItemList[ 3 ] = getString( STR_IMAGE_RESOLUTION_3 ).getToken( 1, ';', nI3 ); - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg1 ), getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton0Pg1 ), mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) ); aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton1Pg1 ), mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, 8, sal_False, mnTabIndex++ ) ); @@ -572,7 +572,7 @@ void OptimizerDialog::InitPage3() } } - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg2 ), getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); aControlList.push_back( InsertCheckBox( *this, TKGet( TK_CheckBox0Pg2 ), mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, mnTabIndex++ ) ); aControlList.push_back( InsertRadioButton( *this, TKGet( TK_RadioButton0Pg2 ), mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, 8, sal_False, mnTabIndex++ ) ); @@ -590,7 +590,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator = double fVal( static_cast<double>( rVal ) ); fVal /= ( 1 << 20 ); fVal += 0.05; - rtl::OUStringBuffer aVal( OUString::valueOf( fVal ) ); + OUStringBuffer aVal( OUString::valueOf( fVal ) ); sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) ); if ( nX >= 0 ) { @@ -649,7 +649,7 @@ void OptimizerDialog::UpdateControlStatesPage4() // taking care of deleted slides sal_Int32 nDeletedSlides = 0; - rtl::OUString aCustomShowName; + OUString aCustomShowName; if ( getControlProperty( TKGet( TK_CheckBox3Pg3 ), TKGet( TK_State ) ) >>= nInt16 ) { if ( nInt16 ) @@ -858,7 +858,7 @@ void OptimizerDialog::InitPage4() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); - Sequence< rtl::OUString > aNames( pNames, nCount ); + Sequence< OUString > aNames( pNames, nCount ); Sequence< Any > aValues( pValues, nCount ); Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( "com.sun.star.awt.UnoControlProgressBarModel" ), @@ -866,7 +866,7 @@ void OptimizerDialog::InitPage4() } Reference< XTextListener > xTextListener; Sequence< OUString > aItemList; - std::vector< rtl::OUString > aControlList; + std::vector< OUString > aControlList; aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg4 ), getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) ); // aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) ); @@ -920,29 +920,29 @@ void OptimizerDialog::InitPage4() // ----------------------------------------------------------------------------- void OptimizerDialog::EnablePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setControlProperty( *aBeg++, TKGet( TK_Enabled ), Any( sal_True ) ); } void OptimizerDialog::DisablePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setControlProperty( *aBeg++, TKGet( TK_Enabled ), Any( sal_False ) ); } void OptimizerDialog::ActivatePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setVisible( *aBeg++, sal_True ); } void OptimizerDialog::DeactivatePage( sal_Int16 nStep ) { - std::vector< rtl::OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); - std::vector< rtl::OUString >::iterator aEnd( maControlPages[ nStep ].end() ); + std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() ); + std::vector< OUString >::iterator aEnd( maControlPages[ nStep ].end() ); while( aBeg != aEnd ) setVisible( *aBeg++, sal_False ); } diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx index 113f3baaf8bb..0e592eab4c6a 100644 --- a/sdext/source/minimizer/pagecollector.cxx +++ b/sdext/source/minimizer/pagecollector.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; -void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const rtl::OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rUsedPageList ) +void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rUsedPageList ) { try { @@ -79,7 +79,7 @@ void PageCollector::CollectCustomShowPages( const com::sun::star::uno::Reference } } -void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const rtl::OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rNonUsedPageList ) +void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, const OUString& rCustomShowName, std::vector< Reference< XDrawPage > >& rNonUsedPageList ) { try { diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx index fe7548680ee6..c934444a6d9b 100644 --- a/sdext/source/minimizer/pagecollector.hxx +++ b/sdext/source/minimizer/pagecollector.hxx @@ -33,8 +33,8 @@ class PageCollector com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage; bool bUsed; }; - static void CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const rtl::OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); - static void CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const rtl::OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); + static void CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); + static void CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& ); static void CollectMasterPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, std::vector< MasterPageEntity >& ); }; diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 4d58933248be..9e4f04ff0bc1 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -91,7 +91,7 @@ Sequence< OUString > SAL_CALL PPPOptimizer::getSupportedServiceNames() // ----------------------------------------------------------------------------- Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch( - const URL& aURL, const ::rtl::OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) { Reference < XDispatch > xRet; if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 ) @@ -162,7 +162,7 @@ void SAL_CALL PPPOptimizer::removeStatusListener( const Reference< XStatusListen // ----------------------------------------------------------------------------- // returning filesize, on error zero is returned -sal_Int64 PPPOptimizer::GetFileSize( const rtl::OUString& rURL ) +sal_Int64 PPPOptimizer::GetFileSize( const OUString& rURL ) { sal_Int64 nFileSize = 0; osl::DirectoryItem aItem; diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index cf4b0be17f58..f01f4dc31c52 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -52,18 +52,18 @@ public: throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( - const com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) + const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( @@ -81,11 +81,11 @@ public: const com::sun::star::util::URL& aURL ) throw( com::sun::star::uno::RuntimeException ); - static sal_Int64 GetFileSize( const rtl::OUString& rURL ); + static sal_Int64 GetFileSize( const OUString& rURL ); }; -rtl::OUString PPPOptimizer_getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > PPPOptimizer_getSupportedServiceNames(); +OUString PPPOptimizer_getImplementationName(); +com::sun::star::uno::Sequence< OUString > PPPOptimizer_getSupportedServiceNames(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > PPPOptimizer_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rSMgr ) throw( com::sun::star::uno::Exception ); diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index d7632d299e37..e8c707b501d6 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -89,7 +89,7 @@ Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames() // ----------------------------------------------------------------------------- Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch( - const URL& aURL, const ::rtl::OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) { Reference < XDispatch > xRet; if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.SunPresentationMinimizer:" ) == 0 ) @@ -142,11 +142,11 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, if ( nFileSizeSource && nFileSizeDest ) { - rtl::OUStringBuffer sBuf( rtl::OUString("Your Presentation has been minimized from:") ); - sBuf.append( rtl::OUString::valueOf( nFileSizeSource >> 10 ) ); - sBuf.append( rtl::OUString("KB to ") ); - sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) ); - sBuf.append( rtl::OUString("KB.") ); + OUStringBuffer sBuf( OUString("Your Presentation has been minimized from:") ); + sBuf.append( OUString::valueOf( nFileSizeSource >> 10 ) ); + sBuf.append( OUString("KB to ") ); + sBuf.append( OUString::valueOf( nFileSizeDest >> 10 ) ); + sBuf.append( OUString("KB.") ); OUString sResult( sBuf.makeStringAndClear() ); SAL_INFO("sdext.minimizer", sResult ); } diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index 4bf3cbdcb84d..69d9a937d84b 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -61,18 +61,18 @@ public: throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( - const com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) + const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( @@ -91,8 +91,8 @@ public: throw( com::sun::star::uno::RuntimeException ); }; -rtl::OUString PPPOptimizerDialog_getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > PPPOptimizerDialog_getSupportedServiceNames(); +OUString PPPOptimizerDialog_getImplementationName(); +com::sun::star::uno::Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames(); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > PPPOptimizerDialog_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rSMgr ) throw( com::sun::star::uno::Exception ); diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index e446863f77eb..78ae022b4d9c 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -296,7 +296,7 @@ static const TokenTable pTokenTableArray[] = { "NotFound", TK_NotFound } }; -PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken ) +PPPOptimizerTokenEnum TKGet( const OUString& rToken ) { if ( !pHashMap ) { // init hash map @@ -324,12 +324,12 @@ PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken ) return eRetValue; } -rtl::OUString TKGet( const PPPOptimizerTokenEnum eToken ) +OUString TKGet( const PPPOptimizerTokenEnum eToken ) { sal_uInt32 i = eToken >= TK_Last ? (sal_uInt32)TK_NotFound : (sal_uInt32)eToken; - return rtl::OUString::createFromAscii( pTokenTableArray[ i ].pS ); + return OUString::createFromAscii( pTokenTableArray[ i ].pS ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index dee94a585bea..6d97989a1967 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -266,8 +266,8 @@ enum PPPOptimizerTokenEnum TK_NotFound }; -PPPOptimizerTokenEnum TKGet( const rtl::OUString& ); -rtl::OUString TKGet( const PPPOptimizerTokenEnum ); +PPPOptimizerTokenEnum TKGet( const OUString& ); +OUString TKGet( const PPPOptimizerTokenEnum ); #endif diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index 6384f6dd3b4b..b08ce1e5d8fe 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -70,41 +70,41 @@ public : com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > createWindowPeer( com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > xParentPeer ) throw ( com::sun::star::uno::Exception ); - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > insertControlModel( const rtl::OUString& rServiceName, const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::uno::XInterface > insertControlModel( const OUString& rServiceName, const OUString& rName, + const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues ); - void setVisible( const rtl::OUString& rName, sal_Bool bVisible ); + void setVisible( const OUString& rName, sal_Bool bVisible ); - com::sun::star::uno::Reference< com::sun::star::awt::XButton > insertButton( const rtl::OUString& rName, - com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > xActionListener, const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, + com::sun::star::uno::Reference< com::sun::star::awt::XButton > insertButton( const OUString& rName, + com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > xActionListener, const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XFixedText > insertFixedText( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XFixedText > insertFixedText( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XCheckBox > insertCheckBox( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XCheckBox > insertCheckBox( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertFormattedField( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertFormattedField( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XComboBox > insertComboBox( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XComboBox > insertComboBox( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XRadioButton > insertRadioButton( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XRadioButton > insertRadioButton( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XListBox > insertListBox( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XListBox > insertListBox( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertImage( const rtl::OUString& rName, - const com::sun::star::uno::Sequence< rtl::OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); + com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertImage( const OUString& rName, + const com::sun::star::uno::Sequence< OUString > rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > rPropertyValues ); - void setControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName, const com::sun::star::uno::Any& rPropertyValue ); - com::sun::star::uno::Any getControlProperty( const rtl::OUString& rControlName, const rtl::OUString& rPropertyName ); + void setControlProperty( const OUString& rControlName, const OUString& rPropertyName, const com::sun::star::uno::Any& rPropertyValue ); + com::sun::star::uno::Any getControlProperty( const OUString& rControlName, const OUString& rPropertyName ); - void enableControl( const rtl::OUString& rControlName ); - void disableControl( const rtl::OUString& rControlName ); + void enableControl( const OUString& rControlName ); + void disableControl( const OUString& rControlName ); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxMSF; com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController; diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index efe23acab074..032ac5777721 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -95,53 +95,53 @@ namespace { {} void initControls( const uno::Reference<awt::XControlContainer>& xControls, - const rtl::OUString& rFilename ) + const OUString& rFilename ) { m_xListbox.set(xControls->getControl( - rtl::OUString( "ListBox" )), + OUString( "ListBox" )), uno::UNO_QUERY_THROW ); m_xWriterText.set(xControls->getControl( - rtl::OUString( "InfoWriter" )), + OUString( "InfoWriter" )), uno::UNO_QUERY_THROW ); m_xImpressText.set(xControls->getControl( - rtl::OUString( "InfoImpress" )), + OUString( "InfoImpress" )), uno::UNO_QUERY_THROW ); m_xDrawText.set(xControls->getControl( - rtl::OUString( "InfoDraw" )), + OUString( "InfoDraw" )), uno::UNO_QUERY_THROW ); uno::Reference<awt::XWindow> xControl; xControl.set(xControls->getControl( - rtl::OUString( "ListBoxWriter" )), + OUString( "ListBoxWriter" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); xControl.set(xControls->getControl( - rtl::OUString( "ListBoxImpress" )), + OUString( "ListBoxImpress" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); xControl.set(xControls->getControl( - rtl::OUString( "ListBoxDraw" )), + OUString( "ListBoxDraw" )), uno::UNO_QUERY_THROW ); xControl->setVisible(sal_False); uno::Reference<beans::XPropertySet> xPropSet( xControls->getControl( - rtl::OUString( "ComboLabel" ))->getModel(), + OUString( "ComboLabel" ))->getModel(), uno::UNO_QUERY_THROW ); - rtl::OUString aFilename( rFilename.copy(rFilename.lastIndexOf('/')+1) ); - rtl::OUString aLabel; - xPropSet->getPropertyValue(rtl::OUString( "Label" )) >>= aLabel; + OUString aFilename( rFilename.copy(rFilename.lastIndexOf('/')+1) ); + OUString aLabel; + xPropSet->getPropertyValue(OUString( "Label" )) >>= aLabel; const char pFileName[] = "%FILENAME"; aLabel = aLabel.replaceAt( aLabel.indexOfAsciiL(pFileName,SAL_N_ELEMENTS(pFileName)-1), SAL_N_ELEMENTS(pFileName)-1, aFilename ); - xPropSet->setPropertyValue(rtl::OUString( "Label" ), + xPropSet->setPropertyValue(OUString( "Label" ), uno::makeAny(aLabel)); - uno::Sequence<rtl::OUString> aListboxItems(3); - aListboxItems[DRAW_INDEX] = rtl::OUString( "Drawing" ); - aListboxItems[IMPRESS_INDEX] = rtl::OUString( "Presentation" ); - aListboxItems[WRITER_INDEX] = rtl::OUString( "Text Document" ); + uno::Sequence<OUString> aListboxItems(3); + aListboxItems[DRAW_INDEX] = OUString( "Drawing" ); + aListboxItems[IMPRESS_INDEX] = OUString( "Presentation" ); + aListboxItems[WRITER_INDEX] = OUString( "Text Document" ); m_xListbox->addItems(aListboxItems,0); m_xListbox->selectItemPos(0,sal_True); @@ -155,7 +155,7 @@ namespace { virtual ::sal_Bool SAL_CALL callHandlerMethod( const uno::Reference< awt::XDialog >& /*xDialog*/, const uno::Any& /*EventObject*/, - const ::rtl::OUString& MethodName ) throw (lang::WrappedTargetException, uno::RuntimeException) + const OUString& MethodName ) throw (lang::WrappedTargetException, uno::RuntimeException) { (void)MethodName; OSL_ENSURE( MethodName.compareToAscii("SelectionChanged") == 0, @@ -164,10 +164,10 @@ namespace { return sal_True; } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedMethodNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getSupportedMethodNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aMethods(1); - aMethods[0] = rtl::OUString( "SelectionChanged" ); + uno::Sequence< OUString > aMethods(1); + aMethods[0] = OUString( "SelectionChanged" ); return aMethods; } }; @@ -183,7 +183,7 @@ private: uno::Reference< io::XOutputStream > m_xOut; public: - FileEmitContext( const rtl::OUString& rOrigFile, + FileEmitContext( const OUString& rOrigFile, const uno::Reference< uno::XComponentContext >& xContext, const pdfparse::PDFContainer* pTop ); virtual ~FileEmitContext(); @@ -196,7 +196,7 @@ public: const uno::Reference< io::XStream >& getContextStream() const { return m_xContextStream; } }; -FileEmitContext::FileEmitContext( const rtl::OUString& rOrigFile, +FileEmitContext::FileEmitContext( const OUString& rOrigFile, const uno::Reference< uno::XComponentContext >& xContext, const pdfparse::PDFContainer* pTop ) : pdfparse::EmitContext( pTop ), @@ -320,7 +320,7 @@ PDFDetector::PDFDetector( const uno::Reference< uno::XComponentContext >& xConte {} // XExtendedFilterDetection -rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException ) +OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException ) { osl::MutexGuard const guard( m_aMutex ); bool bSuccess = false; @@ -328,9 +328,9 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue // get the InputStream carrying the PDF content uno::Reference< io::XInputStream > xInput; uno::Reference< io::XStream > xEmbedStream; - rtl::OUString aOutFilterName, aOutTypeName; - rtl::OUString aURL; - rtl::OUString aPwd; + OUString aOutFilterName, aOutTypeName; + OUString aURL; + OUString aPwd; const beans::PropertyValue* pAttribs = rFilterData.getConstArray(); sal_Int32 nAttribs = rFilterData.getLength(); sal_Int32 nFilterNamePos = -1; @@ -338,11 +338,11 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue for( sal_Int32 i = 0; i < nAttribs; i++ ) { #if OSL_DEBUG_LEVEL > 1 - rtl::OUString aVal( "<no string>" ); + OUString aVal( "<no string>" ); pAttribs[i].Value >>= aVal; OSL_TRACE( "doDetection: Attrib: %s = %s\n", - rtl::OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( aVal, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( pAttribs[i].Name, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aVal, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif if ( pAttribs[i].Name == "InputStream" ) pAttribs[i].Value >>= xInput; @@ -398,7 +398,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { #if OSL_DEBUG_LEVEL > 1 OSL_TRACE( "created temp file %s\n", - rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() ); #endif osl_writeFile( aFile, aBuf.getConstArray(), nBytes, &nWritten ); @@ -426,7 +426,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue } osl_closeFile( aFile ); } - rtl::OUString aEmbedMimetype; + OUString aEmbedMimetype; xEmbedStream = getAdditionalStream( aURL, aEmbedMimetype, aPwd, m_xContext, rFilterData, false ); if( aFile ) osl_removeFile( aURL.pData ); @@ -434,14 +434,14 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.text-master" ) ) ) - aOutFilterName = rtl::OUString( "writer_pdf_addstream_import" ); + aOutFilterName = OUString( "writer_pdf_addstream_import" ); else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.presentation" ) - aOutFilterName = rtl::OUString( "impress_pdf_addstream_import" ); + aOutFilterName = OUString( "impress_pdf_addstream_import" ); else if( aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.graphics" ) ) || aEmbedMimetype.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.oasis.opendocument.drawing" ) ) ) - aOutFilterName = rtl::OUString( "draw_pdf_addstream_import" ); + aOutFilterName = OUString( "draw_pdf_addstream_import" ); else if ( aEmbedMimetype == "application/vnd.oasis.opendocument.spreadsheet" ) - aOutFilterName = rtl::OUString( "calc_pdf_addstream_import" ); + aOutFilterName = OUString( "calc_pdf_addstream_import" ); } } @@ -454,19 +454,19 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue nFilterNamePos = nAttribs; rFilterData.realloc( ++nAttribs ); rFilterData[ nFilterNamePos ].Name = - rtl::OUString( "FilterName" ); + OUString( "FilterName" ); } - aOutTypeName = rtl::OUString("pdf_Portable_Document_Format"); + aOutTypeName = OUString("pdf_Portable_Document_Format"); OSL_TRACE( "setting filter name %s, input stream %s\n", - rtl::OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(), xEmbedStream.is() ? "present" : "not present" ); rFilterData[nFilterNamePos].Value <<= aOutFilterName; if( xEmbedStream.is() ) { rFilterData.realloc( ++nAttribs ); - rFilterData[nAttribs-1].Name = rtl::OUString( "EmbeddedSubstream" ); + rFilterData[nAttribs-1].Name = OUString( "EmbeddedSubstream" ); rFilterData[nAttribs-1].Value <<= xEmbedStream; } if( !aPwd.isEmpty() ) @@ -475,7 +475,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { nPwdPos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nPwdPos ].Name = rtl::OUString( "Password" ); + rFilterData[ nPwdPos ].Name = OUString( "Password" ); } rFilterData[ nPwdPos ].Value <<= aPwd; } @@ -486,42 +486,42 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue { nFilterNamePos = nAttribs; rFilterData.realloc( ++nAttribs ); - rFilterData[ nFilterNamePos ].Name = rtl::OUString( "FilterName" ); + rFilterData[ nFilterNamePos ].Name = OUString( "FilterName" ); } const sal_Int32 nDocumentType = 0; //const sal_Int32 nDocumentType = queryDocumentTypeDialog(m_xContext,aURL); if( nDocumentType < 0 ) { - return rtl::OUString(); + return OUString(); } else switch( nDocumentType ) { case 0: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( "draw_pdf_import" ); + rFilterData[nFilterNamePos].Value <<= OUString( "draw_pdf_import" ); break; case 1: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( "impress_pdf_import" ); + rFilterData[nFilterNamePos].Value <<= OUString( "impress_pdf_import" ); break; case 2: - rFilterData[nFilterNamePos].Value <<= rtl::OUString( "writer_pdf_import" ); + rFilterData[nFilterNamePos].Value <<= OUString( "writer_pdf_import" ); break; default: OSL_FAIL("Unexpected case"); } - aOutTypeName = rtl::OUString("pdf_Portable_Document_Format"); + aOutTypeName = OUString("pdf_Portable_Document_Format"); } } return aOutTypeName; } -bool checkDocChecksum( const rtl::OUString& rInPDFFileURL, +bool checkDocChecksum( const OUString& rInPDFFileURL, sal_uInt32 nBytes, - const rtl::OUString& rChkSum ) + const OUString& rChkSum ) { bool bRet = false; if( rChkSum.getLength() != 2* RTL_DIGEST_LENGTH_MD5 ) @@ -595,19 +595,19 @@ bool checkDocChecksum( const rtl::OUString& rInPDFFileURL, return bRet; } -uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& rInPDFFileURL, - rtl::OUString& rOutMimetype, - rtl::OUString& io_rPwd, +uno::Reference< io::XStream > getAdditionalStream( const OUString& rInPDFFileURL, + OUString& rOutMimetype, + OUString& io_rPwd, const uno::Reference<uno::XComponentContext>& xContext, const uno::Sequence<beans::PropertyValue>& rFilterData, bool bMayUseUI ) { uno::Reference< io::XStream > xEmbed; - rtl::OString aPDFFile; - rtl::OUString aSysUPath; + OString aPDFFile; + OUString aSysUPath; if( osl_getSystemPathFromFileURL( rInPDFFileURL.pData, &aSysUPath.pData ) != osl_File_E_None ) return xEmbed; - aPDFFile = rtl::OUStringToOString( aSysUPath, osl_getThreadTextEncoding() ); + aPDFFile = OUStringToOString( aSysUPath, osl_getThreadTextEncoding() ); pdfparse::PDFReader aParser; boost::scoped_ptr<pdfparse::PDFEntry> pEntry( aParser.read( aPDFFile.getStr() )); @@ -623,9 +623,9 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& if( pTrailer && pTrailer->m_pDict ) { // search document checksum entry - boost::unordered_map< rtl::OString, + boost::unordered_map< OString, pdfparse::PDFEntry*, - rtl::OStringHash >::iterator chk; + OStringHash >::iterator chk; chk = pTrailer->m_pDict->m_aMap.find( "DocChecksum" ); if( chk == pTrailer->m_pDict->m_aMap.end() ) { @@ -640,9 +640,9 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } // search for AdditionalStreams entry - boost::unordered_map< rtl::OString, + boost::unordered_map< OString, pdfparse::PDFEntry*, - rtl::OStringHash >::iterator add_stream; + OStringHash >::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream == pTrailer->m_pDict->m_aMap.end() ) { @@ -657,7 +657,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } // check checksum - rtl::OUString aChkSum = pChkSumName->getFilteredName(); + OUString aChkSum = pChkSumName->getFilteredName(); if( ! checkDocChecksum( rInPDFFileURL, pTrailer->m_nOffset, aChkSum ) ) continue; @@ -679,7 +679,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& bool bAuthenticated = false; if( !io_rPwd.isEmpty() ) { - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } @@ -700,13 +700,13 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& break; } - rtl::OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( sal_Unicode('/') )+1 ) ); + OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( sal_Unicode('/') )+1 ) ); bool bEntered = false; do { bEntered = getPassword( xIntHdl, io_rPwd, ! bEntered, aDocName ); - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } while( bEntered && ! bAuthenticated ); @@ -732,7 +732,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString& } OSL_TRACE( "extracted add stream: mimetype %s\n", - rtl::OUStringToOString( rOutMimetype, + OUStringToOString( rOutMimetype, RTL_TEXTENCODING_UTF8 ).getStr()); return xEmbed; } diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index 42a09f7809f8..d8dc60979c69 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -48,7 +48,7 @@ public: ::com::sun::star::uno::XComponentContext >& xContext ); // XExtendedFilterDetection - virtual rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rDescriptor ) throw (com::sun::star::uno::RuntimeException); }; @@ -82,22 +82,22 @@ public: password */ com::sun::star::uno::Reference< com::sun::star::io::XStream > - getAdditionalStream( const rtl::OUString& rPDFFile, - rtl::OUString& o_rOutMimetype, - rtl::OUString& io_rOutPwd, + getAdditionalStream( const OUString& rPDFFile, + OUString& o_rOutMimetype, + OUString& io_rOutPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData, bool bMayUseUI ); -bool checkDocChecksum( const rtl::OUString& rInPDFFileURL, +bool checkDocChecksum( const OUString& rInPDFFileURL, sal_uInt32 nBytes, - const rtl::OUString& rChkSum ); + const OUString& rChkSum ); bool getPassword( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler, - rtl::OUString& o_rPwd, + OUString& o_rPwd, bool bFirstTry, - const rtl::OUString& i_rDocName + const OUString& i_rDocName ); } diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index bfa1da5059d8..f7cc7d0b7c0b 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -48,7 +48,7 @@ namespace pdfi { struct FontAttributes { - FontAttributes( const rtl::OUString& familyName_, + FontAttributes( const OUString& familyName_, bool isBold_, bool isItalic_, bool isUnderline_, @@ -71,7 +71,7 @@ namespace pdfi size(0.0) {} - ::rtl::OUString familyName; + OUString familyName; bool isBold; bool isItalic; bool isUnderline; @@ -104,7 +104,7 @@ namespace pdfi virtual void endPage() = 0; virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ) = 0; + const OUString& rURI ) = 0; virtual void pushState() = 0; virtual void popState() = 0; @@ -136,7 +136,7 @@ namespace pdfi virtual void intersectEoClip(const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0; - virtual void drawGlyphs( const rtl::OUString& rGlyphs, + virtual void drawGlyphs( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) = 0; diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index 2db7b555b4cd..d233e134cbfb 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -40,14 +40,14 @@ namespace com { namespace sun { namespace star { namespace task namespace pdfi { - typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; + typedef boost::unordered_map< OUString, OUString, OUStringHash > PropertyMap; typedef sal_Int32 ImageId; /// What to do with a polygon. values can be ORed together enum PolygonAction { PATH_STROKE=1, PATH_FILL=2, PATH_EOFILL=4 }; - rtl::OUString unitMMString( double fMM ); - rtl::OUString convertPixelToUnitString( double fPix ); + OUString unitMMString( double fMM ); + OUString convertPixelToUnitString( double fPix ); inline double convPx2mm( double fPix ) { @@ -69,7 +69,7 @@ namespace pdfi } /// Convert color to "#FEFEFE" color notation - rtl::OUString getColorString( const ::com::sun::star::rendering::ARGBColor& ); + OUString getColorString( const ::com::sun::star::rendering::ARGBColor& ); struct FontAttrHash { @@ -181,9 +181,9 @@ namespace pdfi */ bool getPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler, - rtl::OUString& rOutPwd, + OUString& rOutPwd, bool bFirstTry, - const rtl::OUString& rDocName + const OUString& rDocName ); void reportUnsupportedEncryptionFormat( diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index e2051c573cd9..f1073c71b70a 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -68,9 +68,9 @@ struct PDFEntry struct PDFComment : public PDFEntry { - rtl::OString m_aComment; + OString m_aComment; - PDFComment( const rtl::OString& rComment ) + PDFComment( const OString& rComment ) : PDFEntry(), m_aComment( rComment ) {} virtual ~PDFComment(); virtual bool emit( EmitContext& rWriteContext ) const; @@ -86,28 +86,28 @@ struct PDFValue : public PDFEntry struct PDFName : public PDFValue { - rtl::OString m_aName; + OString m_aName; - PDFName( const rtl::OString& rName ) + PDFName( const OString& rName ) : PDFValue(), m_aName( rName ) {} virtual ~PDFName(); virtual bool emit( EmitContext& rWriteContext ) const; virtual PDFEntry* clone() const; - rtl::OUString getFilteredName() const; + OUString getFilteredName() const; }; struct PDFString : public PDFValue { - rtl::OString m_aString; + OString m_aString; - PDFString( const rtl::OString& rString ) + PDFString( const OString& rString ) : PDFValue(), m_aString( rString ) {} virtual ~PDFString(); virtual bool emit( EmitContext& rWriteContext ) const; virtual PDFEntry* clone() const; - rtl::OString getFilteredString() const; + OString getFilteredString() const; }; struct PDFNumber : public PDFValue @@ -180,7 +180,7 @@ struct PDFArray : public PDFContainer struct PDFDict : public PDFContainer { - typedef boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map; + typedef boost::unordered_map<OString,PDFEntry*,OStringHash> Map; Map m_aMap; PDFDict() {} @@ -190,9 +190,9 @@ struct PDFDict : public PDFContainer // inserting a value of NULL will remove rName and the previous value // from the dictionary - void insertValue( const rtl::OString& rName, PDFEntry* pValue ); + void insertValue( const OString& rName, PDFEntry* pValue ); // removes a name/value pair from the dict - void eraseValue( const rtl::OString& rName ); + void eraseValue( const OString& rName ); // builds new map as of sub elements // returns NULL if successful, else the first offending element PDFEntry* buildMap(); @@ -250,13 +250,13 @@ struct PDFFile : public PDFContainer // this method checks whether rPwd is compatible with // either user or owner password and sets up decrypt data in that case // returns true if decryption can be done - bool setupDecryptionData( const rtl::OString& rPwd ) const; + bool setupDecryptionData( const OString& rPwd ) const; bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* pOutBuffer, unsigned int nObject, unsigned int nGeneration ) const; - rtl::OUString getDecryptionKey() const; + OUString getDecryptionKey() const; }; struct PDFObject : public PDFContainer diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx index 72c8fed8a7d2..1b9c5c3f3e81 100644 --- a/sdext/source/pdfimport/inc/wrapper.hxx +++ b/sdext/source/pdfimport/inc/wrapper.hxx @@ -35,11 +35,11 @@ namespace com { namespace sun { namespace star { namespace pdfi { - bool xpdf_ImportFromFile( const rtl::OUString& rURL, + bool xpdf_ImportFromFile( const OUString& rURL, const ContentSinkSharedPtr& rSink, const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); bool xpdf_ImportFromStream( const com::sun::star::uno::Reference< @@ -47,7 +47,7 @@ namespace pdfi const ContentSinkSharedPtr& rSink, const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); } diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx index 6beb96c1f990..800196794912 100644 --- a/sdext/source/pdfimport/inc/xmlemitter.hxx +++ b/sdext/source/pdfimport/inc/xmlemitter.hxx @@ -39,7 +39,7 @@ namespace pdfi virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) = 0; /** Write PCTEXT as-is to output */ - virtual void write( const rtl::OUString& rString ) = 0; + virtual void write( const OUString& rString ) = 0; /** Close previously opened tag */ virtual void endTag( const char* pTag ) = 0; diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx index 64422419f2cc..eaa6304274c2 100644 --- a/sdext/source/pdfimport/misc/pdfihelper.cxx +++ b/sdext/source/pdfimport/misc/pdfihelper.cxx @@ -26,9 +26,9 @@ using namespace pdfi; using namespace com::sun::star; -rtl::OUString pdfi::getColorString( const rendering::ARGBColor& rCol ) +OUString pdfi::getColorString( const rendering::ARGBColor& rCol ) { - rtl::OUStringBuffer aBuf( 7 ); + OUStringBuffer aBuf( 7 ); const sal_uInt8 nRed ( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Red * 255.0 ) ) ); const sal_uInt8 nGreen( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Green * 255.0 ) ) ); const sal_uInt8 nBlue ( sal::static_int_cast<sal_Int8>( basegfx::fround( rCol.Blue * 255.0 ) ) ); @@ -49,18 +49,18 @@ rtl::OUString pdfi::getColorString( const rendering::ARGBColor& rCol ) return aBuf.makeStringAndClear(); } -rtl::OUString pdfi::unitMMString( double fMM ) +OUString pdfi::unitMMString( double fMM ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rtl_math_round( fMM, 2, rtl_math_RoundingMode_Floor ) ); aBuf.appendAscii( "mm" ); return aBuf.makeStringAndClear(); } -rtl::OUString pdfi::convertPixelToUnitString( double fPix ) +OUString pdfi::convertPixelToUnitString( double fPix ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rtl_math_round( convPx2mm( fPix ), 2, rtl_math_RoundingMode_Floor ) ); aBuf.appendAscii( "mm" ); diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 977690a50a87..6e7d0040b725 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -50,19 +50,19 @@ class PDFPasswordRequest: private: mutable osl::Mutex m_aMutex; uno::Any m_aRequest; - rtl::OUString m_aPassword; + OUString m_aPassword; bool m_bSelected; public: - explicit PDFPasswordRequest(bool bFirstTry, const rtl::OUString& rName); + explicit PDFPasswordRequest(bool bFirstTry, const OUString& rName); // XInteractionRequest virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException); virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException); // XInteractionPassword - virtual void SAL_CALL setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException); - virtual rtl::OUString SAL_CALL getPassword() throw (uno::RuntimeException); + virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException); + virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException); // XInteractionContinuation virtual void SAL_CALL select() throw (uno::RuntimeException); @@ -73,7 +73,7 @@ private: virtual ~PDFPasswordRequest() {} }; -PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const rtl::OUString& rName ) : +PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const OUString& rName ) : m_aRequest( uno::makeAny( task::DocumentPasswordRequest( @@ -98,14 +98,14 @@ uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordReq return aRet; } -void PDFPasswordRequest::setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException) +void PDFPasswordRequest::setPassword( const OUString& rPwd ) throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); m_aPassword = rPwd; } -rtl::OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException) +OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException) { osl::MutexGuard const guard( m_aMutex ); @@ -151,9 +151,9 @@ namespace pdfi { bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, - rtl::OUString& rOutPwd, + OUString& rOutPwd, bool bFirstTry, - const rtl::OUString& rDocName + const OUString& rDocName ) { bool bSuccess = false; diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index 10df3ac8243d..540d6476931e 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -42,7 +42,7 @@ public: explicit OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ); virtual void beginTag( const char* pTag, const PropertyMap& rProperties ); - virtual void write( const rtl::OUString& rString ); + virtual void write( const OUString& rString ); virtual void endTag( const char* pTag ); }; @@ -54,7 +54,7 @@ OdfEmitter::OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ) : OSL_PRECOND(m_xOutput.is(), "OdfEmitter(): invalid output stream"); m_aLineFeed[0] = '\n'; - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); write(aElement.makeStringAndClear()); } @@ -63,17 +63,17 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) { OSL_PRECOND(pTag,"Invalid tag string"); - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii("<"); aElement.appendAscii(pTag); aElement.appendAscii(" "); - std::vector<rtl::OUString> aAttributes; + std::vector<OUString> aAttributes; PropertyMap::const_iterator aCurr(rProperties.begin()); const PropertyMap::const_iterator aEnd(rProperties.end()); while( aCurr != aEnd ) { - rtl::OUStringBuffer aAttribute; + OUStringBuffer aAttribute; aAttribute.append(aCurr->first); aAttribute.appendAscii("=\""); aAttribute.append(aCurr->second); @@ -88,8 +88,8 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) std::sort(aAttributes.begin(), aAttributes.end()); std::for_each(aAttributes.begin(), aAttributes.end(), - boost::bind( (rtl::OUStringBuffer& (rtl::OUStringBuffer::*)(const rtl::OUString&)) - (&rtl::OUStringBuffer::append), + boost::bind( (OUStringBuffer& (OUStringBuffer::*)(const OUString&)) + (&OUStringBuffer::append), boost::ref(aElement), _1 )); aElement.appendAscii(">"); @@ -97,9 +97,9 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) write(aElement.makeStringAndClear()); } -void OdfEmitter::write( const rtl::OUString& rText ) +void OdfEmitter::write( const OUString& rText ) { - const rtl::OString aStr = rtl::OUStringToOString(rText,RTL_TEXTENCODING_UTF8); + const OString aStr = OUStringToOString(rText,RTL_TEXTENCODING_UTF8); const sal_Int32 nLen( aStr.getLength() ); m_aBuf.realloc( nLen ); const sal_Char* pStr = aStr.getStr(); @@ -111,7 +111,7 @@ void OdfEmitter::write( const rtl::OUString& rText ) void OdfEmitter::endTag( const char* pTag ) { - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii("</"); aElement.appendAscii(pTag); aElement.appendAscii(">"); diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 92a2376585fb..344845b76534 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -62,14 +62,14 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert if( m_xModel.is() ) { uno::Reference< io::XStream > xSubStream; - rtl::OUString aPwd; + OUString aPwd; const beans::PropertyValue* pAttribs = rFilterData.getConstArray(); sal_Int32 nAttribs = rFilterData.getLength(); sal_Int32 nPwPos = -1; for( sal_Int32 i = 0; i < nAttribs; i++ ) { #if OSL_DEBUG_LEVEL > 1 - rtl::OUString aVal( "<no string>" ); + OUString aVal( "<no string>" ); pAttribs[i].Value >>= aVal; SAL_INFO("sdext.pdfimport", "filter: Attrib: " << pAttribs[i].Name << " = " << aVal << "\n"); #endif @@ -101,7 +101,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert xSeek->seek( 0 ); oslFileHandle aFile = NULL; sal_uInt64 nWritten = 0; - rtl::OUString aURL; + OUString aURL; if( osl_createTempFile( NULL, &aFile, &aURL.pData ) == osl_File_E_None ) { SAL_INFO("sdext.pdfimport", "created temp file " << aURL); @@ -125,8 +125,8 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert osl_closeFile( aFile ); if( xInput.is() ) { - rtl::OUString aEmbedMimetype; - rtl::OUString aOrgPwd( aPwd ); + OUString aEmbedMimetype; + OUString aOrgPwd( aPwd ); xSubStream = getAdditionalStream( aURL, aEmbedMimetype, aPwd, m_xContext, rFilterData, true ); if( aOrgPwd != aPwd ) bAddPwdProp = true; @@ -148,7 +148,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert try { xSubFilter = uno::Reference<document::XFilter>( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - rtl::OUString( "com.sun.star.document.OwnSubFilter" ), + OUString( "com.sun.star.document.OwnSubFilter" ), aArgs, m_xContext ), uno::UNO_QUERY ); @@ -169,7 +169,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert { nPwPos = aFilterData.getLength(); aFilterData.realloc( nPwPos+1 ); - aFilterData[nPwPos].Name = rtl::OUString( "Password" ); + aFilterData[nPwPos].Name = OUString( "Password" ); } aFilterData[nPwPos].Value <<= aPwd; bRet = xSubFilter->filter( aFilterData ); @@ -222,10 +222,10 @@ void PDFIRawAdaptor::setTreeVisitorFactory(const TreeVisitorFactorySharedPtr& rV bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>& xInput, const uno::Reference<task::XInteractionHandler>& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const uno::Reference<task::XStatusIndicator>& xStatus, const XmlEmitterSharedPtr& rEmitter, - const rtl::OUString& rURL ) + const OUString& rURL ) { // container for metaformat boost::shared_ptr<PDFIProcessor> pSink( @@ -248,14 +248,14 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>& xInput return bSuccess; } -bool PDFIRawAdaptor::odfConvert( const rtl::OUString& rURL, +bool PDFIRawAdaptor::odfConvert( const OUString& rURL, const uno::Reference<io::XOutputStream>& xOutput, const uno::Reference<task::XStatusIndicator>& xStatus ) { XmlEmitterSharedPtr pEmitter = createOdfEmitter(xOutput); const bool bSuccess = parse(uno::Reference<io::XInputStream>(), uno::Reference<task::XInteractionHandler>(), - rtl::OUString(), + OUString(), xStatus,pEmitter,rURL); // tell input stream that it is no longer needed @@ -267,14 +267,14 @@ bool PDFIRawAdaptor::odfConvert( const rtl::OUString& r // XImportFilter sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::PropertyValue >& rSourceData, const uno::Reference< xml::sax::XDocumentHandler >& rHdl, - const uno::Sequence< rtl::OUString >& /*rUserData*/ ) throw( uno::RuntimeException ) + const uno::Sequence< OUString >& /*rUserData*/ ) throw( uno::RuntimeException ) { // get the InputStream carrying the PDF content uno::Reference< io::XInputStream > xInput; uno::Reference< task::XStatusIndicator > xStatus; uno::Reference< task::XInteractionHandler > xInteractionHandler; - rtl::OUString aURL; - rtl::OUString aPwd; + OUString aURL; + OUString aPwd; const beans::PropertyValue* pAttribs = rSourceData.getConstArray(); sal_Int32 nAttribs = rSourceData.getLength(); for( sal_Int32 i = 0; i < nAttribs; i++, pAttribs++ ) diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index 22197d384942..c41cb2954602 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -85,10 +85,10 @@ namespace pdfi bool parse( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInput, const com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler>& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus, const XmlEmitterSharedPtr& rEmitter, - const rtl::OUString& rURL ); + const OUString& rURL ); public: explicit PDFIRawAdaptor( const ::com::sun::star::uno::Reference< @@ -112,14 +112,14 @@ namespace pdfi @param xStatus Optional status indicator */ - bool odfConvert( const rtl::OUString& rURL, + bool odfConvert( const OUString& rURL, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOutput, const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus ); // XImportFilter virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl, - const com::sun::star::uno::Sequence< rtl::OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException ); + const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException ); // XImporter virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 4ce780455f45..b9120ed4a077 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -38,10 +38,6 @@ #include <stdio.h> #include <string.h> -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringHash; -using ::rtl::OStringBuffer; namespace pdfparse @@ -350,7 +346,7 @@ PDFNumber::~PDFNumber() bool PDFNumber::emit( EmitContext& rWriteContext ) const { - rtl::OStringBuffer aBuf( 32 ); + OStringBuffer aBuf( 32 ); aBuf.append( ' ' ); double fValue = m_fValue; @@ -998,7 +994,7 @@ bool PDFTrailer::emit( EmitContext& rWriteContext ) const return false; if( ! rWriteContext.write( "startxref\n", 10 ) ) return false; - rtl::OString aOffset( rtl::OString::valueOf( sal_Int32(nXRefPos) ) ); + OString aOffset( OString::valueOf( sal_Int32(nXRefPos) ) ); if( ! rWriteContext.write( aOffset.getStr(), aOffset.getLength() ) ) return false; return rWriteContext.write( "\n%%EOF\n", 7 ); @@ -1277,9 +1273,9 @@ bool PDFFile::setupDecryptionData( const OString& rPwd ) const return bValid; } -rtl::OUString PDFFile::getDecryptionKey() const +OUString PDFFile::getDecryptionKey() const { - rtl::OUStringBuffer aBuf( ENCRYPTION_KEY_LEN * 2 ); + OUStringBuffer aBuf( ENCRYPTION_KEY_LEN * 2 ); if( impl_getData()->m_bIsEncrypted ) { for( sal_uInt32 i = 0; i < m_pData->m_nKeyLength; i++ ) diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 9d68e43be524..b50e60e10303 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -47,8 +47,6 @@ using namespace boost::spirit; using namespace pdfparse; -using ::rtl::OString; -using ::rtl::OStringBuffer; class StringEmitContext : public EmitContext { @@ -94,7 +92,7 @@ public: double m_fDouble; std::vector< unsigned int > m_aUIntStack; std::vector< PDFEntry* > m_aObjectStack; - rtl::OString m_aErrorString; + OString m_aErrorString; iteratorT m_aGlobalBegin; public: @@ -279,9 +277,9 @@ public: throw_( pLocation, pMessage ); } - rtl::OString iteratorToString( iteratorT first, iteratorT last ) const + OString iteratorToString( iteratorT first, iteratorT last ) const { - rtl::OStringBuffer aStr( 32 ); + OStringBuffer aStr( 32 ); while( first != last ) { aStr.append( *first ); diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index f9204407d506..0a856ea29de1 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -52,10 +52,10 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" ); if( pDir ) { - rtl::OUString aStr( rtl::OStringToOUString( pDir, RTL_TEXTENCODING_UTF8 ) ); - rtl::OUString aFileURL; + OUString aStr( OStringToOUString( pDir, RTL_TEXTENCODING_UTF8 ) ); + OUString aFileURL; osl_getFileURLFromSystemPath( aStr.pData, &aFileURL.pData ); - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); aBuf.append( aFileURL ); aBuf.appendAscii( "/pdfimport.xml" ); pStream = new osl::File( aBuf.makeStringAndClear() ); @@ -91,7 +91,7 @@ SaxEmitter::~SaxEmitter() void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) { - rtl::OUString aTag = rtl::OUString::createFromAscii( pTag ); + OUString aTag = OUString::createFromAscii( pTag ); uno::Reference< xml::sax::XAttributeList > xAttr( new SaxAttrList( rProperties ) ); try @@ -108,15 +108,15 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) for( int i = 0; i < nIndent; i++ ) pStream->write( " ", 4, nWritten ); - rtl::OStringBuffer aBuf( 1024 ); + OStringBuffer aBuf( 1024 ); aBuf.append( '<' ); aBuf.append( pTag ); for( PropertyMap::const_iterator it = rProperties.begin(); it != rProperties.end(); ++it ) { aBuf.append( ' ' ); - aBuf.append( rtl::OUStringToOString( it->first, RTL_TEXTENCODING_UTF8 ) ); + aBuf.append( OUStringToOString( it->first, RTL_TEXTENCODING_UTF8 ) ); aBuf.append( "=\"" ); - aBuf.append( rtl::OUStringToOString( it->second, RTL_TEXTENCODING_UTF8 ) ); + aBuf.append( OUStringToOString( it->second, RTL_TEXTENCODING_UTF8 ) ); aBuf.append( "\"" ); } aBuf.append( ">\n" ); @@ -126,7 +126,7 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) #endif } -void SaxEmitter::write( const rtl::OUString& rText ) +void SaxEmitter::write( const OUString& rText ) { try { @@ -138,7 +138,7 @@ void SaxEmitter::write( const rtl::OUString& rText ) #if OSL_DEBUG_LEVEL > 1 if( pStream ) { - rtl::OString aStr( rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8 ) ); + OString aStr( OUStringToOString( rText, RTL_TEXTENCODING_UTF8 ) ); sal_uInt64 nWritten = 0; pStream->write( aStr.getStr(), aStr.getLength(), nWritten ); } @@ -147,7 +147,7 @@ void SaxEmitter::write( const rtl::OUString& rText ) void SaxEmitter::endTag( const char* pTag ) { - rtl::OUString aTag = rtl::OUString::createFromAscii( pTag ); + OUString aTag = OUString::createFromAscii( pTag ); try { m_xDocHdl->endElement( aTag ); @@ -162,7 +162,7 @@ void SaxEmitter::endTag( const char* pTag ) for( int i = 0; i < nIndent; i++ ) pStream->write( " ", 4, nWritten ); - rtl::OStringBuffer aBuf( 1024 ); + OStringBuffer aBuf( 1024 ); aBuf.append( "</" ); aBuf.append( pTag ); aBuf.append( ">\n" ); diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx index 635944cb3537..2d70ca32f16d 100644 --- a/sdext/source/pdfimport/sax/emitcontext.hxx +++ b/sdext/source/pdfimport/sax/emitcontext.hxx @@ -41,7 +41,7 @@ namespace pdfi ~SaxEmitter(); virtual void beginTag( const char* pTag, const PropertyMap& rProperties ); - virtual void write( const rtl::OUString& rString ); + virtual void write( const OUString& rString ); virtual void endTag( const char* pTag ); }; } diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index c31ef1409111..056dfcbdb342 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -23,12 +23,12 @@ namespace pdfi { -SaxAttrList::SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& rMap ) +SaxAttrList::SaxAttrList( const boost::unordered_map< OUString, OUString, OUStringHash >& rMap ) { m_aAttributes.reserve(rMap.size()); - for( boost::unordered_map< rtl::OUString, - rtl::OUString, - rtl::OUStringHash >::const_iterator it = rMap.begin(); + for( boost::unordered_map< OUString, + OUString, + OUStringHash >::const_iterator it = rMap.begin(); it != rMap.end(); ++it ) { m_aIndexMap[ it->first ] = m_aAttributes.size(); @@ -48,9 +48,9 @@ SaxAttrList::~SaxAttrList() } namespace { - static const rtl::OUString& getCDATAString() + static const OUString& getCDATAString() { - static rtl::OUString aStr( "CDATA" ); + static OUString aStr( "CDATA" ); return aStr; } } @@ -59,30 +59,30 @@ sal_Int16 SAL_CALL SaxAttrList::getLength() throw() { return sal_Int16(m_aAttributes.size()); } -rtl::OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw() +OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw() { - return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aName : rtl::OUString(); + return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aName : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) throw() +OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) throw() { - return (i_nIndex < sal_Int16(m_aAttributes.size())) ? getCDATAString() : rtl::OUString(); + return (i_nIndex < sal_Int16(m_aAttributes.size())) ? getCDATAString() : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getTypeByName( const ::rtl::OUString& i_rName ) throw() +OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName ) throw() { - return (m_aIndexMap.find( i_rName ) != m_aIndexMap.end()) ? getCDATAString() : rtl::OUString(); + return (m_aIndexMap.find( i_rName ) != m_aIndexMap.end()) ? getCDATAString() : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw() +OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw() { - return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aValue : rtl::OUString(); + return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aValue : OUString(); } -rtl::OUString SAL_CALL SaxAttrList::getValueByName(const ::rtl::OUString& i_rName) throw() +OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) throw() { - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); - return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : rtl::OUString(); + boost::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); + return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : OUString(); } com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw() diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 408f9baec66a..f4866de2a36a 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -37,28 +37,28 @@ namespace pdfi { struct AttrEntry { - rtl::OUString m_aName; - rtl::OUString m_aValue; + OUString m_aName; + OUString m_aValue; - AttrEntry( const rtl::OUString& i_rName, const rtl::OUString& i_rValue ) + AttrEntry( const OUString& i_rName, const OUString& i_rValue ) : m_aName( i_rName ), m_aValue( i_rValue ) {} }; std::vector< AttrEntry > m_aAttributes; - boost::unordered_map< rtl::OUString, size_t, rtl::OUStringHash > m_aIndexMap; + boost::unordered_map< OUString, size_t, OUStringHash > m_aIndexMap; public: SaxAttrList() {} - SaxAttrList( const boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& ); + SaxAttrList( const boost::unordered_map< OUString, OUString, OUStringHash >& ); SaxAttrList( const SaxAttrList& ); virtual ~SaxAttrList(); // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength() throw(); - virtual rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(); - virtual rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(); - virtual rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw(); - virtual rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(); - virtual rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw(); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(); // ::com::sun::star::util::XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(); diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 9b186757cfb7..75c6e0649e0f 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -115,7 +115,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( SAL_UNUSED_PARAMETER void* /*pServiceManager*/, SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) { - ::rtl::OUString sImplementationName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString sImplementationName( OUString::createFromAscii( pImplementationName ) ); Reference< XSingleComponentFactory > xFactory; @@ -124,8 +124,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdfimport_component_getFactory( { if ( 0 == sImplementationName.compareToAscii( pComponents->pAsciiImplementationName ) ) { - Sequence< ::rtl::OUString > sServices(1); - sServices[0] = ::rtl::OUString::createFromAscii( pComponents->pAsciiServiceName ); + Sequence< OUString > sServices(1); + sServices[0] = OUString::createFromAscii( pComponents->pAsciiServiceName ); xFactory = ::cppu::createSingleComponentFactory( pComponents->pFactory, diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index 5272ee120621..bac32f2da2c1 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -38,7 +38,7 @@ typedef ::cppu::WeakComponentImplHelper1< public: - explicit OutputWrap( const rtl::OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL) + explicit OutputWrap( const OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL) { maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write); } diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx index 71e9f633a195..d18bfa07c210 100644 --- a/sdext/source/pdfimport/test/pdf2xml.cxx +++ b/sdext/source/pdfimport/test/pdf2xml.cxx @@ -40,7 +40,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if( argc != 5 ) return 1; - ::rtl::OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; + OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; TreeVisitorFactorySharedPtr pTreeFactory; if( rtl_str_compare(argv[1], "-writer") == 0 ) @@ -53,15 +53,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 1; osl_getProcessWorkingDir(&aBaseURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[2]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[3]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[4]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[4]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData); diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx index 0e2016b9ab1f..5558e0cb7e38 100644 --- a/sdext/source/pdfimport/test/pdfunzip.cxx +++ b/sdext/source/pdfimport/test/pdfunzip.cxx @@ -30,10 +30,6 @@ using namespace pdfparse; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; void printHelp( const char* pExe ) { @@ -268,7 +264,7 @@ int write_addStreamArray( const char* pOutFile, PDFArray* pStreams, PDFFile* pPD PDFObject* pObject = pPDFFile->findObject( pStreamRef->m_nNumber, pStreamRef->m_nGeneration ); if( pObject ) { - rtl::OStringBuffer aOutStream( pOutFile ); + OStringBuffer aOutStream( pOutFile ); aOutStream.append( "_stream_" ); aOutStream.append( sal_Int32(pStreamRef->m_nNumber) ); aOutStream.append( "_" ); @@ -300,7 +296,7 @@ int write_addStreams( const char* pInFile, const char* pOutFile, PDFFile* pPDFFi if( pTrailer && pTrailer->m_pDict ) { // search for AdditionalStreams entry - boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator add_stream; + boost::unordered_map<OString,PDFEntry*,OStringHash>::iterator add_stream; add_stream = pTrailer->m_pDict->m_aMap.find( "AdditionalStreams" ); if( add_stream != pTrailer->m_pDict->m_aMap.end() ) { @@ -327,7 +323,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF if( ! pDict ) continue; - boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator map_it = + boost::unordered_map<OString,PDFEntry*,OStringHash>::iterator map_it = pDict->m_aMap.find( "Type" ); if( map_it == pDict->m_aMap.end() ) continue; @@ -346,7 +342,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF pName = dynamic_cast<PDFName*>(map_it->second); if( ! pName ) continue; - rtl::OString aFontName( pName->m_aName ); + OString aFontName( pName->m_aName ); PDFObjectRef* pStreamRef = 0; const char* pFileType = NULL; @@ -378,7 +374,7 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF if( ! pStream ) continue; - rtl::OStringBuffer aOutStream( i_pOutFile ); + OStringBuffer aOutStream( i_pOutFile ); aOutStream.append( "_font_" ); aOutStream.append( sal_Int32(pStreamRef->m_nNumber) ); aOutStream.append( "_" ); @@ -414,7 +410,7 @@ int write_objects( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPD continue; } - rtl::OStringBuffer aOutStream( i_pOutFile ); + OStringBuffer aOutStream( i_pOutFile ); aOutStream.append( "_stream_" ); aOutStream.append( nObject ); aOutStream.append( "_" ); @@ -472,11 +468,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) nArg++; if( nArg < argc ) { - rtl::OString aObjs( argv[nArg] ); + OString aObjs( argv[nArg] ); sal_Int32 nIndex = 0; while( nIndex != -1 ) { - rtl::OString aToken( aObjs.getToken( 0, ',', nIndex ) ); + OString aToken( aObjs.getToken( 0, ',', nIndex ) ); sal_Int32 nObject = 0; sal_Int32 nGeneration = 0; sal_Int32 nGenIndex = 0; diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 226c1d8cc6a2..ec3681011626 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -96,17 +96,17 @@ namespace rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, OUString("http://download.openoffice.org/") ); const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n" "Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n"; - ::rtl::OString aTmp; + OString aTmp; m_aTextOut.makeStringAndClear().convertToString( &aTmp, RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Imported text is \"This is a testtext New paragraph, new line" " Hyperlink, this is * This is more text outline mode * New paragraph\"", - rtl::OString(sText), aTmp ); + OString(sText), aTmp ); CPPUNIT_ASSERT_MESSAGE( "red circle seen in input", m_bRedCircleSeen ); CPPUNIT_ASSERT_MESSAGE( "green stroke seen in input", m_bGreenStrokeSeen ); @@ -133,7 +133,7 @@ namespace } virtual void hyperLink( const geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ) + const OUString& rURI ) { m_aHyperlinkBounds = rBounds; m_aURI = rURI; @@ -346,7 +346,7 @@ namespace getCurrentContext().Clip = aNewClip; } - virtual void drawGlyphs( const rtl::OUString& rGlyphs, + virtual void drawGlyphs( const OUString& rGlyphs, const geometry::RealRectangle2D& /*rRect*/, const geometry::Matrix2D& /*rFontMatrix*/ ) { @@ -355,7 +355,7 @@ namespace virtual void endText() { - m_aTextOut.append( ::rtl::OUString("\n") ); + m_aTextOut.append( OUString("\n") ); } virtual void drawMask(const uno::Sequence<beans::PropertyValue>& xBitmap, @@ -443,8 +443,8 @@ namespace GraphicsContextStack m_aGCStack; geometry::RealSize2D m_aPageSize; geometry::RealRectangle2D m_aHyperlinkBounds; - ::rtl::OUString m_aURI; - ::rtl::OUStringBuffer m_aTextOut; + OUString m_aURI; + OUStringBuffer m_aTextOut; sal_Int32 m_nNumPages; bool m_bPageEnded; bool m_bRedCircleSeen; @@ -461,7 +461,7 @@ namespace pdfi::xpdf_ImportFromFile( getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"), pSink, uno::Reference< task::XInteractionHandler >(), - rtl::OUString(), + OUString(), getComponentContext() ); // make destruction explicit, a bunch of things are @@ -474,7 +474,7 @@ namespace pdfi::PDFIRawAdaptor aAdaptor( getComponentContext() ); aAdaptor.setTreeVisitorFactory( createDrawTreeVisitorFactory() ); - ::rtl::OUString tempFileURL; + OUString tempFileURL; CPPUNIT_ASSERT( osl::File::createTempFile( NULL, NULL, &tempFileURL ) == osl::File::E_None ); osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", @@ -489,7 +489,7 @@ namespace pdfi::PDFIRawAdaptor aAdaptor( getComponentContext() ); aAdaptor.setTreeVisitorFactory( createWriterTreeVisitorFactory() ); - ::rtl::OUString tempFileURL; + OUString tempFileURL; CPPUNIT_ASSERT( osl::File::createTempFile( NULL, NULL, &tempFileURL ) == osl::File::E_None ); osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 421728b71cca..514401586fb2 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -94,17 +94,17 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons if( ! elem.Text.getLength() ) return; - rtl::OUString strSpace(32); - rtl::OUString strNbSpace(160); - rtl::OUString tabSpace(0x09); + OUString strSpace(32); + OUString strNbSpace(160); + OUString tabSpace(0x09); PropertyMap aProps; if( elem.StyleId != -1 ) { - aProps[ rtl::OUString( "text:style-name" ) ] = + aProps[ OUString( "text:style-name" ) ] = m_rEmitContext.rStyles.getStyleName( elem.StyleId ); } - rtl::OUString str(elem.Text.getStr()); + OUString str(elem.Text.getStr()); // Check for RTL bool isRTL = false; @@ -130,7 +130,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons for(int i=0; i< elem.Text.getLength(); i++) { - rtl::OUString strToken= str.copy(i,1) ; + OUString strToken= str.copy(i,1) ; if( strSpace.equals(strToken) || strNbSpace.equals(strToken)) { aProps[ "text:c" ] = "1"; @@ -191,7 +191,7 @@ void DrawXmlEmitter::fillFrameProps( DrawElement& rElem, { double rel_x = rElem.x, rel_y = rElem.y; - rProps[ "draw:z-index" ] = rtl::OUString::valueOf( rElem.ZOrder ); + rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder ); rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId ); rProps[ "svg:width" ] = convertPixelToUnitString( rElem.w ); rProps[ "svg:height" ] = convertPixelToUnitString( rElem.h ); @@ -210,7 +210,7 @@ void DrawXmlEmitter::fillFrameProps( DrawElement& rElem, rGC.Transformation.decompose( aScale, aTranslation, fRotate, fShearX ); - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); // TODO(F2): general transformation case missing; if implemented, note // that ODF rotation is oriented the other way @@ -329,7 +329,7 @@ void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >:: // so we need to tell fillFrameProps here that the transformation for // a PolyPolyElement was already applied (aside form translation) fillFrameProps( elem, aProps, m_rEmitContext, true ); - rtl::OUStringBuffer aBuf( 64 ); + OUStringBuffer aBuf( 64 ); aBuf.appendAscii( "0 0 " ); aBuf.append( convPx2mmPrec2(elem.w)*100.0 ); aBuf.append( sal_Unicode(' ') ); @@ -696,7 +696,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent) { TextElement* pNext = dynamic_cast<TextElement*>(*next); bool isComplex = false; - rtl::OUString str(pCur->Text.getStr()); + OUString str(pCur->Text.getStr()); for(int i=0; i< str.getLength(); i++) { sal_Int16 nType = GetBreakIterator()->getScriptType( str, i ); @@ -791,7 +791,7 @@ void DrawXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* > aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 ); aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 ); - aGCProps[ "svg:stroke-width" ] = rtl::OUString::valueOf( aVec.getLength() ); + aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() ); } } else @@ -860,10 +860,10 @@ void DrawXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::co aFontProps[ "style:text-outline" ] = "true"; } // size - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rFont.size*72/PDFI_OUTDEV_RESOLUTION ); aBuf.appendAscii( "pt" ); - rtl::OUString aFSize = aBuf.makeStringAndClear(); + OUString aFSize = aBuf.makeStringAndClear(); aFontProps[ "fo:font-size" ] = aFSize; aFontProps[ "style:font-size-asian" ] = aFSize; aFontProps[ "style:font-size-complex" ] = aFSize; @@ -1028,7 +1028,7 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co sal_Int32 nPageStyle = m_rStyleContainer.impl_getStyleId( aStyle, false ); // create master page - rtl::OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); + OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); aPageProps[ "style:page-layout-name" ] = aMasterPageLayoutName; StyleContainer::Style aMPStyle( "style:master-page", aPageProps); diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index 6ca3c8a5a02b..bb862dacd57b 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -114,13 +114,13 @@ namespace pdfi { friend class ElementFactory; protected: - HyperlinkElement( Element* pParent, const rtl::OUString& rURI ) + HyperlinkElement( Element* pParent, const OUString& rURI ) : Element( pParent ), URI( rURI ) {} public: // ElementTreeVisitable virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); - rtl::OUString URI; + OUString URI; }; struct GraphicalElement : public Element @@ -168,7 +168,7 @@ namespace pdfi // ElementTreeVisitable virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); - rtl::OUStringBuffer Text; + OUStringBuffer Text; sal_Int32 FontId; }; @@ -285,7 +285,7 @@ namespace pdfi ElementFactory() {} virtual ~ElementFactory(); - virtual HyperlinkElement* createHyperlinkElement( Element* pParent, const rtl::OUString& rURI ) + virtual HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI ) { return new HyperlinkElement( pParent, rURI ); } virtual TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId ) diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 7b4ecefeabb4..71619da32447 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -49,9 +49,9 @@ static const sal_Char aBase64EncodeTable[] = 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' }; -rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBufferLength ) +OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBufferLength ) { - rtl::OUStringBuffer aBuf( (i_nBufferLength+1) * 4 / 3 ); + OUStringBuffer aBuf( (i_nBufferLength+1) * 4 / 3 ); const sal_Int32 nRemain(i_nBufferLength%3); const sal_Int32 nFullTripleLength( i_nBufferLength - (i_nBufferLength%3)); sal_Int32 nBufPos( 0 ); @@ -129,7 +129,7 @@ void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContex std::find_if(pAry,pAry+nLen, boost::bind(comphelper::TPropertyValueEqualFunctor(), _1, - rtl::OUString("InputSequence")))); + OUString("InputSequence")))); OSL_ENSURE( pValue != pAry+nLen, "InputSequence not found" ); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index df255434bbf5..83be259d3b69 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -425,7 +425,7 @@ void PDFIProcessor::processGlyph( double fPreAvarageSpaceValue, } } -void PDFIProcessor::drawGlyphLine( const rtl::OUString& rGlyphs, +void PDFIProcessor::drawGlyphLine( const OUString& rGlyphs, const geometry::RealRectangle2D& rRect, const geometry::Matrix2D& rFontMatrix ) { @@ -455,8 +455,8 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString& rGlyphs, if( !m_bIsWhiteSpaceInLine ) { - static rtl::OUString tempWhiteSpaceStr( 0x20 ); - static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); + static OUString tempWhiteSpaceStr( 0x20 ); + static OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr )); } } @@ -485,7 +485,7 @@ GraphicsContext& PDFIProcessor::getTransformGlyphContext( CharGlyph& rGlyph ) return rGlyph.getGC(); } -void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, +void PDFIProcessor::drawCharGlyphs( OUString& rGlyphs, geometry::RealRectangle2D& rRect, const GraphicsContext& aGC, ParagraphElement* pPara, @@ -494,7 +494,7 @@ void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, { - rtl::OUString tempStr( 32 ); + OUString tempStr( 32 ); geometry::RealRectangle2D aRect(rRect); ::basegfx::B2DRange aRect2; @@ -523,7 +523,7 @@ void PDFIProcessor::drawCharGlyphs( rtl::OUString& rGlyphs, } -void PDFIProcessor::drawGlyphs( const rtl::OUString& rGlyphs, +void PDFIProcessor::drawGlyphs( const OUString& rGlyphs, const geometry::RealRectangle2D& rRect, const geometry::Matrix2D& rFontMatrix ) { @@ -712,7 +712,7 @@ void PDFIProcessor::intersectEoClip(const uno::Reference< rendering::XPolyPolygo } void PDFIProcessor::hyperLink( const geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ) + const OUString& rURI ) { if( !rURI.isEmpty() ) { @@ -780,7 +780,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize ) if( m_xStatusIndicator.is() ) { if( nNextPageNr == 1 ) - startIndicator( rtl::OUString( " " ) ); + startIndicator( OUString( " " ) ); m_xStatusIndicator->setValue( nNextPageNr ); } m_pCurPage = m_pElFactory->createPageElement(m_pDocument.get(), nNextPageNr); @@ -802,7 +802,7 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter, ElementTreeVisitorSharedPtr optimizingVisitor( rVisitorFactory.createOptimizingVisitor(*this)); // FIXME: localization - startIndicator( rtl::OUString( " " ) ); + startIndicator( OUString( " " ) ); m_pDocument->visitedBy( *optimizingVisitor, std::list<Element*>::const_iterator()); #if OSL_DEBUG_LEVEL > 1 @@ -855,14 +855,14 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter, endIndicator(); } -void PDFIProcessor::startIndicator( const rtl::OUString& rText, sal_Int32 nElements ) +void PDFIProcessor::startIndicator( const OUString& rText, sal_Int32 nElements ) { if( nElements == -1 ) nElements = m_nPages; if( m_xStatusIndicator.is() ) { sal_Int32 nUnicodes = rText.getLength(); - rtl::OUStringBuffer aStr( nUnicodes*2 ); + OUStringBuffer aStr( nUnicodes*2 ); const sal_Unicode* pText = rText.getStr(); for( int i = 0; i < nUnicodes; i++ ) { @@ -1009,10 +1009,10 @@ void PDFIProcessor::sortElements( Element* pEle, bool bDeep ) } // helper method: get a mirrored string -rtl::OUString PDFIProcessor::mirrorString( const rtl::OUString& i_rString ) const +OUString PDFIProcessor::mirrorString( const OUString& i_rString ) const { const sal_Int32 nLen = i_rString.getLength(); - rtl::OUStringBuffer aMirror( nLen ); + OUStringBuffer aMirror( nLen ); sal_Int32 i = 0; while(i < nLen) diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index bd792bc4d35d..093fd937cd23 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -99,7 +99,7 @@ namespace pdfi void sortElements( Element* pElement, bool bDeep = false ); - rtl::OUString mirrorString( const rtl::OUString& i_rInString ) const; + OUString mirrorString( const OUString& i_rInString ) const; private: void processGlyphLine(); @@ -109,11 +109,11 @@ namespace pdfi FrameElement* pFrame, bool bIsWhiteSpaceInLine ); - void drawGlyphLine( const rtl::OUString& rGlyphs, + void drawGlyphLine( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, const ::com::sun::star::geometry::Matrix2D& rFontMatrix ); - void drawCharGlyphs( rtl::OUString& rGlyphs, + void drawCharGlyphs( OUString& rGlyphs, ::com::sun::star::geometry::RealRectangle2D& rRect, const GraphicsContext& aGC, ParagraphElement* pPara, @@ -129,7 +129,7 @@ namespace pdfi virtual void endPage(); virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ); + const OUString& rURI ); virtual void pushState(); virtual void popState(); virtual void setFlatness( double ); @@ -158,7 +158,7 @@ namespace pdfi virtual void intersectEoClip(const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPath); - virtual void drawGlyphs( const rtl::OUString& rGlyphs, + virtual void drawGlyphs( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, const ::com::sun::star::geometry::Matrix2D& rFontMatrix ); virtual void endText(); @@ -188,7 +188,7 @@ namespace pdfi ::com::sun::star::beans::PropertyValue>& xMask); /// nElements == -1 means fill in number of pages - void startIndicator( const rtl::OUString& rText, sal_Int32 nElements = -1 ); + void startIndicator( const OUString& rText, sal_Int32 nElements = -1 ); void endIndicator(); void setupImage(ImageId nImage); @@ -238,13 +238,13 @@ namespace pdfi public: CharGlyph(double fXPrevGlyphPosition, double fYPrevGlyphPosition, double fPrevGlyphHeight, double fPrevGlyphWidth, Element* pCurElement, const GraphicsContext& rCurrentContext, const com::sun::star::geometry::Matrix2D& rFontMatrix, - const com::sun::star::geometry::RealRectangle2D& rRect, const rtl::OUString& rGlyphs ) + const com::sun::star::geometry::RealRectangle2D& rRect, const OUString& rGlyphs ) : m_fXPrevGlyphPosition(fXPrevGlyphPosition), m_fYPrevGlyphPosition(fYPrevGlyphPosition), m_fPrevGlyphHeight(fPrevGlyphHeight), m_fPrevGlyphWidth(fPrevGlyphWidth), m_pCurElement(pCurElement), m_rCurrentContext(rCurrentContext), m_rFontMatrix(rFontMatrix), m_rRect(rRect), m_rGlyphs(rGlyphs) {}; virtual ~CharGlyph(){}; - rtl::OUString& getGlyph(){ return m_rGlyphs; } + OUString& getGlyph(){ return m_rGlyphs; } com::sun::star::geometry::RealRectangle2D& getRect(){ return m_rRect; } com::sun::star::geometry::Matrix2D& getFontMatrix(){ return m_rFontMatrix; } GraphicsContext& getGC(){ return m_rCurrentContext; } @@ -272,7 +272,7 @@ namespace pdfi GraphicsContext m_rCurrentContext ; com::sun::star::geometry::Matrix2D m_rFontMatrix ; com::sun::star::geometry::RealRectangle2D m_rRect ; - rtl::OUString m_rGlyphs ; + OUString m_rGlyphs ; }; } diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index 772e81f35690..d3523828d784 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -28,8 +28,6 @@ using namespace pdfi; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; StyleContainer::StyleContainer() : m_nNextId( 1 ) @@ -75,10 +73,10 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle ) return nRet; } -sal_Int32 StyleContainer::getStandardStyleId( const rtl::OString& rName ) +sal_Int32 StyleContainer::getStandardStyleId( const OString& rName ) { PropertyMap aProps; - aProps[ "style:family" ] = rtl::OStringToOUString( rName, RTL_TEXTENCODING_UTF8 ); + aProps[ "style:family" ] = OStringToOUString( rName, RTL_TEXTENCODING_UTF8 ); aProps[ "style:name" ] = "standard"; Style aStyle( "style:style", aProps ); diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx index 0db40d440276..1ef45e605c58 100644 --- a/sdext/source/pdfimport/tree/style.hxx +++ b/sdext/source/pdfimport/tree/style.hxx @@ -38,14 +38,14 @@ namespace pdfi public: struct Style { - rtl::OString Name; + OString Name; PropertyMap Properties; - rtl::OUString Contents; + OUString Contents; Element* ContainedElement; std::vector< Style* > SubStyles; Style() : ContainedElement( NULL ) {} - Style( const rtl::OString& rName, const PropertyMap& rProps ) : + Style( const OString& rName, const PropertyMap& rProps ) : Name( rName ), Properties( rProps ), ContainedElement( NULL ) @@ -55,9 +55,9 @@ namespace pdfi private: struct HashedStyle { - rtl::OString Name; + OString Name; PropertyMap Properties; - rtl::OUString Contents; + OUString Contents; Element* ContainedElement; std::vector<sal_Int32> SubStyles; @@ -161,12 +161,12 @@ namespace pdfi sal_Int32 impl_getStyleId( const Style& rStyle, bool bSubStyle ); sal_Int32 getStyleId( const Style& rStyle ) { return impl_getStyleId( rStyle, false ); } - sal_Int32 getStandardStyleId( const rtl::OString& rFamily ); + sal_Int32 getStandardStyleId( const OString& rFamily ); // returns NULL for an invalid style id const PropertyMap* getProperties( sal_Int32 nStyleId ) const; sal_Int32 setProperties( sal_Int32 nStyleId, const PropertyMap &rNewProps ); - rtl::OUString getStyleName( sal_Int32 nStyle ) const; + OUString getStyleName( sal_Int32 nStyle ) const; }; } diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 487bc7a5a6dd..dcb863e0358a 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -64,7 +64,7 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co PropertyMap aProps; if( elem.StyleId != -1 ) { - aProps[ rtl::OUString( "text:style-name" ) ] = + aProps[ OUString( "text:style-name" ) ] = m_rEmitContext.rStyles.getStyleName( elem.StyleId ); } @@ -127,13 +127,13 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem, { PageElement* pPage = dynamic_cast<PageElement*>(pAnchor); rProps[ "text:anchor-type" ] = "page"; - rProps[ "text:anchor-page-number" ] = rtl::OUString::valueOf(pPage->PageNumber); + rProps[ "text:anchor-page-number" ] = OUString::valueOf(pPage->PageNumber); } rel_x -= pAnchor->x; rel_y -= pAnchor->y; } - rProps[ "draw:z-index" ] = rtl::OUString::valueOf( rElem.ZOrder ); + rProps[ "draw:z-index" ] = OUString::valueOf( rElem.ZOrder ); rProps[ "draw:style-name"] = rEmitContext.rStyles.getStyleName( rElem.StyleId ); rProps[ "svg:width" ] = convertPixelToUnitString( rElem.w ); rProps[ "svg:height" ] = convertPixelToUnitString( rElem.h ); @@ -155,7 +155,7 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem, rGC.Transformation.decompose( aScale, aTranslation, fRotate, fShearX ); - rtl::OUStringBuffer aBuf( 256 ); + OUStringBuffer aBuf( 256 ); // TODO(F2): general transformation case missing; if implemented, note // that ODF rotation is oriented the other way @@ -269,7 +269,7 @@ void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* > PropertyMap aProps; fillFrameProps( elem, aProps, m_rEmitContext ); - rtl::OUStringBuffer aBuf( 64 ); + OUStringBuffer aBuf( 64 ); aBuf.appendAscii( "0 0 " ); aBuf.append( convPx2mmPrec2(elem.w)*100.0 ); aBuf.append( sal_Unicode(' ') ); @@ -856,7 +856,7 @@ void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* aVec.setX ( convPx2mmPrec2( aVec.getX() )*100.0 ); aVec.setY ( convPx2mmPrec2( aVec.getY() )*100.0 ); - aGCProps[ "svg:stroke-width" ] = rtl::OUString::valueOf( aVec.getLength() ); + aGCProps[ "svg:stroke-width" ] = OUString::valueOf( aVec.getLength() ); } } else @@ -923,10 +923,10 @@ void WriterXmlFinalizer::visit( TextElement& elem, const std::list< Element* >:: aFontProps[ "style:text-outline" ] = "true"; } // size - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( rFont.size*72/PDFI_OUTDEV_RESOLUTION ); aBuf.appendAscii( "pt" ); - rtl::OUString aFSize = aBuf.makeStringAndClear(); + OUString aFSize = aBuf.makeStringAndClear(); aFontProps[ "fo:font-size" ] = aFSize; aFontProps[ "style:font-size-asian" ] = aFSize; aFontProps[ "style:font-size-complex" ] = aFSize; @@ -975,7 +975,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element if( ! bIsCenter && elem.x > p_x + p_w/10 ) { // indent - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( convPx2mm( elem.x - p_x ) ); aBuf.appendAscii( "mm" ); aParaProps[ "fo:margin-left" ] = aBuf.makeStringAndClear(); @@ -991,7 +991,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element { if( pNextPara->y - (elem.y+elem.h) > convmm2Px( 10 ) ) { - rtl::OUStringBuffer aBuf( 32 ); + OUStringBuffer aBuf( 32 ); aBuf.append( convPx2mm( pNextPara->y - (elem.y+elem.h) ) ); aBuf.appendAscii( "mm" ); aParaProps[ "fo:margin-bottom" ] = aBuf.makeStringAndClear(); @@ -1036,7 +1036,7 @@ void WriterXmlFinalizer::visit( ImageElement&, const std::list< Element* >::cons void WriterXmlFinalizer::setFirstOnPage( ParagraphElement& rElem, StyleContainer& rStyles, - const rtl::OUString& rMasterPageName ) + const OUString& rMasterPageName ) { PropertyMap aProps; if( rElem.StyleId != -1 ) @@ -1161,7 +1161,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: sal_Int32 nPageStyle = m_rStyleContainer.impl_getStyleId( aStyle, false ); // create master page - rtl::OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); + OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle ); aPageProps[ "style:page-layout-name" ] = aMasterPageLayoutName; StyleContainer::Style aMPStyle( "style:master-page", aPageProps ); StyleContainer::Style aHeaderStyle( "style:header", PropertyMap() ); @@ -1181,7 +1181,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: elem.StyleId = m_rStyleContainer.impl_getStyleId( aMPStyle,false ); - rtl::OUString aMasterPageName = m_rStyleContainer.getStyleName( elem.StyleId ); + OUString aMasterPageName = m_rStyleContainer.getStyleName( elem.StyleId ); // create styles for children elem.applyToChildren(*this); diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx index f4b84f91ef74..dec3e913bb14 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.hxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx @@ -58,7 +58,7 @@ namespace pdfi void setFirstOnPage( ParagraphElement& rElem, StyleContainer& rStyles, - const rtl::OUString& rMasterPageName ); + const OUString& rMasterPageName ); public: explicit WriterXmlFinalizer(StyleContainer& rStyleContainer, diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 9a3c63ffc646..87f2b85418db 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -136,7 +136,7 @@ class Parser const uno::Reference<uno::XComponentContext> m_xContext; const ContentSinkSharedPtr m_pSink; const oslFileHandle m_pErr; - ::rtl::OString m_aLine; + OString m_aLine; FontMapType m_aFontMap; sal_Int32 m_nNextToken; sal_Int32 m_nCharIndex; @@ -144,7 +144,7 @@ class Parser const double minAreaThreshold; const double minLineWidth; - ::rtl::OString readNextToken(); + OString readNextToken(); void readInt32( sal_Int32& o_Value ); sal_Int32 readInt32(); void readInt64( sal_Int64& o_Value ); @@ -189,7 +189,7 @@ public: minLineWidth( 12 ) {} - void parseLine( const ::rtl::OString& rLine ); + void parseLine( const OString& rLine ); }; @@ -200,7 +200,7 @@ namespace characters are encoded as pairs of characters: '\\' 'n', resp. '\\' 'r'. This function converts them back to '\n', resp. '\r'. */ - rtl::OString lcl_unescapeLineFeeds(const rtl::OString& i_rStr) + OString lcl_unescapeLineFeeds(const OString& i_rStr) { const size_t nOrigLen(sal::static_int_cast<size_t>(i_rStr.getLength())); const sal_Char* const pOrig(i_rStr.getStr()); @@ -238,7 +238,7 @@ namespace } *pWrite = '\0'; - rtl::OString aResult(pBuffer); + OString aResult(pBuffer); delete[] pBuffer; return aResult; } @@ -246,7 +246,7 @@ namespace } -::rtl::OString Parser::readNextToken() +OString Parser::readNextToken() { OSL_PRECOND(m_nCharIndex!=-1,"insufficient input"); return m_aLine.getToken(m_nNextToken,' ',m_nCharIndex); @@ -295,7 +295,7 @@ void Parser::readBinaryData( uno::Sequence<sal_Int8>& rBuf ) uno::Reference<rendering::XPolyPolygon2D> Parser::readPath( double* pArea = NULL ) { - const rtl::OString aSubPathMarker( "subpath" ); + const OString aSubPathMarker( "subpath" ); if( 0 != readNextToken().compareTo( aSubPathMarker ) ) OSL_PRECOND(false, "broken path"); @@ -311,7 +311,7 @@ uno::Reference<rendering::XPolyPolygon2D> Parser::readPath( double* pArea = NULL sal_Int32 nContiguousControlPoints(0); sal_Int32 nDummy=m_nCharIndex; - rtl::OString aCurrToken( m_aLine.getToken(m_nNextToken,' ',nDummy) ); + OString aCurrToken( m_aLine.getToken(m_nNextToken,' ',nDummy) ); while( m_nCharIndex != -1 && 0 != aCurrToken.compareTo(aSubPathMarker) ) { @@ -380,12 +380,12 @@ void Parser::readChar() readDouble(aUnoMatrix.m10); readDouble(aUnoMatrix.m11); - rtl::OString aChars = lcl_unescapeLineFeeds( m_aLine.copy( m_nCharIndex ) ); + OString aChars = lcl_unescapeLineFeeds( m_aLine.copy( m_nCharIndex ) ); // chars gobble up rest of line m_nCharIndex = -1; - m_pSink->drawGlyphs( rtl::OStringToOUString( aChars, + m_pSink->drawGlyphs( OStringToOUString( aChars, RTL_TEXTENCODING_UTF8 ), aRect, aUnoMatrix ); } @@ -490,7 +490,7 @@ int Parser::parseFontRemoveSuffix( const sal_Unicode* pCopy, const char* s, sal_ void Parser::parseFontFamilyName( FontAttributes& aResult ) { - rtl::OUStringBuffer aNewFamilyName( aResult.familyName.getLength() ); + OUStringBuffer aNewFamilyName( aResult.familyName.getLength() ); const sal_Unicode* pCopy = aResult.familyName.getStr(); sal_Int32 nLen = aResult.familyName.getLength(); @@ -527,7 +527,7 @@ void Parser::parseFontFamilyName( FontAttributes& aResult ) void Parser::readFont() { - ::rtl::OString aFontName; + OString aFontName; sal_Int64 nFontID; sal_Int32 nIsEmbedded, nIsBold, nIsItalic, nIsUnderline, nFileLen; double nSize; @@ -558,7 +558,7 @@ void Parser::readFont() } // yet unknown font - get info and add to map - FontAttributes aResult( rtl::OStringToOUString( aFontName, + FontAttributes aResult( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ), nIsBold != 0, nIsItalic != 0, @@ -582,7 +582,7 @@ void Parser::readFont() { uno::Reference< beans::XMaterialHolder > xMat( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - rtl::OUString( "com.sun.star.awt.FontIdentificator" ), + OUString( "com.sun.star.awt.FontIdentificator" ), aArgs, m_xContext ), uno::UNO_QUERY ); @@ -608,7 +608,7 @@ void Parser::readFont() if( aResult.familyName.isEmpty() ) { // last fallback - aResult.familyName = ::rtl::OUString( "Arial" ); + aResult.familyName = OUString( "Arial" ); aResult.isUnderline = false; } @@ -621,19 +621,19 @@ void Parser::readFont() uno::Sequence<beans::PropertyValue> Parser::readImageImpl() { - static const rtl::OString aJpegMarker( "JPEG" ); - static const rtl::OString aPbmMarker( "PBM" ); - static const rtl::OString aPpmMarker( "PPM" ); - static const rtl::OString aPngMarker( "PNG" ); - static const rtl::OUString aJpegFile( "DUMMY.JPEG" ); - static const rtl::OUString aPbmFile( "DUMMY.PBM" ); - static const rtl::OUString aPpmFile( "DUMMY.PPM" ); - static const rtl::OUString aPngFile( "DUMMY.PNG" ); - - rtl::OString aToken = readNextToken(); + static const OString aJpegMarker( "JPEG" ); + static const OString aPbmMarker( "PBM" ); + static const OString aPpmMarker( "PPM" ); + static const OString aPngMarker( "PNG" ); + static const OUString aJpegFile( "DUMMY.JPEG" ); + static const OUString aPbmFile( "DUMMY.PBM" ); + static const OUString aPpmFile( "DUMMY.PPM" ); + static const OUString aPngFile( "DUMMY.PNG" ); + + OString aToken = readNextToken(); const sal_Int32 nImageSize( readInt32() ); - rtl::OUString aFileName; + OUString aFileName; if( aToken.compareTo( aPngMarker ) == 0 ) aFileName = aPngFile; else if( aToken.compareTo( aJpegMarker ) == 0 ) @@ -655,19 +655,19 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl() uno::Reference< uno::XComponentContext > xContext( m_xContext, uno::UNO_SET_THROW ); uno::Reference< lang::XMultiComponentFactory > xFactory( xContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< io::XInputStream > xDataStream( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "com.sun.star.io.SequenceInputStream" ), + OUString( "com.sun.star.io.SequenceInputStream" ), aStreamCreationArgs, m_xContext ), uno::UNO_QUERY_THROW ); uno::Sequence<beans::PropertyValue> aSequence(3); - aSequence[0] = beans::PropertyValue( ::rtl::OUString("URL"), + aSequence[0] = beans::PropertyValue( OUString("URL"), 0, uno::makeAny(aFileName), beans::PropertyState_DIRECT_VALUE ); - aSequence[1] = beans::PropertyValue( ::rtl::OUString("InputStream"), + aSequence[1] = beans::PropertyValue( OUString("InputStream"), 0, uno::makeAny( xDataStream ), beans::PropertyState_DIRECT_VALUE ); - aSequence[2] = beans::PropertyValue( ::rtl::OUString("InputSequence"), + aSequence[2] = beans::PropertyValue( OUString("InputSequence"), 0, uno::makeAny(aDataSequence), beans::PropertyState_DIRECT_VALUE ); @@ -727,7 +727,7 @@ void Parser::readLink() readDouble(aBounds.Y2); m_pSink->hyperLink( aBounds, - rtl::OStringToOUString( lcl_unescapeLineFeeds( + OStringToOUString( lcl_unescapeLineFeeds( m_aLine.copy(m_nCharIndex) ), RTL_TEXTENCODING_UTF8 ) ); // name gobbles up rest of line @@ -761,7 +761,7 @@ void Parser::readSoftMaskedImage() m_pSink->drawAlphaMaskedImage( aImage, aMask ); } -void Parser::parseLine( const ::rtl::OString& rLine ) +void Parser::parseLine( const OString& rLine ) { OSL_PRECOND( m_pSink, "Invalid sink" ); OSL_PRECOND( m_pErr, "Invalid filehandle" ); @@ -769,7 +769,7 @@ void Parser::parseLine( const ::rtl::OString& rLine ) m_nNextToken = 0; m_nCharIndex = 0; m_aLine = rLine; uno::Reference<rendering::XPolyPolygon2D> xPoly; - const ::rtl::OString& rCmd = readNextToken(); + const OString& rCmd = readNextToken(); const hash_entry* pEntry = PdfKeywordHash::in_word_set( rCmd.getStr(), rCmd.getLength() ); OSL_ASSERT(pEntry); @@ -865,7 +865,7 @@ void Parser::parseLine( const ::rtl::OString& rLine ) OSL_POSTCOND(m_nCharIndex==-1,"leftover scanner input"); } -oslFileError readLine( oslFileHandle pFile, ::rtl::OStringBuffer& line ) +oslFileError readLine( oslFileHandle pFile, OStringBuffer& line ) { OSL_PRECOND( line.isEmpty(), "line buf not empty" ); @@ -893,16 +893,16 @@ oslFileError readLine( oslFileHandle pFile, ::rtl::OStringBuffer& line ) } // namespace -static bool checkEncryption( const rtl::OUString& i_rPath, +static bool checkEncryption( const OUString& i_rPath, const uno::Reference< task::XInteractionHandler >& i_xIHdl, - rtl::OUString& io_rPwd, + OUString& io_rPwd, bool& o_rIsEncrypted, - const rtl::OUString& i_rDocName + const OUString& i_rDocName ) { bool bSuccess = false; - rtl::OString aPDFFile; - aPDFFile = rtl::OUStringToOString( i_rPath, osl_getThreadTextEncoding() ); + OString aPDFFile; + aPDFFile = OUStringToOString( i_rPath, osl_getThreadTextEncoding() ); pdfparse::PDFReader aParser; boost::scoped_ptr<pdfparse::PDFEntry> pEntry( aParser.read( aPDFFile.getStr() )); @@ -919,7 +919,7 @@ static bool checkEncryption( const rtl::OUString& bool bAuthenticated = false; if( !io_rPwd.isEmpty() ) { - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } @@ -933,7 +933,7 @@ static bool checkEncryption( const rtl::OUString& do { bEntered = getPassword( i_xIHdl, io_rPwd, ! bEntered, i_rDocName ); - rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, + OString aIsoPwd = OUStringToOString( io_rPwd, RTL_TEXTENCODING_ISO_8859_1 ); bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() ); } while( bEntered && ! bAuthenticated ); @@ -944,7 +944,7 @@ static bool checkEncryption( const rtl::OUString& } if( bAuthenticated ) { - rtl::OUStringBuffer aBuf( 128 ); + OUStringBuffer aBuf( 128 ); aBuf.appendAscii( "_OOO_pdfi_Credentials_" ); aBuf.append( pPDFFile->getDecryptionKey() ); io_rPwd = aBuf.makeStringAndClear(); @@ -967,15 +967,15 @@ static bool checkEncryption( const rtl::OUString& return bSuccess; } -bool xpdf_ImportFromFile( const ::rtl::OUString& rURL, +bool xpdf_ImportFromFile( const OUString& rURL, const ContentSinkSharedPtr& rSink, const uno::Reference< task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const uno::Reference< uno::XComponentContext >& xContext ) { OSL_ASSERT(rSink); - ::rtl::OUString aSysUPath; + OUString aSysUPath; if( osl_getSystemPathFromFileURL( rURL.pData, &aSysUPath.pData ) != osl_File_E_None ) { SAL_WARN( @@ -983,10 +983,10 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR "getSystemPathFromFileURL(" << rURL << ") failed"); return false; } - rtl::OUString aDocName( rURL.copy( rURL.lastIndexOf( sal_Unicode('/') )+1 ) ); + OUString aDocName( rURL.copy( rURL.lastIndexOf( sal_Unicode('/') )+1 ) ); // check for encryption, if necessary get password - rtl::OUString aPwd( rPwd ); + OUString aPwd( rPwd ); bool bIsEncrypted = false; if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false ) { @@ -1018,11 +1018,11 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR sal_uInt32 nEnv = 0; #if defined UNX && ! defined MACOSX - rtl::OUString aStr( "$URE_LIB_DIR" ); + OUString aStr( "$URE_LIB_DIR" ); rtl_bootstrap_expandMacros( &aStr.pData ); - rtl::OUString aSysPath; + OUString aSysPath; osl_getSystemPathFromFileURL( aStr.pData, &aSysPath.pData ); - rtl::OUStringBuffer aEnvBuf( aStr.getLength() + 20 ); + OUStringBuffer aEnvBuf( aStr.getLength() + 20 ); aEnvBuf.appendAscii( "LD_LIBRARY_PATH=" ); aEnvBuf.append( aSysPath ); aStr = aEnvBuf.makeStringAndClear(); @@ -1060,9 +1060,9 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR if( pIn ) { - rtl::OStringBuffer aBuf(256); + OStringBuffer aBuf(256); if( bIsEncrypted ) - aBuf.append( rtl::OUStringToOString( aPwd, RTL_TEXTENCODING_ISO_8859_1 ) ); + aBuf.append( OUStringToOString( aPwd, RTL_TEXTENCODING_ISO_8859_1 ) ); aBuf.append( '\n' ); sal_uInt64 nWritten = 0; @@ -1075,7 +1075,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR // OutputDev. stderr is used for alternate streams, like // embedded fonts and bitmaps Parser aParser(rSink,pErr,xContext); - ::rtl::OStringBuffer line; + OStringBuffer line; while( osl_File_E_None == readLine(pOut, line) && line.getLength() ) aParser.parseLine(line.makeStringAndClear()); } @@ -1100,7 +1100,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString& rUR bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xInput, const ContentSinkSharedPtr& rSink, const uno::Reference<task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const uno::Reference< uno::XComponentContext >& xContext ) { OSL_ASSERT(xInput.is()); @@ -1108,7 +1108,7 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >& xI // convert XInputStream to local temp file oslFileHandle aFile = NULL; - rtl::OUString aURL; + OUString aURL; if( osl_createTempFile( NULL, &aFile, &aURL.pData ) != osl_File_E_None ) return false; diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 59d2396c6117..b442f76d3148 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; //===== PresenterAccessibleObject ============================================= @@ -70,7 +69,7 @@ public: AccessibleObject ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName); + const OUString& rsName); void LateInitialization (void); virtual ~AccessibleObject (void); @@ -88,7 +87,7 @@ public: void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild); void SetIsFocused (const bool bIsFocused); - void SetAccessibleName (const ::rtl::OUString& rsName); + void SetAccessibleName (const OUString& rsName); void FireAccessibleEvent ( const sal_Int16 nEventId, @@ -130,10 +129,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName (void) + virtual OUString SAL_CALL getAccessibleName (void) throw (cssu::RuntimeException); virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL @@ -210,7 +209,7 @@ public: throw (cssu::RuntimeException); protected: - ::rtl::OUString msName; + OUString msName; cssu::Reference<css::awt::XWindow2> mxContentWindow; cssu::Reference<css::awt::XWindow2> mxBorderWindow; const css::lang::Locale maLocale; @@ -328,7 +327,7 @@ public: AccessibleParagraph ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName, + const OUString& rsName, const SharedPresenterTextParagraph& rpParagraph, const sal_Int32 nParagraphIndex); @@ -354,7 +353,7 @@ public: virtual cssu::Sequence<css::beans::PropertyValue> SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence<rtl::OUString>& rRequestedAttributes) + const cssu::Sequence<OUString>& rRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) @@ -366,7 +365,7 @@ public: virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText (void) + virtual OUString SAL_CALL getSelectedText (void) throw (cssu::RuntimeException); virtual sal_Int32 SAL_CALL getSelectionStart (void) @@ -378,10 +377,10 @@ public: virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText (void) + virtual OUString SAL_CALL getText (void) throw (cssu::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange ( + virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); @@ -490,7 +489,7 @@ public: AccessibleNotes ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName); + const OUString& rsName); static rtl::Reference<PresenterAccessible::AccessibleObject> Create ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, @@ -642,7 +641,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (void) void PresenterAccessible::UpdateAccessibilityHierarchy ( const Reference<awt::XWindow>& rxPreviewContentWindow, const Reference<awt::XWindow>& rxPreviewBorderWindow, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const Reference<awt::XWindow>& rxNotesContentWindow, const Reference<awt::XWindow>& rxNotesBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView) @@ -710,7 +709,7 @@ void PresenterAccessible::NotifyCurrentSlideChange ( mpAccessiblePreview->SetAccessibleName( (pPreviewPane&&pPreviewPane->mxPane.is() ? pPreviewPane->mxPane->GetTitle() - : rtl::OUString())); + : OUString())); } // Play some focus ping-pong to trigger AT tools. @@ -1270,7 +1269,7 @@ void PresenterAccessible::AccessibleObject::SetIsFocused (const bool bIsFocused) } } -void PresenterAccessible::AccessibleObject::SetAccessibleName (const ::rtl::OUString& rsName) +void PresenterAccessible::AccessibleObject::SetAccessibleName (const OUString& rsName) { if (msName != rsName) { @@ -1601,7 +1600,7 @@ sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal Sequence<css::beans::PropertyValue> SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterAttributes ( ::sal_Int32 nIndex, - const cssu::Sequence<rtl::OUString>& rRequestedAttributes) + const cssu::Sequence<OUString>& rRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) { ThrowIfDisposed(); @@ -1678,7 +1677,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( return nIndex; } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) throw (cssu::RuntimeException) { ThrowIfDisposed(); @@ -1713,26 +1712,26 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( return setCaretPosition(nStartIndex); } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) throw (cssu::RuntimeException) { ThrowIfDisposed(); - ::rtl::OUString sText; + OUString sText; if (mpParagraph) sText = mpParagraph->GetText(); return sText; } -::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( sal_Int32 nLocalStartIndex, sal_Int32 nLocalEndIndex) throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) { ThrowIfDisposed(); - ::rtl::OUString sText; + OUString sText; if (mpParagraph) { const TextSegment aSegment ( @@ -1867,7 +1866,7 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n AccessibleNotes::AccessibleNotes ( const css::lang::Locale aLocale, const sal_Int16 nRole, - const ::rtl::OUString& rsName) + const OUString& rsName) : AccessibleObject(aLocale,nRole,rsName), mpTextView() { diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 6a70c9ed625e..10740d193d93 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -121,7 +121,7 @@ private: void UpdateAccessibilityHierarchy ( const css::uno::Reference<css::awt::XWindow>& rxPreviewContentWindow, const css::uno::Reference<css::awt::XWindow>& rxPreviewBorderWindow, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const css::uno::Reference<css::awt::XWindow>& rxNotesContentWindow, const css::uno::Reference<css::awt::XWindow>& rxNotesBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView); diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 66d0cf86a25a..37e2f08a7c7c 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -31,14 +31,13 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; namespace sdext { namespace presenter { //===== PresenterBitmapContainer ============================================== PresenterBitmapContainer::PresenterBitmapContainer ( - const ::rtl::OUString& rsConfigurationBase, + const OUString& rsConfigurationBase, const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, @@ -141,7 +140,7 @@ void PresenterBitmapContainer::LoadBitmaps ( SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPath, + const OUString& rsPath, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const SharedBitmapDescriptor& rpDefault) diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 60f029629f29..c88dfb5082f6 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -92,7 +92,7 @@ public: bitmap sets. */ PresenterBitmapContainer ( - const ::rtl::OUString& rsConfigurationBase, + const OUString& rsConfigurationBase, const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, @@ -110,18 +110,18 @@ public: /** Return the bitmap set that is associated with the given name. */ - ::boost::shared_ptr<BitmapDescriptor> GetBitmap (const ::rtl::OUString& rsName) const; + ::boost::shared_ptr<BitmapDescriptor> GetBitmap (const OUString& rsName) const; static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToBitmapNode, + const OUString& rsPathToBitmapNode, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::boost::shared_ptr<BitmapDescriptor>& rpDefaultBitmap); private: ::boost::shared_ptr<PresenterBitmapContainer> mpParentContainer; - typedef ::std::map<rtl::OUString, ::boost::shared_ptr<BitmapDescriptor> > BitmapContainer; + typedef ::std::map<OUString, ::boost::shared_ptr<BitmapDescriptor> > BitmapContainer; BitmapContainer maIconContainer; css::uno::Reference<css::rendering::XCanvas> mxCanvas; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; @@ -129,7 +129,7 @@ private: void LoadBitmaps ( const css::uno::Reference<css::container::XNameAccess>& rsRootNode); void ProcessBitmap ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const css::uno::Reference<css::beans::XPropertySet>& rProperties); static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap ( const css::uno::Reference<css::beans::XPropertySet>& rxProperties, @@ -137,7 +137,7 @@ private: const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault); static BitmapDescriptor::TexturingMode - StringToTexturingMode (const ::rtl::OUString& rsTexturingMode); + StringToTexturingMode (const OUString& rsTexturingMode); }; typedef PresenterBitmapContainer::BitmapDescriptor PresenterBitmapDescriptor; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index bc9a1274a4d0..0326735277f9 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 2c56e2195498..069b647207c8 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -63,7 +63,7 @@ public: const ::boost::shared_ptr<PresenterTheme>& rpTheme, const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas, - const ::rtl::OUString& rsConfigurationName); + const OUString& rsConfigurationName); ~PresenterButton (void); virtual void SAL_CALL disposing (void); @@ -125,10 +125,10 @@ private: css::uno::Reference<css::awt::XWindow> mxWindow; css::uno::Reference<css::rendering::XCanvas> mxCanvas; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; - const ::rtl::OUString msText; + const OUString msText; const PresenterTheme::SharedFontDescriptor mpFont; const PresenterTheme::SharedFontDescriptor mpMouseOverFont; - const ::rtl::OUString msAction; + const OUString msAction; css::geometry::RealPoint2D maCenter; css::geometry::IntegerSize2D maButtonSize; PresenterBitmapDescriptor::Mode meState; @@ -142,8 +142,8 @@ private: const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const PresenterTheme::SharedFontDescriptor& rFont, const PresenterTheme::SharedFontDescriptor& rMouseOverFont, - const ::rtl::OUString& rxText, - const ::rtl::OUString& rxAction); + const OUString& rxText, + const OUString& rxAction); void RenderButton ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::geometry::IntegerSize2D& rSize, @@ -160,7 +160,7 @@ private: void SetupButtonBitmaps (void); static css::uno::Reference<css::beans::XPropertySet> GetConfigurationProperties ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const ::rtl::OUString& rsConfgurationName); + const OUString& rsConfgurationName); void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 92f3f1ac6200..596fda71237c 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -261,7 +261,7 @@ void PresenterCanvasHelper::SetDeviceColor( css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 nTextDirection) { if (rxFont.is() && !rsText.isEmpty()) @@ -279,7 +279,7 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 nTextDirection) { const geometry::RealRectangle2D aTextBBox (GetTextBoundingBox(rxFont, rsText, nTextDirection)); diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index d9e10dd04967..dc5477e85229 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -63,12 +63,12 @@ public: static css::geometry::RealRectangle2D GetTextBoundingBox ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT); static css::geometry::RealSize2D GetTextSize ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const ::rtl::OUString& rsText, + const OUString& rsText, const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT); private: diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index de18f450ea0e..f285d1346898 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace cppu; using namespace osl; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index be5d839af0bf..3a36cb332623 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -27,11 +27,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName = +const OUString PresenterConfigurationAccess::msPresenterScreenRootName = "/org.openoffice.Office.PresenterScreen/"; PresenterConfigurationAccess::PresenterConfigurationAccess ( @@ -78,7 +77,7 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( catch (const Exception& rException) { OSL_TRACE ("caught exception while opening configuration: %s", - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -99,7 +98,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToN sPathToNode); } -bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNode) +bool PresenterConfigurationAccess::GoToChild (const OUString& rsPathToNode) { if ( ! IsValid()) return false; @@ -132,7 +131,7 @@ bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate) } bool PresenterConfigurationAccess::SetProperty ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const Any& rValue) { Reference<beans::XPropertySet> xProperties (maNode, UNO_QUERY); @@ -162,8 +161,8 @@ Any PresenterConfigurationAccess::GetConfigurationNode ( catch (const Exception& rException) { OSL_TRACE ("caught exception while getting configuration node %s: %s", - ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(), + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } return Any(); @@ -171,7 +170,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode ( Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToNode) + const OUString& rsPathToNode) { return Reference<beans::XPropertySet>(GetConfigurationNode(rxNode, rsPathToNode), UNO_QUERY); } @@ -257,8 +256,8 @@ Any PresenterConfigurationAccess::Find ( } bool PresenterConfigurationAccess::IsStringPropertyEqual ( - const ::rtl::OUString& rsValue, - const ::rtl::OUString& rsPropertyName, + const OUString& rsValue, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertySet>& rxNode) { OUString sValue; diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index ee2035a2dab4..ea663e46a3c0 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -49,9 +49,9 @@ class PresenterConfigurationAccess public: enum WriteMode { READ_WRITE, READ_ONLY }; typedef ::boost::function<bool( - const ::rtl::OUString&, + const OUString&, const css::uno::Reference<css::beans::XPropertySet>&)> Predicate; - static const ::rtl::OUString msPresenterScreenRootName; + static const OUString msPresenterScreenRootName; /** Create a new object to access the configuration entries below the given root. @@ -64,7 +64,7 @@ public: */ PresenterConfigurationAccess( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::OUString& rsRootName, + const OUString& rsRootName, WriteMode eMode); ~PresenterConfigurationAccess (void); @@ -74,7 +74,7 @@ public: The relative path from the root (as given the constructor) to the node. */ css::uno::Any GetConfigurationNode ( - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Return <TRUE/> when opening the configuration (via creating a new PresenterConfigurationAccess object) or previous calls to @@ -85,7 +85,7 @@ public: /** Move the focused node to the (possibly indirect) child specified by the given path. */ - bool GoToChild (const ::rtl::OUString& rsPathToNode); + bool GoToChild (const OUString& rsPathToNode); /** Move the focused node to the first direct child that fulfills the given predicate. */ @@ -95,7 +95,7 @@ public: mind to call CommitChanges() to write the change back to the configuration. */ - bool SetProperty (const ::rtl::OUString& rsPropertyName, const css::uno::Any& rValue); + bool SetProperty (const OUString& rsPropertyName, const css::uno::Any& rValue); /** Return a configuration node below the given node. @param rxNode @@ -109,11 +109,11 @@ public: */ static css::uno::Any GetConfigurationNode ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); static css::uno::Reference<css::beans::XPropertySet> GetNodeProperties ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsPathToNode); + const OUString& rsPathToNode); /** Write any changes that have been made back to the configuration. This call is ignored when the called ConfigurationAccess object was @@ -122,10 +122,10 @@ public: void CommitChanges (void); typedef ::boost::function<void( - const ::rtl::OUString&, + const OUString&, const ::std::vector<css::uno::Any>&) > ItemProcessor; typedef ::boost::function<void( - const ::rtl::OUString&, + const OUString&, const css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor; /** Execute a functor for all elements of the given container. @@ -142,7 +142,7 @@ public: */ static void ForAll ( const css::uno::Reference<css::container::XNameAccess>& rxContainer, - const ::std::vector<rtl::OUString>& rArguments, + const ::std::vector<OUString>& rArguments, const ItemProcessor& rProcessor); static void ForAll ( const css::uno::Reference<css::container::XNameAccess>& rxContainer, @@ -153,8 +153,8 @@ public: const Predicate& rPredicate); static bool IsStringPropertyEqual ( - const ::rtl::OUString& rsValue, - const ::rtl::OUString& rsPropertyName, + const OUString& rsValue, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertySet>& rxNode); /** This method wraps a call to getPropertyValue() and returns an empty @@ -163,7 +163,7 @@ public: */ static css::uno::Any GetProperty ( const css::uno::Reference<css::beans::XPropertySet>& rxProperties, - const ::rtl::OUString& rsKey); + const OUString& rsKey); private: css::uno::Reference<css::uno::XInterface> mxRoot; diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 18d0aa943f17..0532de6b6f93 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -60,8 +60,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace { const sal_Int32 ResourceActivationEventType = 0; @@ -429,7 +427,7 @@ void PresenterController::UpdateViews (void) } SharedBitmapDescriptor - PresenterController::GetViewBackground (const ::rtl::OUString& rsViewURL) const + PresenterController::GetViewBackground (const OUString& rsViewURL) const { if (mpTheme.get() != NULL) { @@ -440,7 +438,7 @@ SharedBitmapDescriptor } PresenterTheme::SharedFontDescriptor - PresenterController::GetViewFont (const ::rtl::OUString& rsViewURL) const + PresenterController::GetViewFont (const OUString& rsViewURL) const { if (mpTheme.get() != NULL) { @@ -555,7 +553,7 @@ Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::U frame::FrameSearchFlag::SELF); } -util::URL PresenterController::CreateURLFromString (const ::rtl::OUString& rsURL) const +util::URL PresenterController::CreateURLFromString (const OUString& rsURL) const { util::URL aURL; diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index fb66f31b2e4b..e8b4ec6c2c9a 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -97,9 +97,9 @@ public: void UpdateCurrentSlide (const sal_Int32 nOffset); SharedBitmapDescriptor - GetViewBackground (const ::rtl::OUString& rsViewURL) const; + GetViewBackground (const OUString& rsViewURL) const; PresenterTheme::SharedFontDescriptor - GetViewFont (const ::rtl::OUString& rsViewURL) const; + GetViewFont (const OUString& rsViewURL) const; ::boost::shared_ptr<PresenterTheme> GetTheme (void) const; ::rtl::Reference<PresenterWindowManager> GetWindowManager (void) const; css::uno::Reference<css::presentation::XSlideShowController> @@ -111,13 +111,13 @@ public: ::boost::shared_ptr<PresenterPaintManager> GetPaintManager (void) const; void HideSlideSorter (void); double GetSlideAspectRatio (void) const; - void ShowView (const ::rtl::OUString& rsViewURL); - void HideView (const ::rtl::OUString& rsViewURL); + void ShowView (const OUString& rsViewURL); + void HideView (const OUString& rsViewURL); void SwitchMonitors (void); - void DispatchUnoCommand (const ::rtl::OUString& rsCommand) const; + void DispatchUnoCommand (const OUString& rsCommand) const; css::uno::Reference<css::frame::XDispatch> GetDispatch ( const css::util::URL& rURL) const; - css::util::URL CreateURLFromString (const ::rtl::OUString& rsURL) const; + css::util::URL CreateURLFromString (const OUString& rsURL) const; css::uno::Reference<css::drawing::framework::XConfigurationController> GetConfigurationController (void) const; css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide (void) const; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index ef77190e8d92..d9ba2009158a 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -21,7 +21,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -106,7 +105,7 @@ void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse) mpPresenterController->UpdateCurrentSlide(+1); } -void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const rtl::OUString &) +void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &) throw (css::uno::RuntimeException) { } diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 1c009c3af53d..cddb6d64af02 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -63,7 +63,7 @@ public: virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException); // XAnimationListener virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 0c318463a198..782742bf20ea 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 57153bdcf188..b855793fb3a2 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -57,7 +57,7 @@ public: throw (css::uno::RuntimeException); private: - ::rtl::OUString msEventType; + OUString msEventType; css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; Predicate maPredicate; Action maAction; @@ -75,7 +75,7 @@ private: */ PresenterFrameworkObserver ( const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, - const ::rtl::OUString& rsEventName, + const OUString& rsEventName, const Predicate& rPredicate, const Action& rAction); virtual ~PresenterFrameworkObserver (void); diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 638b72855964..70fe8b87af17 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; using ::std::vector; namespace sdext { namespace presenter { @@ -88,9 +87,9 @@ namespace { const OUString msText; ::boost::shared_ptr<vector<LineDescriptor> > mpLineDescriptors; - void SplitText (const ::rtl::OUString& rsText, vector<rtl::OUString>& rTextParts); + void SplitText (const OUString& rsText, vector<OUString>& rTextParts); void FormatText ( - const vector<rtl::OUString>& rTextParts, + const vector<OUString>& rTextParts, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, const sal_Int32 nMaximalWidth); }; diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 0145eb922ff1..1e5fae0b47c1 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index d0145afffc53..b140d464a0fa 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -35,19 +35,19 @@ class PresenterHelper : ::boost::noncopyable { public: - static const ::rtl::OUString msPaneURLPrefix; - static const ::rtl::OUString msCenterPaneURL; - static const ::rtl::OUString msFullScreenPaneURL; + static const OUString msPaneURLPrefix; + static const OUString msCenterPaneURL; + static const OUString msFullScreenPaneURL; - static const ::rtl::OUString msViewURLPrefix; - static const ::rtl::OUString msPresenterScreenURL; - static const ::rtl::OUString msSlideSorterURL; + static const OUString msViewURLPrefix; + static const OUString msPresenterScreenURL; + static const OUString msSlideSorterURL; - static const ::rtl::OUString msResourceActivationEvent; - static const ::rtl::OUString msResourceDeactivationEvent; + static const OUString msResourceActivationEvent; + static const OUString msResourceDeactivationEvent; - static const ::rtl::OUString msDefaultPaneStyle; - static const ::rtl::OUString msDefaultViewStyle; + static const OUString msDefaultPaneStyle; + static const OUString msDefaultViewStyle; /** Return the slide show controller of a running presentation that has the same document as the given framework controller. diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 2ffb8ceb7b59..90450a414d97 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; static const sal_Int32 gnSpaceBelowSeparator (10); static const sal_Int32 gnSpaceAboveSeparator (10); @@ -226,15 +225,15 @@ void PresenterNotesView::CreateToolBar ( void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesPage) { - static const ::rtl::OUString sNotesShapeName ( + static const OUString sNotesShapeName ( "com.sun.star.presentation.NotesShape"); - static const ::rtl::OUString sTextShapeName ( + static const OUString sTextShapeName ( "com.sun.star.drawing.TextShape"); Reference<container::XIndexAccess> xIndexAccess (rxNotesPage, UNO_QUERY); if (xIndexAccess.is()) { - ::rtl::OUString sText; + OUString sText; // Iterate over all shapes and find the one that holds the text. sal_Int32 nCount (xIndexAccess->getCount()); @@ -258,7 +257,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP xIndexAccess->getByIndex(nIndex), UNO_QUERY); if (xShapeDescriptor.is()) { - ::rtl::OUString sType (xShapeDescriptor->getShapeType()); + OUString sType (xShapeDescriptor->getShapeType()); if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName)) { Reference<text::XTextRange> xText ( diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 8f79086e61dc..458ea7d6c38f 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 67bf1814c2f4..61ec241d5cb3 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -50,8 +50,8 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterPane (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index d20b530b7be4..2ded1b0e3c31 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -117,7 +116,7 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle) mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } -::rtl::OUString PresenterPaneBase::GetTitle (void) const +OUString PresenterPaneBase::GetTitle (void) const { return msTitle; } @@ -448,7 +447,7 @@ void PresenterPaneBase::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterPane object has already been disposed"), + OUString( "PresenterPane object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index eb9fa8d9b3a3..170a743c299c 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -74,8 +74,8 @@ public: css::uno::Reference<css::awt::XWindow> GetBorderWindow (void) const; void SetBackground (const SharedBitmapDescriptor& rpBackground); - void SetTitle (const ::rtl::OUString& rsTitle); - ::rtl::OUString GetTitle (void) const; + void SetTitle (const OUString& rsTitle); + OUString GetTitle (void) const; css::uno::Reference<css::drawing::framework::XPaneBorderPainter> GetPaneBorderPainter (void) const; void SetCalloutAnchor (const css::awt::Point& rAnchorPosition); css::awt::Point GetCalloutAnchor (void) const; @@ -122,7 +122,7 @@ protected: css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; css::uno::Reference<css::drawing::framework::XPaneBorderPainter> mxBorderPainter; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; - ::rtl::OUString msTitle; + OUString msTitle; css::uno::Reference<css::uno::XComponentContext> mxComponentContext; SharedBitmapDescriptor mpViewBackground; bool mbHasCallout; diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 7f09074721c7..5cb992a6d1de 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -52,9 +51,9 @@ OUString PresenterPaneBorderManager::getImplementationName_static (void) Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName( + static const OUString sServiceName( "com.sun.star.drawing.PresenterPaneBorderManager"); - return Sequence<rtl::OUString>(&sServiceName, 1); + return Sequence<OUString>(&sServiceName, 1); } Reference<XInterface> PresenterPaneBorderManager::Create (const Reference<uno::XComponentContext>& rxContext) @@ -504,7 +503,7 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterPaneBorderManager object has already been disposed"), + OUString( "PresenterPaneBorderManager object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index a37fde6db78e..e95147a5dfdd 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -71,8 +71,8 @@ public: virtual void SAL_CALL disposing (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index bcee08161b8e..9b03dc3a576e 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -173,7 +172,7 @@ PresenterPaneBorderPainter::~PresenterPaneBorderPainter (void) //----- XPaneBorderPainter ---------------------------------------------------- awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException) @@ -186,7 +185,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( } awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException) @@ -199,11 +198,11 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( } void SAL_CALL PresenterPaneBorderPainter::paintBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle) + const OUString& rsTitle) throw(css::uno::RuntimeException) { ThrowIfDisposed(); @@ -234,11 +233,11 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder ( } void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle, + const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) throw(css::uno::RuntimeException) { @@ -271,7 +270,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( } awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( - const rtl::OUString& rsPaneBorderStyleName) + const OUString& rsPaneBorderStyleName) throw(css::uno::RuntimeException) { ThrowIfDisposed(); @@ -351,7 +350,7 @@ void PresenterPaneBorderPainter::SetTheme (const ::boost::shared_ptr<PresenterTh } awt::Rectangle PresenterPaneBorderPainter::AddBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const awt::Rectangle& rInnerBox, const css::drawing::framework::BorderType eBorderType) const { @@ -365,7 +364,7 @@ awt::Rectangle PresenterPaneBorderPainter::AddBorder ( } awt::Rectangle PresenterPaneBorderPainter::RemoveBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const css::awt::Rectangle& rOuterBox, const css::drawing::framework::BorderType eBorderType) const { diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 50f630038712..3866db4bfc8f 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -65,7 +65,7 @@ public: The rectangle of the inner window content. */ css::awt::Rectangle AddBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const css::awt::Rectangle& rInnerBox, const css::drawing::framework::BorderType eBorderType) const; @@ -80,7 +80,7 @@ public: supposed to contain the window title. */ css::awt::Rectangle RemoveBorder ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const css::awt::Rectangle& rOuterBox, const css::drawing::framework::BorderType eBorderType) const; @@ -91,36 +91,36 @@ public: // XPaneBorderPainter virtual css::awt::Rectangle SAL_CALL addBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException); virtual css::awt::Rectangle SAL_CALL removeBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) throw(css::uno::RuntimeException); virtual void SAL_CALL paintBorder ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle) + const OUString& rsTitle) throw(css::uno::RuntimeException); virtual void SAL_CALL paintBorderWithCallout ( - const rtl::OUString& rsPaneBorderStyleName, + const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const rtl::OUString& rsTitle, + const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) throw(css::uno::RuntimeException); virtual css::awt::Point SAL_CALL getCalloutOffset ( - const rtl::OUString& rsPaneBorderStyleName) + const OUString& rsPaneBorderStyleName) throw(css::uno::RuntimeException); private: diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 9a06197cd04d..76ead71214d5 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -327,7 +326,7 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindViewURL return SharedPaneDescriptor(); } -::rtl::OUString PresenterPaneContainer::GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL) +OUString PresenterPaneContainer::GetPaneURLForViewURL (const OUString& rsViewURL) { SharedPaneDescriptor pDescriptor (FindViewURL(rsViewURL)); if (pDescriptor.get() != NULL) diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 951ee1564c40..abe7df99e6f7 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -82,14 +82,14 @@ public: typedef ::boost::function<void(bool)> Activator; typedef ::boost::function<boost::shared_ptr<PresenterSprite>()> SpriteProvider; css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; - ::rtl::OUString msViewURL; + OUString msViewURL; ::rtl::Reference<PresenterPaneBase> mxPane; css::uno::Reference<css::drawing::framework::XView> mxView; css::uno::Reference<css::awt::XWindow> mxContentWindow; css::uno::Reference<css::awt::XWindow> mxBorderWindow; - ::rtl::OUString msTitleTemplate; - ::rtl::OUString msAccessibleTitleTemplate; - ::rtl::OUString msTitle; + OUString msTitleTemplate; + OUString msAccessibleTitleTemplate; + OUString msTitle; ViewInitializationFunction maViewInitialization; double mnLeft; double mnTop; @@ -113,9 +113,9 @@ public: void PreparePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::rtl::OUString& rsViewURL, - const ::rtl::OUString& rsTitle, - const ::rtl::OUString& rsAccessibleTitle, + const OUString& rsViewURL, + const OUString& rsTitle, + const OUString& rsAccessibleTitle, const bool bIsOpaque, const ViewInitializationFunction& rViewIntialization, const double nLeft, @@ -156,16 +156,16 @@ public: /** Find the pane whose pane URL is identical to the given URL string. */ - SharedPaneDescriptor FindPaneURL (const ::rtl::OUString& rsPaneURL); + SharedPaneDescriptor FindPaneURL (const OUString& rsPaneURL); /** Find the pane whose resource id is identical to the given one. */ SharedPaneDescriptor FindPaneId (const css::uno::Reference< css::drawing::framework::XResourceId>& rxPaneId); - SharedPaneDescriptor FindViewURL (const ::rtl::OUString& rsViewURL); + SharedPaneDescriptor FindViewURL (const OUString& rsViewURL); - ::rtl::OUString GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL); + OUString GetPaneURLForViewURL (const OUString& rsViewURL); void ToTop (const SharedPaneDescriptor& rpDescriptor); @@ -178,7 +178,7 @@ public: private: css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; - PaneList::const_iterator FindIteratorForPaneURL (const ::rtl::OUString& rsPaneURL); + PaneList::const_iterator FindIteratorForPaneURL (const OUString& rsPaneURL); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 775244ddfc8b..958bc363e1ab 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -36,24 +36,23 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( +const OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane1"); -const ::rtl::OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( +const OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane2"); -const ::rtl::OUString PresenterPaneFactory::msNotesPaneURL( +const OUString PresenterPaneFactory::msNotesPaneURL( "private:resource/pane/Presenter/Pane3"); -const ::rtl::OUString PresenterPaneFactory::msToolBarPaneURL( +const OUString PresenterPaneFactory::msToolBarPaneURL( "private:resource/pane/Presenter/Pane4"); -const ::rtl::OUString PresenterPaneFactory::msSlideSorterPaneURL( +const OUString PresenterPaneFactory::msSlideSorterPaneURL( "private:resource/pane/Presenter/Pane5"); -const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL( +const OUString PresenterPaneFactory::msHelpPaneURL( "private:resource/pane/Presenter/Pane6"); -const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL( +const OUString PresenterPaneFactory::msOverlayPaneURL( "private:resource/pane/Presenter/Overlay"); //===== PresenterPaneFactory ================================================== diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index c03674dd69ad..ec2db5a54357 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -53,13 +53,13 @@ class PresenterPaneFactory public PresenterPaneFactoryInterfaceBase { public: - static const ::rtl::OUString msCurrentSlidePreviewPaneURL; - static const ::rtl::OUString msNextSlidePreviewPaneURL; - static const ::rtl::OUString msNotesPaneURL; - static const ::rtl::OUString msToolBarPaneURL; - static const ::rtl::OUString msSlideSorterPaneURL; - static const ::rtl::OUString msHelpPaneURL; - static const ::rtl::OUString msOverlayPaneURL; + static const OUString msCurrentSlidePreviewPaneURL; + static const OUString msNextSlidePreviewPaneURL; + static const OUString msNotesPaneURL; + static const OUString msToolBarPaneURL; + static const OUString msSlideSorterPaneURL; + static const OUString msHelpPaneURL; + static const OUString msOverlayPaneURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. @@ -73,8 +73,8 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterPaneFactory (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -101,7 +101,7 @@ private: css::uno::WeakReference<css::drawing::framework::XConfigurationController> mxConfigurationControllerWeak; ::rtl::Reference<PresenterController> mpPresenterController; - typedef ::std::map<rtl::OUString, css::uno::Reference<css::drawing::framework::XResource> > + typedef ::std::map<OUString, css::uno::Reference<css::drawing::framework::XResource> > ResourceContainer; ::boost::scoped_ptr<ResourceContainer> mpResourceCache; @@ -113,10 +113,10 @@ private: css::uno::Reference<css::drawing::framework::XResource> CreatePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::rtl::OUString& rsTitle); + const OUString& rsTitle); css::uno::Reference<css::drawing::framework::XResource> CreatePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::rtl::OUString& rsTitle, + const OUString& rsTitle, const css::uno::Reference<css::drawing::framework::XPane>& rxParentPane, const bool bIsSpritePane); diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 18500ee0e2ab..60068de88daf 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -241,8 +240,8 @@ OUString PresenterProtocolHandler::getImplementationName_static (void) Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static (void) { - static const ::rtl::OUString sServiceName("com.sun.star.frame.ProtocolHandler"); - return Sequence<rtl::OUString>(&sServiceName, 1); + static const OUString sServiceName("com.sun.star.frame.ProtocolHandler"); + return Sequence<OUString>(&sServiceName, 1); } Reference<XInterface> PresenterProtocolHandler::Create ( @@ -295,7 +294,7 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArgume Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( const css::util::URL& rURL, - const rtl::OUString& rsTargetFrameName, + const OUString& rsTargetFrameName, sal_Int32 nSearchFlags) throw(RuntimeException) { diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 0d3994fa24d1..1e8db5f584da 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -51,8 +51,8 @@ public: void SAL_CALL disposing (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -68,7 +68,7 @@ public: virtual css::uno::Reference<css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL, - const rtl::OUString& aTargetFrameName, + const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException); diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 202888710519..8fe7fcebaf8f 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -99,7 +98,7 @@ OUString PresenterScreenJob::getImplementationName_static (void) Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void) { - return Sequence<rtl::OUString>(); + return Sequence<OUString>(); } Reference<XInterface> PresenterScreenJob::Create (const Reference<uno::XComponentContext>& rxContext) @@ -684,7 +683,7 @@ void PresenterScreen::ProcessLayout ( OUString("Layout")), UNO_QUERY_THROW); - ::std::vector<rtl::OUString> aProperties (6); + ::std::vector<OUString> aProperties (6); aProperties[0] = OUString("PaneURL"); aProperties[1] = OUString("ViewURL"); aProperties[2] = OUString("RelativeX"); @@ -715,7 +714,7 @@ void PresenterScreen::ProcessViewDescriptions ( rConfiguration.GetConfigurationNode("Presenter/Views"), UNO_QUERY_THROW); - ::std::vector<rtl::OUString> aProperties (4); + ::std::vector<OUString> aProperties (4); aProperties[0] = OUString("ViewURL"); aProperties[1] = OUString("Title"); aProperties[2] = OUString("AccessibleTitle"); diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 2538fea31219..1647f84b99d7 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -62,8 +62,8 @@ class PresenterScreenJob public PresenterScreenJobInterfaceBase { public: - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -153,7 +153,7 @@ private: { } }; - typedef ::std::map<rtl::OUString,ViewDescriptor> ViewDescriptorContainer; + typedef ::std::map<OUString,ViewDescriptor> ViewDescriptorContainer; ViewDescriptorContainer maViewDescriptors; void ShutdownPresenterScreen (void); @@ -181,7 +181,7 @@ private: */ void ProcessLayout ( PresenterConfigurationAccess& rConfiguration, - const ::rtl::OUString& rsLayoutName, + const OUString& rsLayoutName, const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId); @@ -189,7 +189,7 @@ private: configuration list. */ void ProcessComponent ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues, const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId); @@ -202,14 +202,14 @@ private: /** Called by ProcessViewDescriptions for a single entry. */ void ProcessViewDescription ( - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues); void SetupView ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId, - const ::rtl::OUString& rsPaneURL, - const ::rtl::OUString& rsViewURL, + const OUString& rsPaneURL, + const OUString& rsViewURL, const PresenterPaneContainer::ViewInitializationFunction& rViewInitialization, const double nLeft, const double nTop, diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 774d5dfa00b9..c48b8d148a34 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; const static double gnScrollBarGap (10); diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 1829d9c1da7d..e7b7b51b6594 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { @@ -356,7 +355,7 @@ void PresenterSlidePreview::ThrowIfDisposed (void) if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) { throw lang::DisposedException ( - ::rtl::OUString( "PresenterSlidePreview object has already been disposed"), + OUString( "PresenterSlidePreview object has already been disposed"), static_cast<uno::XWeak*>(this)); } } diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index e0ddc680c520..34457f18d9d8 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index ed676c13ccb3..a392842d2e99 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -235,9 +235,9 @@ private: bool mbIsInModifyNotification; bool mbIsForcedPaintPending; bool mbIsPaintPending; - ::rtl::OUString msClickToExitPresentationText; - ::rtl::OUString msClickToExitPresentationTitle; - ::rtl::OUString msTitleTemplate; + OUString msClickToExitPresentationText; + OUString msClickToExitPresentationTitle; + OUString msTitleTemplate; bool mbIsEndSlideVisible; css::uno::Reference<css::drawing::XDrawPage> mxCurrentSlide; diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index a49ba0aeeab0..daad9e1c5284 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace { const static sal_Int32 gnVerticalGap (10); diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index c7364477eef7..b1bd9045f332 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 43687e3b87df..8787c4505ca2 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -61,8 +61,8 @@ public: ::boost::shared_ptr<PresenterSprite> GetSprite (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 2be9a4b9b3b2..4463ea236c10 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -712,7 +712,7 @@ void PresenterTextParagraph::AddWord ( if ( ! maLines.empty()) nLineStart = rCurrentLine.startPos; - const ::rtl::OUString sLineCandidate ( + const OUString sLineCandidate ( msParagraphText.copy(nLineStart, nWordBoundary-nLineStart)); css::geometry::RealRectangle2D aLineBox ( @@ -792,7 +792,7 @@ sal_Unicode PresenterTextParagraph::GetCharacter ( } } -::rtl::OUString PresenterTextParagraph::GetText (void) const +OUString PresenterTextParagraph::GetText (void) const { return msParagraphText; } @@ -859,7 +859,7 @@ TextSegment PresenterTextParagraph::GetTextSegment ( return CreateTextSegment(nIndex+nOffset, nIndex+nOffset+1); } - return TextSegment(::rtl::OUString(), 0,0); + return TextSegment(OUString(), 0,0); } TextSegment PresenterTextParagraph::GetWordTextSegment ( @@ -913,7 +913,7 @@ TextSegment PresenterTextParagraph::CreateTextSegment ( { if (nEndIndex <= nStartIndex) return TextSegment( - ::rtl::OUString(), + OUString(), nStartIndex, nEndIndex); else @@ -1239,7 +1239,7 @@ void PresenterTextParagraph::Line::ProvideCellBoxes (void) } void PresenterTextParagraph::Line::ProvideLayoutedLine ( - const ::rtl::OUString& rsParagraphText, + const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection) { diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 5eba5bfb1457..2cbb37517558 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -111,7 +111,7 @@ public: void SetCharacterOffset (const sal_Int32 nCharacterOffset); sal_Int32 GetCharacterCount (void) const; sal_Unicode GetCharacter (const sal_Int32 nGlobalCharacterIndex) const; - ::rtl::OUString GetText (void) const; + OUString GetText (void) const; cssa::TextSegment GetTextSegment ( const sal_Int32 nOffset, const sal_Int32 nGlobalCharacterIndex, @@ -142,7 +142,7 @@ public: css::awt::Size GetSize (void); private: - ::rtl::OUString msParagraphText; + OUString msParagraphText; const sal_Int32 mnParagraphIndex; SharedPresenterTextCaret mpCaret; @@ -174,7 +174,7 @@ private: cssu::Sequence<css::geometry::RealRectangle2D> maCellBoxes; void ProvideLayoutedLine ( - const ::rtl::OUString& rsParagraphText, + const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection); void ProvideCellBoxes (void); diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 58ee37b4ecb9..5a37c1e281ea 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::std; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -103,7 +102,7 @@ public: */ static PresenterTheme::SharedFontDescriptor ReadFont ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxTheme, - const ::rtl::OUString& rsFontPath, + const OUString& rsFontPath, const PresenterTheme::SharedFontDescriptor& rpDefault); static PresenterTheme::SharedFontDescriptor ReadFont ( const Reference<beans::XPropertySet>& rxFontProperties, @@ -159,7 +158,7 @@ public: private: void ProcessPaneStyle ( ReadContext& rReadContext, - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues); }; @@ -220,7 +219,7 @@ private: void ProcessStyleAssociation( ReadContext& rReadContext, - const ::rtl::OUString& rsKey, + const OUString& rsKey, const ::std::vector<css::uno::Any>& rValues); }; @@ -249,7 +248,7 @@ public: StyleAssociationContainer maStyleAssociations; Reference<container::XHierarchicalNameAccess> mxThemeRoot; ::boost::shared_ptr<PresenterBitmapContainer> mpIconContainer; - typedef map<rtl::OUString,SharedFontDescriptor> FontContainer; + typedef map<OUString,SharedFontDescriptor> FontContainer; FontContainer maFontContainer; SharedPaneStyle GetPaneStyle (const OUString& rsStyleName) const; @@ -266,7 +265,7 @@ private: PresenterTheme::PresenterTheme ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const rtl::OUString& rsThemeName, + const OUString& rsThemeName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) : mxContext(rxContext), msThemeName(rsThemeName), @@ -307,7 +306,7 @@ void PresenterTheme::ProvideCanvas (const Reference<rendering::XCanvas>& rxCanva } } -OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) const +OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const { OUString sStyleName; ::boost::shared_ptr<Theme> pTheme (mpTheme); @@ -320,7 +319,7 @@ OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) con } ::std::vector<sal_Int32> PresenterTheme::GetBorderSize ( - const ::rtl::OUString& rsStyleName, + const OUString& rsStyleName, const bool bOuter) const { OSL_ASSERT(mpTheme.get() != NULL); @@ -366,7 +365,7 @@ bool PresenterTheme::ConvertToColor ( } ::boost::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName) const + const OUString& rsStyleName) const { if (mpTheme.get() == NULL) return ::boost::shared_ptr<PresenterConfigurationAccess>(); @@ -853,7 +852,7 @@ void PaneStyleContainer::Read ( UNO_QUERY); if (xPaneStyleList.is()) { - ::std::vector<rtl::OUString> aProperties; + ::std::vector<OUString> aProperties; aProperties.reserve(6); aProperties.push_back("StyleName"); aProperties.push_back("ParentStyle"); @@ -1117,7 +1116,7 @@ void StyleAssociationContainer::Read ( UNO_QUERY); if (xStyleAssociationList.is()) { - ::std::vector<rtl::OUString> aProperties (2); + ::std::vector<OUString> aProperties (2); aProperties[0] = "ResourceURL"; aProperties[1] = "StyleName"; PresenterConfigurationAccess::ForAll( diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 436758f123e1..45bb5da01b46 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -60,16 +60,16 @@ class PresenterTheme public: PresenterTheme ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const rtl::OUString& rsThemeName, + const OUString& rsThemeName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); ~PresenterTheme (void); bool HasCanvas (void) const; void ProvideCanvas (const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - ::rtl::OUString GetStyleName (const ::rtl::OUString& rsResourceURL) const; + OUString GetStyleName (const OUString& rsResourceURL) const; ::std::vector<sal_Int32> GetBorderSize ( - const ::rtl::OUString& rsStyleName, + const OUString& rsStyleName, const bool bOuter) const; class Theme; @@ -78,11 +78,11 @@ public: public: explicit FontDescriptor (const ::boost::shared_ptr<FontDescriptor>& rpDescriptor); - ::rtl::OUString msFamilyName; - ::rtl::OUString msStyleName; + OUString msFamilyName; + OUString msStyleName; sal_Int32 mnSize; sal_uInt32 mnColor; - ::rtl::OUString msAnchor; + OUString msAnchor; sal_Int32 mnXOffset; sal_Int32 mnYOffset; css::uno::Reference<css::rendering::XCanvasFont> mxFont; @@ -100,20 +100,20 @@ public: typedef ::boost::shared_ptr<FontDescriptor> SharedFontDescriptor; SharedBitmapDescriptor GetBitmap ( - const ::rtl::OUString& rsStyleName, - const ::rtl::OUString& rsBitmapName) const; + const OUString& rsStyleName, + const OUString& rsBitmapName) const; SharedBitmapDescriptor GetBitmap ( - const ::rtl::OUString& rsBitmapName) const; + const OUString& rsBitmapName) const; ::boost::shared_ptr<PresenterBitmapContainer> GetBitmapContainer (void) const; SharedFontDescriptor GetFont ( - const ::rtl::OUString& rsStyleName) const; + const OUString& rsStyleName) const; static SharedFontDescriptor ReadFont ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, - const ::rtl::OUString& rsFontPath, + const OUString& rsFontPath, const SharedFontDescriptor& rDefaultFount); static bool ConvertToColor ( @@ -121,11 +121,11 @@ public: sal_uInt32& rColor); ::boost::shared_ptr<PresenterConfigurationAccess> GetNodeForViewStyle ( - const ::rtl::OUString& rsStyleName) const; + const OUString& rsStyleName) const; private: css::uno::Reference<css::uno::XComponentContext> mxContext; - const ::rtl::OUString msThemeName; + const OUString msThemeName; ::boost::shared_ptr<Theme> mpTheme; ::boost::shared_ptr<PresenterBitmapContainer> mpBitmapContainer; css::uno::Reference<css::rendering::XCanvas> mxCanvas; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 76aaa7ca4fec..ce5c61f41ac6 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { @@ -105,7 +104,7 @@ namespace { void ReadElementMode ( const Reference<beans::XPropertySet>& rxProperties, - const ::rtl::OUString& rsModeName, + const OUString& rsModeName, ::boost::shared_ptr<ElementMode>& rpDefaultMode, ::sdext::presenter::PresenterToolBar::Context& rContext); }; @@ -387,7 +386,7 @@ PresenterToolBar::PresenterToolBar ( } void PresenterToolBar::Initialize ( - const ::rtl::OUString& rsConfigurationPath) + const OUString& rsConfigurationPath) { try { @@ -621,7 +620,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage (void) //----------------------------------------------------------------------------- void PresenterToolBar::CreateControls ( - const ::rtl::OUString& rsConfigurationPath) + const OUString& rsConfigurationPath) { if ( ! mxWindow.is()) return; @@ -1806,7 +1805,7 @@ TimeFormatter::TimeFormatter (void) OUString TimeFormatter::FormatTime (const oslDateTime& rTime) { - ::rtl::OUStringBuffer sText; + OUStringBuffer sText; const sal_Int32 nHours (sal::static_int_cast<sal_Int32>(rTime.Hours)); const sal_Int32 nMinutes (sal::static_int_cast<sal_Int32>(rTime.Minutes)); diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index d289394067a9..edbd55a5f979 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -91,7 +91,7 @@ public: virtual ~PresenterToolBar (void); void Initialize ( - const ::rtl::OUString& rsConfigurationPath); + const OUString& rsConfigurationPath); virtual void SAL_CALL disposing (void); @@ -184,7 +184,7 @@ private: css::geometry::RealSize2D maMinimalSize; void CreateControls ( - const ::rtl::OUString& rsConfigurationPath); + const OUString& rsConfigurationPath); void Layout (const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); css::geometry::RealSize2D CalculatePartSize ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 46c763a08cfd..4ebc8fe59245 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -41,21 +41,20 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { -const ::rtl::OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( +const OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( "private:resource/view/Presenter/CurrentSlidePreview"); -const ::rtl::OUString PresenterViewFactory::msNextSlidePreviewViewURL( +const OUString PresenterViewFactory::msNextSlidePreviewViewURL( "private:resource/view/Presenter/NextSlidePreview"); -const ::rtl::OUString PresenterViewFactory::msNotesViewURL( +const OUString PresenterViewFactory::msNotesViewURL( "private:resource/view/Presenter/Notes"); -const ::rtl::OUString PresenterViewFactory::msToolBarViewURL( +const OUString PresenterViewFactory::msToolBarViewURL( "private:resource/view/Presenter/ToolBar"); -const ::rtl::OUString PresenterViewFactory::msSlideSorterURL( +const OUString PresenterViewFactory::msSlideSorterURL( "private:resource/view/Presenter/SlideSorter"); -const ::rtl::OUString PresenterViewFactory::msHelpViewURL( +const OUString PresenterViewFactory::msHelpViewURL( "private:resource/view/Presenter/Help"); //===== SimpleView ============================================================ diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 80df427fa171..5d616f34ed92 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -79,12 +79,12 @@ class PresenterViewFactory public PresenterViewFactoryInterfaceBase { public: - static const ::rtl::OUString msCurrentSlidePreviewViewURL; - static const ::rtl::OUString msNextSlidePreviewViewURL; - static const ::rtl::OUString msNotesViewURL; - static const ::rtl::OUString msToolBarViewURL; - static const ::rtl::OUString msSlideSorterURL; - static const ::rtl::OUString msHelpViewURL; + static const OUString msCurrentSlidePreviewViewURL; + static const OUString msNextSlidePreviewViewURL; + static const OUString msNotesViewURL; + static const OUString msToolBarViewURL; + static const OUString msSlideSorterURL; + static const OUString msHelpViewURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. @@ -98,8 +98,8 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterViewFactory (void); - static ::rtl::OUString getImplementationName_static (void); - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static (void); + static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext) SAL_THROW((css::uno::Exception)); @@ -127,7 +127,7 @@ private: ::rtl::Reference<PresenterController> mpPresenterController; typedef ::std::pair<css::uno::Reference<css::drawing::framework::XView>, css::uno::Reference<css::drawing::framework::XPane> > ViewResourceDescriptor; - typedef ::std::map<rtl::OUString, ViewResourceDescriptor> ResourceContainer; + typedef ::std::map<OUString, ViewResourceDescriptor> ResourceContainer; ::boost::scoped_ptr<ResourceContainer> mpResourceCache; PresenterViewFactory ( diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index c195c5b4bc44..fddf3e53554e 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 02c45fee05c0..3544c45aaeed 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -79,7 +79,7 @@ public: void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme); void NotifyViewCreation (const css::uno::Reference<css::drawing::framework::XView>& rxView); void SetPanePosSizeAbsolute ( - const ::rtl::OUString& rsPaneURL, + const OUString& rsPaneURL, const double nX, const double nY, const double nWidth, @@ -214,7 +214,7 @@ private: css::awt::Size CalculatePaneSize ( const double nOuterWidth, - const ::rtl::OUString& rsPaneURL); + const OUString& rsPaneURL); /** Notify changes of the layout mode and of the slide sorter state. */ |