[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - svx/inc svx/source
Pavel JanÃk
paveljanik at apache.org
Sat Apr 13 16:30:08 PDT 2013
svx/inc/svx/nbdtmg.hxx | 12 +++++-----
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 4 ---
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 18 ++++++++--------
svx/source/xoutdev/xattr2.cxx | 4 +--
4 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 0093a8cf7a4961ee9ee0fdd3ccadf1cd4900d66c
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Sat Apr 13 11:13:27 2013 +0000
Unname unused arguments to prevent WaE issues.
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 79cb92d..e69d8d0 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -359,13 +359,13 @@ SvStream& AffineMatrixItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/
return rStream;
}
-sal_Bool AffineMatrixItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+sal_Bool AffineMatrixItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberId */ ) const
{
rVal <<= maMatrix;
return sal_True;
}
-sal_Bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+sal_Bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberId */ )
{
if (rVal >>= maMatrix)
{
commit accfa2d9d175b955c939a14f60ffd02bfef70b2e
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Sat Apr 13 11:05:13 2013 +0000
Unname unused argument to prevent WaE issue.
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index ee996d5..8aa6328 100755
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -621,7 +621,7 @@ IMPL_LINK( ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox*, pBox )
return 0;
}
-IMPL_LINK( ParaLineSpacingControl, LineSPDistAtHdl_Impl, MetricField*, pBox )
+IMPL_LINK( ParaLineSpacingControl, LineSPDistAtHdl_Impl, MetricField*, /* pBox */ )
{
ExecuteLineSpace();
return (0L);
commit 48b65c174fb6483b0aa69b18891a5c78936e6432
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Sat Apr 13 11:02:59 2013 +0000
Unname unused arguments to prevent WaE issues.
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index b12baf5..88d20dd 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -750,7 +750,7 @@ void ParaPropertyPanel::ShowMenu (void)
}
}
-void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState)
+void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState)
{
if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxColorItem))
{
@@ -773,7 +773,7 @@ Color ParaPropertyPanel::GetBGColor (void) const
}
void ParaPropertyPanel::SetBGColor (
- const String& rsColorName,
+ const String& /* rsColorName */,
const Color aColor)
{
SvxColorItem aColorItem(aColor, SID_BACKGROUND_COLOR);
@@ -831,7 +831,7 @@ IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox )
return 0;
}
//==================================for Paragraph Indent=====================
-IMPL_LINK( ParaPropertyPanel, ModifyIndentHdl_Impl, SvxRelativeField*, pBox )
+IMPL_LINK( ParaPropertyPanel, ModifyIndentHdl_Impl, SvxRelativeField*, /* pBox */ )
{
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
aMargin.SetTxtLeft( (const long)GetCoreValue( *maLeftIndent.get(), m_eLRSpaceUnit ) );
@@ -998,7 +998,7 @@ IMPL_LINK( ParaPropertyPanel, ClickLineSPDropDownHdl_Impl, ToolBox*, pBox )
}
//==================================for Paragraph Spacing=====================
-IMPL_LINK( ParaPropertyPanel, ULSpaceHdl_Impl, SvxRelativeField*, pBox )
+IMPL_LINK( ParaPropertyPanel, ULSpaceHdl_Impl, SvxRelativeField*, /* pBox */)
{
SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE );
aMargin.SetUpper( (sal_uInt16)GetCoreValue( *maTopDist.get(), m_eULSpaceUnit ) );
@@ -1199,7 +1199,7 @@ void ParaPropertyPanel::StateChangedAlignmentImpl( sal_uInt16 nSID, SfxItemState
}
}
-void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
+void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
{
switch (maContext.GetCombinedContext())
{
@@ -1357,7 +1357,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eS
}
}
-void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
+void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
{
meLnSpState = eState;
@@ -1369,7 +1369,7 @@ void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 nSID, SfxItemState eSta
}
}
-void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
+void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
{
maTopDist->SetMax( maTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
maBottomDist->SetMax( maBottomDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) );
@@ -1500,7 +1500,7 @@ void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState
}
//Modified for Numbering&Bullets Dialog UX Enh(Story 992) by chengjh,2011.7.5
//Handing the transferred the num rule index data of the current selection
-void ParaPropertyPanel::StateChangeBulletNumRuleImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
+void ParaPropertyPanel::StateChangeBulletNumRuleImpl( sal_uInt16 nSID, SfxItemState /* eState */, const SfxPoolItem* pState )
{
const SfxUInt16Item* pIt = (const SfxUInt16Item*)pState;
@@ -1579,7 +1579,7 @@ PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pPar
ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const cssu::Reference<css::frame::XFrame>& /* rxFrame */,
SfxBindings* pBindings,
const cssu::Reference<css::ui::XSidebar>& rxSidebar)
: Control(pParent, SVX_RES(RID_SIDEBAR_PARA_PANEL)),
commit 2075b0da2291174da5dc08f8246857bcc924f777
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Sat Apr 13 11:01:17 2013 +0000
Remove unused varables to prevent WaE issues.
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 773af4a..ee996d5 100755
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -728,8 +728,6 @@ IMPL_LINK(ParaLineSpacingControl, VSSelHdl, void *, pControl)
if(pControl == &maLineSpacing)
{
sal_uInt16 iPos = maLineSpacing.GetSelectItemId();
- short nKern = 0;
- long nVal = 0;
switch ( iPos )
{
case 1:
commit 51c58ff8442f922ebd1e5365b286d0a255f54265
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Sat Apr 13 10:59:17 2013 +0000
Reorder initializations to prevent compiler warnings.
diff --git a/svx/inc/svx/nbdtmg.hxx b/svx/inc/svx/nbdtmg.hxx
index 047fcb5..8f2f298 100755
--- a/svx/inc/svx/nbdtmg.hxx
+++ b/svx/inc/svx/nbdtmg.hxx
@@ -80,10 +80,10 @@ class SVX_DLLPUBLIC NumSettings_Impl
public:
NumSettings_Impl() :
- nNumberType(0),
- pBrushItem(0),
- aSize(0,0),
- nParentNumbering(0)
+ nNumberType(0),
+ nParentNumbering(0),
+ pBrushItem(0),
+ aSize(0,0)
{}
~NumSettings_Impl(){}
};
@@ -134,8 +134,8 @@ class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings
BulletsSettings(eTy),
nTabIndex((sal_uInt16)0xFFFF),
nGallaryIndex((sal_uInt16)0xFFFF),
- aSize(0,0),
- pGrfObj(0)
+ pGrfObj(0),
+ aSize(0,0)
{}
virtual ~GrfBulDataRelation(){}
};
More information about the Libreoffice-commits
mailing list