[Libreoffice-commits] core.git: include/vcl vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/outdev.hxx     |    5 ---
 include/vcl/sysdata.hxx    |   14 ----------
 vcl/source/outdev/text.cxx |   61 ---------------------------------------------
 3 files changed, 80 deletions(-)

New commits:
commit dbe58407ecf6a74671e8703a57b27896409fd5af
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat May 23 21:07:52 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 24 20:25:18 2020 +0200

    GetSysTextLayoutData is newly unused
    
    and thus SystemTextLayoutData and SystemGlyphData
    
    Change-Id: Ib22e4b4f98b9da0337f31645bd26e41475f6d830
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94739
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 81724f297917..e9231c30fb8a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -56,7 +56,6 @@ struct ImplOutDevData;
 class LogicalFontInstance;
 struct SystemGraphicsData;
 struct SystemFontData;
-struct SystemTextLayoutData;
 class ImplFontCache;
 class PhysicalFontCollection;
 class ImplDeviceFontList;
@@ -1331,10 +1330,6 @@ private:
 
 public:
 
-    SystemTextLayoutData        GetSysTextLayoutData( const Point& rStartPt, const OUString& rStr,
-                                                      sal_Int32 nIndex, sal_Int32 nLen,
-                                                      const long* pDXAry ) const;
-
     // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
     SAL_DLLPRIVATE bool         ImplIsAntiparallel() const ;
     SAL_DLLPRIVATE void         ReMirror( Point &rPoint ) const;
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 3152fa3bed56..8be99112d74b 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -185,14 +185,6 @@ struct SystemWindowData
 #endif
 };
 
-struct SystemGlyphData
-{
-    sal_uInt32           index;
-    double               x;
-    double               y;
-    int                  fallbacklevel;
-};
-
 #if ENABLE_CAIRO_CANVAS
 
 struct SystemFontData
@@ -222,12 +214,6 @@ struct SystemFontData
 
 #endif // ENABLE_CAIRO_CANVAS
 
-struct SystemTextLayoutData
-{
-    std::vector<SystemGlyphData> rGlyphData;    // glyph data
-    int orientation;   // Text orientation
-};
-
 #endif // INCLUDED_VCL_SYSDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 34db8e6299c1..b11e1e480503 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2254,67 +2254,6 @@ OUString OutputDevice::GetNonMnemonicString( const OUString& rStr, sal_Int32& rM
     return aStr;
 }
 
-/** OutputDevice::GetSysTextLayoutData
- *
- * @param rStartPt Start point of the text
- * @param rStr Text string that will be transformed into layout of glyphs
- * @param nIndex Position in the string from where layout will be done
- * @param nLen Length of the string
- * @param pDXAry Custom layout adjustment data
- *
- * Export finalized glyph layout data as platform independent SystemTextLayoutData
- * (see vcl/inc/vcl/sysdata.hxx)
- *
- * Only parameters rStartPt and rStr are mandatory, the rest is optional
- * (default values will be used)
- *
- * @return SystemTextLayoutData
- **/
-SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen,
-                                                        const long* pDXAry) const
-{
-    if( (nLen < 0) || (nIndex + nLen >= rStr.getLength()))
-    {
-        nLen = rStr.getLength() - nIndex;
-    }
-
-    SystemTextLayoutData aSysLayoutData;
-    aSysLayoutData.rGlyphData.reserve( 256 );
-    aSysLayoutData.orientation = 0;
-
-    if ( mpMetaFile )
-    {
-        if (pDXAry)
-            mpMetaFile->AddAction( new MetaTextArrayAction( rStartPt, rStr, pDXAry, nIndex, nLen ) );
-        else
-            mpMetaFile->AddAction( new MetaTextAction( rStartPt, rStr, nIndex, nLen ) );
-    }
-
-    if ( !IsDeviceOutputNecessary() ) return aSysLayoutData;
-
-    std::unique_ptr<SalLayout> pLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, pDXAry);
-
-    if ( !pLayout ) return aSysLayoutData;
-
-    // setup glyphs
-    Point aPos;
-    const GlyphItem* pGlyph;
-    int nStart = 0;
-    SystemGlyphData aSystemGlyph;
-    while (pLayout->GetNextGlyph(&pGlyph, aPos, nStart, nullptr, &aSystemGlyph.fallbacklevel))
-    {
-        aSystemGlyph.index = pGlyph->glyphId();
-        aSystemGlyph.x = aPos.X();
-        aSystemGlyph.y = aPos.Y();
-        aSysLayoutData.rGlyphData.push_back(aSystemGlyph);
-    }
-
-    // Get font data
-    aSysLayoutData.orientation = pLayout->GetOrientation();
-
-    return aSysLayoutData;
-}
-
 bool OutputDevice::GetTextBoundRect( tools::Rectangle& rRect,
                                          const OUString& rStr, sal_Int32 nBase,
                                          sal_Int32 nIndex, sal_Int32 nLen,