Kaydet (Commit) e2873d69 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "Remove unused FontSelectPattern constructor"

This reverts commit 44a4c577.

...the ctor is still used on Windows.
üst 44a4c577
EditEngine::GetNextVisPortion(ParaPortion const*) const
FmFieldWinMgr::GetChildWindowId()
FmPropBrwMgr::GetChildWindowId()
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
FontStyleBox::FontStyleBox(Window*, long)
HTMLControls::Insert(HTMLControl const*&, unsigned short&)
HTMLControls::Insert(HTMLControl const**, unsigned short)
......
......@@ -161,6 +161,8 @@ class FontSelectPattern : public ImplFontAttributes
public:
FontSelectPattern( const Font&, const String& rSearchName,
const Size&, float fExactHeight );
FontSelectPattern( const ImplFontData&, const Size&,
float fExactHeight, int nOrientation, bool bVertical );
public: // TODO: change to private
String maTargetName; // name of the font name token that is chosen
......
......@@ -2175,6 +2175,26 @@ FontSelectPattern::FontSelectPattern( const Font& rFont,
mnWidth = -mnWidth;
}
// -----------------------------------------------------------------------
FontSelectPattern::FontSelectPattern( const ImplFontData& rFontData,
const Size& rSize, float fExactHeight, int nOrientation, bool bVertical )
: ImplFontAttributes( rFontData ),
mnWidth( rSize.Width() ),
mnHeight( rSize.Height() ),
mfExactHeight( fExactHeight ),
mnOrientation( nOrientation ),
meLanguage( 0 ),
mbVertical( bVertical ),
mbNonAntialiased( false ),
mbEmbolden( false ),
mpFontData( &rFontData ),
mpFontEntry( NULL )
{
maTargetName = maSearchName = maName;
// NOTE: no normalization for width/height/orientation
}
// =======================================================================
size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD ) const
......
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