diff options
| -rw-r--r-- | toolkit/qa/unoapi/knownissues.xcl | 4 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 5 | ||||
| -rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl index e6880b85efaf..a64fd8f78bd0 100644 --- a/toolkit/qa/unoapi/knownissues.xcl +++ b/toolkit/qa/unoapi/knownissues.xcl @@ -150,10 +150,6 @@ toolkit.UnoControlNumericField::com::sun::star::awt::XView toolkit.UnoControlCheckBox::com::sun::star::awt::XView toolkit.UnoScrollBarControl::com::sun::star::awt::XView - -### i87757 ### -toolkit.AccessibleFixedText::com::sun::star::accessibility::XAccessibleText - ### i37643 ### toolkit.AccessibleStatusBarItem::com::sun::star::accessibility::XAccessibleEventBroadcaster diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index ef03aa302311..c1b5b102e779 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -43,6 +43,11 @@ namespace { struct SimpleLayoutEngine : public rtl::Static< ServerFontLayoutEngine, SimpleLayoutEngine > {}; } +void GlyphMetric::SetSize(const Size& s) +{ + maSize = Size(std::max<long>(1, s.Width()), std::max<long>(1, s.Height())); +} + // ======================================================================= // layout implementation for ServerFont // ======================================================================= diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 1ab2a74eda45..8c0f3b17cacd 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -132,7 +132,7 @@ protected: friend class GlyphData; void SetOffset( int nX, int nY ) { maOffset = Point( nX, nY); } void SetDelta( int nX, int nY ) { maDelta = Point( nX, nY); } - void SetSize( const Size& s ) { maSize = s; } + void SetSize(const Size& s); void SetCharWidth( long nW ) { mnAdvanceWidth = nW; } private: |