summaryrefslogtreecommitdiff
path: root/hwpfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-25 09:59:16 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-12 22:06:19 -0400
commitc5cdfe39d3afca716e7b11f8f8e169ce378861ea (patch)
tree5b804fa2e78405afe16db734f88f24a7b9714209 /hwpfilter
parent0c4c31576fe03b3b59217bf9990b75f32d193d0d (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. Reviewed-on: https://gerrit.libreoffice.org/24391 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit e8fd5a07eca70912ddee45aaa34d434809b59fb7) Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1
Diffstat (limited to 'hwpfilter')
-rw-r--r--hwpfilter/source/hwpreader.cxx104
1 files changed, 52 insertions, 52 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index a39ff9452a9d..b02ff5c12cec 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -954,43 +954,43 @@ void HwpReader::makeMasterStyles()
int i;
int nMax = hwpfile.getMaxSettedPage();
- std::deque<PageSetting> pSet(nMax + 1);
+ std::deque<PageSetting> aSet(nMax + 1);
for( i = 0 ; i < hwpfile.getPageNumberCount() ; i++ )
{
ShowPageNum *pn = hwpfile.getPageNumber(i);
- pSet[pn->m_nPageNumber].pagenumber = pn;
- pSet[pn->m_nPageNumber].bIsSet = true;
+ aSet[pn->m_nPageNumber].pagenumber = pn;
+ aSet[pn->m_nPageNumber].bIsSet = true;
}
for( i = 0 ; i < hwpfile.getHeaderFooterCount() ; i++ )
{
HeaderFooter* hf = hwpfile.getHeaderFooter(i);
- pSet[hf->m_nPageNumber].bIsSet = true;
+ aSet[hf->m_nPageNumber].bIsSet = true;
if( hf->type == 0 ) // header
{
switch( hf->where )
{
case 0 :
- pSet[hf->m_nPageNumber].header = hf;
- pSet[hf->m_nPageNumber].header_even = nullptr;
- pSet[hf->m_nPageNumber].header_odd = nullptr;
+ aSet[hf->m_nPageNumber].header = hf;
+ aSet[hf->m_nPageNumber].header_even = nullptr;
+ aSet[hf->m_nPageNumber].header_odd = nullptr;
break;
case 1:
- pSet[hf->m_nPageNumber].header_even = hf;
- if( pSet[hf->m_nPageNumber].header )
+ aSet[hf->m_nPageNumber].header_even = hf;
+ if( aSet[hf->m_nPageNumber].header )
{
- pSet[hf->m_nPageNumber].header_odd =
- pSet[hf->m_nPageNumber].header;
- pSet[hf->m_nPageNumber].header = nullptr;
+ aSet[hf->m_nPageNumber].header_odd =
+ aSet[hf->m_nPageNumber].header;
+ aSet[hf->m_nPageNumber].header = nullptr;
}
break;
case 2:
- pSet[hf->m_nPageNumber].header_odd = hf;
- if( pSet[hf->m_nPageNumber].header )
+ aSet[hf->m_nPageNumber].header_odd = hf;
+ if( aSet[hf->m_nPageNumber].header )
{
- pSet[hf->m_nPageNumber].header_even =
- pSet[hf->m_nPageNumber].header;
- pSet[hf->m_nPageNumber].header = nullptr;
+ aSet[hf->m_nPageNumber].header_even =
+ aSet[hf->m_nPageNumber].header;
+ aSet[hf->m_nPageNumber].header = nullptr;
}
break;
}
@@ -1000,26 +1000,26 @@ void HwpReader::makeMasterStyles()
switch( hf->where )
{
case 0 :
- pSet[hf->m_nPageNumber].footer = hf;
- pSet[hf->m_nPageNumber].footer_even = nullptr;
- pSet[hf->m_nPageNumber].footer_odd = nullptr;
+ aSet[hf->m_nPageNumber].footer = hf;
+ aSet[hf->m_nPageNumber].footer_even = nullptr;
+ aSet[hf->m_nPageNumber].footer_odd = nullptr;
break;
case 1:
- pSet[hf->m_nPageNumber].footer_even = hf;
- if( pSet[hf->m_nPageNumber].footer )
+ aSet[hf->m_nPageNumber].footer_even = hf;
+ if( aSet[hf->m_nPageNumber].footer )
{
- pSet[hf->m_nPageNumber].footer_odd =
- pSet[hf->m_nPageNumber].footer;
- pSet[hf->m_nPageNumber].footer = nullptr;
+ aSet[hf->m_nPageNumber].footer_odd =
+ aSet[hf->m_nPageNumber].footer;
+ aSet[hf->m_nPageNumber].footer = nullptr;
}
break;
case 2:
- pSet[hf->m_nPageNumber].footer_odd = hf;
- if( pSet[hf->m_nPageNumber].footer )
+ aSet[hf->m_nPageNumber].footer_odd = hf;
+ if( aSet[hf->m_nPageNumber].footer )
{
- pSet[hf->m_nPageNumber].footer_even =
- pSet[hf->m_nPageNumber].footer;
- pSet[hf->m_nPageNumber].footer = nullptr;
+ aSet[hf->m_nPageNumber].footer_even =
+ aSet[hf->m_nPageNumber].footer;
+ aSet[hf->m_nPageNumber].footer = nullptr;
}
break;
}
@@ -1046,47 +1046,47 @@ void HwpReader::makeMasterStyles()
rstartEl("style:master-page", rList);
pList->clear();
- if( pSet[i].bIsSet ) /* If you've changed the current setting */
+ if( aSet[i].bIsSet ) /* If you've changed the current setting */
{
- if( !pSet[i].pagenumber ){
+ if( !aSet[i].pagenumber ){
if( pPrevSet && pPrevSet->pagenumber )
- pSet[i].pagenumber = pPrevSet->pagenumber;
+ aSet[i].pagenumber = pPrevSet->pagenumber;
}
- if( pSet[i].pagenumber )
+ if( aSet[i].pagenumber )
{
- if( pSet[i].pagenumber->where == 7 && pSet[i].header )
+ if( aSet[i].pagenumber->where == 7 && aSet[i].header )
{
- pSet[i].header_even = pSet[i].header;
- pSet[i].header_odd = pSet[i].header;
- pSet[i].header = nullptr;
+ aSet[i].header_even = aSet[i].header;
+ aSet[i].header_odd = aSet[i].header;
+ aSet[i].header = nullptr;
}
- if( pSet[i].pagenumber->where == 8 && pSet[i].footer )
+ if( aSet[i].pagenumber->where == 8 && aSet[i].footer )
{
- pSet[i].footer_even = pSet[i].footer;
- pSet[i].footer_odd = pSet[i].footer;
- pSet[i].footer = nullptr;
+ aSet[i].footer_even = aSet[i].footer;
+ aSet[i].footer_odd = aSet[i].footer;
+ aSet[i].footer = nullptr;
}
}
- if( !pSet[i].header_even && pPrevSet && pPrevSet->header_even )
+ if( !aSet[i].header_even && pPrevSet && pPrevSet->header_even )
{
- pSet[i].header_even = pPrevSet->header_even;
+ aSet[i].header_even = pPrevSet->header_even;
}
- if( !pSet[i].header_odd && pPrevSet && pPrevSet->header_odd )
+ if( !aSet[i].header_odd && pPrevSet && pPrevSet->header_odd )
{
- pSet[i].header_odd = pPrevSet->header_odd;
+ aSet[i].header_odd = pPrevSet->header_odd;
}
- if( !pSet[i].footer_even && pPrevSet && pPrevSet->footer_even )
+ if( !aSet[i].footer_even && pPrevSet && pPrevSet->footer_even )
{
- pSet[i].footer_even = pPrevSet->footer_even;
+ aSet[i].footer_even = pPrevSet->footer_even;
}
- if( !pSet[i].footer_odd && pPrevSet && pPrevSet->footer_odd )
+ if( !aSet[i].footer_odd && pPrevSet && pPrevSet->footer_odd )
{
- pSet[i].footer_odd = pPrevSet->footer_odd;
+ aSet[i].footer_odd = pPrevSet->footer_odd;
}
- pPage = &pSet[i];
- pPrevSet = &pSet[i];
+ pPage = &aSet[i];
+ pPrevSet = &aSet[i];
}
else if( pPrevSet ) /* If the previous setting exists */
{