[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source

[Stephan Bergmann]

 unusedcode.easy            |    1 +
 vcl/inc/outfont.hxx        |    2 ++
 vcl/source/gdi/outdev3.cxx |   20 ++++++++++++++++++++
 3 files changed, 23 insertions(+)

New commits:
commit e2873d699b47f55c67d0ee874b49a075d52eb6fb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 26 10:12:04 2012 +0200

    Revert "Remove unused FontSelectPattern constructor"
    
    This reverts commit 44a4c577fd54de12e089e76c234f6b5f5099a3d4.
    
    ...the ctor is still used on Windows.

diff --git a/unusedcode.easy b/unusedcode.easy
index 558f12e..f2ca669 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,7 @@
 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)
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 8d159a5..19c2c3a 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -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
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 93e85ff..adc2bf7 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -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