Kaydet (Commit) 0f6dbd1b authored tarafından Caolán McNamara's avatar Caolán McNamara

callcatcher: GetKerningPair* is now unused

since commit c4008ef5

Change-Id: I0cef8db6b59774c804a6a5589f258a55bfc64592
üst 5d900f6e
......@@ -269,9 +269,6 @@ private:
// --------------------
// - ImplKernPairData -
// --------------------
// TODO: get rid of ImplKernPairData and use outdev.hxx's KerningPair struct
// the problem is that outdev.hxx is too high level for the device layers
// and outdev.hxx's customers depend on KerningPair being defined there
struct ImplKernPairData
{
......
......@@ -134,17 +134,6 @@ struct ImplThresholdRes
long mnThresPixToLogY; // ""
};
// ---------------
// - KerningPair -
// ---------------
struct KerningPair
{
sal_Unicode nChar1;
sal_Unicode nChar2;
long nKern;
};
// ----------------------
// - OutputDevice-Types -
// ----------------------
......@@ -650,9 +639,6 @@ public:
static XubString GetNonMnemonicString( const XubString& rStr )
{ xub_StrLen nDummy; return GetNonMnemonicString( rStr, nDummy ); }
sal_uLong GetKerningPairCount() const;
void GetKerningPairs( sal_uLong nPairs, KerningPair* pKernPairs ) const;
sal_Bool GetTextBoundRect( Rectangle& rRect,
const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN,
sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
......
......@@ -7624,58 +7624,6 @@ xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt,
return nDropped;
}
// -----------------------------------------------------------------------
// TODO: best is to get rid of this method completely
sal_uLong OutputDevice::GetKerningPairCount() const
{
OSL_TRACE( "OutputDevice::GetKerningPairCount()" );
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( mbNewFont && !ImplNewFont() )
return 0;
if( mbInitFont )
ImplInitFont();
if( mpPDFWriter && mpPDFWriter->isBuiltinFont( mpFontEntry->maFontSelData.mpFontData ) )
return 0;
// get the kerning pair count from the device layer
int nKernPairs = mpGraphics->GetKernPairs( 0, NULL );
return nKernPairs;
}
// -----------------------------------------------------------------------
inline bool CmpKernData( const KerningPair& a, const KerningPair& b )
{
return (a.nChar1 < b.nChar1) || ((a.nChar1 == b.nChar1) && (a.nChar2 < b.nChar2));
}
// TODO: best is to get rid of this method completely
void OutputDevice::GetKerningPairs( sal_uLong nRequestedPairs, KerningPair* pKernPairs ) const
{
OSL_TRACE( "OutputDevice::GetKerningPairs()" );
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
if( mbNewFont && !ImplNewFont() )
return;
if( mbInitFont )
ImplInitFont();
if( mpPDFWriter && mpPDFWriter->isBuiltinFont( mpFontEntry->maFontSelData.mpFontData ) )
return;
// get the kerning pairs directly from the device layer
int nKernPairs = mpGraphics->GetKernPairs( nRequestedPairs, (ImplKernPairData*)pKernPairs );
// sort kerning pairs
std::sort( pKernPairs, pKernPairs+nKernPairs, CmpKernData );
}
// -----------------------------------------------------------------------
sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& rStr,
......
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