rpms/openoffice.org/devel openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch, 1.2, 1.3

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20775

Modified Files:
	openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch 
Log Message:
more loving

openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch:
 cppu/source/threadpool/jobqueue.cxx            |    3 -
 cppu/source/threadpool/jobqueue.hxx            |    6 ++
 cppu/source/threadpool/thread.cxx              |   32 ++++++------
 cppu/source/threadpool/thread.hxx              |    5 +
 cppu/source/threadpool/threadpool.cxx          |   58 +++++++++++----------
 cppu/source/threadpool/threadpool.hxx          |   15 ++++-
 cppu/source/uno/lbenv.cxx                      |   11 +++-
 cppu/util/target.pmk                           |    9 ---
 package/inc/ZipPackageFolder.hxx               |    7 --
 package/source/xstor/owriteablestream.cxx      |   20 +------
 package/source/xstor/xstorage.cxx              |   20 +------
 package/source/zippackage/ZipPackage.cxx       |   16 +-----
 package/source/zippackage/ZipPackageFolder.cxx |   15 +++--
 package/source/zippackage/ZipPackageStream.cxx |   15 +++--
 package/source/zippackage/ZipPackageStream.hxx |    6 --
 sax/source/tools/fastserializer.cxx            |   66 ++++++++++++-------------
 16 files changed, 154 insertions(+), 150 deletions(-)

Index: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch	22 Jun 2010 14:10:37 -0000	1.2
+++ openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch	24 Jun 2010 15:57:55 -0000	1.3
@@ -642,7 +642,7 @@
  	return m_pData->m_pTypeCollection->getTypes() ;
  }
  
-+struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {};
++namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 +
  //-----------------------------------------------
  uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId()
@@ -682,7 +682,7 @@
  	return m_pData->m_pTypeCollection->getTypes() ;
  }
  
-+struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {};
++namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 +
  //-----------------------------------------------
  uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId()
@@ -722,7 +722,7 @@
  										   static_getSupportedServiceNames());
  }
  
-+struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {};
++namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 +
  // XUnoTunnel
  Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void ) 
@@ -759,7 +759,7 @@
  using vos::ORef;
  
 -Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();
-+struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {};
++namespace { struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {}; }
  
  ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory,
  									 sal_Int16 nFormat,
@@ -805,7 +805,7 @@
  using namespace rtl;
  
 -Sequence < sal_Int8 > ZipPackageStream::aImplementationId = Sequence < sal_Int8 > ();
-+struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {};
++namespace { struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {}; }
  
 +const ::com::sun::star::uno::Sequence < sal_Int8 >& ZipPackageStream::static_getImplementationId()
 +{