[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Dec 21 10:40:43 UTC 2017
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 3
include/svx/svxids.hrc | 101 +++++-----
sc/source/ui/view/cellsh3.cxx | 2
sc/source/ui/view/formatsh.cxx | 10
sd/source/ui/view/drviewse.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 6
svx/source/table/tablecontroller.cxx | 4
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/unocore/unostyle.cxx | 2
sw/source/ui/chrdlg/tblnumfm.cxx | 2
sw/source/uibase/shells/basesh.cxx | 4
sw/source/uibase/shells/tabsh.cxx | 6
sw/source/uibase/uiview/pview.cxx | 6
sw/source/uibase/uiview/viewtab.cxx | 4
14 files changed, 81 insertions(+), 73 deletions(-)
New commits:
commit 956dd4a202a0897b7ca1f8abd285af2cad47abb2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Dec 20 15:53:37 2017 +0200
TypedWhichId in svx part 2
Change-Id: Id927679c9f07f1dd820f4fdca9a45eb7aede037c
Reviewed-on: https://gerrit.libreoffice.org/46850
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 13c8c2246ab3..aa168a51e6e2 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -926,8 +926,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
if( aState == SfxItemState::SET )
{
sal_Int32 nFormatKey = static_cast< sal_Int32 >(
- static_cast< const SfxUInt32Item & >(
- rItemSet.Get( SID_ATTR_NUMBERFORMAT_VALUE )).GetValue());
+ rItemSet.Get( SID_ATTR_NUMBERFORMAT_VALUE ).GetValue());
aValue <<= nFormatKey;
}
else
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index a98b1b644ba9..07e808c37627 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -26,6 +26,12 @@
#include <svx/unomid.hxx>
#include <svl/typedwhich.hxx>
+class SfxInt32Item;
+class SfxAllEnumItem;
+class SfxPointItem;
+class SfxBoolItem;
+class SfxUInt32Item;
+class SfxRectangleItem;
class SvxPageItem;
class SvxSizeItem;
class SvxLongULSpaceItem;
@@ -34,6 +40,17 @@ class SvxPostItAuthorItem;
class SvxPostItDateItem;
class SvxPostItTextItem;
class SvxPostItIdItem;
+class SvxColorListItem;
+class SvxColorItem;
+class SvxGradientListItem;
+class SvxRulerItem;
+class SvxNumberInfoItem;
+class SvxHatchListItem;
+class SvxBitmapListItem;
+class SvxPatternListItem;
+class SvxDashListItem;
+class SvxLineEndListItem;
+class SvxLineItem;
// member IDs
@@ -245,23 +262,23 @@ class SvxPostItIdItem;
// CAUTION! Range <64 .. 67> used by EditEngine (!)
#define SID_RULER_CHANGE_STATE ( SID_SVX_START + 78 )
-#define SID_RULER_NULL_OFFSET ( SID_SVX_START + 79 )
-#define SID_RULER_BORDERS ( SID_SVX_START + 80 )
-#define SID_RULER_OBJECT ( SID_SVX_START + 81 )
-#define SID_RULER_PAGE_POS ( SID_SVX_START + 82 )
-#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 )
-#define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 )
-#define SID_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 )
-#define SID_ATTR_NUMBERFORMAT_INFO ( SID_SVX_START + 86 )
-#define SID_ATTR_TRANSFORM ( SID_SVX_START + 87 )
-#define SID_ATTR_TRANSFORM_POS_X ( SID_SVX_START + 88 )
-#define SID_ATTR_TRANSFORM_POS_Y ( SID_SVX_START + 89 )
-#define SID_ATTR_TRANSFORM_WIDTH ( SID_SVX_START + 90 )
-#define SID_ATTR_TRANSFORM_HEIGHT ( SID_SVX_START + 91 )
-#define SID_ATTR_TRANSFORM_SIZE_POINT ( SID_SVX_START + 92 )
-#define SID_ATTR_TRANSFORM_ROT_X ( SID_SVX_START + 93 )
-#define SID_ATTR_TRANSFORM_ROT_Y ( SID_SVX_START + 94 )
-#define SID_ATTR_TRANSFORM_ANGLE ( SID_SVX_START + 95 )
+#define SID_RULER_NULL_OFFSET TypedWhichId<SfxPointItem>( SID_SVX_START + 79 )
+#define SID_RULER_BORDERS TypedWhichId<SvxRulerItem>( SID_SVX_START + 80 )
+#define SID_RULER_OBJECT TypedWhichId<SvxRulerItem>( SID_SVX_START + 81 )
+#define SID_RULER_PAGE_POS TypedWhichId<SvxRulerItem>( SID_SVX_START + 82 )
+#define SID_RULER_ACT_LINE_ONLY TypedWhichId<SfxBoolItem>( SID_SVX_START + 83 )
+#define SID_RULER_LR_MIN_MAX TypedWhichId<SfxUInt32Item>( SID_SVX_START + 84 )
+#define SID_ATTR_NUMBERFORMAT_VALUE TypedWhichId<SfxUInt32Item>( SID_SVX_START + 85 )
+#define SID_ATTR_NUMBERFORMAT_INFO TypedWhichId<SvxNumberInfoItem>( SID_SVX_START + 86 )
+#define SID_ATTR_TRANSFORM TypedWhichId<SfxInt32Item>( SID_SVX_START + 87 )
+#define SID_ATTR_TRANSFORM_POS_X TypedWhichId<SfxInt32Item>( SID_SVX_START + 88 )
+#define SID_ATTR_TRANSFORM_POS_Y TypedWhichId<SfxInt32Item>( SID_SVX_START + 89 )
+#define SID_ATTR_TRANSFORM_WIDTH TypedWhichId<SfxUInt32Item>( SID_SVX_START + 90 )
+#define SID_ATTR_TRANSFORM_HEIGHT TypedWhichId<SfxUInt32Item>( SID_SVX_START + 91 )
+#define SID_ATTR_TRANSFORM_SIZE_POINT TypedWhichId<SfxAllEnumItem>( SID_SVX_START + 92 )
+#define SID_ATTR_TRANSFORM_ROT_X TypedWhichId<SfxInt32Item>( SID_SVX_START + 93 )
+#define SID_ATTR_TRANSFORM_ROT_Y TypedWhichId<SfxInt32Item>( SID_SVX_START + 94 )
+#define SID_ATTR_TRANSFORM_ANGLE TypedWhichId<SfxInt32Item>( SID_SVX_START + 95 )
#define SID_SIZE_ALL ( SID_SVX_START + 101 )
#define SID_DRAW_LINE ( SID_SVX_START + 102 )
#define SID_DRAW_XLINE ( SID_SVX_START + 103 )
@@ -276,12 +293,12 @@ class SvxPostItIdItem;
#define SID_BEZIER_INSERT ( SID_SVX_START + 119 )
#define SID_BEZIER_DELETE ( SID_SVX_START + 120 )
#define SID_BEZIER_MOVE ( SID_SVX_START + 121 )
-#define SID_BEZIER_CLOSE ( SID_SVX_START + 122 )
-#define SID_BEZIER_SMOOTH ( SID_SVX_START + 123 )
+#define SID_BEZIER_CLOSE TypedWhichId<SfxBoolItem>( SID_SVX_START + 122 )
+#define SID_BEZIER_SMOOTH TypedWhichId<SfxBoolItem>( SID_SVX_START + 123 )
#define SID_BEZIER_EDIT ( SID_SVX_START + 126 )
#define SID_BEZIER_CUTLINE ( SID_SVX_START + 127 )
#define SID_OBJECT_SELECT ( SID_SVX_START + 128 )
-#define SID_OBJECT_ROTATE ( SID_SVX_START + 129 )
+#define SID_OBJECT_ROTATE TypedWhichId<SfxBoolItem>( SID_SVX_START + 129 )
#define SID_OBJECT_ALIGN ( SID_SVX_START + 130 )
#define SID_OBJECT_ALIGN_LEFT ( SID_SVX_START + 131 )
#define SID_OBJECT_ALIGN_CENTER ( SID_SVX_START + 132 )
@@ -324,14 +341,14 @@ class SvxPostItIdItem;
#define SID_ATTR_LINE_ENDWIDTH ( SID_SVX_START + 176 )
#define SID_ATTR_LINE_STARTCENTER ( SID_SVX_START + 177 )
#define SID_ATTR_LINE_ENDCENTER ( SID_SVX_START + 178 )
-#define SID_COLOR_TABLE ( SID_SVX_START + 179 )
-#define SID_GRADIENT_LIST ( SID_SVX_START + 180 )
-#define SID_HATCH_LIST ( SID_SVX_START + 181 )
-#define SID_BITMAP_LIST ( SID_SVX_START + 182 )
-#define SID_PATTERN_LIST ( SID_SVX_START + 183 )
-#define SID_DASH_LIST ( SID_SVX_START + 184 )
-#define SID_LINEEND_LIST ( SID_SVX_START + 185 )
-#define SID_BACKGROUND_COLOR ( SID_SVX_START + 186 )
+#define SID_COLOR_TABLE TypedWhichId<SvxColorListItem>( SID_SVX_START + 179 )
+#define SID_GRADIENT_LIST TypedWhichId<SvxGradientListItem>( SID_SVX_START + 180 )
+#define SID_HATCH_LIST TypedWhichId<SvxHatchListItem>( SID_SVX_START + 181 )
+#define SID_BITMAP_LIST TypedWhichId<SvxBitmapListItem>( SID_SVX_START + 182 )
+#define SID_PATTERN_LIST TypedWhichId<SvxPatternListItem>( SID_SVX_START + 183 )
+#define SID_DASH_LIST TypedWhichId<SvxDashListItem>( SID_SVX_START + 184 )
+#define SID_LINEEND_LIST TypedWhichId<SvxLineEndListItem>( SID_SVX_START + 185 )
+#define SID_BACKGROUND_COLOR TypedWhichId<SvxColorItem>( SID_SVX_START + 186 )
#define SID_BACKGROUND_PATTERN ( SID_SVX_START + 187 )
#define SID_ATTR_BORDER ( SID_SVX_START + 188 )
#define SID_INSERT_FIXEDTEXT ( SID_SVX_START + 189 )
@@ -344,18 +361,18 @@ class SvxPostItIdItem;
#define SID_INSERT_VSCROLLBAR ( SID_SVX_START + 196 )
#define SID_INSERT_SELECT ( SID_SVX_START + 199 )
#define SID_DIALOG_TESTMODE ( SID_SVX_START + 200 )
-#define SID_FRAME_LINESTYLE ( SID_SVX_START + 201 )
-#define SID_FRAME_LINECOLOR ( SID_SVX_START + 202 )
+#define SID_FRAME_LINESTYLE TypedWhichId<SvxLineItem>( SID_SVX_START + 201 )
+#define SID_FRAME_LINECOLOR TypedWhichId<SvxColorItem>( SID_SVX_START + 202 )
#define SID_SEARCHDLG_SEARCHSTRINGS ( SID_SVX_START + 215 )
#define SID_SEARCHDLG_REPLACESTRINGS ( SID_SVX_START + 216 )
#define SID_ATTR_TABLE ( SID_SVX_START + 217 )
-#define SID_ATTR_TABLE_COLUMN ( SID_SVX_START + 218 )
-#define SID_ATTR_TABLE_ROW ( SID_SVX_START + 219 )
-#define SID_ATTR_COLUMNS ( SID_SVX_START + 220 )
-#define SID_ATTR_INSERT ( SID_SVX_START + 221 )
-#define SID_ATTR_ZOOM_USER ( SID_SVX_START + 222 )
-#define SID_ATTR_POSITION ( SID_SVX_START + 223 )
-#define SID_ATTR_SIZE ( SID_SVX_START + 224 )
+#define SID_ATTR_TABLE_COLUMN TypedWhichId<SfxUInt16Item>( SID_SVX_START + 218 )
+#define SID_ATTR_TABLE_ROW TypedWhichId<SfxUInt16Item>( SID_SVX_START + 219 )
+#define SID_ATTR_COLUMNS TypedWhichId<SfxUInt16Item>( SID_SVX_START + 220 )
+#define SID_ATTR_INSERT TypedWhichId<SfxBoolItem>( SID_SVX_START + 221 )
+#define SID_ATTR_ZOOM_USER TypedWhichId<SfxUInt16Item>( SID_SVX_START + 222 )
+#define SID_ATTR_POSITION TypedWhichId<SfxPointItem>( SID_SVX_START + 223 )
+#define SID_ATTR_SIZE TypedWhichId<SvxSizeItem>( SID_SVX_START + 224 )
#define SID_TABLE_CELL ( SID_SVX_START + 225 )
#define SID_ATTR_ALIGN_MARGIN ( SID_SVX_START + 228 )
#define SID_ATTR_ALIGN_STACKED ( SID_SVX_START + 229 )
@@ -364,13 +381,13 @@ class SvxPostItIdItem;
#define SID_OUTLINE_EXPAND_ALL ( SID_SVX_START + 232 )
#define SID_OUTLINE_EXPAND ( SID_SVX_START + 233 )
#define SID_OUTLINE_DELETEALL ( SID_SVX_START + 234 )
-#define SID_ATTR_TRANSFORM_PROTECT_POS ( SID_SVX_START + 236 )
-#define SID_ATTR_TRANSFORM_PROTECT_SIZE ( SID_SVX_START + 237 )
+#define SID_ATTR_TRANSFORM_PROTECT_POS TypedWhichId<SfxBoolItem>( SID_SVX_START + 236 )
+#define SID_ATTR_TRANSFORM_PROTECT_SIZE TypedWhichId<SfxBoolItem>( SID_SVX_START + 237 )
#define SID_ATTR_TRANSFORM_AUTOSIZE ( SID_SVX_START + 238 ) // !!!
-#define SID_ATTR_TRANSFORM_INTERN ( SID_SVX_START + 239 )
+#define SID_ATTR_TRANSFORM_INTERN TypedWhichId<SfxRectangleItem>( SID_SVX_START + 239 )
#define SID_INSERT_FRAME ( SID_SVX_START + 240 )
-#define SID_INSERT_GRAPHIC ( SID_SVX_START + 241 )
-#define SID_AUTOFORMAT ( SID_SVX_START + 242 )
+#define SID_INSERT_GRAPHIC TypedWhichId<SfxStringItem>( SID_SVX_START + 241 )
+#define SID_AUTOFORMAT TypedWhichId<SfxStringItem>( SID_SVX_START + 242 )
#define SID_SPELL_DIALOG ( SID_SVX_START + 243 )
#define SID_INSERT_DRAW ( SID_SVX_START + 244 )
#define SID_THESAURUS ( SID_SVX_START + 245 )
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 305bbd68f876..f0a77deca879 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -844,7 +844,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
if ( pReqArgs )
{
- const SfxStringItem& rNameItem = static_cast<const SfxStringItem&>(pReqArgs->Get( SID_AUTOFORMAT ));
+ const SfxStringItem& rNameItem = pReqArgs->Get( SID_AUTOFORMAT );
ScAutoFormat* pFormat = ScGlobal::GetOrCreateAutoFormat();
ScAutoFormat::const_iterator it = pFormat->find(rNameItem.GetValue());
ScAutoFormat::const_iterator itBeg = pFormat->begin();
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index cc718541f730..a8cfadc0dfab 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1832,8 +1832,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
{
// Update default line
const ::editeng::SvxBorderLine* pLine =
- static_cast<const SvxLineItem&>(
- pNewAttrs->Get( SID_FRAME_LINESTYLE )).
+ pNewAttrs->Get( SID_FRAME_LINESTYLE ).
GetLine();
if ( pLine )
@@ -1868,9 +1867,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
case SID_FRAME_LINECOLOR:
{
::editeng::SvxBorderLine* pDefLine = pTabViewShell->GetDefaultFrameLine();
- const Color& rColor = static_cast<const SvxColorItem&>(
- pNewAttrs->Get( SID_FRAME_LINECOLOR )).
- GetValue();
+ const Color& rColor = pNewAttrs->Get( SID_FRAME_LINECOLOR ).GetValue();
// Update default line
if ( pDefLine )
@@ -1993,8 +1990,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
// ATTR_BACKGROUND (=SID_ATTR_BRUSH) has to be set to two IDs:
case SID_BACKGROUND_COLOR:
{
- const SvxColorItem rNewColorItem = static_cast<const SvxColorItem&>(
- pNewAttrs->Get( SID_BACKGROUND_COLOR ) );
+ const SvxColorItem rNewColorItem = pNewAttrs->Get( SID_BACKGROUND_COLOR );
SvxBrushItem aBrushItem(
pTabViewShell->GetSelectionPattern()->
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 99a1c34343f5..517417adda4c 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -308,7 +308,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
short nSlotId = rReq.GetSlot();
- if( nSlotId == SID_OBJECT_ROTATE )
+ if( nSlotId == sal_uInt16(SID_OBJECT_ROTATE) )
{
// toggle rotation
if( nOldSId == nSlotId )
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 32c1885a112e..beb208537ad3 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1513,7 +1513,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
bChgHgt=true;
}
if (bChgSiz) {
- eSizePoint=(RectPoint)static_cast<const SfxAllEnumItem&>(rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
+ eSizePoint=(RectPoint)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT).GetValue();
}
// rotation
@@ -1524,11 +1524,11 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
// position rotation point x
if(bRotate || SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, true ,&pPoolItem))
- nRotateX = static_cast<const SfxInt32Item&>(rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue();
+ nRotateX = rAttr.Get(SID_ATTR_TRANSFORM_ROT_X).GetValue();
// position rotation point y
if(bRotate || SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, true ,&pPoolItem))
- nRotateY = static_cast<const SfxInt32Item&>(rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue();
+ nRotateY = rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y).GetValue();
// shearing
if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,true,&pPoolItem)) {
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 6649ba4df9b4..37e267b2eea4 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2423,11 +2423,11 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr )
const SvxColorItem* pLineColorItem = nullptr;
if(SfxItemState::SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, false) )
- pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) );
+ pLineColorItem = &rAttr.Get( SID_FRAME_LINECOLOR );
const SvxBorderLine* pBorderLineItem = nullptr;
if(SfxItemState::SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, false) )
- pBorderLineItem = static_cast<const SvxLineItem&>(rAttr.Get( SID_FRAME_LINESTYLE )).GetLine();
+ pBorderLineItem = rAttr.Get( SID_FRAME_LINESTYLE ).GetLine();
if( pBoxInfoItem && !pBoxItem )
{
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 8d13fa4dc7e7..313942cbf48e 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1080,7 +1080,7 @@ lcl_IsStartNodeInFormat(const bool bHeader, SwStartNode const *const pSttNode,
const SfxItemSet& rSet = pFrameFormat->GetAttrSet();
const SfxPoolItem* pItem;
if (SfxItemState::SET == rSet.GetItemState(
- static_cast<sal_uInt16>(bHeader ? RES_HEADER : RES_FOOTER),
+ bHeader ? sal_uInt16(RES_HEADER) : sal_uInt16(RES_FOOTER),
true, &pItem))
{
SfxPoolItem *const pItemNonConst(const_cast<SfxPoolItem *>(pItem));
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index f5989402cdab..83c0439efd69 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1635,7 +1635,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(XATTR_FILLGRADIENT)>(const SfxItemPro
SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, aValue, o_rStyleBase);
}
template<>
-void SwXStyle::SetPropertyValue<RES_BACKGROUND>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
+void SwXStyle::SetPropertyValue<sal_uInt16(RES_BACKGROUND)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
{
SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rStyleSet, RES_BACKGROUND, true, m_pDoc->IsInXMLImport()));
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index 967fc154afae..4c254aa884cd 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -40,7 +40,7 @@ SwNumFormatDlg::SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet)
{
VclPtr<SfxTabPage> pNewPage = (*fnCreatePage)( get_content_area(), &rSet );
SfxAllItemSet aSet(*(rSet.GetPool()));
- aSet.Put ( SvxNumberInfoItem( static_cast<const SvxNumberInfoItem&>(pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO ))));
+ aSet.Put ( SvxNumberInfoItem( pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO ) ));
pNewPage->PageCreated(aSet);
SetTabPage(pNewPage);
}
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 9d907536b750..173c8d69d372 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -801,7 +801,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if(SfxItemState::SET == pArgs->GetItemState(nSlot))
nCount = static_cast<const SfxUInt16Item &>(pArgs->Get(nSlot)).GetValue();
else
- nCount = static_cast<const SfxUInt16Item &>(pArgs->Get(SID_ATTR_COLUMNS)).GetValue();
+ nCount = pArgs->Get(SID_ATTR_COLUMNS).GetValue();
sal_uInt16 nGutterWidth = DEF_GUTTER_WIDTH;
aFormatCol.Init(nCount ? nCount : 1, nGutterWidth, USHRT_MAX);
@@ -2298,7 +2298,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
if(pArgs)
{
- const SvxColorItem& rNewColorItem = static_cast<const SvxColorItem&>(pArgs->Get(SID_BACKGROUND_COLOR));
+ const SvxColorItem& rNewColorItem = pArgs->Get(SID_BACKGROUND_COLOR);
const Color& rNewColor = rNewColorItem.GetValue();
aBrushItem.SetColor(rNewColor);
GetView().GetViewFrame()->GetBindings().SetState(rNewColorItem);
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index abe8de4389af..818a1074ba73 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1421,15 +1421,13 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
case SID_FRAME_LINECOLOR:
if ( rReq.GetSlot() == SID_FRAME_LINESTYLE )
{
- const SvxLineItem &rLineItem = static_cast<const SvxLineItem&>(pArgs->
- Get( SID_FRAME_LINESTYLE ));
+ const SvxLineItem &rLineItem = pArgs->Get( SID_FRAME_LINESTYLE );
const SvxBorderLine* pBorderLine = rLineItem.GetLine();
rSh.SetTabLineStyle( nullptr, true, pBorderLine);
}
else
{
- const SvxColorItem &rNewColorItem = static_cast<const SvxColorItem&>(pArgs->
- Get( SID_FRAME_LINECOLOR ));
+ const SvxColorItem &rNewColorItem = pArgs->Get( SID_FRAME_LINECOLOR );
rSh.SetTabLineStyle( &rNewColorItem.GetValue() );
}
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 5a7aa7de520b..5eb755d5cb9c 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -704,10 +704,8 @@ void SwPagePreview::Execute( SfxRequest &rReq )
const SfxItemSet *pArgs = rReq.GetArgs();
if( pArgs && pArgs->Count() >= 2 )
{
- sal_uInt8 nCols = (sal_uInt8)static_cast<const SfxUInt16Item &>(pArgs->Get(
- SID_ATTR_TABLE_COLUMN)).GetValue();
- sal_uInt8 nRows = (sal_uInt8)static_cast<const SfxUInt16Item &>(pArgs->Get(
- SID_ATTR_TABLE_ROW)).GetValue();
+ sal_uInt8 nCols = (sal_uInt8)pArgs->Get(SID_ATTR_TABLE_COLUMN).GetValue();
+ sal_uInt8 nRows = (sal_uInt8)pArgs->Get(SID_ATTR_TABLE_ROW).GetValue();
m_pViewWin->CalcWish( nRows, nCols );
}
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index ad5611a1e628..06ed70fa4def 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -829,8 +829,8 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
{
OSL_ENSURE(aColItem.Count(), "ColDesc is empty!!");
- const bool bSingleLine = static_cast<const SfxBoolItem&>(rReq.
- GetArgs()->Get(SID_RULER_ACT_LINE_ONLY)).GetValue();
+ const bool bSingleLine = rReq.
+ GetArgs()->Get(SID_RULER_ACT_LINE_ONLY).GetValue();
SwTabCols aTabCols;
if ( m_bSetTabColFromDoc )
More information about the Libreoffice-commits
mailing list