From 5e6b2d0e4a55be8a4f57ecfe55248d7924d4f0b7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 27 Aug 2013 11:43:48 +0200 Subject: convert include/sfx2/filedlghelper.hxx from String to OUString Change-Id: I2d16440c719d0b63acd734e8618541487500067a --- sfx2/source/appl/appopen.cxx | 13 +++----- sfx2/source/dialog/filedlghelper.cxx | 64 ++++++++++++++++++------------------ sfx2/source/dialog/filedlgimpl.hxx | 8 ++--- sfx2/source/doc/guisaveas.cxx | 2 +- 4 files changed, 42 insertions(+), 45 deletions(-) (limited to 'sfx2/source') diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 363bfab56de4..a88300ed0be5 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -636,9 +636,9 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // get FileName from dialog std::vector pURLList; - String aFilter; + OUString aFilter; SfxItemSet* pSet = NULL; - String aPath; + OUString aPath; SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, sal_False ); if ( pFolderNameItem ) aPath = pFolderNameItem->GetValue(); @@ -646,10 +646,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { aPath = SvtPathOptions().GetTemplatePath(); sal_Int32 nTokenCount = comphelper::string::getTokenCount(aPath, ';'); - aPath = aPath.GetToken( - sal::static_int_cast< xub_StrLen >( - nTokenCount ? ( nTokenCount - 1 ) : 0 ), - ';' ); + aPath = aPath.getToken( nTokenCount ? ( nTokenCount - 1 ) : 0 , ';' ); } sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG; @@ -672,7 +669,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) sal_uIntPtr nErr = sfx2::FileOpenDialog_Impl( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - SFXWB_MULTISELECTION, String(), pURLList, + SFXWB_MULTISELECTION, OUString(), pURLList, aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList ); if ( nErr == ERRCODE_ABORT ) @@ -682,7 +679,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } rReq.SetArgs( *(SfxAllItemSet*)pSet ); - if (aFilter.Len() >0 ) + if ( !aFilter.isEmpty() ) rReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilter ) ); rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); rReq.AppendItem( SfxStringItem( SID_REFERER, OUString(SFX_REFERER_USER) ) ); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 1a7d4669dbdb..44eacbc178f8 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1452,7 +1452,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac // ------------------------------------------------------------------------ ErrCode FileDialogHelper_Impl::execute( std::vector& rpURLList, SfxItemSet *& rpSet, - String& rFilter ) + OUString& rFilter ) { // rFilter is a pure output parameter, it shouldn't be used for anything else // changing this would surely break code @@ -1641,18 +1641,18 @@ OUString FileDialogHelper_Impl::getFilter() const } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::getRealFilter( String& _rFilter ) const +void FileDialogHelper_Impl::getRealFilter( OUString& _rFilter ) const { _rFilter = getCurrentFilterUIName(); - if ( !_rFilter.Len() ) + if ( _rFilter.isEmpty() ) _rFilter = maCurFilter; - if ( _rFilter.Len() && mpMatcher ) + if ( !_rFilter.isEmpty() && mpMatcher ) { const SfxFilter* pFilter = mpMatcher->GetFilter4UIName( _rFilter, m_nMustFlags, m_nDontFlags ); - _rFilter = pFilter ? String(pFilter->GetFilterName()) : _rFilter.Erase(); + _rFilter = pFilter ? pFilter->GetFilterName() : OUString(""); } } @@ -2288,7 +2288,7 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext ) FileDialogHelper::FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - const String& rFact, + const OUString& rFact, SfxFilterFlags nMust, SfxFilterFlags nDont ) { @@ -2304,11 +2304,11 @@ FileDialogHelper::FileDialogHelper( FileDialogHelper::FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - const String& rFact, + const OUString& rFact, sal_Int16 nDialog, SfxFilterFlags nMust, SfxFilterFlags nDont, - const String& rStandardDir, + const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, NULL, rStandardDir, rBlackList ); @@ -2367,7 +2367,7 @@ FileDialogHelper::~FileDialogHelper() } // ------------------------------------------------------------------------ -void FileDialogHelper::CreateMatcher( const String& rFactory ) +void FileDialogHelper::CreateMatcher( const OUString& rFactory ) { mpImp->createMatcher( SfxObjectShell::GetServiceNameFromFactory(rFactory) ); } @@ -2397,8 +2397,8 @@ IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker) // rDirPath has to be a directory ErrCode FileDialogHelper::Execute( std::vector& rpURLList, SfxItemSet *& rpSet, - String& rFilter, - const String& rDirPath ) + OUString& rFilter, + const OUString& rDirPath ) { SetDisplayFolder( rDirPath ); return mpImp->execute( rpURLList, rpSet, rFilter ); @@ -2413,7 +2413,7 @@ ErrCode FileDialogHelper::Execute() // ------------------------------------------------------------------------ ErrCode FileDialogHelper::Execute( SfxItemSet *& rpSet, - String& rFilter ) + OUString& rFilter ) { ErrCode nRet; std::vector rURLList; @@ -2447,23 +2447,23 @@ sal_Bool FileDialogHelper::IsPasswordEnabled() const // ------------------------------------------------------------------------ -String FileDialogHelper::GetRealFilter() const +OUString FileDialogHelper::GetRealFilter() const { - String sFilter; + OUString sFilter; if ( mpImp ) mpImp->getRealFilter( sFilter ); return sFilter; } // ------------------------------------------------------------------------ -void FileDialogHelper::SetTitle( const String& rNewTitle ) +void FileDialogHelper::SetTitle( const OUString& rNewTitle ) { if ( mpImp->mxFileDlg.is() ) mpImp->mxFileDlg->setTitle( rNewTitle ); } // ------------------------------------------------------------------------ -String FileDialogHelper::GetPath() const +OUString FileDialogHelper::GetPath() const { OUString aPath; @@ -2539,13 +2539,13 @@ Sequence< OUString > FileDialogHelper::GetSelectedFiles() const } // ------------------------------------------------------------------------ -String FileDialogHelper::GetDisplayDirectory() const +OUString FileDialogHelper::GetDisplayDirectory() const { return mpImp->getPath(); } // ------------------------------------------------------------------------ -String FileDialogHelper::GetCurrentFilter() const +OUString FileDialogHelper::GetCurrentFilter() const { return mpImp->getFilter(); } @@ -2576,9 +2576,9 @@ static int impl_isFolder( const OUString& rPath ) return -1; } -void FileDialogHelper::SetDisplayDirectory( const String& _rPath ) +void FileDialogHelper::SetDisplayDirectory( const OUString& _rPath ) { - if ( !_rPath.Len() ) + if ( _rPath.isEmpty() ) return; // if the given path isn't a folder, we cut off the last part @@ -2613,28 +2613,28 @@ void FileDialogHelper::SetDisplayDirectory( const String& _rPath ) } // ------------------------------------------------------------------------ -void FileDialogHelper::SetDisplayFolder( const String& _rURL ) +void FileDialogHelper::SetDisplayFolder( const OUString& _rURL ) { mpImp->displayFolder( _rURL ); } // ------------------------------------------------------------------------ -void FileDialogHelper::SetFileName( const String& _rFileName ) +void FileDialogHelper::SetFileName( const OUString& _rFileName ) { mpImp->setFileName( _rFileName ); } // ------------------------------------------------------------------------ -void FileDialogHelper::AddFilter( const String& rFilterName, - const String& rExtension ) +void FileDialogHelper::AddFilter( const OUString& rFilterName, + const OUString& rExtension ) { mpImp->addFilter( rFilterName, rExtension ); } // ------------------------------------------------------------------------ -void FileDialogHelper::SetCurrentFilter( const String& rFilter ) +void FileDialogHelper::SetCurrentFilter( const OUString& rFilter ) { - String sFilter( rFilter ); + OUString sFilter( rFilter ); if ( mpImp->isShowFilterExtensionEnabled() ) sFilter = mpImp->getFilterWithExtension( rFilter ); mpImp->setFilter( sFilter ); @@ -2690,25 +2690,25 @@ void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, - const String& rFact, + const OUString& rFact, std::vector& rpURLList, - String& rFilter, + OUString& rFilter, SfxItemSet *& rpSet, - const String* pPath, + const OUString* pPath, sal_Int16 nDialog, - const String& rStandardDir, + const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { ErrCode nRet; FileDialogHelper aDialog( nDialogType, nFlags, rFact, nDialog, 0, 0, rStandardDir, rBlackList ); - String aPath; + OUString aPath; if ( pPath ) aPath = *pPath; nRet = aDialog.Execute( rpURLList, rpSet, rFilter, aPath ); - DBG_ASSERT( rFilter.SearchAscii(": ") == STRING_NOTFOUND, "Old filter name used!"); + DBG_ASSERT( rFilter.indexOf(": ") == -1, "Old filter name used!"); return nRet; } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 2662de1bb53d..4387c291ad22 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -188,7 +188,7 @@ namespace sfx2 ErrCode execute( std::vector& rpURLList, SfxItemSet *& rpSet, - String& rFilter ); + OUString& rFilter ); ErrCode execute(); void setFilter( const OUString& rFilter ); @@ -201,9 +201,9 @@ namespace sfx2 void displayFolder( const OUString& rPath ); void setFileName( const OUString& _rFile ); - OUString getPath() const; - OUString getFilter() const; - void getRealFilter( String& _rFilter ) const; + OUString getPath() const; + OUString getFilter() const; + void getRealFilter( OUString& _rFilter ) const; ErrCode getGraphic( Graphic& rGraphic ) const; void createMatcher( const String& rFactory ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 5afd2c1b5635..f8f880540b15 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1050,7 +1050,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, } // aStringTypeFN is a pure output parameter, pDialogParams is an in/out parameter - String aStringTypeFN; + OUString aStringTypeFN; if ( pFileDlg->Execute( pDialogParams, aStringTypeFN ) != ERRCODE_NONE ) { throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); -- cgit