diff options
Diffstat (limited to 'sdext/source/minimizer')
22 files changed, 163 insertions, 163 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; |