Kaydet (Commit) c57ba947 authored tarafından Caolán McNamara's avatar Caolán McNamara

drop confusing and unused single font setters

üst e3ef9beb
...@@ -674,7 +674,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat ...@@ -674,7 +674,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat
aFont.SetEmphasisMark( static_cast< FontEmphasisMark >( _xReportControlFormat->getControlTextEmphasis() ) ); aFont.SetEmphasisMark( static_cast< FontEmphasisMark >( _xReportControlFormat->getControlTextEmphasis() ) );
aFont.SetRelief( static_cast< FontRelief >( _xReportControlFormat->getCharRelief() ) ); aFont.SetRelief( static_cast< FontRelief >( _xReportControlFormat->getCharRelief() ) );
aFont.SetColor( _xReportControlFormat->getCharColor() ); aFont.SetColor( _xReportControlFormat->getCharColor() );
m_aPreview.SetFont( aFont ); m_aPreview.SetFont( aFont, aFont, aFont );
m_aPreview.SetBackColor( _xReportControlFormat->getControlBackground() ); m_aPreview.SetBackColor( _xReportControlFormat->getControlBackground() );
m_aPreview.SetTextLineColor( Color( _xReportControlFormat->getCharUnderlineColor() ) ); m_aPreview.SetTextLineColor( Color( _xReportControlFormat->getCharUnderlineColor() ) );
} }
......
...@@ -68,10 +68,7 @@ public: ...@@ -68,10 +68,7 @@ public:
// for reasons of efficiency not const // for reasons of efficiency not const
SvxFont& GetFont(); SvxFont& GetFont();
const SvxFont& GetFont() const; const SvxFont& GetFont() const;
void SetFont( const SvxFont& rFont );
void SetFont( const SvxFont& rNormalFont, const SvxFont& rCJKFont, const SvxFont& rCTLFont ); void SetFont( const SvxFont& rNormalFont, const SvxFont& rCJKFont, const SvxFont& rCTLFont );
void SetCJKFont( const SvxFont& rFont );
void SetCTLFont( const SvxFont& rFont );
SvxFont& GetCJKFont(); SvxFont& GetCJKFont();
SvxFont& GetCTLFont(); SvxFont& GetCTLFont();
void SetColor( const Color& rColor ); void SetColor( const Color& rColor );
......
...@@ -599,16 +599,6 @@ void SvxFontPrevWindow::SetFontNameAsPreviewText() ...@@ -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 ) void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& rCJKOutFont, const SvxFont& rCTLFont )
{ {
setFont( rNormalOutFont, pImpl->aFont ); setFont( rNormalOutFont, pImpl->aFont );
...@@ -622,24 +612,6 @@ void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& r ...@@ -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) void SvxFontPrevWindow::SetColor(const Color &rColor)
{ {
delete pImpl->pColor; delete pImpl->pColor;
...@@ -1457,7 +1429,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo ...@@ -1457,7 +1429,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo
sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nSlot ); sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nSlot );
if( ISITEMSET ) if( ISITEMSET )
{ {
const SvxFontItem& rFontItem = ( SvxFontItem& ) rSet.Get( nWhich ); const SvxFontItem& rFontItem = (const SvxFontItem&)rSet.Get(nWhich);
rFont.SetFamily( rFontItem.GetFamily() ); rFont.SetFamily( rFontItem.GetFamily() );
rFont.SetName( rFontItem.GetFamilyName() ); rFont.SetName( rFontItem.GetFamilyName() );
rFont.SetPitch( rFontItem.GetPitch() ); rFont.SetPitch( rFontItem.GetPitch() );
......
...@@ -1025,8 +1025,6 @@ SvxEditSourceHint::SetStartValue(unsigned long) ...@@ -1025,8 +1025,6 @@ SvxEditSourceHint::SetStartValue(unsigned long)
SvxEditSourceHint::SetValue(unsigned long) SvxEditSourceHint::SetValue(unsigned long)
SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short, unsigned short) const SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short, unsigned short) const
SvxFontPrevWindow::IsTwoLines() const SvxFontPrevWindow::IsTwoLines() const
SvxFontPrevWindow::SetCJKFont(SvxFont const&)
SvxFontPrevWindow::SetCTLFont(SvxFont const&)
SvxFontPrevWindow::SetNoLines(unsigned char) SvxFontPrevWindow::SetNoLines(unsigned char)
SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char) SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char)
SvxFontPrevWindow::SvxFontPrevWindow(Window*) SvxFontPrevWindow::SvxFontPrevWindow(Window*)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment