diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-08-29 00:59:08 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-08-30 02:46:33 +0200 |
commit | 229136b7c9363bc758c9e925ccfd0c9bb34ceaec (patch) | |
tree | b5d2546256a9bb0e8740d242cce5e3c0cd3ee332 /include | |
parent | d350a1364a1c34b96d00f2f716c44882b7b57fe9 (diff) |
vcl: move TextLayoutCache into vcl::text namespace
Placed TextLayoutCache function into own source file and moved it into
the new vcl::text namespace. With this patch we will have these vcl::*
namespaces:
namespace vcl::bitmap
namespace vcl::CommandInfoProvider
namespace vcl::detail
namespace vcl::drawmode
namespace vcl::fileregistration
namespace vcl::filter
namespace vcl::font
namespace vcl::graphic
namespace vcl::lok
namespace vcl::pdf
namespace vcl::table
namespace vcl::test
namespace vcl::text
namespace vcl::unohelper
namespace vcl::unotools
Change-Id: Ia38c2d73715676a924cdbb0de6308a72a40ec3b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121206
Reviewed-by: Hossein <hossein@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/outdev.hxx | 19 | ||||
-rw-r--r-- | include/vcl/window.hxx | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 144a52308a3e..402b998bc1aa 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -101,12 +101,15 @@ namespace vcl class ExtOutDevData; class ITextLayout; struct FontCapabilities; - class TextLayoutCache; class Window; class WindowOutputDevice; namespace font { struct Feature; } + + namespace text { + class TextLayoutCache; + } } namespace basegfx { @@ -1027,7 +1030,7 @@ public: See also GetTextBoundRect() for more explanation + code examples. */ tools::Long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - vcl::TextLayoutCache const* = nullptr, + vcl::text::TextLayoutCache const* = nullptr, SalLayoutGlyphs const*const pLayoutCache = nullptr) const; /** Height where any character of the current font fits; in logic coordinates. @@ -1045,7 +1048,7 @@ public: const SalLayoutGlyphs* pLayoutCache = nullptr); tools::Long GetTextArray( const OUString& rStr, tools::Long* pDXAry, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - vcl::TextLayoutCache const* = nullptr, + vcl::text::TextLayoutCache const* = nullptr, SalLayoutGlyphs const*const pLayoutCache = nullptr) const; void GetCaretPositions( const OUString&, tools::Long* pCaretXArray, @@ -1057,14 +1060,14 @@ public: sal_Int32 GetTextBreak( const OUString& rStr, tools::Long nTextWidth, sal_Int32 nIndex, sal_Int32 nLen = -1, tools::Long nCharExtra = 0, - vcl::TextLayoutCache const* = nullptr, + vcl::text::TextLayoutCache const* = nullptr, const SalLayoutGlyphs* pGlyphs = nullptr) const; sal_Int32 GetTextBreak( const OUString& rStr, tools::Long nTextWidth, sal_Unicode nExtraChar, sal_Int32& rExtraCharPos, sal_Int32 nIndex, sal_Int32 nLen, tools::Long nCharExtra, - vcl::TextLayoutCache const* = nullptr) const; - static std::shared_ptr<vcl::TextLayoutCache> CreateTextLayoutCache(OUString const&); + vcl::text::TextLayoutCache const* = nullptr) const; + static std::shared_ptr<vcl::text::TextLayoutCache> CreateTextLayoutCache(OUString const&); protected: SAL_DLLPRIVATE void ImplInitTextLineSize(); @@ -1214,12 +1217,12 @@ public: ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen, const Point& rLogicPos = Point(0,0), tools::Long nLogicWidth=0, const tools::Long* pLogicDXArray=nullptr, SalLayoutFlags flags = SalLayoutFlags::NONE, - vcl::TextLayoutCache const* = nullptr, + vcl::text::TextLayoutCache const* = nullptr, const SalLayoutGlyphs* pGlyphs = nullptr) const; SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const sal_Int32 nIndex, const sal_Int32 nLen, DeviceCoordinate nPixelWidth, const DeviceCoordinate* pPixelDXArray, SalLayoutFlags flags = SalLayoutFlags::NONE, - vcl::TextLayoutCache const* = nullptr) const; + vcl::text::TextLayoutCache const* = nullptr) const; SAL_DLLPRIVATE std::unique_ptr<SalLayout> ImplGlyphFallbackLayout( std::unique_ptr<SalLayout>, ImplLayoutArgs&, diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 4fb9e4ab15e0..8d918161c2e0 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1536,7 +1536,7 @@ public: See also GetTextBoundRect() for more explanation + code examples. */ tools::Long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - vcl::TextLayoutCache const* = nullptr, + vcl::text::TextLayoutCache const* = nullptr, SalLayoutGlyphs const*const pLayoutCache = nullptr) const; /** Height where any character of the current font fits; in logic coordinates. |