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

Adapt Library_vclplug_qt5

...to 8f54136c "use std::unique_ptr for
SalLayout"

Change-Id: Ibf8962de1b43881c70a1bad1881df61bf4b551a4
üst 6b56336e
...@@ -184,7 +184,7 @@ public: ...@@ -184,7 +184,7 @@ public:
virtual bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override; virtual bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override;
virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override; virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override;
virtual SalLayout* GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) override; virtual std::unique_ptr<SalLayout> GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) override;
virtual void DrawTextLayout(const CommonSalLayout&) override; virtual void DrawTextLayout(const CommonSalLayout&) override;
// Native control support // Native control support
......
...@@ -137,11 +137,11 @@ bool Qt5Graphics::GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) { retur ...@@ -137,11 +137,11 @@ bool Qt5Graphics::GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) { retur
bool Qt5Graphics::GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) { return false; } bool Qt5Graphics::GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) { return false; }
SalLayout* Qt5Graphics::GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) std::unique_ptr<SalLayout> Qt5Graphics::GetTextLayout(ImplLayoutArgs&, int nFallbackLevel)
{ {
if (m_pTextStyle[nFallbackLevel]) if (m_pTextStyle[nFallbackLevel])
return new CommonSalLayout(*m_pTextStyle[nFallbackLevel]); return std::unique_ptr<SalLayout>(new CommonSalLayout(*m_pTextStyle[nFallbackLevel]));
return nullptr; return std::unique_ptr<SalLayout>();
} }
void Qt5Graphics::DrawTextLayout(const CommonSalLayout&) {} void Qt5Graphics::DrawTextLayout(const CommonSalLayout&) {}
......
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