[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - cui/source svx/source
Pavel JanÃk
paveljanik at apache.org
Thu May 16 23:07:09 PDT 2013
cui/source/tabpages/tpline.cxx | 2 ++
svx/source/sidebar/nbdtmg.cxx | 14 --------------
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 4 ++++
svx/source/xoutdev/xattr2.cxx | 4 ++++
4 files changed, 10 insertions(+), 14 deletions(-)
New commits:
commit d9f2a2f5cd4e33610d3ce7335f034b861f55ca79
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Fri May 17 05:59:14 2013 +0000
Remove unused variables to prevent compiler warnings.
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 28c7a9b..a1bf73b 100755
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -386,7 +386,6 @@ sal_uInt16 BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
sal_Unicode cChar = aFmt.GetBulletChar();
- const Font* pFont = aFmt.GetBulletFont();
//sal_uInt16 nLength = 0;
/*if( Application::GetSettings().GetLayoutRTL() )
{
@@ -676,7 +675,6 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI
if ( pGrf )
{
- const String* pGrfName = pBrsh->GetGraphicLink();
Graphic aGraphic;
for(sal_uInt16 i=0;i<aGrfDataLst.Count();i++)
{
@@ -1054,8 +1052,6 @@ sal_uInt16 MixBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
if ( pGrf )
{
- const String* pGrfName = pBrsh->GetGraphicLink();
- //String* pGrfName = (String*)(pBrsh->GetGraphicLink());
for(sal_uInt16 i = nFromIndex; i < DEFAULT_BULLET_TYPES; i++)
{
if ( pActualBullets[i]->eType == eNBType::GRAPHICBULLETS )
@@ -1537,8 +1533,6 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m
return (sal_uInt16)0xFFFF;
SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
- sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0];
- sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
String sPreFix = aFmt.GetPrefix();
String sSuffix = aFmt.GetSuffix();
String sEmpty;
@@ -1798,12 +1792,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
{
NumSettings_ImplPtr _pSet = pItemArr->pNumSettingsArr->GetObject(iLevel);
sal_Int16 eNType = _pSet->nNumberType;
- const sal_Unicode cLocalPrefix = _pSet->sPrefix.getLength() ? _pSet->sPrefix.getStr()[0] : 0;
- const sal_Unicode cLocalSuffix = _pSet->sSuffix.getLength() ? _pSet->sSuffix.getStr()[0] : 0;
SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
- sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0];
- sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
String sPreFix = aFmt.GetPrefix();
String sSuffix = aFmt.GetSuffix();
String sEmpty;
@@ -1811,7 +1801,6 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
if( eNumType == SVX_NUM_CHAR_SPECIAL)
{
sal_Unicode cChar = aFmt.GetBulletChar();
- const Font* pFont = aFmt.GetBulletFont();
sal_Unicode ccChar = _pSet->sBulletChar.getStr()[0];
rtl::OUString sFont = _pSet->sBulletFont;
if ( !((cChar == ccChar) && //pFont && sFont.compareTo(pFont->GetName()) &&
@@ -1881,8 +1870,6 @@ sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
for (sal_uInt16 iLevel=0;iLevel < nCount;iLevel++)
{
SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
- sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0];
- sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
sal_Int16 eNumType = aFmt.GetNumberingType();
NumSettings_ImplPtr _pSet = pItemArr->pNumSettingsArr->GetObject(iLevel);
@@ -1958,7 +1945,6 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
NumSettings_ImplPtr pLevelSettings = 0;
String sBulletCharFmtName = GetBulCharFmtName();
- sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{
if(pNumSettingsArr->Count() > i)
commit 827fdf8263184e0ed99ede6bf36ae141a4e79b21
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Fri May 17 05:33:54 2013 +0000
Add default cases to prevent compiler warnings.
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 349a62f..d54d8bc 100755
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -392,6 +392,8 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
mbUseLineSPCustom = USE_CUSTOM;
}
break;
+ default:
+ break;
}
}
break;
@@ -447,6 +449,8 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
mbUseLineSPCustom = USE_CUSTOM;
}
break;
+ default:
+ break;
}
}
else if( eState == SFX_ITEM_DISABLED )
commit e861ea8ddcca07aa23961d4d636bde1eb94ad39c
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Fri May 17 05:27:38 2013 +0000
Add missing case for LineJoint_MAKE_FIXED_SIZE to prevent compiler warning.
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index e69d8d0..5b8bb26 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -222,6 +222,10 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
case( com::sun::star::drawing::LineJoint_ROUND ):
nId = RID_SVXSTR_LINEJOINT_ROUND;
break;
+
+ // Not handled?
+ case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ):
+ break;
}
if( nId )
commit bb338f14b275ff6aed147a4bedb3e6af1e2d8618
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Fri May 17 05:25:47 2013 +0000
Add missing case for LineJoint_MAKE_FIXED_SIZE to prevent compiler warning.
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index c27b132..e77de6e 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1344,6 +1344,8 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
case com::sun::star::drawing::LineJoint_NONE : maLBEdgeStyle.SelectEntryPos(1); break;
case com::sun::star::drawing::LineJoint_MITER : maLBEdgeStyle.SelectEntryPos(2); break;
case com::sun::star::drawing::LineJoint_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break;
+ // Not handled?
+ case com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE : break;
}
}
else
More information about the Libreoffice-commits
mailing list