rpms/openoffice.org/devel openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch, NONE, 1.1 openoffice.org.spec, 1.967, 1.968 visibility.warning.patch, 1.1, 1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Dec 4 09:54:12 UTC 2006 

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19641

Modified Files:
	openoffice.org.spec visibility.warning.patch 
Added Files:
	openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch 
Log Message:
openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch

openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch:
 source/glyphs/gcach_ftyp.cxx     |    0 
 source/glyphs/gcach_ftyp.hxx     |    0 
 vcl/source/glyphs/gcach_ftyp.cxx |   10 ++++++++++
 vcl/source/glyphs/gcach_ftyp.hxx |    2 ++
 4 files changed, 12 insertions(+)

--- NEW FILE openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch ---
Index: source/glyphs/gcach_ftyp.hxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v
retrieving revision 1.36
diff -u -r1.36 gcach_ftyp.hxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.hxx	19 Jun 2006 19:32:37 -0000	1.36
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.hxx	4 Dec 2006 09:48:24 -0000
@@ -214,6 +214,8 @@
     int                         mnPrioAntiAlias;
     FtFontInfo*                 mpFontInfo;
     FT_Int                      mnLoadFlags;
+    int				mnZWJ;
+    int				mnZWNJ;
     double                      mfStretch;
     FT_FaceRec_*                maFaceFT;
     FT_SizeRec_*                maSizeFT;
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.133.2.3
diff -u -r1.133.2.3 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	13 Nov 2006 09:58:00 -0000	1.133.2.3
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	4 Dec 2006 09:50:52 -0000
@@ -688,6 +688,7 @@
     mnPrioEmbedded(nDefaultPrioEmbedded),
     mnPrioAntiAlias(nDefaultPrioAntiAlias),
     mpFontInfo( pFI ),
+    mnZWJ(0), mnZWNJ(0), 
     maFaceFT( NULL ),
     maSizeFT( NULL ),
     maRecodeConverter( NULL ),
@@ -856,6 +857,9 @@
 
     if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
         mnLoadFlags |= FT_LOAD_NO_BITMAP;
+
+    mnZWJ = GetGlyphIndex( 0x200D );
+    mnZWNJ = GetGlyphIndex( 0x200C );
 }
 
 // -----------------------------------------------------------------------
@@ -1299,6 +1303,9 @@
 
 bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap ) const
 {
+    if ((nGlyphIndex == mnZWNJ) || (nGlyphIndex == mnZWJ))
+        return true;
+
     if( maSizeFT )
         pFTActivateSize( maSizeFT );
 
@@ -1456,6 +1463,9 @@
 
 bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap ) const
 {
+    if ((nGlyphIndex == mnZWNJ) || (nGlyphIndex == mnZWJ))
+        return true;
+
     if( maSizeFT )
         pFTActivateSize( maSizeFT );
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.967
retrieving revision 1.968
diff -u -r1.967 -r1.968
--- openoffice.org.spec	3 Dec 2006 13:09:18 -0000	1.967
+++ openoffice.org.spec	4 Dec 2006 09:54:10 -0000	1.968
@@ -138,6 +138,7 @@
 Patch70: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
 Patch71: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
 Patch72: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch73: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -1012,6 +1013,7 @@
 %patch70 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
 %patch71 -p1 -b .rh217269.officecfg.nosequencecheck.patch
 %patch72 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch73 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}
@@ -2624,9 +2626,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Sat Dec 03 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.2
+* Sun Dec 03 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.2
 - hazard some educated guesses as to dictionaries might be acceptable to
   speakers of the same language in neighbouring countries
+- Resolves: rhbz#218253 openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
 
 * Fri Dec 01 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.1
 - next version

visibility.warning.patch:
 ./inc/comphelper/propertycontainerhelper.hxx          |    0 
 comphelper/inc/comphelper/propertycontainerhelper.hxx |    2 
 cppu/inc/com/sun/star/uno/Any.h                       |    2 
 cppu/inc/com/sun/star/uno/Type.h                      |    2 
 inc/com/sun/star/uno/Any.h                            |    0 
 inc/com/sun/star/uno/Type.h                           |    0 
 inc/iface.hxx                                         |    0 
 inc/sdasitm.hxx                                       |    0 
 inc/so2dll.hxx                                        |    0 
 so3/inc/iface.hxx                                     |   55 ------------------
 so3/inc/insdlg.hxx                                    |    2 
 so3/inc/so2dll.hxx                                    |    2 
 so3/source/inplace/ipenv.cxx                          |   48 ---------------
 source/inplace/ipenv.cxx                              |    0 
 source/xforms/xformsexport.cxx                        |    0 
 svx/inc/sdasitm.hxx                                   |    6 -
 xmloff/source/xforms/xformsexport.cxx                 |    4 -
 17 files changed, 13 insertions(+), 110 deletions(-)

Index: visibility.warning.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/visibility.warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- visibility.warning.patch	28 Nov 2006 10:50:37 -0000	1.1
+++ visibility.warning.patch	4 Dec 2006 09:54:10 -0000	1.2
@@ -30,3 +30,228 @@
  {
  public:
  	// these are here to force memory de/allocation to sal lib.
+Index: inc/sdasitm.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/sdasitm.hxx,v
+retrieving revision 1.6
+diff -u -r1.6 sdasitm.hxx
+--- openoffice.org.orig/svx/inc/sdasitm.hxx	8 Sep 2005 18:26:02 -0000	1.6
++++ openoffice.org/svx/inc/sdasitm.hxx	29 Nov 2006 12:29:03 -0000
+@@ -84,15 +84,15 @@
+ 	typedef std::pair < const ::rtl::OUString, const ::rtl::OUString > PropertyPair;
+ 
+ private:
+-	struct SVX_DLLPRIVATE PropertyEq
++	struct PropertyEq
+ 	{
+ 		bool operator()( const rtl::OUString&, const rtl::OUString& ) const;
+ 	};
+-	struct SVX_DLLPRIVATE PropertyPairEq
++	struct PropertyPairEq
+ 	{
+ 		bool operator()( const SdrCustomShapeGeometryItem::PropertyPair&, const SdrCustomShapeGeometryItem::PropertyPair& ) const;
+ 	};
+-	struct SVX_DLLPRIVATE PropertyPairHash
++	struct PropertyPairHash
+ 	{
+ 		size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const;
+ 	};
+Index: ./inc/comphelper/propertycontainerhelper.hxx
+===================================================================
+RCS file: /cvs/util/comphelper/inc/comphelper/propertycontainerhelper.hxx,v
+retrieving revision 1.4
+diff -u -r1.4 propertycontainerhelper.hxx
+--- openoffice.org.orig/comphelper/inc/comphelper/propertycontainerhelper.hxx	15 Aug 2006 11:03:37 -0000	1.4
++++ openoffice.org/comphelper/inc/comphelper/propertycontainerhelper.hxx	28 Nov 2006 14:34:06 -0000
+@@ -58,7 +58,7 @@
+ //.........................................................................
+ 
+ // infos about one single property
+-struct COMPHELPER_DLLPRIVATE PropertyDescription
++struct COMPHELPER_DLLPUBLIC PropertyDescription
+ {
+     // the possibilities where a property holding object may be located
+     enum LocationType
+Index: source/xforms/xformsexport.cxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/xforms/xformsexport.cxx,v
+retrieving revision 1.9
+diff -u -r1.9 xformsexport.cxx
+--- openoffice.org.orig/xmloff/source/xforms/xformsexport.cxx	17 Sep 2006 11:32:08 -0000	1.9
++++ openoffice.org/xmloff/source/xforms/xformsexport.cxx	1 Dec 2006 15:27:07 -0000
+@@ -144,8 +144,8 @@
+ OUString lcl_string( const Any& );
+ OUString lcl_bool( const Any& );
+ OUString lcl_whitespace( const Any& );
+-template<typename T, void (*FUNC)( OUStringBuffer&, T )> OUString lcl_convert( const Any& );
+-template<typename T, void (*FUNC)( OUStringBuffer&, const T& )> OUString lcl_convertRef( const Any& );
++template<typename T, void (*FUNC)( OUStringBuffer&, T )> OUString SAL_DLLPRIVATE lcl_convert( const Any& );
++template<typename T, void (*FUNC)( OUStringBuffer&, const T& )> OUString SAL_DLLPRIVATE lcl_convertRef( const Any& );
+ 
+ void lcl_formatDate( OUStringBuffer& aBuffer, const Date& aDate );
+ void lcl_formatTime( OUStringBuffer& aBuffer, const com::sun::star::util::Time& aTime );
+Index: inc/so2dll.hxx
+===================================================================
+RCS file: /cvs/oi/so3/inc/so2dll.hxx,v
+retrieving revision 1.9
+diff -u -r1.9 so2dll.hxx
+--- openoffice.org.orig/so3/inc/so2dll.hxx	24 Oct 2006 14:12:01 -0000	1.9
++++ openoffice.org/so3/inc/so2dll.hxx	1 Dec 2006 15:40:27 -0000
+@@ -75,7 +75,7 @@
+ struct SvBindingData;
+ 
+ //=========================================================================
+-struct SO3_DLLPRIVATE ConvertTo_Impl
++struct ConvertTo_Impl
+ /*  [Beschreibung]
+ 
+ 	In dieser Struktur werden Informationen "uber den Vorg"anger und den
+Index: inc/iface.hxx
+===================================================================
+RCS file: /cvs/oi/so3/inc/iface.hxx,v
+retrieving revision 1.8
+diff -u -r1.8 iface.hxx
+--- openoffice.org,orig/so3/inc/iface.hxx	24 Oct 2006 14:08:22 -0000	1.8
++++ openoffice.org/so3/inc/iface.hxx	1 Dec 2006 16:05:02 -0000
+@@ -42,6 +42,9 @@
+ #ifndef _GEN_HXX //autogen
+ #include <tools/gen.hxx>
+ #endif
++#ifndef _SVBORDER_HXX
++#include <tools/svborder.hxx>
++#endif
+ #ifndef _SHL_HXX //autogen
+ #include <tools/shl.hxx>
+ #endif
+@@ -333,58 +336,6 @@
+ Rect GetSysRect( const Rectangle & rRect );
+ Rectangle GetSvRect( const Rect & rRect );
+ #endif
+-
+-class SO3_DLLPRIVATE SvBorder
+-{
+-private:
+-	long nTop, nRight, nBottom, nLeft;
+-public:
+-	SO3_DLLPRIVATE SvBorder()
+-	{ nTop = nRight = nBottom = nLeft = 0; }
+-	SO3_DLLPRIVATE SvBorder( const Size & rSz )
+-	{ nTop = nBottom = rSz.Height(); nRight = nLeft = rSz.Width(); }
+-	SO3_DLLPRIVATE SvBorder( const Rectangle & rOuter, const Rectangle & rInner );
+-	SO3_DLLPRIVATE SvBorder( long nLeftP, long nTopP, long nRightP, long nBottomP )
+-	{ nLeft = nLeftP; nTop = nTopP; nRight = nRightP; nBottom = nBottomP; }
+-	SO3_DLLPRIVATE BOOL    operator == ( const SvBorder & rObj ) const
+-			{
+-				return nTop == rObj.nTop && nRight == rObj.nRight &&
+-					   nBottom == rObj.nBottom && nLeft == rObj.nLeft;
+-			}
+-	SO3_DLLPRIVATE BOOL    operator != ( const SvBorder & rObj ) const
+-			{ return !(*this == rObj); }
+-	SO3_DLLPRIVATE SvBorder & operator += ( const SvBorder & rBorder )
+-			{
+-				Left()   += rBorder.Left();
+-				Top()    += rBorder.Top();
+-				Right()  += rBorder.Right();
+-				Bottom() += rBorder.Bottom();
+-				return *this;
+-			}
+-	SO3_DLLPRIVATE SvBorder & operator -= ( const SvBorder & rBorder )
+-			{
+-				Left()   -= rBorder.Left();
+-				Top()    -= rBorder.Top();
+-				Right()  -= rBorder.Right();
+-				Bottom() -= rBorder.Bottom();
+-				return *this;
+-			}
+-	SO3_DLLPRIVATE BOOL    IsInside( const SvBorder & rInside )
+-			{
+-				return nTop >= rInside.nTop && nRight >= rInside.nRight &&
+-					   nBottom >= rInside.nBottom && nLeft >= rInside.nLeft;
+-			}
+-	SO3_DLLPRIVATE long &  Top()    { return nTop; }
+-	SO3_DLLPRIVATE long &  Right()  { return nRight; }
+-	SO3_DLLPRIVATE long &  Bottom() { return nBottom; }
+-	SO3_DLLPRIVATE long &  Left()   { return nLeft; }
+-	SO3_DLLPRIVATE long    Top()    const { return nTop; }
+-	SO3_DLLPRIVATE long    Right()  const { return nRight; }
+-	SO3_DLLPRIVATE long    Bottom() const { return nBottom; }
+-	SO3_DLLPRIVATE long    Left()   const { return nLeft; }
+-};
+-SO3_DLLPRIVATE Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder );
+-SO3_DLLPRIVATE Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder );
+ 
+ #ifdef DBG_UTIL
+ ByteString  SvPrint( const SvBorder & );
+Index: source/inplace/ipenv.cxx
+===================================================================
+RCS file: /cvs/oi/so3/source/inplace/ipenv.cxx,v
+retrieving revision 1.9
+diff -u -r1.9 ipenv.cxx
+--- openoffice.org.orig/so3/source/inplace/ipenv.cxx	12 Oct 2006 10:58:21 -0000	1.9
++++ openoffice.org/so3/source/inplace/ipenv.cxx	1 Dec 2006 16:05:04 -0000
+@@ -61,54 +61,6 @@
+ 
+ class INetURLObject;
+ 
+-//=========================================================================
+-//==========SvContainerEnvironment=========================================
+-//=========================================================================
+-SvBorder::SvBorder( const Rectangle & rOuter, const Rectangle & rInner )
+-{
+-	Rectangle aOuter( rOuter );
+-	aOuter.Justify();
+-	Rectangle aInner( rInner );
+-	if( aInner.IsEmpty() )
+-		aInner = Rectangle( aOuter.Center(), aOuter.Center() );
+-	else
+-		aInner.Justify();
+-
+-	DBG_ASSERT( aOuter.IsInside( aInner ),
+-				"SvBorder::SvBorder: FALSE == aOuter.IsInside( aInner )" )
+-	nTop	= aInner.Top()	  - aOuter.Top();
+-	nRight	= aOuter.Right()  - aInner.Right();
+-	nBottom = aOuter.Bottom() - aInner.Bottom();
+-	nLeft	= aInner.Left()   - aOuter.Left();
+-}
+-
+-Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder )
+-{
+-	// wegen Empty-Rect, GetSize muss als erstes gerufen werden
+-	Size aS( rRect.GetSize() );
+-	aS.Width()	+= rBorder.Left() + rBorder.Right();
+-	aS.Height() += rBorder.Top() + rBorder.Bottom();
+-
+-	rRect.Left()   -= rBorder.Left();
+-	rRect.Top()    -= rBorder.Top();
+-	rRect.SetSize( aS );
+-	return rRect;
+-}
+-
+-Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder )
+-{
+-	// wegen Empty-Rect, GetSize muss als erstes gerufen werden
+-	Size aS( rRect.GetSize() );
+-	aS.Width()	-= rBorder.Left() + rBorder.Right();
+-	aS.Height() -= rBorder.Top() + rBorder.Bottom();
+-
+-	rRect.Left()   += rBorder.Left();
+-	rRect.Top()    += rBorder.Top();
+-	rRect.SetSize( aS );
+-	return rRect;
+-}
+-
+-
+ /************************************************************************
+ |*	  SvPrint( ... )
+ |*
+--- openoffie.org.orig/so3/inc/insdlg.hxx	2006-10-24 15:08:35.000000000 +0100
++++ openoffice.org/so3/inc/insdlg.hxx	2006-12-02 18:34:46.000000000 +0000
+@@ -77,7 +77,7 @@
+ 	const String &          GetHumanName() const { return aHumanName; }
+ };
+ 
+-class SO3_DLLPRIVATE SvObjectServerList
++class SO3_DLLPUBLIC SvObjectServerList
+ {
+ 	PRV_SV_DECL_OWNER_LIST(SvObjectServerList,SvObjectServer)
+ 	SO3_DLLPRIVATE const SvObjectServer *  Get( const String & rHumanName ) const;

More information about the fedora-cvs-commits mailing list