rpms/openoffice.org/devel openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.7, 1.8 openoffice.org.spec, 1.983, 1.984

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Dec 19 14:23:35 UTC 2006


Author: caolanm

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

Modified Files:
	openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 
	openoffice.org.spec 
Log Message:
don't lock local statics as we're manually doing this anyway

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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	19 Dec 2006 10:06:41 -0000	1.7
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch	19 Dec 2006 14:23:33 -0000	1.8
@@ -10,7 +10,7 @@
      template< typename Ifc1, typename Impl > struct ImplClassData1
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data1 s_cd =
              {
@@ -35,7 +35,7 @@
  	struct ImplClassData10
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data10 s_cd =
              {
@@ -60,7 +60,7 @@
  	struct ImplClassData11
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data11 s_cd =
              {
@@ -85,7 +85,7 @@
  	struct ImplClassData12
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data12 s_cd =
              {
@@ -110,7 +110,7 @@
      template< typename Ifc1, typename Ifc2, typename Impl > struct ImplClassData2
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data2 s_cd =
              {
@@ -135,7 +135,7 @@
      template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct ImplClassData3
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data3 s_cd =
              {
@@ -160,7 +160,7 @@
          struct ImplClassData4
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data4 s_cd =
              {
@@ -185,7 +185,7 @@
          struct ImplClassData5
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data5 s_cd =
              {
@@ -210,7 +210,7 @@
          struct ImplClassData6
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data6 s_cd =
              {
@@ -235,7 +235,7 @@
          struct ImplClassData7
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data7 s_cd =
              {
@@ -260,7 +260,7 @@
  	struct ImplClassData8
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data8 s_cd =
              {
@@ -285,7 +285,7 @@
  	struct ImplClassData9
      {
 -        class_data* operator ()()
-+        CPPU_GCC_DLLPRIVATE class_data* operator ()()
++        CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
          {
              static class_data9 s_cd =
              {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -r1.983 -r1.984
--- openoffice.org.spec	19 Dec 2006 11:00:22 -0000	1.983
+++ openoffice.org.spec	19 Dec 2006 14:23:33 -0000	1.984
@@ -1040,7 +1040,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
+ARCH_FLAGS="$ARCH_FLAGS -fno-threadsafe-statics -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
 export ARCH_FLAGS
 
 # see tamil translation issue rh#159381#, remove when complete and upstreamed




More information about the fedora-cvs-commits mailing list