rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.25, 1.26 openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.6, 1.7 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.45, 1.46 openoffice.org-2.2.0.ooo63159.sal.dtype.patch, 1.3, 1.4 openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.3, 1.4 workspace.cmcfixes43.patch, 1.2, 1.3

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Tue Apr 15 18:04:50 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23405

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org-2.2.0.ooo63159.sal.dtype.patch 
	openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 
	workspace.cmcfixes43.patch 
Log Message:
fix up for m7

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	27 Mar 2008 15:13:50 -0000	1.25
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	15 Apr 2008 18:04:28 -0000	1.26
@@ -82,9 +82,9 @@
 
 --- openoffice.org.orig/desktop/source/app/appfirststart.cxx	2008-01-28 16:54:47.000000000 +0000
 +++ openoffice.org/desktop/source/app/appfirststart.cxx	2008-01-28 16:56:10.000000000 +0000
-@@ -81,26 +81,8 @@
-         // yuck! no license :/
-     }
+@@ -67,26 +67,8 @@
+     OUString aBaseInstallPath(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+     rtl::Bootstrap::expandMacros(aBaseInstallPath);
  
 -    // determine the filename of the license to show
 -    OUString  aLangString;
@@ -93,7 +93,7 @@
 -
 -    AllSettings aSettings(Application::GetSettings());
 -    aLocale = aSettings.GetUILocale();
--    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);    
+-    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
 +    OUString aLangString(OUString::createFromAscii("en-US"));
  
 -    aLangString = aLocale.Language;
@@ -108,9 +108,9 @@
 -        }
 -    }
  #if defined(WNT) || defined(OS2)
-     aLicensePath = 
+     aLicensePath =
          aBaseInstallPath + OUString::createFromAscii(szLicensePath)
-@@ -116,7 +98,7 @@
+@@ -102,7 +84,7 @@
          + aLangString
          + OUString::createFromAscii(szUNXLicenseExt);
  #endif
@@ -791,16 +791,15 @@
 diff -u -r1.17 substitutepathvars.cxx
 --- openoffice.org.orig/framework/source/services/substitutepathvars.cxx	16 Sep 2006 14:12:15 -0000	1.17
 +++ openoffice.org/framework/source/services/substitutepathvars.cxx	28 Jun 2007 13:59:22 -0000
-@@ -84,6 +84,8 @@
- #include <unotools/bootstrap.hxx>
- #endif
- 
+@@ -49,6 +49,7 @@
+ //_________________________________________________________________________________________________________________
+ #include <unotools/configitem.hxx>
+ #include <unotools/localfilehelper.hxx>
 +#include <unotools/localedatawrapper.hxx>
-+
- #ifndef _OSL_MUTEX_HXX_
- #include <osl/mutex.hxx>
- #endif
-@@ -1266,7 +1268,10 @@
+ #include <unotools/configmgr.hxx>
+ 
+ #ifndef _UTL_BOOTSTRAP_HXX_
+@@ -1200,7 +1201,10 @@
  	Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
  	rtl::OUString aLocaleStr;
  	if ( aLocale >>= aLocaleStr )

openoffice.org-2.0.3.ooo80816.selinux.bridges.patch:

Index: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo80816.selinux.bridges.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch	14 Apr 2008 10:28:01 -0000	1.6
+++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch	15 Apr 2008 18:04:28 -0000	1.7
@@ -782,8 +782,8 @@
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx,v
 retrieving revision 1.2
 diff -u -r1.2 cpp2uno.cxx
---- openoffice.org.orig/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	3 Apr 2008 16:47:43 -0000	1.2
-+++ openoffice.org/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	14 Apr 2008 10:27:08 -0000
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	3 Apr 2008 16:47:43 -0000	1.2
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	14 Apr 2008 10:27:08 -0000
 @@ -601,7 +601,7 @@
  }
  

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	14 Apr 2008 11:38:02 -0000	1.45
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	15 Apr 2008 18:04:28 -0000	1.46
@@ -310,15 +310,15 @@
 diff -u -r1.7 jobset.hxx
 --- openoffice.org.orig/vcl/inc/vcl/jobset.hxx	9 Sep 2005 11:06:48 -0000	1.7
 +++ openoffice.org/vcl/inc/vcl/jobset.hxx	19 May 2006 13:16:52 -0000
-@@ -50,6 +50,7 @@
- #ifndef _SV_PRNTYPES_HXX
+@@ -35,6 +35,7 @@
+ #include <vcl/sv.h>
+ #include <vcl/dllapi.h>
  #include <vcl/prntypes.hxx>
- #endif
 +#include <psprint/printerinfomanager.hxx>
  
  class SvStream;
  struct ImplJobSetup;
-@@ -87,6 +88,9 @@
+@@ -72,6 +73,9 @@
  	 */
  	String				GetValue( const String& rKey ) const;
  	void				SetValue( const String& rKey, const String& rValue );
@@ -759,30 +759,17 @@
 diff -u -r1.23 printdlg.cxx
 --- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx	17 Sep 2006 14:45:21 -0000	1.23
 +++ openoffice.org/svtools/source/dialogs/printdlg.cxx	16 Nov 2006 14:14:35 -0000
-@@ -85,9 +85,64 @@
- #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+@@ -57,9 +57,48 @@
+ #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
  #include <comphelper/processfactory.hxx>
- #endif
 +extern void ImplDeletePrnQueueList();
-+#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
 +#include <com/sun/star/frame/XFrame.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UTIL_URL_HPP_
 +#include <com/sun/star/util/URL.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_
 +#include <com/sun/star/util/XURLTransformer.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
 +#include <com/sun/star/frame/XDispatchProvider.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 +#include <com/sun/star/beans/PropertyValue.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_
 +#include <com/sun/star/view/XSelectionSupplier.hpp>
-+#endif
-+
 +#include <com/sun/star/document/XFilter.hpp>
 +#include <com/sun/star/document/XExporter.hpp>
 +#include <com/sun/star/io/XOutputStream.hpp>
@@ -793,9 +780,8 @@
 +#include <unotools/streamwrap.hxx>
 +#include <unotools/ucbstreamhelper.hxx>
 +
-+#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
 +#include "svtools/miscopt.hxx"
-+#endif
++
 +#include <gtk/gtkprintunixdialog.h>
 +#include <gtk/gtkstock.h>
 +#include <gtk/gtkcheckbutton.h>
@@ -806,10 +792,8 @@
 +#include <gtk/gtkvbox.h>
 +#include <gtk/gtknotebook.h>
 +#include <psprint/printerinfomanager.hxx>
-+
-+using namespace osl;
-+
  
++using namespace osl;
  using rtl::OUString;
  using namespace com::sun::star;
 +using namespace ::com::sun::star::frame;
@@ -824,7 +808,7 @@
  
  struct SvtPrinterImpl
  {
-@@ -144,8 +199,10 @@
+@@ -116,8 +155,10 @@
      maBtnCancel         ( this, SvtResId( BTN_CANCEL ) ),
      maBtnHelp           ( this, SvtResId( BTN_HELP ) ),
      mbWithSheetsAndCells( bWithSheetsAndCells ),
@@ -837,7 +821,7 @@
  {
  	FreeResource();
  
-@@ -781,6 +838,250 @@
+@@ -753,6 +794,250 @@
  
  // -----------------------------------------------------------------------
  
@@ -1088,7 +1072,7 @@
  short PrintDialog::Execute()
  {
  	if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -803,15 +1104,329 @@
+@@ -775,15 +1060,329 @@
  	ImplInitControls();
  	ImplModifyControlHdl( NULL );
  
@@ -1425,7 +1409,7 @@
  	}
  
  	maStatusTimer.Stop();
-@@ -826,4 +1441,3 @@
+@@ -798,4 +1397,3 @@
  	mpPrinterImpl->m_bHelpDisabled = sal_True;
  	maBtnHelp.Disable();
  }

openoffice.org-2.2.0.ooo63159.sal.dtype.patch:

Index: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo63159.sal.dtype.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.2.0.ooo63159.sal.dtype.patch	5 Mar 2007 10:02:39 -0000	1.3
+++ openoffice.org-2.2.0.ooo63159.sal.dtype.patch	15 Apr 2008 18:04:28 -0000	1.4
@@ -126,20 +126,17 @@
 diff -u -p -r1.6 file_stat.cxx
 --- openoffice.org.orig/sal/osl/unx/file_stat.cxx	8 Sep 2005 14:56:14 -0000	1.6
 +++ openoffice.org/sal/osl/unx/file_stat.cxx	18 Jan 2006 14:38:41 -0000
-@@ -45,6 +45,10 @@
+@@ -42,6 +42,7 @@
+ #ifndef _UNISTD_H
  #include <unistd.h>
  #endif
- 
-+#ifndef _DIRENT_H
 +#include <dirent.h>
-+#endif
-+
- #ifndef _OSL_FILE_H_
  #include <osl/file.h>
- #endif
-@@ -69,6 +73,9 @@
+ 
+ #ifndef _ERRNO_H
+@@ -56,6 +57,9 @@
+ #include "file_path_helper.hxx"
  #include "file_error_transl.h"
- #endif
  
 +#ifdef _DIRENT_HAVE_D_TYPE
 +#include "file_impl.hxx"
@@ -147,7 +144,7 @@
  
  namespace /* private */
  {
-@@ -236,9 +243,19 @@ namespace /* private */
+@@ -223,9 +227,19 @@
  	
  	/* we only need to call stat or lstat if one of the 
         following flags is set */
@@ -168,7 +165,7 @@
  				(field_mask & osl_FileStatus_Mask_Attributes) ||
  				(field_mask & osl_FileStatus_Mask_CreationTime) ||
  				(field_mask & osl_FileStatus_Mask_AccessTime) ||
-@@ -267,7 +284,11 @@ namespace /* private */
+@@ -254,7 +268,11 @@
      	if ((NULL == Item) || (NULL == pStat))
          	return osl_File_E_INVAL;
  							
@@ -180,7 +177,7 @@
  
  		OSL_ASSERT(file_path.getLength() > 0);
  		
-@@ -298,10 +319,18 @@ oslFileError SAL_CALL osl_getFileStatus(
+@@ -285,10 +303,18 @@
  #else
  	struct stat file_stat;
  #endif
@@ -201,7 +198,7 @@
  	{
  		// we set all these attributes because it's cheap				
  		set_file_type(file_stat, pStat);
-@@ -318,6 +347,40 @@ oslFileError SAL_CALL osl_getFileStatus(
+@@ -305,6 +331,40 @@
  				return osl_error;
  		}
      }

openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch:

Index: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	15 Apr 2008 13:56:23 -0000	1.3
+++ openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	15 Apr 2008 18:04:28 -0000	1.4
@@ -147,17 +147,17 @@
 diff -ru sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
 --- openoffice.org.orig/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
 +++ openoffice.org/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-06 16:28:52.000000000 +0000
-@@ -59,6 +59,9 @@
+@@ -54,6 +54,9 @@
  #include "taskpane/ControlContainer.hxx"
  #include "controller/SlideSorterController.hxx"
  #include "controller/SlsPageSelector.hxx"
 +#include "SlideSorter.hxx"
 +#include "model/SlideSorterModel.hxx"
 +#include "controller/SlsCurrentSlideManager.hxx"
- 
- #ifndef	_SFXOBJFACE_HXX
  #include <sfx2/objface.hxx>
-@@ -589,6 +592,26 @@
+ #include "sdresid.hxx"
+ #include "TemplateScanner.hxx"
+@@ -561,6 +564,26 @@
              break;
          }
  

workspace.cmcfixes43.patch:

Index: workspace.cmcfixes43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes43.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.cmcfixes43.patch	27 Mar 2008 15:13:51 -0000	1.2
+++ workspace.cmcfixes43.patch	15 Apr 2008 18:04:28 -0000	1.3
@@ -102,57 +102,6 @@
  #include <dlfcn.h>
  #include <cxxabi.h>
  #include <hash_map>
-Index: udk/testtools/source/bridgetest/component.LINUXIgcc3.map
-diff -u udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3 udk/testtools/source/bridgetest/component.LINUXIgcc3.map:removed
---- udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3	Fri Sep  9 05:21:49 2005
-+++ udk/testtools/source/bridgetest/component.LINUXIgcc3.map	Mon Mar 10 06:32:43 2008
-@@ -1,46 +0,0 @@
--#*************************************************************************
--#
--#   OpenOffice.org - a multi-platform office productivity suite
--#
--#   $RCSfile$
--#
--#   $Revision$
--#
--#   last change: $Author$ $Date$
--#
--#   The Contents of this file are made available subject to
--#   the terms of GNU Lesser General Public License Version 2.1.
--#
--#
--#     GNU Lesser General Public License Version 2.1
--#     =============================================
--#     Copyright 2005 by Sun Microsystems, Inc.
--#     901 San Antonio Road, Palo Alto, CA 94303, USA
--#
--#     This library is free software; you can redistribute it and/or
--#     modify it under the terms of the GNU Lesser General Public
--#     License version 2.1, as published by the Free Software Foundation.
--#
--#     This library 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 for more details.
--#
--#     You should have received a copy of the GNU Lesser General Public
--#     License along with this library; if not, write to the Free Software
--#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
--#     MA  02111-1307  USA
--#
--#*************************************************************************
--
--UDK_3_0_0 {
--    global:
--        component_getFactory;
--        component_getImplementationEnvironment;
--        component_writeInfo;
--
--        _ZN4_STL7num_put*; # STLport
--
--    local:
--        *;
--};
 Index: udk/testtools/source/bridgetest/component.gcc3.map
 diff -u /dev/null udk/testtools/source/bridgetest/component.gcc3.map:1.1.2.1
 --- /dev/null	Mon Mar 10 06:32:43 2008
@@ -343,55 +292,6 @@
 +    local:
 +        *;
 +};
-Index: porting/sal/qa/rtl/textenc/linuxigcc3_export.map
-diff -u porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3 porting/sal/qa/rtl/textenc/linuxigcc3_export.map:removed
---- porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3	Thu Sep  8 08:52:16 2005
-+++ porting/sal/qa/rtl/textenc/linuxigcc3_export.map	Mon Mar 10 06:32:58 2008
-@@ -1,44 +0,0 @@
--#*************************************************************************
--#
--#   OpenOffice.org - a multi-platform office productivity suite
--#
--#   $RCSfile$
--#
--#   $Revision$
--#
--#   last change: $Author$ $Date$
--#
--#   The Contents of this file are made available subject to
--#   the terms of GNU Lesser General Public License Version 2.1.
--#
--#
--#     GNU Lesser General Public License Version 2.1
--#     =============================================
--#     Copyright 2005 by Sun Microsystems, Inc.
--#     901 San Antonio Road, Palo Alto, CA 94303, USA
--#
--#     This library is free software; you can redistribute it and/or
--#     modify it under the terms of the GNU Lesser General Public
--#     License version 2.1, as published by the Free Software Foundation.
--#
--#     This library 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 for more details.
--#
--#     You should have received a copy of the GNU Lesser General Public
--#     License along with this library; if not, write to the Free Software
--#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
--#     MA  02111-1307  USA
--#
--#*************************************************************************
--
--UDK_3_0_0 {
--    global:
--        registerAllTestFunction;
--
--        _ZN4_STL7num_put*; # STLport
--
--    local:
--        *;
--};
 Index: porting/sal/qa/rtl/textenc/makefile.mk
 diff -u porting/sal/qa/rtl/textenc/makefile.mk:1.6 porting/sal/qa/rtl/textenc/makefile.mk:1.6.54.2
 --- porting/sal/qa/rtl/textenc/makefile.mk:1.6	Tue Nov 20 11:46:49 2007
@@ -832,107 +732,6 @@
 +        _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &)
 +        _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &)
 +} UDK_3.3;
-Index: udk/jvmaccess/util/gcc3_linux_intel.map
-diff -u udk/jvmaccess/util/gcc3_linux_intel.map:1.14 udk/jvmaccess/util/gcc3_linux_intel.map:removed
---- udk/jvmaccess/util/gcc3_linux_intel.map:1.14	Tue Jul  3 05:42:50 2007
-+++ udk/jvmaccess/util/gcc3_linux_intel.map	Mon Mar 10 06:33:43 2008
-@@ -1,96 +0,0 @@
--#*************************************************************************
--#
--#   OpenOffice.org - a multi-platform office productivity suite
--#
--#   $RCSfile$
--#
--#   $Revision$
--#
--#   last change: $Author$ $Date$
--#
--#   The Contents of this file are made available subject to
--#   the terms of GNU Lesser General Public License Version 2.1.
--#
--#
--#     GNU Lesser General Public License Version 2.1
--#     =============================================
--#     Copyright 2005 by Sun Microsystems, Inc.
--#     901 San Antonio Road, Palo Alto, CA 94303, USA
--#
--#     This library is free software; you can redistribute it and/or
--#     modify it under the terms of the GNU Lesser General Public
--#     License version 2.1, as published by the Free Software Foundation.
--#
--#     This library 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 for more details.
--#
--#     You should have received a copy of the GNU Lesser General Public
--#     License along with this library; if not, write to the Free Software
--#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
--#     MA  02111-1307  USA
--#
--#*************************************************************************
--
--UDK_3.1 {
--    global:
--        # jvmaccess/virtualmachine.hxx:
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
--        # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
--        # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
--        _ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
--        _ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
--        _ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
--        _ZN9jvmaccess14VirtualMachine11AttachGuardD2Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
--        _ZN9jvmaccess14VirtualMachineC1EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
--
--    local:
--        *;
--};
--
--UDK_3.2 {
--    global:
--        # initially forgotten jvmaccess/virtualmachine.hxx:
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
--        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
--        _ZN9jvmaccess14VirtualMachineC2EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
--
--	# We prefix the next two symbols with a wildcard sign because they will only be generated by gcj. The Mac OS X linker doesn't support
--	# "Treat not existing symbols as warning" under certain circumstances and thus ends with an error when trying to find these symbols
--	# (see man ld on Mac OS X). For further details see also #i69351#. By using the wildcard the symbols will be filtered out before.
--	# We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
--        _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
--        _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
--} UDK_3.1;
--
--UDK_3.3 {
--    global:
--        # jvmaccess/unovirtualmachine.hxx:
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD0Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
--        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
--        # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
--        # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
--        _ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
--        _ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
--        _ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
--        _ZNK9jvmaccess17UnoVirtualMachine14getClassLoaderEv; # jvmaccess::UnoVirtualMachine::getClassLoader() const
--} UDK_3.2;
--
--UDK_3.4 { # OOo 2.3
--    global:
--        # jvmaccess/classpath.hxx:
--        _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &)
--        _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &)
--} UDK_3.3;
 Index: udk/jvmaccess/util/makefile.mk
 diff -u udk/jvmaccess/util/makefile.mk:1.12 udk/jvmaccess/util/makefile.mk:1.12.6.1
 --- udk/jvmaccess/util/makefile.mk:1.12	Fri Nov  2 05:41:23 2007
@@ -1023,57 +822,6 @@
  .ELSE
  SHL1VERSIONMAP = testregistrytdprovider.map
  .ENDIF
-Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map
-diff -u udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3 udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:removed
---- udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3	Thu Sep  8 01:30:31 2005
-+++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map	Mon Mar 10 06:34:10 2008
-@@ -1,46 +0,0 @@
--#*************************************************************************
--#
--#   OpenOffice.org - a multi-platform office productivity suite
--#
--#   $RCSfile$
--#
--#   $Revision$
--#
--#   last change: $Author$ $Date$
--#
--#   The Contents of this file are made available subject to
--#   the terms of GNU Lesser General Public License Version 2.1.
--#
--#
--#     GNU Lesser General Public License Version 2.1
--#     =============================================
--#     Copyright 2005 by Sun Microsystems, Inc.
--#     901 San Antonio Road, Palo Alto, CA 94303, USA
--#
--#     This library is free software; you can redistribute it and/or
--#     modify it under the terms of the GNU Lesser General Public
--#     License version 2.1, as published by the Free Software Foundation.
--#
--#     This library 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 for more details.
--#
--#     You should have received a copy of the GNU Lesser General Public
--#     License along with this library; if not, write to the Free Software
--#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
--#     MA  02111-1307  USA
--#
--#*************************************************************************
--
--UDK_3_0_0 {
--    global:
--        component_getFactory;
--        component_getImplementationEnvironment;
--        component_writeInfo;
--
--        _ZN4_STL7num_put*; # STLport
--
--    local:
--        *;
--};
 Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
 diff -u /dev/null udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map:1.1.2.1
 --- /dev/null	Mon Mar 10 06:34:10 2008
@@ -1140,57 +888,6 @@
  .ELSE
  SHL1VERSIONMAP = testtdmanager.map
  .ENDIF
-Index: udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map
-diff -u udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3 udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:removed
---- udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3	Thu Sep  8 01:32:51 2005
-+++ udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map	Mon Mar 10 06:34:10 2008
-@@ -1,46 +0,0 @@
--#*************************************************************************
--#
--#   OpenOffice.org - a multi-platform office productivity suite
--#
--#   $RCSfile$
--#
--#   $Revision$
--#
--#   last change: $Author$ $Date$
--#
--#   The Contents of this file are made available subject to
--#   the terms of GNU Lesser General Public License Version 2.1.
--#
--#
--#     GNU Lesser General Public License Version 2.1
--#     =============================================
--#     Copyright 2005 by Sun Microsystems, Inc.
--#     901 San Antonio Road, Palo Alto, CA 94303, USA
--#
--#     This library is free software; you can redistribute it and/or
--#     modify it under the terms of the GNU Lesser General Public
--#     License version 2.1, as published by the Free Software Foundation.
--#
--#     This library 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 for more details.
--#
--#     You should have received a copy of the GNU Lesser General Public
--#     License along with this library; if not, write to the Free Software
--#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
--#     MA  02111-1307  USA
--#
--#*************************************************************************
--
--UDK_3_0_0 {
--    global:
--        component_getFactory;
--        component_getImplementationEnvironment;
--        component_writeInfo;
--
--        _ZN4_STL7num_put*; # STLport
--
--    local:
--        *;
--};
 Index: udk/stoc/test/tdmanager/testtdmanager.gcc3.map
 diff -u /dev/null udk/stoc/test/tdmanager/testtdmanager.gcc3.map:1.1.2.1
 --- /dev/null	Mon Mar 10 06:34:10 2008




More information about the fedora-extras-commits mailing list