diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-16 13:09:02 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-17 11:11:50 +0100 |
commit | c690d38b066bb9cda3e6af790c36fb37d2e0dea3 (patch) | |
tree | f769acfa1b117c65f65ba0cc512e92e03a3b5964 /svx | |
parent | 666dc76e0426927c5f8e70fcfa5bce25171a0722 (diff) |
TypedWhichId for EE_CHAR* constants
Change-Id: I261f8a949ddd858dee196118bb42993a101a2a28
Reviewed-on: https://gerrit.libreoffice.org/44829
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 8 | ||||
-rw-r--r-- | svx/source/engine3d/view3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/tablertfexporter.cxx | 6 | ||||
-rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index a3c09c83038d..0aea03d3ed54 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -157,7 +157,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape, sal_uInt16 nOutlinesCount2d = rOutline2d.Count(); vcl::Font aFont; - const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTINFO )); + const SvxFontItem& rFontItem = pCustomShape->GetMergedItem( EE_CHAR_FONTINFO ); aFont.SetFontHeight( pCustomShape->GetLogicRect().GetHeight() / rFWData.nMaxParagraphsPerTextArea ); aFont.SetAlignment( ALIGN_TOP ); aFont.SetFamilyName( rFontItem.GetFamilyName() ); @@ -253,10 +253,10 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F aFont.SetStyleName( rFontItem.GetStyleName() ); aFont.SetOrientation( 0 ); - const SvxPostureItem& rPostureItem = static_cast<const SvxPostureItem&>(pCustomShape->GetMergedItem( EE_CHAR_ITALIC )); + const SvxPostureItem& rPostureItem = pCustomShape->GetMergedItem( EE_CHAR_ITALIC ); aFont.SetItalic( rPostureItem.GetPosture() ); - const SvxWeightItem& rWeightItem = static_cast<const SvxWeightItem&>(pCustomShape->GetMergedItem( EE_CHAR_WEIGHT )); + const SvxWeightItem& rWeightItem = pCustomShape->GetMergedItem( EE_CHAR_WEIGHT ); aFont.SetWeight( rWeightItem.GetWeight() ); // initializing virtual device @@ -267,7 +267,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F if ( aParagraphIter->nFrameDirection == SvxFrameDirection::Horizontal_RL_TB ) pVirDev->SetLayoutMode( ComplexTextLayoutFlags::BiDiRtl ); - const SvxCharScaleWidthItem& rCharScaleWidthItem = static_cast<const SvxCharScaleWidthItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTWIDTH )); + const SvxCharScaleWidthItem& rCharScaleWidthItem = pCustomShape->GetMergedItem( EE_CHAR_FONTWIDTH ); sal_uInt16 nCharScaleWidth = rCharScaleWidthItem.GetValue(); std::unique_ptr<long[]> pDXArry; sal_Int32 nWidth = 0; diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index dd4396c91a56..8c63c38f2923 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -652,7 +652,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) if(dynamic_cast<const SdrTextObj*>( pObj) != nullptr) { const SfxItemSet& rSet = pObj->GetMergedItemSet(); - const SvxColorItem& rTextColorItem = static_cast<const SvxColorItem&>(rSet.Get(EE_CHAR_COLOR)); + const SvxColorItem& rTextColorItem = rSet.Get(EE_CHAR_COLOR); if(rTextColorItem.GetValue() == RGB_Color(COL_BLACK)) { //For black text objects, the color set to gray diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index cf54d971184e..37d793de6df3 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -200,9 +200,9 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) const SfxItemSet& rCellSet = xCell->GetItemSet(); - const SvxWeightItem& rWeightItem = static_cast<const SvxWeightItem&> ( rCellSet.Get( EE_CHAR_WEIGHT ) ); - const SvxPostureItem& rPostureItem = static_cast<const SvxPostureItem&> ( rCellSet.Get( EE_CHAR_ITALIC ) ); - const SvxUnderlineItem& rUnderlineItem = static_cast<const SvxUnderlineItem&>( rCellSet.Get( EE_CHAR_UNDERLINE ) ); + const SvxWeightItem& rWeightItem = rCellSet.Get( EE_CHAR_WEIGHT ); + const SvxPostureItem& rPostureItem = rCellSet.Get( EE_CHAR_ITALIC ); + const SvxUnderlineItem& rUnderlineItem = rCellSet.Get( EE_CHAR_UNDERLINE ); const sal_Char* pChar; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 01a8c424117b..d7d35fb7c0be 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -107,7 +107,7 @@ void SetCharacterSpacingState( SdrView const * pSdrView, SfxItemSet& rSet ) if( dynamic_cast<const SdrObjCustomShape*>( pObj) != nullptr ) { sal_Int32 nOldCharacterSpacing = nCharacterSpacing; - const SvxCharScaleWidthItem& rCharScaleWidthItem = static_cast<const SvxCharScaleWidthItem&>(pObj->GetMergedItem( EE_CHAR_FONTWIDTH )); + const SvxCharScaleWidthItem& rCharScaleWidthItem = pObj->GetMergedItem( EE_CHAR_FONTWIDTH ); nCharacterSpacing = rCharScaleWidthItem.GetValue(); if ( ( nOldCharacterSpacing != -1 ) && ( nOldCharacterSpacing != nCharacterSpacing ) ) { @@ -131,7 +131,7 @@ void SetKernCharacterPairsState( SdrView const * pSdrView, SfxItemSet& rSet ) SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if( dynamic_cast<const SdrObjCustomShape*>( pObj) != nullptr ) { - const SvxKerningItem& rKerningItem = static_cast<const SvxKerningItem&>(pObj->GetMergedItem( EE_CHAR_KERNING )); + const SvxKerningItem& rKerningItem = pObj->GetMergedItem( EE_CHAR_KERNING ); if ( rKerningItem.GetValue() ) bChecked = true; } |