summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-02-12 14:47:52 +0100
committerJulien Nabet <serval2412@yahoo.fr>2013-02-12 14:48:04 +0100
commit2ce2fafa1b19f3eaad89ec57ac312ce2f33fbf20 (patch)
tree98c0ddb2a496a1b43c154c48a45a1fed8f7b3501 /cui
parent2bfccd148958ff8b3af49854b611649839028c97 (diff)
Some cppcheck cleaning
Change-Id: Idb380dbb7470dbdb371778ba0c486392cc55380e
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/border.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 3eb3c00f91ef..0772e5da7a5d 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -246,14 +246,13 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs
// fill ColorBox out of the XColorList
SfxObjectShell* pDocSh = SfxObjectShell::Current();
- const SfxPoolItem* pItem = NULL;
XColorListRef pColorTable;
DBG_ASSERT( pDocSh, "DocShell not found!" );
if ( pDocSh )
{
- pItem = pDocSh->GetItem( SID_COLOR_TABLE );
+ const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
if ( pItem != NULL )
pColorTable = ( (SvxColorListItem*)pItem )->GetColorList();
}
@@ -562,7 +561,6 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_OUTER );
SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich );
- const SfxPoolItem* pOld = 0;
//------------------
// outer border:
@@ -684,7 +682,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
rCoreAttrs.Put( aBoxItem );
bAttrsChanged |= sal_True;
}
- pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER, sal_False );
+ const SfxPoolItem* pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER, sal_False );
if ( !pOld || !( *(const SvxBoxInfoItem*)pOld == aBoxInfoItem ) )
{
@@ -796,7 +794,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl)
IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb )
{
- ColorListBox* pColLb = (ColorListBox*)pLb;
+ ColorListBox* pColLb = (ColorListBox*)(pLb);
if (pLb == m_pLbLineColor)
{