diff options
Diffstat (limited to 'svx/source/sidebar/text/TextUnderlineControl.cxx')
| -rw-r--r-- | svx/source/sidebar/text/TextUnderlineControl.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index cc62e5b5e74b..c90ec5407739 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -84,34 +84,34 @@ void TextUnderlineControl::initial() maVSUnderline.SetText( SVX_RESSTR(STR_WITHOUT) ); maVSUnderline.InsertItem(1, maIMGSingle, SVX_RESSTR(STR_SINGLE)); - maVSUnderline.SetItemData(1, (void*)(sal_uInt64)UNDERLINE_SINGLE); + maVSUnderline.SetItemData(1, reinterpret_cast<void*>(UNDERLINE_SINGLE)); maVSUnderline.InsertItem(2, maIMGDouble, SVX_RESSTR(STR_DOUBLE)); - maVSUnderline.SetItemData(2, (void*)(sal_uInt64)UNDERLINE_DOUBLE); + maVSUnderline.SetItemData(2, reinterpret_cast<void*>(UNDERLINE_DOUBLE)); maVSUnderline.InsertItem(3, maIMGBold, SVX_RESSTR(STR_BOLD)); - maVSUnderline.SetItemData(3,(void*)(sal_uInt64)UNDERLINE_BOLD); + maVSUnderline.SetItemData(3, reinterpret_cast<void*>(UNDERLINE_BOLD)); maVSUnderline.InsertItem(4, maIMGDot, SVX_RESSTR(STR_DOT)); - maVSUnderline.SetItemData(4,(void*)(sal_uInt64)UNDERLINE_DOTTED); + maVSUnderline.SetItemData(4, reinterpret_cast<void*>(UNDERLINE_DOTTED)); maVSUnderline.InsertItem(5, maIMGDotBold, SVX_RESSTR(STR_DOT_BOLD)); - maVSUnderline.SetItemData(5,(void*)(sal_uInt64)UNDERLINE_BOLDDOTTED); + maVSUnderline.SetItemData(5, reinterpret_cast<void*>(UNDERLINE_BOLDDOTTED)); maVSUnderline.InsertItem(6, maIMGDash, SVX_RESSTR(STR_DASH)); - maVSUnderline.SetItemData(6,(void*)(sal_uInt64)UNDERLINE_DASH); + maVSUnderline.SetItemData(6, reinterpret_cast<void*>(UNDERLINE_DASH)); maVSUnderline.InsertItem(7, maIMGDashLong, SVX_RESSTR(STR_DASH_LONG)); - maVSUnderline.SetItemData(7,(void*)(sal_uInt64)UNDERLINE_LONGDASH); + maVSUnderline.SetItemData(7, reinterpret_cast<void*>(UNDERLINE_LONGDASH)); maVSUnderline.InsertItem(8, maIMGDashDot, SVX_RESSTR(STR_DASH_DOT)); - maVSUnderline.SetItemData(8,(void*)(sal_uInt64)UNDERLINE_DASHDOT); + maVSUnderline.SetItemData(8, reinterpret_cast<void*>(UNDERLINE_DASHDOT)); maVSUnderline.InsertItem(9, maIMGDashDotDot, SVX_RESSTR(STR_DASH_DOT_DOT)); - maVSUnderline.SetItemData(9,(void*)(sal_uInt64)UNDERLINE_DASHDOTDOT); + maVSUnderline.SetItemData(9, reinterpret_cast<void*>(UNDERLINE_DASHDOTDOT)); maVSUnderline.InsertItem(10, maIMGWave, SVX_RESSTR(STR_WAVE)); - maVSUnderline.SetItemData(10,(void*)(sal_uInt64)UNDERLINE_WAVE); + maVSUnderline.SetItemData(10, reinterpret_cast<void*>(UNDERLINE_WAVE)); maVSUnderline.SetColCount( 1 ); aLink = LINK( this, TextUnderlineControl, VSSelectHdl ) ; @@ -207,7 +207,7 @@ IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl) const sal_uInt16 iPos = maVSUnderline.GetSelectItemId(); const FontUnderline eUnderline = ( iPos == 0 ) ? UNDERLINE_NONE - : (FontUnderline)(sal_uInt64)maVSUnderline.GetItemData( iPos ); + : static_cast<FontUnderline>(reinterpret_cast<sal_uInt64>(maVSUnderline.GetItemData( iPos ))); SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE); |