diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-25 09:59:16 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-26 10:55:58 +0000 |
commit | e8fd5a07eca70912ddee45aaa34d434809b59fb7 (patch) | |
tree | d5dc890d12987cad73f5e64301f823ba23a97f2d /sw/source/uibase/utlui | |
parent | e6adb3e8b4de3c0f78d249b83de19b849ef65b59 (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/uibase/utlui')
-rw-r--r-- | sw/source/uibase/utlui/content.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/utlui/gloslst.cxx | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 165289ba089d..072d82b3f1c0 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2711,10 +2711,10 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) } if ( !hasObjectMarked ) { - SwEditWin& pEditWindow = m_pActiveShell->GetView().GetEditWin(); + SwEditWin& rEditWindow = m_pActiveShell->GetView().GetEditWin(); vcl::KeyCode tempKeycode( KEY_ESCAPE ); KeyEvent rKEvt( 0 , tempKeycode ); - static_cast<vcl::Window*>(&pEditWindow)->KeyInput( rKEvt ); + static_cast<vcl::Window*>(&rEditWindow)->KeyInput( rKEvt ); } } } diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 94678dee00ac..21fa08f59d04 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -137,11 +137,11 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName, if(rLongName != sLong) continue; - TripleString pTriple; - pTriple.sGroup = pGroup->sName; - pTriple.sBlock = sLong; - pTriple.sShort = pGroup->sShortNames.getToken(j, STRING_DELIM); - aTripleStrings.push_back(pTriple); + TripleString aTriple; + aTriple.sGroup = pGroup->sName; + aTriple.sBlock = sLong; + aTriple.sShort = pGroup->sShortNames.getToken(j, STRING_DELIM); + aTripleStrings.push_back(aTriple); } } @@ -149,9 +149,9 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName, nCount = aTripleStrings.size(); if(1 == nCount) { - const TripleString& pTriple(aTripleStrings.front()); - rShortName = pTriple.sShort; - rGroupName = pTriple.sGroup; + const TripleString& rTriple(aTripleStrings.front()); + rShortName = rTriple.sShort; + rGroupName = rTriple.sGroup; bRet = true; } else if(1 < nCount) @@ -168,9 +168,9 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName, if(RET_OK == aDlg->Execute() && LISTBOX_ENTRY_NOTFOUND != rLB.GetSelectEntryPos()) { - const TripleString& pTriple(aTripleStrings[rLB.GetSelectEntryPos()]); - rShortName = pTriple.sShort; - rGroupName = pTriple.sGroup; + const TripleString& rTriple(aTripleStrings[rLB.GetSelectEntryPos()]); + rShortName = rTriple.sShort; + rGroupName = rTriple.sGroup; bRet = true; } else |