From e8fd5a07eca70912ddee45aaa34d434809b59fb7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 25 Apr 2016 09:59:16 +0200 Subject: update loplugin stylepolice to check local pointers vars are actually pointer vars. Also convert from regex to normal code, so we can enable this plugin all the time. Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1 Reviewed-on: https://gerrit.libreoffice.org/24391 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sfx2/source/appl/appopen.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sfx2/source/appl/appopen.cxx') diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index e2a00eda4538..de80bc8c8058 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -592,7 +592,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( !pFileNameItem ) { // get FileName from dialog - std::vector pURLList; + std::vector aURLList; OUString aFilter; SfxItemSet* pSet = nullptr; OUString aPath; @@ -630,12 +630,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) sal_uIntPtr nErr = sfx2::FileOpenDialog_Impl( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - SFXWB_MULTISELECTION, OUString(), pURLList, + SFXWB_MULTISELECTION, OUString(), aURLList, aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList ); if ( nErr == ERRCODE_ABORT ) { - pURLList.clear(); + aURLList.clear(); return; } @@ -646,7 +646,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.AppendItem( SfxStringItem( SID_REFERER, "private:user" ) ); delete pSet; - if(!pURLList.empty()) + if(!aURLList.empty()) { if ( nSID == SID_OPENTEMPLATE ) rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, false ) ); @@ -683,7 +683,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.AppendItem(SfxStringItem(SID_DOC_SERVICE, aDocService)); } - for(std::vector::const_iterator i = pURLList.begin(); i != pURLList.end(); ++i) + for(std::vector::const_iterator i = aURLList.begin(); i != aURLList.end(); ++i) { rReq.RemoveItem( SID_FILE_NAME ); rReq.AppendItem( SfxStringItem( SID_FILE_NAME, *i ) ); @@ -715,10 +715,10 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } } - pURLList.clear(); + aURLList.clear(); return; } - pURLList.clear(); + aURLList.clear(); } bool bHyperlinkUsed = false; -- cgit