[ooo-build-commit] .: patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Mon Apr 26 07:09:27 PDT 2010


 patches/dev300/gcc4-visibility-sc.diff             |   19 -------
 patches/dev300/mono-2.4-workaround.diff            |   21 --------
 patches/dev300/sd-builddep.diff                    |    8 ---
 patches/dev300/sfx2-shutdownicon-3layer.diff       |   51 ---------------------
 patches/dev300/solenv-cwsid.diff                   |   11 ----
 patches/dev300/tools-resmgr-set-defaultlocale.diff |   13 -----
 6 files changed, 123 deletions(-)

New commits:
commit 9b9aff11121da43a955961ea9794dec49d0b5d37
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Apr 26 16:07:50 2010 +0200

    Bin unused and already upstreamed diffs
    
    * patches/dev300/gcc4-visibility-sc.diff: bin
    * patches/dev300/mono-2.4-workaround.diff: bin
    * patches/dev300/sd-builddep.diff: bin
    * patches/dev300/sfx2-shutdownicon-3layer.diff: bin
    * patches/dev300/solenv-cwsid.diff: bin
    * patches/dev300/tools-resmgr-set-defaultlocale.diff: bin

diff --git a/patches/dev300/gcc4-visibility-sc.diff b/patches/dev300/gcc4-visibility-sc.diff
deleted file mode 100644
index 4c18351..0000000
--- a/patches/dev300/gcc4-visibility-sc.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- sc/inc/optutil.hxx.old	2000-11-02 20:08:15.000000000 +0100
-+++ sc/inc/optutil.hxx	2005-08-02 19:32:54.000000000 +0200
-@@ -70,6 +70,7 @@
- #include <unotools/configitem.hxx>
- #include <tools/link.hxx>
- 
-+#include "scdllapi.h"
- 
- class ScOptionsUtil
- {
-@@ -80,7 +84,7 @@
- 
- //	ConfigItem for classes that use items from several sub trees
- 
--class ScLinkConfigItem : public utl::ConfigItem
-+class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem
- {
- 	Link	aCommitLink;
- 
diff --git a/patches/dev300/mono-2.4-workaround.diff b/patches/dev300/mono-2.4-workaround.diff
deleted file mode 100644
index 5605c3c..0000000
--- a/patches/dev300/mono-2.4-workaround.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- cli_ure/source/mono_bridge/typedescription.cs.old	2009-04-15 12:24:38.000000000 +0200
-+++ cli_ure/source/mono_bridge/typedescription.cs	2009-04-15 16:05:34.000000000 +0200
-@@ -85,7 +85,7 @@ public unsafe struct TypeDescriptionRefe
-     public uno.rtl.UString *               pTypeName;
-     /** pointer to full typedescription; this value is only valid if the type is never swapped out
-     */
--    public TypeDescription *               pType;
-+    public void *                          pType;
-     /** pointer to optimize the runtime; not for public use
-     */
-     public void *                          pUniqueIdentifier;
-@@ -136,7 +136,7 @@ public unsafe struct TypeDescription
-     public uno.rtl.UString *               pTypeName;
-     /** pointer to self to distinguish reference from description; for internal use only
-     */
--    public TypeDescription *               pSelf;
-+    public void *                          pSelf;
-     /** pointer to optimize the runtime; not for public use
-     */
-     public void *                          pUniqueIdentifier;
-
diff --git a/patches/dev300/sd-builddep.diff b/patches/dev300/sd-builddep.diff
deleted file mode 100644
index cc806fe..0000000
--- a/patches/dev300/sd-builddep.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- sd/prj/build.lst
-+++ sd/prj/build.lst
-@@ -1,4 +1,4 @@
--sd	sd	:	svx stoc uui canvas NULL
-+sd	sd	:	animations svx stoc uui canvas NULL
- sd	sd										usr1	-	all	sd_mkout NULL
- sd	sd\inc									nmake		-	all	sd_inc NULL
- sd	sd\prj									get		-	all	sd_prj NULL
diff --git a/patches/dev300/sfx2-shutdownicon-3layer.diff b/patches/dev300/sfx2-shutdownicon-3layer.diff
deleted file mode 100644
index 6d3dfdd..0000000
--- a/patches/dev300/sfx2-shutdownicon-3layer.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- sfx2/source/appl/shutdownicon.cxx.old	2008-10-15 20:02:56.000000000 +0200
-+++ sfx2/source/appl/shutdownicon.cxx	2008-10-15 21:00:25.000000000 +0200
-@@ -52,6 +52,7 @@
- #include <com/sun/star/ui/dialogs/ControlActions.hpp>
- #include <com/sun/star/document/MacroExecMode.hpp>
- #include <com/sun/star/document/UpdateDocMode.hpp>
-+#include <rtl/bootstrap.hxx>
- #include <sfx2/filedlghelper.hxx>
- #include <sfx2/fcontnr.hxx>
- #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
-@@ -83,6 +84,8 @@ using namespace ::vos;
- using namespace ::rtl;
- using namespace ::sfx2;
- 
-+extern "C" { static void SAL_CALL thisModule() {} }
-+
- class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
- {
- public:
-@@ -142,7 +145,7 @@ bool ShutdownIcon::LoadModule( osl::Modu
- 
- 	oslGenericFunction pTmpInit = NULL;
- 	oslGenericFunction pTmpDeInit = NULL;
--	if ( pPlugin->load( OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
-+	if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
- 	{
- 		pTmpInit = pPlugin->getFunctionSymbol(
- 			OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );
-@@ -825,17 +828,19 @@ void ShutdownIcon::SetAutostart( bool bA
- #else // UNX
- 		getDotAutostart( true );
- 
--		OUString aPath;
--		::utl::Bootstrap::locateBaseInstallation(aPath);
-+		OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ) );
-+		Bootstrap::expandMacros( aPath );
- 
- 		OUString aDesktopFile;
- 		::osl::File::getSystemPathFromFileURL( aPath, aDesktopFile );
--		aDesktopFile += OUString( RTL_CONSTASCII_USTRINGPARAM( "/share/xdg/qstart.desktop" ) );
- 
- 		OString aDesktopFileUnx = OUStringToOString( aDesktopFile,
- 													 osl_getThreadTextEncoding() );
- 		OString aShortcutUnx = OUStringToOString( aShortcut,
- 												  osl_getThreadTextEncoding() );
-+		// call unlink just in case there is a broken link pointing to an older OOo that
-+		// is not longer available on the system
-+		unlink( aShortcutUnx );
- 		symlink( aDesktopFileUnx, aShortcutUnx );
- 
- 		ShutdownIcon *pIcon = ShutdownIcon::createInstance();
diff --git a/patches/dev300/solenv-cwsid.diff b/patches/dev300/solenv-cwsid.diff
deleted file mode 100644
index 000df57..0000000
--- a/patches/dev300/solenv-cwsid.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/bin/modules/Cws.pm.old	2008-04-10 18:57:34.000000000 +0200
-+++ solenv/bin/modules/Cws.pm	2008-06-10 13:19:53.000000000 +0200
-@@ -847,7 +847,7 @@ sub get_eis_id
-     my $child  = Eis::to_string($self->child());
- 
-     my $result;
--    eval { $result = $eis->getChildWorkspaceId($master, $child) };
-+    eval { $result = int($eis->getChildWorkspaceId($master, $child)) };
-     if ( $@ ) {
-         carp("ERROR: get_eis_id(): EIS database transaction failed. Reason:\n$@\n");
-     }
diff --git a/patches/dev300/tools-resmgr-set-defaultlocale.diff b/patches/dev300/tools-resmgr-set-defaultlocale.diff
deleted file mode 100644
index 1a8df60..0000000
--- a/patches/dev300/tools-resmgr-set-defaultlocale.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/source/rc/resmgr.cxx.old	2008-01-23 18:05:46.000000000 +0100
-+++ tools/source/rc/resmgr.cxx	2008-06-17 20:00:31.000000000 +0200
-@@ -323,6 +323,10 @@ void ResMgrContainer::init()
-                  OUStringToOString( it->second.aFileURL, osl_getThreadTextEncoding() ).getStr() );
-     }
-     #endif
-+
-+    // set default language
-+    LanguageType nLang = MsLangId::getSystemUILanguage();
-+    MsLangId::convertLanguageToLocale(nLang, m_aDefLocale);
- }
- 
- InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,


More information about the ooo-build-commit mailing list