diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-10-06 15:55:28 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-06 15:56:46 +0100 |
commit | 0f6dbd1b1762e0b273046a045eb902475fc6890b (patch) | |
tree | aeedc7e7f66d542429dbe714a65dce8f30ed6104 /vcl | |
parent | 5d900f6ef8573dfe40fef236fbc3c788cea15224 (diff) |
callcatcher: GetKerningPair* is now unused
since commit c4008ef54630b560792aa288437db1179ad96095
Change-Id: I0cef8db6b59774c804a6a5589f258a55bfc64592
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/outfont.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/vcl/outdev.hxx | 14 | ||||
-rw-r--r-- | vcl/source/gdi/outdev3.cxx | 52 |
3 files changed, 0 insertions, 69 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index bb40f86fdc24..39bc2a2e1009 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -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 { diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index e1721e9ef4f4..fabeb78217cb 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -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; diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index d0428a72a8b0..d743b4dde64f 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -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, |