drop confusing and unused single font setters

4 files changed, 2 insertions, 35 deletions

diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index a5d55fbe6278..10520e343f50 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -674,7 +674,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat
             aFont.SetEmphasisMark( static_cast< FontEmphasisMark >( _xReportControlFormat->getControlTextEmphasis() ) );
             aFont.SetRelief( static_cast< FontRelief >( _xReportControlFormat->getCharRelief() ) );
             aFont.SetColor( _xReportControlFormat->getCharColor() );
-            m_aPreview.SetFont( aFont );
+            m_aPreview.SetFont( aFont, aFont, aFont );
             m_aPreview.SetBackColor( _xReportControlFormat->getControlBackground() );
             m_aPreview.SetTextLineColor( Color( _xReportControlFormat->getCharUnderlineColor() ) );
         }
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 7adc049fcc54..2d5083337121 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -68,10 +68,7 @@ public:
     // for reasons of efficiency not const
     SvxFont&            GetFont();
     const SvxFont&      GetFont() const;
-    void                SetFont( const SvxFont& rFont );
     void                SetFont( const SvxFont& rNormalFont, const SvxFont& rCJKFont, const SvxFont& rCTLFont );
-    void                SetCJKFont( const SvxFont& rFont );
-    void                SetCTLFont( const SvxFont& rFont );
     SvxFont&            GetCJKFont();
     SvxFont&            GetCTLFont();
     void                SetColor( const Color& rColor );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 2f5dcf08f9ec..4e8db6956211 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -599,16 +599,6 @@ void SvxFontPrevWindow::SetFontNameAsPreviewText()
 
 // -----------------------------------------------------------------------
 
-void SvxFontPrevWindow::SetFont( const SvxFont& rOutFont )
-{
-    setFont( rOutFont, pImpl->aFont );
-
-    pImpl->Invalidate100PercentFontWidth();
-    Invalidate();
-}
-
-// -----------------------------------------------------------------------
-
 void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& rCJKOutFont, const SvxFont& rCTLFont )
 {
     setFont( rNormalOutFont, pImpl->aFont );
@@ -622,24 +612,6 @@ void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& r
 
 // -----------------------------------------------------------------------
 
-void SvxFontPrevWindow::SetCJKFont( const SvxFont &rCJKOutFont )
-{
-    setFont( rCJKOutFont, pImpl->aCJKFont );
-
-    pImpl->Invalidate100PercentFontWidth();
-    Invalidate();
-}
-// -----------------------------------------------------------------------------
-void SvxFontPrevWindow::SetCTLFont( const SvxFont &rCTLOutFont )
-{
-    setFont( rCTLOutFont, pImpl->aCTLFont );
-
-    pImpl->Invalidate100PercentFontWidth();
-    Invalidate();
-}
-
-// -----------------------------------------------------------------------
-
 void SvxFontPrevWindow::SetColor(const Color &rColor)
 {
     delete pImpl->pColor;
@@ -1457,7 +1429,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo
     sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nSlot );
     if( ISITEMSET )
     {
-        const SvxFontItem& rFontItem = ( SvxFontItem& ) rSet.Get( nWhich );
+        const SvxFontItem& rFontItem = (const SvxFontItem&)rSet.Get(nWhich);
         rFont.SetFamily( rFontItem.GetFamily() );
         rFont.SetName( rFontItem.GetFamilyName() );
         rFont.SetPitch( rFontItem.GetPitch() );
diff --git a/unusedcode.easy b/unusedcode.easy
index 60c838c72165..c6a0ba0a5695 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1025,8 +1025,6 @@ SvxEditSourceHint::SetStartValue(unsigned long)
 SvxEditSourceHint::SetValue(unsigned long)
 SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short, unsigned short) const
 SvxFontPrevWindow::IsTwoLines() const
-SvxFontPrevWindow::SetCJKFont(SvxFont const&)
-SvxFontPrevWindow::SetCTLFont(SvxFont const&)
 SvxFontPrevWindow::SetNoLines(unsigned char)
 SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char)
 SvxFontPrevWindow::SvxFontPrevWindow(Window*)