From 0e6ab013f7def9891c2e982bec76458a64953c20 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Mon, 30 May 2011 18:09:09 +0200
Subject: ause130: #i117218# change .idl handling to gnu make

---
 ucbhelper/prj/build.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/prj/build.lst b/ucbhelper/prj/build.lst
index bbd01df9022a..f97173305622 100644
--- a/ucbhelper/prj/build.lst
+++ b/ucbhelper/prj/build.lst
@@ -1,4 +1,4 @@
-uh	ucbhelper   :   offuh sal cppu cppuhelper salhelper NULL
+uh	ucbhelper   :   offapi sal cppu cppuhelper salhelper NULL
 uh	ucbhelper                   usr1    -   all uh_mkout NULL
 uh	ucbhelper\inc               nmake   -   all uh_inc NULL
 uh	ucbhelper\source\client     nmake   -   all uh_client uh_inc NULL
-- 
cgit 


From fef6942ac3d6d9ebf8acfa4576308c923ee05544 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Sat, 18 Jun 2011 16:05:23 +0300
Subject: Produce the expected import library name in the MinGW case

---
 ucbhelper/util/makefile.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ucbhelper')

diff --git a/ucbhelper/util/makefile.mk b/ucbhelper/util/makefile.mk
index 41cd0e5b4190..05fee92e83dc 100644
--- a/ucbhelper/util/makefile.mk
+++ b/ucbhelper/util/makefile.mk
@@ -49,7 +49,11 @@ SHL1STDLIBS = \
     $(SALLIB)
 
 SHL1DEPN=
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=	i$(TARGET)
+.ELSE
+SHL1IMPLIB=	$(TARGET)$(UCBHELPER_MAJOR)$(COMID)
+.ENDIF
 SHL1USE_EXPORTS=name
 SHL1LIBS=	$(LIB1TARGET)
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-- 
cgit 


From bbc355c39f52397ce98081bfc090e366a73f0c91 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 17 Jun 2011 23:52:59 +0100
Subject: catch by const reference

---
 ucbhelper/source/provider/propertyvalueset.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index c6ab550237c1..361a8fd514af 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -221,10 +221,10 @@ class PropertyValues : public PropertyValuesVector {};
                                         m_bWasNull = sal_False;               \
                                     }                                         \
                                 }                                             \
-                                catch ( IllegalArgumentException )            \
+                                catch (const IllegalArgumentException&)       \
                                 {                                             \
                                 }                                             \
-                                catch ( CannotConvertException )              \
+                                catch (const CannotConvertException&)         \
                                 {                                             \
                                 }                                             \
                             }                                                 \
@@ -881,10 +881,10 @@ void PropertyValueSet::appendPropertySet(
                         if ( aValue.hasValue() )
                             appendObject( rProp, aValue );
                     }
-                    catch ( UnknownPropertyException )
+                    catch (const UnknownPropertyException&)
                     {
                     }
-                       catch ( WrappedTargetException )
+                    catch (const WrappedTargetException&)
                     {
                     }
                 }
@@ -909,10 +909,10 @@ sal_Bool PropertyValueSet::appendPropertySetValue(
                 return sal_True;
             }
         }
-        catch ( UnknownPropertyException )
+        catch (const UnknownPropertyException&)
         {
         }
-        catch ( WrappedTargetException )
+        catch (const WrappedTargetException&)
         {
         }
     }
-- 
cgit 


From 22f299b12e1c874a43b38f7efdda0d1b952d09a0 Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Sun, 3 Jul 2011 17:43:02 +0200
Subject: Remove component_getImplementationEnvironment methods

---
 ucbhelper/workben/myucp/myucp_services.cxx | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx
index 6551ca755a12..c455addd1a22 100644
--- a/ucbhelper/workben/myucp/myucp_services.cxx
+++ b/ucbhelper/workben/myucp/myucp_services.cxx
@@ -80,13 +80,6 @@ sal_Bool writeInfo( void * pRegistryKey,
 
 }
 
-//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 //=========================================================================
 extern "C" sal_Bool SAL_CALL component_writeInfo(
     void * /*pServiceManager*/, void * pRegistryKey )
-- 
cgit