incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1179221 - in /incubator/ooo/trunk/main: toolkit/source/awt/vclxfont.cxx vcl/inc/vcl/outdev.hxx vcl/source/gdi/outdev3.cxx
Date Wed, 05 Oct 2011 13:37:27 GMT
Author: hdu
Date: Wed Oct  5 13:37:25 2011
New Revision: 1179221

URL: http://svn.apache.org/viewvc?rev=1179221&view=rev
Log:
remove the OutDev::GetKernPair* stubs completely

Modified:
    incubator/ooo/trunk/main/toolkit/source/awt/vclxfont.cxx
    incubator/ooo/trunk/main/vcl/inc/vcl/outdev.hxx
    incubator/ooo/trunk/main/vcl/source/gdi/outdev3.cxx

Modified: incubator/ooo/trunk/main/toolkit/source/awt/vclxfont.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/source/awt/vclxfont.cxx?rev=1179221&r1=1179220&r2=1179221&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/source/awt/vclxfont.cxx (original)
+++ incubator/ooo/trunk/main/toolkit/source/awt/vclxfont.cxx Wed Oct  5 13:37:25 2011
@@ -194,42 +194,9 @@ sal_Int32 VCLXFont::getStringWidthArray(
 	return nRet;
 }
 
-void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& rnChars1,
::com::sun::star::uno::Sequence< sal_Unicode >& rnChars2, ::com::sun::star::uno::Sequence<
sal_Int16 >& rnKerns ) throw(::com::sun::star::uno::RuntimeException)
+void VCLXFont::getKernPairs( ::com::sun::star::uno::Sequence< sal_Unicode >& /*rnChars1*/,
::com::sun::star::uno::Sequence< sal_Unicode >& /*rnChars2*/, ::com::sun::star::uno::Sequence<
sal_Int16 >& /*rnKerns*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
-	::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-
-	OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( mxDevice );
-	if( pOutDev )
-	{
-		Font aOldFont = pOutDev->GetFont();
-		pOutDev->SetFont( maFont );
-
-		sal_uLong nPairs = pOutDev->GetKerningPairCount();
-		if ( nPairs )
-		{
-			KerningPair* pData = new KerningPair[ nPairs ];
-			pOutDev->GetKerningPairs( nPairs, pData );
-
-			rnChars1 = ::com::sun::star::uno::Sequence<sal_Unicode>( nPairs );
-			rnChars2 = ::com::sun::star::uno::Sequence<sal_Unicode>( nPairs );
-			rnKerns = ::com::sun::star::uno::Sequence<sal_Int16>( nPairs );
-
-			sal_Unicode* pChars1 = rnChars1.getArray();
-			sal_Unicode* pChars2 = rnChars2.getArray();
-			sal_Int16* pKerns = rnKerns.getArray();
-
-			for ( sal_uLong n = 0; n < nPairs; n++ )
-			{
-				pChars1[n] = pData[n].nChar1;
-				pChars2[n] = pData[n].nChar2;
-				pKerns[n] = sal::static_int_cast< sal_Int16 >(pData[n].nKern);
-			}
-
-
-			delete[] pData;
-		}
-		pOutDev->SetFont( aOldFont );
-	}
+	// NOTE: this empty method is just used for keeping the related UNO-API stable
 }
 
 // ::com::sun::star::awt::XFont2

Modified: incubator/ooo/trunk/main/vcl/inc/vcl/outdev.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/vcl/outdev.hxx?rev=1179221&r1=1179220&r2=1179221&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/vcl/outdev.hxx (original)
+++ incubator/ooo/trunk/main/vcl/inc/vcl/outdev.hxx Wed Oct  5 13:37:25 2011
@@ -656,9 +656,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;

Modified: incubator/ooo/trunk/main/vcl/source/gdi/outdev3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/gdi/outdev3.cxx?rev=1179221&r1=1179220&r2=1179221&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/gdi/outdev3.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/gdi/outdev3.cxx Wed Oct  5 13:37:25 2011
@@ -7494,20 +7494,6 @@ xub_StrLen OutputDevice::ValidateKashida
 	return nDropped;
 }
 
-
-
-// -----------------------------------------------------------------------
-
-// TODO: best is to get rid of this method completely
-// until then these stubs are used for keeping the related UNO-API stable
-sal_uLong OutputDevice::GetKerningPairCount() const
-{
-	return 0;
-}
-
-void OutputDevice::GetKerningPairs( sal_uLong /*nRequestedPairs*/, KerningPair* /*pKernPairs*/
) const
-{}
-
 // -----------------------------------------------------------------------
 
 sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& rStr,



Mime
View raw message