GNOME.org
 

ooo-build r12556 - in trunk: . patches/vba

Author: noelpwer
Date: Fri May 16 15:12:33 2008
New Revision: 12556
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12556&view=rev

Log:
2008-05-16  Noel Power  <noel power novell com>

        * patches/vba/vbaevents-services-sources.diff: fix weird windows  compile 
        problem in svx




Modified:
   trunk/ChangeLog
   trunk/patches/vba/vbaevents-services-sources.diff

Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff	(original)
+++ trunk/patches/vba/vbaevents-services-sources.diff	Fri May 16 15:12:33 2008
@@ -111,7 +111,7 @@
 +#include <com/sun/star/script/XScriptListener.hpp>
 +#include <cppuhelper/implbase1.hxx>
 +#include <cppuhelper/implbase2.hxx>
-+#include <comphelper/evtlistenerhlp.hxx>
++#include <comphelper/evtmethodhelper.hxx>
 +
 +#include <set>
 +#include <list>
@@ -149,7 +149,7 @@
 +            {
 +                sTypeName = sFullTypeName.copy( lastDotIndex + 1 );    
 +            } 
-+            Sequence< ::rtl::OUString > sMeths = comphelper::EventHelper::getEventMethodsForType( listType );    
++            Sequence< ::rtl::OUString > sMeths = comphelper::getEventMethodsForType( listType );    
 +            sal_Int32 sMethLen = sMeths.getLength();
 +            for ( sal_Int32 j=0 ; j < sMethLen; ++j )
 +            {
@@ -484,7 +484,7 @@
 +                Type& listType = aControlListeners[ i ];
 +                rtl::OUString sFullTypeName = listType.getTypeName();
 +                Sequence< ::rtl::OUString > sMeths = 
-+                    comphelper::EventHelper::getEventMethodsForType( listType );    
++                    comphelper::getEventMethodsForType( listType );    
 +                sal_Int32 sMethLen = sMeths.getLength();
 +                for ( sal_Int32 j=0 ; j < sMethLen; ++j )
 +                {
@@ -1836,72 +1836,12 @@
  void SAL_CALL
  ScVbaWorksheet::setCodeName( const rtl::OUString& sCodeName ) throw (css::uno::RuntimeException)
  {
-diff -up comphelper/source/misc/evtlistenerhlp.cxx comphelper.patched/source/misc/evtlistenerhlp.cxx
---- comphelper/source/misc/evtlistenerhlp.cxx	2008-04-11 12:08:06.000000000 +0100
-+++ comphelper/source/misc/evtlistenerhlp.cxx	2008-05-09 12:00:24.000000000 +0100
-@@ -32,8 +32,40 @@
- #include "precompiled_comphelper.hxx"
- #include "comphelper/evtlistenerhlp.hxx"
- 
-+using ::com::sun::star::uno::Sequence;
-+using ::com::sun::star::uno::Type;
-+
- namespace comphelper
- {
-+
-+	Sequence< ::rtl::OUString> EventHelper::getEventMethodsForType(const Type& type)
-+	{
-+		typelib_InterfaceTypeDescription *pType=0;
-+		type.getDescription( (typelib_TypeDescription**)&pType);
-+	
-+		if(!pType)
-+			return Sequence< ::rtl::OUString>();
-+	    
-+		Sequence< ::rtl::OUString> aNames(pType->nMembers);
-+		::rtl::OUString* pNames = aNames.getArray();
-+		for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
-+		{
-+			// the decription reference
-+			typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
-+			// the description for the reference
-+			typelib_TypeDescription* pMemberDescription = NULL;
-+			typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
-+			if (pMemberDescription)
-+			{
-+				typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
-+				reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
-+				*pNames = pRealMemberDescription->pMemberName;
-+			}
-+		}
-+		typelib_typedescription_release( (typelib_TypeDescription *)pType );
-+		return aNames;
-+	}
-+
- 	OEventListenerHelper::OEventListenerHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>&
- 			_rxListener) : m_xListener(_rxListener)
- 	{
-diff -up comphelper/inc/comphelper/evtlistenerhlp.hxx comphelper.patched/inc/comphelper/evtlistenerhlp.hxx
---- comphelper/inc/comphelper/evtlistenerhlp.hxx	2008-04-11 11:29:59.000000000 +0100
-+++ comphelper/inc/comphelper/evtlistenerhlp.hxx	2008-05-09 11:50:55.000000000 +0100
-@@ -39,6 +39,11 @@
- //........................................................................
- namespace comphelper
- {
-+	class COMPHELPER_DLLPUBLIC EventHelper
-+	{ 
-+	public:
-+		static ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
-+	};
- //........................................................................
- 
- 	//==========================================================================
---- extensions/source/propctrlr/eventhandler.cxx	2008-04-11 11:47:33.000000000 +0100
 +++ extensions/source/propctrlr/eventhandler.cxx	2008-05-09 15:08:21.000000000 +0100
 @@ -62,6 +62,7 @@
  /** === end UNO includes === **/
  
  #include <comphelper/namedvaluecollection.hxx>
-+#include <comphelper/evtlistenerhlp.hxx>
++#include <comphelper/evtmethodhelper.hxx>
  #include <comphelper/types.hxx>
  #include <cppuhelper/implbase1.hxx>
  #include <rtl/ref.hxx>
@@ -1947,7 +1887,7 @@
  
                      // loop through all methods
 -                    Sequence< ::rtl::OUString > aMethods( lcl_getListenerMethodsForType( *pListeners ) );
-+                    Sequence< ::rtl::OUString > aMethods( comphelper::EventHelper::getEventMethodsForType( *pListeners ) );
++                    Sequence< ::rtl::OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) );
  
                      const ::rtl::OUString* pMethods = aMethods.getConstArray();
                      sal_uInt32 methodCount = aMethods.getLength();
@@ -1957,7 +1897,7 @@
  #include <comphelper/uno3.hxx>
  #include <connectivity/dbexception.hxx>
  #include <comphelper/extract.hxx>
-+#include <comphelper/evtlistenerhlp.hxx>
++#include <comphelper/evtmethodhelper.hxx>
  #include <cppuhelper/typeprovider.hxx>
  #include <algorithm>
  
@@ -2003,8 +1943,142 @@
  
  				// now check the methods
 -				Sequence< ::rtl::OUString> aMethodsNames = getEventMethods(*pCurrentListeners);
-+				Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::EventHelper::getEventMethodsForType(*pCurrentListeners);
++				Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners);
 +
  				const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray();
  				for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames)
  				{
+--- comphelper.orig/source/misc/makefile.mk	2008-04-11 12:11:33.000000000 +0100
++++ comphelper/source/misc/makefile.mk	2008-05-15 18:08:56.703125000 +0100
+@@ -84,6 +84,7 @@ SLOFILES=	\
+             $(SLO)$/logging.obj \
+             $(SLO)$/documentinfo.obj \
+             $(SLO)$/string.obj \
++            $(SLO)$/evtmethodhelper.obj \
+             $(SLO)$/legacysingletonfactory.obj
+ 
+ # --- Targets ----------------------------------
+--- /dev/null	2008-05-15 18:17:31.156250000 +0100
++++ comphelper/inc/comphelper/evtmethodhelper.hxx	2008-05-15 18:07:14.781250000 +0100
+@@ -0,0 +1,41 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: evtlistenerhlp.hxx,v $
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef COMPHELPER_EVENTMEHODHELPER_HXX
++#define COMPHELPER_EVENMETHODHELPER_HXX
++#include <comphelper/sequence.hxx>
++//........................................................................
++namespace comphelper
++{
++	COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
++//........................................................................
++
++}	// namespace comphelper
++//........................................................................
++#endif // COMPHELPER_EVENTMEHODHELPER_HXX
+--- /dev/null	2008-05-15 18:18:04.703125000 +0100
++++ comphelper/source/misc/evtmethodhelper.cxx	2008-05-15 18:08:38.968750000 +0100
+@@ -0,0 +1,77 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: evtlistenerhlp.cxx,v $
++ * $Revision$
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_comphelper.hxx"
++#include "comphelper/evtmethodhelper.hxx"
++#include "cppuhelper/typeprovider.hxx"
++
++using ::com::sun::star::uno::Sequence;
++using ::com::sun::star::uno::Type;
++
++namespace comphelper
++{
++
++	Sequence< ::rtl::OUString> getEventMethodsForType(const Type& type)
++	{
++		typelib_InterfaceTypeDescription *pType=0;
++		type.getDescription( (typelib_TypeDescription**)&pType);
++	
++		if(!pType)
++			return Sequence< ::rtl::OUString>();
++	    
++		Sequence< ::rtl::OUString> aNames(pType->nMembers);
++		::rtl::OUString* pNames = aNames.getArray();
++		for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
++		{
++			// the decription reference
++			typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
++			// the description for the reference
++			typelib_TypeDescription* pMemberDescription = NULL;
++			typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
++			if (pMemberDescription)
++			{
++				typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
++				reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
++				*pNames = pRealMemberDescription->pMemberName;
++			}
++		}
++		typelib_typedescription_release( (typelib_TypeDescription *)pType );
++		return aNames;
++	}
++
++}
++
++
++
++
++
++
++
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]