[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                             |    4 --
 patches/dev300/comphelper-symbol-visibility.diff |   39 -----------------------
 2 files changed, 43 deletions(-)

New commits:
commit 10310018380952dbdd68bb008cc546b9fb791ca4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:22:57 2009 +0300

    comphelper-symbol-visibility.diff is upstream in dev300-m54
    
    * patches/dev300/comphelper-symbol-visibility.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6ecf821..6fd09de 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2903,10 +2903,6 @@ optional-outplace-ole.diff, i#98970, thorsten
 # UI + core to have in-slideshow user drawing configurable (color &
 # stroke width)
 slideshow-configurable-paintoverlay.diff, i#97972, fredus
-# Add visibility markup to servicedecl's c component functions
-# (necessary since bulk addition of VISIBILITY_HIDDEN=TRUE to several
-# component makefiles)
-comphelper-symbol-visibility.diff, i#100225, thorsten
 # let ctrl-<keycode> stuff pass dlg keyboard handling, to permit
 # global application-wide shortcuts also in open dialogs
 vcl-permit-global-shortcuts.diff, thorsten
diff --git a/patches/dev300/comphelper-symbol-visibility.diff b/patches/dev300/comphelper-symbol-visibility.diff
deleted file mode 100644
index 6e9ee84..0000000
--- a/patches/dev300/comphelper-symbol-visibility.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix for svgimport visibility bug
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- comphelper/inc/comphelper/servicedecl.hxx |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-
-diff --git comphelper/inc/comphelper/servicedecl.hxx comphelper/inc/comphelper/servicedecl.hxx
-index bd114be..1fa97cc 100644
---- comphelper/inc/comphelper/servicedecl.hxx
-+++ comphelper/inc/comphelper/servicedecl.hxx
-@@ -418,20 +418,20 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
- #define COMPHELPER_SERVICEDECL_make_exports(varargs_ )  \
- extern "C" \
- { \
--    void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
-+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
-                                                           uno_Environment** /*ppEnv*/ ) \
-     { \
-         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \
-     } \
-  \
--    sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
-+    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
-                                            ::com::sun::star::registry::XRegistryKey*        pRegistryKey ) \
-     { \
-         return component_writeInfoHelper( pServiceManager, pRegistryKey, \
-                                           BOOST_PP_SEQ_ENUM(varargs_) ); \
-     } \
-  \
--    void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
-+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
-                                          ::com::sun::star::lang::XMultiServiceFactory*  pServiceManager, \
-                                          ::com::sun::star::registry::XRegistryKey*      pRegistryKey ) \
-     { \