summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-11-16 13:09:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-11-17 11:11:50 +0100
commitc690d38b066bb9cda3e6af790c36fb37d2e0dea3 (patch)
treef769acfa1b117c65f65ba0cc512e92e03a3b5964 /sd
parent666dc76e0426927c5f8e70fcfa5bce25171a0722 (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 'sd')
-rw-r--r--sd/qa/unit/import-tests.cxx2
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx4
-rw-r--r--sd/source/core/sdpage.cxx12
-rw-r--r--sd/source/core/stlsheet.cxx4
-rw-r--r--sd/source/filter/html/htmlex.cxx10
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx8
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx8
-rw-r--r--sd/source/ui/func/fuhhconv.cxx2
-rw-r--r--sd/source/ui/func/futext.cxx1
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx2
-rw-r--r--sd/source/ui/view/drtxtob.cxx5
-rw-r--r--sd/source/ui/view/drtxtob1.cxx40
-rw-r--r--sd/source/ui/view/drviews2.cxx8
-rw-r--r--sd/source/ui/view/drviewsf.cxx4
14 files changed, 50 insertions, 60 deletions
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index f27a9ec685b2..1f0cd6fde6e2 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -590,7 +590,7 @@ void SdImportTest::testFdo68594()
SdrObject *pObj = pPage->GetObj(1);
SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>( pObj );
CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != nullptr);
- const SvxColorItem *pC = dynamic_cast<const SvxColorItem *>(&pTxtObj->GetMergedItem(EE_CHAR_COLOR));
+ const SvxColorItem *pC = &pTxtObj->GetMergedItem(EE_CHAR_COLOR);
CPPUNIT_ASSERT_MESSAGE( "no color item", pC != nullptr);
// Color should be black
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Placeholder color mismatch", static_cast<ColorData>(0), pC->GetValue().GetColor());
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 37ded6498370..9622946a4743 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1342,7 +1342,7 @@ void SdTiledRenderingTest::testTdf102223()
EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
rEditView.SetSelection(ESelection(0, 0, 0, 3)); // start para, start char, end para, end char.
CPPUNIT_ASSERT_EQUAL(OUString("Red"), rEditView.GetSelected());
- const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rEditView.GetAttribs().Get(EE_CHAR_FONTHEIGHT));
+ const SvxFontHeightItem& rItem = rEditView.GetAttribs().Get(EE_CHAR_FONTHEIGHT);
CPPUNIT_ASSERT_EQUAL((int)1411, (int)rItem.GetHeight());
// cut contents of cell
@@ -1354,7 +1354,7 @@ void SdTiledRenderingTest::testTdf102223()
CPPUNIT_ASSERT(pView->GetTextEditObject());
EditView& rEditView2 = pView->GetTextEditOutlinerView()->GetEditView();
rEditView2.SetSelection(ESelection(0, 0, 0, 1)); // start para, start char, end para, end char.
- const SvxFontHeightItem& rItem2 = static_cast<const SvxFontHeightItem&>(rEditView2.GetAttribs().Get(EE_CHAR_FONTHEIGHT));
+ const SvxFontHeightItem& rItem2 = rEditView2.GetAttribs().Get(EE_CHAR_FONTHEIGHT);
CPPUNIT_ASSERT_EQUAL((int)1411, (int)rItem2.GetHeight());
comphelper::LibreOfficeKit::setActive(false);
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 9654035413aa..9479976ac74e 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1948,14 +1948,14 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN
{
SfxItemSet& rSet = pTitleSheet->GetItemSet();
- const SvxFontHeightItem& rOldHgt = static_cast<const SvxFontHeightItem&>( rSet.Get(EE_CHAR_FONTHEIGHT) );
+ const SvxFontHeightItem& rOldHgt = rSet.Get(EE_CHAR_FONTHEIGHT);
sal_uLong nFontHeight = rOldHgt.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
rSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT));
if( SfxItemState::DEFAULT == rSet.GetItemState( EE_CHAR_FONTHEIGHT_CJK ) )
{
- const SvxFontHeightItem& rOldHgt2 = static_cast<const SvxFontHeightItem&>( rSet.Get(EE_CHAR_FONTHEIGHT_CJK) );
+ const SvxFontHeightItem& rOldHgt2 = rSet.Get(EE_CHAR_FONTHEIGHT_CJK);
nFontHeight = rOldHgt2.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
rSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CJK));
@@ -1963,7 +1963,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN
if( SfxItemState::DEFAULT == rSet.GetItemState( EE_CHAR_FONTHEIGHT_CTL ) )
{
- const SvxFontHeightItem& rOldHgt2 = static_cast<const SvxFontHeightItem&>( rSet.Get(EE_CHAR_FONTHEIGHT_CTL) );
+ const SvxFontHeightItem& rOldHgt2 = rSet.Get(EE_CHAR_FONTHEIGHT_CTL);
nFontHeight = rOldHgt2.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
rSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CTL));
@@ -1987,14 +1987,14 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN
// Calculate new font height
SfxItemSet aTempSet(pOutlineSheet->GetItemSet());
- const SvxFontHeightItem& rOldHgt = static_cast<const SvxFontHeightItem&>( aTempSet.Get(EE_CHAR_FONTHEIGHT) );
+ const SvxFontHeightItem& rOldHgt = aTempSet.Get(EE_CHAR_FONTHEIGHT);
sal_uLong nFontHeight = rOldHgt.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
aTempSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT));
if( SfxItemState::DEFAULT == aTempSet.GetItemState( EE_CHAR_FONTHEIGHT_CJK ) )
{
- const SvxFontHeightItem& rOldHgt2 = static_cast<const SvxFontHeightItem&>( aTempSet.Get(EE_CHAR_FONTHEIGHT_CJK) );
+ const SvxFontHeightItem& rOldHgt2 = aTempSet.Get(EE_CHAR_FONTHEIGHT_CJK);
nFontHeight = rOldHgt2.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
aTempSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CJK));
@@ -2002,7 +2002,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN
if( SfxItemState::DEFAULT == aTempSet.GetItemState( EE_CHAR_FONTHEIGHT_CTL ) )
{
- const SvxFontHeightItem& rOldHgt2 = static_cast<const SvxFontHeightItem&>( aTempSet.Get(EE_CHAR_FONTHEIGHT_CTL) );
+ const SvxFontHeightItem& rOldHgt2 = aTempSet.Get(EE_CHAR_FONTHEIGHT_CTL);
nFontHeight = rOldHgt2.GetHeight();
nFontHeight = long(nFontHeight * (double) aFractY);
aTempSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CTL));
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 0fe25f35df06..47ee855153d2 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -529,8 +529,8 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
rSet.GetItemState(EE_CHAR_FONTHEIGHT) == SfxItemState::SET)
{
const SfxItemSet* pCurSet = &GetItemSet();
- sal_uInt32 nNewHeight = static_cast<const SvxFontHeightItem&>(rSet.Get(EE_CHAR_FONTHEIGHT)).GetHeight();
- sal_uInt32 nOldHeight = static_cast<const SvxFontHeightItem&>(pCurSet->Get(EE_CHAR_FONTHEIGHT)).GetHeight();
+ sal_uInt32 nNewHeight = rSet.Get(EE_CHAR_FONTHEIGHT).GetHeight();
+ sal_uInt32 nOldHeight = pCurSet->Get(EE_CHAR_FONTHEIGHT).GetHeight();
if (rSet.GetItemState(EE_PARA_BULLET) != SfxItemState::SET || !bOnlyMissingItems)
{
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 428605c5a964..497a0912f5c1 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1477,7 +1477,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState*
if ( pSet->GetItemState( EE_CHAR_WEIGHT ) == SfxItemState::SET )
{
- bTemp = static_cast<const SvxWeightItem&>(pSet->Get( EE_CHAR_WEIGHT )).GetWeight() == WEIGHT_BOLD;
+ bTemp = pSet->Get( EE_CHAR_WEIGHT ).GetWeight() == WEIGHT_BOLD;
aTemp = pState->SetWeight( bTemp );
if( bTemp )
aStr.insert(0, aTemp);
@@ -1487,7 +1487,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState*
if ( pSet->GetItemState( EE_CHAR_UNDERLINE ) == SfxItemState::SET )
{
- bTemp = static_cast<const SvxUnderlineItem&>(pSet->Get( EE_CHAR_UNDERLINE )).GetLineStyle() != LINESTYLE_NONE;
+ bTemp = pSet->Get( EE_CHAR_UNDERLINE ).GetLineStyle() != LINESTYLE_NONE;
aTemp = pState->SetUnderline( bTemp );
if( bTemp )
aStr.insert(0, aTemp);
@@ -1497,7 +1497,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState*
if ( pSet->GetItemState( EE_CHAR_STRIKEOUT ) == SfxItemState::SET )
{
- bTemp = static_cast<const SvxCrossedOutItem&>(pSet->Get( EE_CHAR_STRIKEOUT )).GetStrikeout() != STRIKEOUT_NONE;
+ bTemp = pSet->Get( EE_CHAR_STRIKEOUT ).GetStrikeout() != STRIKEOUT_NONE;
aTemp = pState->SetStrikeout( bTemp );
if( bTemp )
aStr.insert(0, aTemp);
@@ -1507,7 +1507,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState*
if ( pSet->GetItemState( EE_CHAR_ITALIC ) == SfxItemState::SET )
{
- bTemp = static_cast<const SvxPostureItem&>(pSet->Get( EE_CHAR_ITALIC )).GetPosture() != ITALIC_NONE;
+ bTemp = pSet->Get( EE_CHAR_ITALIC ).GetPosture() != ITALIC_NONE;
aTemp = pState->SetItalic( bTemp );
if( bTemp )
aStr.insert(0, aTemp);
@@ -1519,7 +1519,7 @@ OUString HtmlExport::TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState*
{
if ( pSet->GetItemState( EE_CHAR_COLOR ) == SfxItemState::SET )
{
- Color aTextColor = static_cast<const SvxColorItem&>(pSet->Get( EE_CHAR_COLOR )).GetValue();
+ Color aTextColor = pSet->Get( EE_CHAR_COLOR ).GetValue();
if( aTextColor == COL_AUTO )
{
if( !rBackgroundColor.IsDark() )
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 06b23d2ae26b..d9df5c535086 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1120,25 +1120,25 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( const Reference< XAnno
if ( aSet.GetItemState( EE_CHAR_WEIGHT ) == SfxItemState::SET )
{
- if( static_cast<const SvxWeightItem&>(aSet.Get( EE_CHAR_WEIGHT )).GetWeight() == WEIGHT_BOLD )
+ if( aSet.Get( EE_CHAR_WEIGHT ).GetWeight() == WEIGHT_BOLD )
pMenu->CheckItem(pMenu->GetItemId("bold"));
}
if ( aSet.GetItemState( EE_CHAR_ITALIC ) == SfxItemState::SET )
{
- if( static_cast<const SvxPostureItem&>(aSet.Get( EE_CHAR_ITALIC )).GetPosture() != ITALIC_NONE )
+ if( aSet.Get( EE_CHAR_ITALIC ).GetPosture() != ITALIC_NONE )
pMenu->CheckItem(pMenu->GetItemId("italic"));
}
if ( aSet.GetItemState( EE_CHAR_UNDERLINE ) == SfxItemState::SET )
{
- if( static_cast<const SvxUnderlineItem&>(aSet.Get( EE_CHAR_UNDERLINE )).GetLineStyle() != LINESTYLE_NONE )
+ if( aSet.Get( EE_CHAR_UNDERLINE ).GetLineStyle() != LINESTYLE_NONE )
pMenu->CheckItem(pMenu->GetItemId("underline"));
}
if ( aSet.GetItemState( EE_CHAR_STRIKEOUT ) == SfxItemState::SET )
{
- if( static_cast<const SvxCrossedOutItem&>(aSet.Get( EE_CHAR_STRIKEOUT )).GetStrikeout() != STRIKEOUT_NONE )
+ if( aSet.Get( EE_CHAR_STRIKEOUT ).GetStrikeout() != STRIKEOUT_NONE )
pMenu->CheckItem(pMenu->GetItemId("strike"));
}
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pAnnotationWindow ) );
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index d7bebce766ce..46de3bffe1b7 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -752,25 +752,25 @@ void AnnotationWindow::ExecuteSlot( sal_uInt16 nSID )
{
case SID_ATTR_CHAR_WEIGHT:
{
- FontWeight eFW = static_cast<const SvxWeightItem&>( aEditAttr.Get( EE_CHAR_WEIGHT ) ).GetWeight();
+ FontWeight eFW = aEditAttr.Get( EE_CHAR_WEIGHT ).GetWeight();
aNewAttr.Put( SvxWeightItem( eFW == WEIGHT_NORMAL ? WEIGHT_BOLD : WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
}
break;
case SID_ATTR_CHAR_POSTURE:
{
- FontItalic eFI = static_cast<const SvxPostureItem&>( aEditAttr.Get( EE_CHAR_ITALIC ) ).GetPosture();
+ FontItalic eFI = aEditAttr.Get( EE_CHAR_ITALIC ).GetPosture();
aNewAttr.Put( SvxPostureItem( eFI == ITALIC_NORMAL ? ITALIC_NONE : ITALIC_NORMAL, EE_CHAR_ITALIC ) );
}
break;
case SID_ATTR_CHAR_UNDERLINE:
{
- FontLineStyle eFU = static_cast<const SvxUnderlineItem&>( aEditAttr. Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
+ FontLineStyle eFU = aEditAttr. Get( EE_CHAR_UNDERLINE ).GetLineStyle();
aNewAttr.Put( SvxUnderlineItem( eFU == LINESTYLE_SINGLE ? LINESTYLE_NONE : LINESTYLE_SINGLE, EE_CHAR_UNDERLINE ) );
}
break;
case SID_ATTR_CHAR_STRIKEOUT:
{
- FontStrikeout eFSO = static_cast<const SvxCrossedOutItem&>( aEditAttr.Get( EE_CHAR_STRIKEOUT ) ).GetStrikeout();
+ FontStrikeout eFSO = aEditAttr.Get( EE_CHAR_STRIKEOUT ).GetStrikeout();
aNewAttr.Put( SvxCrossedOutItem( eFSO == STRIKEOUT_SINGLE ? STRIKEOUT_NONE : STRIKEOUT_SINGLE, EE_CHAR_STRIKEOUT ) );
}
break;
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index c4616e3ab6af..3eac550fc361 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -171,7 +171,7 @@ void FuHangulHanjaConversion::ConvertStyles( LanguageType nTargetLanguage, const
( !bHasParent || rSet.GetItemState( EE_CHAR_FONTINFO_CJK, false ) == SfxItemState::SET ) )
{
// set new font attribute
- SvxFontItem aFontItem( static_cast<const SvxFontItem&>( rSet.Get( EE_CHAR_FONTINFO_CJK ) ) );
+ SvxFontItem aFontItem( rSet.Get( EE_CHAR_FONTINFO_CJK ) );
aFontItem.SetFamilyName( pTargetFont->GetFamilyName());
aFontItem.SetFamily( pTargetFont->GetFamilyType());
aFontItem.SetStyleName( pTargetFont->GetStyleName());
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 3e3143f20dd6..b2ca0d1111b1 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -27,6 +27,7 @@
#include <tools/urlobj.hxx>
#include <vcl/help.hxx>
#include <editeng/editstat.hxx>
+#include <editeng/fhgtitem.hxx>
#include <svl/aeitem.hxx>
#include <svl/intitem.hxx>
#include <svx/svdotext.hxx>
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 8026e3a8adf8..9e4920ab2ccf 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -470,7 +470,7 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle )
maCellColor.SetColor( COL_TRANSPARENT );
// get style text color
- const SvxColorItem* pTextColor = dynamic_cast<const SvxColorItem*>( rSet.GetItem(EE_CHAR_COLOR) );
+ const SvxColorItem* pTextColor = rSet.GetItem(EE_CHAR_COLOR);
if( pTextColor )
maTextColor = pTextColor->GetValue();
else
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 9f17f7f08915..3bcaf5e71f90 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -134,7 +134,7 @@ void TextObjectBar::GetCharState( SfxItemSet& rSet )
aNewAttr.Put(aCharAttrSet, false);
rSet.Put(aNewAttr, false);
- SvxKerningItem aKern = static_cast<const SvxKerningItem&>( aCharAttrSet.Get( EE_CHAR_KERNING ) );
+ SvxKerningItem aKern = aCharAttrSet.Get( EE_CHAR_KERNING );
//aKern.SetWhich(SID_ATTR_CHAR_KERNING);
rSet.Put(aKern);
@@ -581,8 +581,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
}
// justification (superscript, subscript) is also needed in outline-mode
- SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
- aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement ) aAttrSet.Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Superscript )
rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) );
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index b2db72bf1b55..40af5696ff75 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -444,8 +444,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
case SID_ATTR_CHAR_WEIGHT:
{
- FontWeight eFW = static_cast<const SvxWeightItem&>( aEditAttr.
- Get( EE_CHAR_WEIGHT ) ).GetWeight();
+ FontWeight eFW = aEditAttr.Get( EE_CHAR_WEIGHT ).GetWeight();
aNewAttr.Put( SvxWeightItem( eFW == WEIGHT_NORMAL ?
WEIGHT_BOLD : WEIGHT_NORMAL,
EE_CHAR_WEIGHT ) );
@@ -453,8 +452,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_ATTR_CHAR_POSTURE:
{
- FontItalic eFI = static_cast<const SvxPostureItem&>( aEditAttr.
- Get( EE_CHAR_ITALIC ) ).GetPosture();
+ FontItalic eFI = aEditAttr.Get( EE_CHAR_ITALIC ).GetPosture();
aNewAttr.Put( SvxPostureItem( eFI == ITALIC_NORMAL ?
ITALIC_NONE : ITALIC_NORMAL,
EE_CHAR_ITALIC ) );
@@ -462,8 +460,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_ATTR_CHAR_UNDERLINE:
{
- FontLineStyle eFU = static_cast<const SvxUnderlineItem&>( aEditAttr.
- Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
+ FontLineStyle eFU = aEditAttr.Get( EE_CHAR_UNDERLINE ).GetLineStyle();
aNewAttr.Put( SvxUnderlineItem( eFU == LINESTYLE_SINGLE ?
LINESTYLE_NONE : LINESTYLE_SINGLE,
EE_CHAR_UNDERLINE ) );
@@ -471,8 +468,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_ATTR_CHAR_OVERLINE:
{
- FontLineStyle eFO = static_cast<const SvxOverlineItem&>( aEditAttr.
- Get( EE_CHAR_OVERLINE ) ).GetLineStyle();
+ FontLineStyle eFO = aEditAttr.Get( EE_CHAR_OVERLINE ).GetLineStyle();
aNewAttr.Put( SvxOverlineItem( eFO == LINESTYLE_SINGLE ?
LINESTYLE_NONE : LINESTYLE_SINGLE,
EE_CHAR_OVERLINE ) );
@@ -480,26 +476,22 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_ATTR_CHAR_CONTOUR:
{
- aNewAttr.Put( SvxContourItem( !static_cast<const SvxContourItem&>( aEditAttr.
- Get( EE_CHAR_OUTLINE ) ).GetValue(), EE_CHAR_OUTLINE ) );
+ aNewAttr.Put( SvxContourItem( !aEditAttr.Get( EE_CHAR_OUTLINE ).GetValue(), EE_CHAR_OUTLINE ) );
}
break;
case SID_ATTR_CHAR_SHADOWED:
{
- aNewAttr.Put( SvxShadowedItem( !static_cast<const SvxShadowedItem&>( aEditAttr.
- Get( EE_CHAR_SHADOW ) ).GetValue(), EE_CHAR_SHADOW ) );
+ aNewAttr.Put( SvxShadowedItem( !aEditAttr.Get( EE_CHAR_SHADOW ).GetValue(), EE_CHAR_SHADOW ) );
}
break;
case SID_ATTR_CHAR_CASEMAP:
{
- aNewAttr.Put( SvxCaseMapItem( static_cast<const SvxCaseMapItem&>( aEditAttr.
- Get( EE_CHAR_CASEMAP ) ) ) );
+ aNewAttr.Put( SvxCaseMapItem( aEditAttr.Get( EE_CHAR_CASEMAP ) ) );
}
break;
case SID_ATTR_CHAR_STRIKEOUT:
{
- FontStrikeout eFSO = ( static_cast<const SvxCrossedOutItem&>( aEditAttr.
- Get( EE_CHAR_STRIKEOUT ) ).GetStrikeout() );
+ FontStrikeout eFSO = aEditAttr.Get( EE_CHAR_STRIKEOUT ).GetStrikeout();
aNewAttr.Put( SvxCrossedOutItem( eFSO == STRIKEOUT_SINGLE ?
STRIKEOUT_NONE : STRIKEOUT_SINGLE, EE_CHAR_STRIKEOUT ) );
}
@@ -549,8 +541,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
case SID_SET_SUPER_SCRIPT:
{
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
- SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
- aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement )
+ aEditAttr.Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Superscript )
aItem.SetEscapement( SvxEscapement::Off );
@@ -562,8 +554,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
case SID_SET_SUB_SCRIPT:
{
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
- SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
- aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement )
+ aEditAttr.Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Subscript )
aItem.SetEscapement( SvxEscapement::Off );
@@ -674,8 +666,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
else if(nSlot == SID_SET_SUPER_SCRIPT )
{
SvxEscapementItem aItem(EE_CHAR_ESCAPEMENT);
- SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>(
- aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement)
+ aEditAttr.Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Superscript )
aItem.SetEscapement( SvxEscapement::Off );
@@ -688,8 +680,8 @@ void TextObjectBar::Execute( SfxRequest &rReq )
else if( nSlot == SID_SET_SUB_SCRIPT )
{
SvxEscapementItem aItem(EE_CHAR_ESCAPEMENT);
- SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>(
- aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement)
+ aEditAttr.Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Subscript )
aItem.SetEscapement( SvxEscapement::Off );
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 6e327c690ae1..6b0259bfeaae 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3382,7 +3382,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
}
else
{
- FontLineStyle eFU = static_cast<const SvxUnderlineItem&>( aEditAttr.Get( EE_CHAR_UNDERLINE ) ).GetLineStyle();
+ FontLineStyle eFU = aEditAttr.Get( EE_CHAR_UNDERLINE ).GetLineStyle();
aNewAttr.Put( SvxUnderlineItem( eFU != LINESTYLE_NONE ?LINESTYLE_NONE : LINESTYLE_SINGLE, EE_CHAR_UNDERLINE ) );
}//aNewAttr.Put( (const SvxUnderlineItem&)aEditAttr.Get( EE_CHAR_UNDERLINE ) );
}
@@ -3440,8 +3440,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
case SID_SET_SUB_SCRIPT:
{
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
- SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
- aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement ) aEditAttr.Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Subscript )
aItem.SetEscapement( SvxEscapement::Off );
else
@@ -3452,8 +3451,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
case SID_SET_SUPER_SCRIPT:
{
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );
- SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
- aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement ) aEditAttr.Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Superscript )
aItem.SetEscapement( SvxEscapement::Off );
else
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index b4833f19a2bd..dc13ed8cbca8 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -718,8 +718,8 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
rSet.InvalidateItem(SID_ATTR_PARA_ULSPACE);
}
- SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>(
- pSet->Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ SvxEscapement eEsc = (SvxEscapement)
+ pSet->Get( EE_CHAR_ESCAPEMENT ).GetEnumValue();
if( eEsc == SvxEscapement::Superscript )
{
rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) );