rpms/openoffice.org/devel openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.6, 1.7 openoffice.org.spec, 1.981, 1.982 visibility.warning.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 19 10:06:43 UTC 2006
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.10, 1.11 openoffice.org.spec, 1.980, 1.981 openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch, 1.4, NONE openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, 1.8, NONE openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.3, 1.4 openoffice.org.spec, 1.982, 1.983 openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1674
Modified Files:
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
openoffice.org.spec
Removed Files:
visibility.warning.patch
Log Message:
merge workaround
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
./inc/comphelper/propertycontainerhelper.hxx | 0
comphelper/inc/comphelper/implbase_var.hxx | 2
comphelper/inc/comphelper/propertycontainerhelper.hxx | 2
cppu/inc/com/sun/star/uno/Any.h | 2
cppu/inc/com/sun/star/uno/Sequence.hxx | 2
cppu/inc/com/sun/star/uno/Type.h | 2
cppu/inc/cppu/unotype.hxx | 2
cppuhelper/inc/cppuhelper/implbase1.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase10.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase11.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase12.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase2.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase3.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase4.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase5.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase6.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase7.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase8.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase9.hxx | 4 -
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 16 +++++
inc/com/sun/star/uno/Any.h | 0
inc/com/sun/star/uno/Sequence.hxx | 0
inc/com/sun/star/uno/Type.h | 0
inc/comphelper/implbase_var.hxx | 0
inc/cppu/unotype.hxx | 0
inc/cppuhelper/implbase1.hxx | 0
inc/cppuhelper/implbase10.hxx | 0
inc/cppuhelper/implbase11.hxx | 0
inc/cppuhelper/implbase12.hxx | 0
inc/cppuhelper/implbase2.hxx | 0
inc/cppuhelper/implbase3.hxx | 0
inc/cppuhelper/implbase4.hxx | 0
inc/cppuhelper/implbase5.hxx | 0
inc/cppuhelper/implbase6.hxx | 0
inc/cppuhelper/implbase7.hxx | 0
inc/cppuhelper/implbase8.hxx | 0
inc/cppuhelper/implbase9.hxx | 0
inc/cppuhelper/implbase_ex.hxx | 0
inc/iface.hxx | 0
inc/salhelper/singletonref.hxx | 0
inc/sdasitm.hxx | 0
inc/so2dll.hxx | 0
salhelper/inc/salhelper/singletonref.hxx | 2
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 -
51 files changed, 57 insertions(+), 138 deletions(-)
Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 27 Nov 2006 13:22:49 -0000 1.6
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 19 Dec 2006 10:06:41 -0000 1.7
@@ -399,3 +399,260 @@
getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *) {
//TODO On certain platforms with weak memory models, the following code can
// result in some threads observing that td points to garbage:
+Index: inc/com/sun/star/uno/Type.h
+===================================================================
+RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Type.h,v
+retrieving revision 1.15
+diff -u -r1.15 Type.h
+--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Type.h 9 Mar 2006 10:44:42 -0000 1.15
++++ openoffice.org/cppu/inc/com/sun/star/uno/Type.h 27 Nov 2006 19:35:45 -0000
+@@ -79,7 +79,7 @@
+
+ @see typelib_TypeDescriptionReference
+ */
+-class Type
++class CPPU_GCC_DLLPUBLIC_EXPORT Type
+ {
+ /** the C typelib reference pointer
+ @internal
+Index: inc/com/sun/star/uno/Any.h
+===================================================================
+RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Any.h,v
+retrieving revision 1.12
+diff -u -r1.12 Any.h
+--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Any.h 10 Jan 2006 15:52:55 -0000 1.12
++++ openoffice.org/cppu/inc/com/sun/star/uno/Any.h 27 Nov 2006 19:38:12 -0000
+@@ -70,7 +70,7 @@
+ return true if the any contains an assignable value (no data loss), e.g. the any contains a
+ short and you >>= it into a long variable.
+ */
+-class Any : public uno_Any
++class CPPU_GCC_DLLPUBLIC_EXPORT Any : public uno_Any
+ {
+ 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;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.981
retrieving revision 1.982
diff -u -r1.981 -r1.982
--- openoffice.org.spec 19 Dec 2006 09:58:54 -0000 1.981
+++ openoffice.org.spec 19 Dec 2006 10:06:41 -0000 1.982
@@ -119,13 +119,12 @@
Patch51: workspace.dba22b.patch
Patch52: workspace.sixtyfour10.patch
Patch53: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch54: visibility.warning.patch
-Patch55: workspace.vcl70.patch
-Patch56: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch57: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch58: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch59: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
-Patch60: workspace.vcl71.patch
+Patch54: workspace.vcl70.patch
+Patch55: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch56: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch57: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch58: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
+Patch59: workspace.vcl71.patch
%define instdir %{_libdir}/openoffice.org2.1
@@ -982,13 +981,12 @@
%patch51 -p1 -b .workspace.dba22b.patch
%patch52 -p1 -b .workspace.sixtyfour10.patch
%patch53 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch54 -p1 -b .visibility.warning.patch
-%patch55 -p1 -b .workspace.vcl70.patch
-%patch56 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch57 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch58 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch59 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
-%patch60 -p1 -b .workspace.vcl71.patch
+%patch54 -p1 -b .workspace.vcl70.patch
+%patch55 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch56 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch57 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch58 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
+%patch59 -p1 -b .workspace.vcl71.patch
%if %{langpacks}
tar xzf %{SOURCE1}
--- visibility.warning.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.10, 1.11 openoffice.org.spec, 1.980, 1.981 openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch, 1.4, NONE openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, 1.8, NONE openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.3, 1.4 openoffice.org.spec, 1.982, 1.983 openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list