[Libreoffice-commits] core.git: 8 commits - basic/source bridges/Library_cpp_uno.mk connectivity/source jvmfwk/plugins sw/source sysui/desktop

Caolán McNamara caolanm at redhat.com
Wed May 29 04:59:08 PDT 2013


 basic/source/runtime/methods.cxx                 |   10 +-
 bridges/Library_cpp_uno.mk                       |   24 +++++-
 connectivity/source/drivers/mysql/YDriver.cxx    |   19 ++++
 connectivity/source/manager/mdrivermanager.cxx   |    8 +-
 connectivity/source/manager/mdrivermanager.hxx   |    7 +
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |   22 +++++
 sw/source/filter/ww8/WW8TableInfo.hxx            |   89 +++++++++++------------
 sw/source/ui/fldui/fldref.src                    |   26 +++---
 sysui/desktop/macosx/gen_strings.pl              |    1 
 9 files changed, 133 insertions(+), 73 deletions(-)

New commits:
commit 54054514403a3e9bc45a71b20eb5e58befbb5508
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 29 12:40:06 2013 +0100

    bogus TRUE/FALSE -> sal_False/sal_True
    
    Change-Id: I72e0b6b3261422bd5fc47445d38cc64241d62362

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 2fd3eb5..118c80a 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4381,11 +4381,11 @@ RTLFUNC(MsgBox)
     };
     static const sal_Int16 nButtonMap[] =
     {
-        2, // #define RET_CANCEL sal_False
-        1, // #define RET_OK     sal_True
-        6, // #define RET_YES    2
-        7, // #define RET_NO     3
-        4  // #define RET_RETRY  4
+        2, // RET_CANCEL is 0
+        1, // RET_OK     is 1
+        6, // RET_YES    is 2
+        7, // RET_NO     is 3
+        4  // RET_RETRY  is 4
     };
 
 
commit ac66cb60b09b16b3a280e7cea5f2f01e852dfc85
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Thu Sep 27 03:20:34 2012 +0000

    Ensure socket or pipe are passed to the native driver
    
    (cherry picked from commit ad1186563ea12ce63dfdf738c332bf712084f633)
    
    Change-Id: Ib556732abb42dd3371331368c2b2eb717d505461

diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index bd826e0..dd8c36d 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -354,6 +354,25 @@ namespace connectivity
                     ,Sequence< OUString >())
                     );
         }
+        else if ( eType == D_NATIVE )
+        {
+            aDriverInfo.push_back(DriverPropertyInfo(
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket"))
+                    ,OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "The file path of a socket to connect to a local MySQL server."))
+                    ,sal_False
+                    ,OUString()
+                    ,Sequence< OUString >())
+                    );
+            aDriverInfo.push_back(DriverPropertyInfo(
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("NamedPipe"))
+                    ,OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "The name of a pipe to connect to a local MySQL server."))
+                    ,sal_False
+                    ,OUString()
+                    ,Sequence< OUString >())
+                    );
+        }
 
         return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
     }
commit 37ca14359b8c4027f1d9f9569ddfa2740cd2731e
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Fri Sep 21 17:08:44 2012 +0000

    Related: #i119525# List only JREs whose jvm library can be loaded
    
    (cherry picked from commit 0b31fa19e50d8259d3cbe695723ea02e2c5ff711)
    
    Change-Id: I1f96c6239d7278c4eb0c17b69f9d35e08eb8260b

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 6fa931d..b1cd722 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -19,6 +19,9 @@
 
 
 #include "osl/file.hxx"
+#include "osl/diagnose.h"
+#include "osl/module.hxx"
+#include "osl/thread.hxx"
 
 #include "vendorbase.hxx"
 #include "util.hxx"
@@ -158,6 +161,25 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
     if (!bRt)
         return false;
 
+#if defined(WNT)
+    oslModule moduleRt = 0;
+    rtl::OUString sRuntimeLib;
+    if( File::getSystemPathFromFileURL( m_sRuntimeLibrary, sRuntimeLib ) == File::E_None )
+    {
+        if ( ( moduleRt = osl_loadModule( sRuntimeLib.pData, SAL_LOADMODULE_DEFAULT ) ) == 0 )
+        {
+            OSL_TRACE( "jfw_plugin::VendorBase::initialize - cannot load library %s",
+                       rtl::OUStringToOString( sRuntimeLib, osl_getThreadTextEncoding() ).getStr() );
+            return false;
+        }
+        else
+        {
+            // do not leave the module loaded!
+            osl_unloadModule( moduleRt );
+        }
+    }
+#endif
+
     // init m_sLD_LIBRARY_PATH
     OSL_ASSERT(!m_sHome.isEmpty());
     size = 0;
commit 33c2427824ac893b15777527b818ec99c78c61dd
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Wed Sep 19 18:22:46 2012 +0000

    Ensure UNO context propagation on drivers instantiation
    
    (cherry picked from commit 78b2bf15963704fafb823e80bbccb287847fe1db)
    
    Change-Id: I876b24bc5324c3aede992c4cadb7014b570de5dc

diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 42c63c6..6c40bb8 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -120,7 +120,8 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
                 // we did not load this driver, yet
                 if ( _rDescriptor.xComponentFactory.is() )
                     // we have a factory for it
-                    const_cast< DriverAccess& >( _rDescriptor ).xDriver = _rDescriptor.xDriver.query( _rDescriptor.xComponentFactory->createInstance() );
+                    const_cast< DriverAccess& >( _rDescriptor ).xDriver = _rDescriptor.xDriver.query(
+                        _rDescriptor.xComponentFactory->createInstanceWithContext( _rDescriptor.xUNOContext ) );
             return _rDescriptor;
         }
     };
@@ -268,7 +269,7 @@ void OSDBCDriverManager::bootstrapDrivers()
     OSL_ENSURE( xEnumDrivers.is(), "OSDBCDriverManager::bootstrapDrivers: no enumeration for the drivers available!" );
     if (xEnumDrivers.is())
     {
-        Reference< XSingleServiceFactory > xFactory;
+        Reference< XSingleComponentFactory > xFactory;
         Reference< XServiceInfo > xSI;
         while (xEnumDrivers->hasMoreElements())
         {
@@ -287,6 +288,7 @@ void OSDBCDriverManager::bootstrapDrivers()
                 {   // yes -> no need to load the driver immediately (load it later when needed)
                     aDriverDescriptor.sImplementationName = xSI->getImplementationName();
                     aDriverDescriptor.xComponentFactory = xFactory;
+                    aDriverDescriptor.xUNOContext = m_aContext.getUNOContext();
                     bValidDescriptor = sal_True;
 
                     m_aEventLogger.log( LogLevel::CONFIG,
@@ -297,7 +299,7 @@ void OSDBCDriverManager::bootstrapDrivers()
                 else
                 {
                     // no -> create the driver
-                    Reference< XDriver > xDriver( xFactory->createInstance(), UNO_QUERY );
+                    Reference< XDriver > xDriver( xFactory->createInstanceWithContext( m_aContext.getUNOContext() ), UNO_QUERY );
                     OSL_ENSURE( xDriver.is(), "OSDBCDriverManager::bootstrapDrivers: a driver which is no driver?!" );
 
                     if ( xDriver.is() )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 864158d..8fae89d 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -25,7 +25,8 @@
 #include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+//#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
 #include <cppuhelper/implbase3.hxx>
 #include <comphelper/stl_types.hxx>
@@ -43,11 +44,13 @@ namespace drivermanager
     typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >                     SdbcDriver;
     DECLARE_STL_USTRINGACCESS_MAP( SdbcDriver, DriverCollection );
 
-    typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory >       DriverFactory;
+    typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >     DriverFactory;
+    typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >            UNOContext;
     struct DriverAccess
     {
         OUString     sImplementationName;        /// the implementation name of the driver
         DriverFactory       xComponentFactory;          /// the factory to create the driver component (if not already done so)
+        UNOContext          xUNOContext;                /// ensure UNO context propagation
         SdbcDriver          xDriver;                    /// the driver itself
     };
 
commit 1c21f83d723df1ced2582c2c3f2411e803a197bf
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Fri Dec 14 13:26:40 2012 +0000

    remove code which has been commented out
    
    (cherry picked from commit 613c8044fd9af3d1820c293bd95d12b700177405)
    
    Change-Id: I8412a600ea4a828639b3334b3d913705b6e4f782

diff --git a/sysui/desktop/macosx/gen_strings.pl b/sysui/desktop/macosx/gen_strings.pl
index 4ba73fa..9c6ffee 100644
--- a/sysui/desktop/macosx/gen_strings.pl
+++ b/sysui/desktop/macosx/gen_strings.pl
@@ -94,7 +94,6 @@ sub print_lang
       if ( $lang ne $_ && $lang eq $this_lang && exists $documents{$last_section} ) {
         # replacing product variable doesn't work inside zip files and also not for UTF-16
         next if /%PRODUCTNAME/;
-#        s/%PRODUCTNAME/\${FILEFORMATNAME} \${FILEFORMATVERSION}/g;
         s/$lang/"$documents{$last_section}"/;
         s/\n/;\n/;
         print;
commit 988c2ed9391107c3807abcdf81cae2f8872395d3
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Wed May 29 00:44:00 2013 +0000

    Resolves: #i122351# Rearrange controls of Cross-reference page
    
    in Fields dialog
    
    Patch by: Tsutomu Uchino
    
    (cherry picked from commit 5e59a33a330ec1bbc7ebea0c43d59eadc7460b9b)
    
    Change-Id: I8e7264caa875fe49cf66a24e201fbf8966aa19fa

diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src
index 6dd8dea..3771c5b 100644
--- a/sw/source/ui/fldui/fldref.src
+++ b/sw/source/ui/fldui/fldref.src
@@ -38,7 +38,7 @@ TabPage TP_FLD_REF
         HelpID = "sw:ListBox:TP_FLD_REF:LB_REFTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
-        Size = MAP_APPFONT ( 76 , 165 ) ;
+        Size = MAP_APPFONT ( 76 , 73 ) ;
         TabStop = TRUE ;
         AutoHScroll = TRUE ;
     };
@@ -54,7 +54,7 @@ TabPage TP_FLD_REF
         HelpID = "sw:ListBox:TP_FLD_REF:LB_REFSELECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 14 ) ;
-        Size = MAP_APPFONT ( 166 , 73 ) ;
+        Size = MAP_APPFONT ( 166 , 136 ) ;
         TabStop = TRUE ;
         Sort = TRUE ;
     };
@@ -64,12 +64,12 @@ TabPage TP_FLD_REF
         HelpID = HID_REFSELECTION_TOOLTIP ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 14 ) ;
-        Size = MAP_APPFONT ( 166 , 73 ) ;
+        Size = MAP_APPFONT ( 166 , 136 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_REFFORMAT
     {
-        Pos = MAP_APPFONT ( 88 , 93 ) ;
+        Pos = MAP_APPFONT ( 6 , 93 ) ;
         Size = MAP_APPFONT ( 76 , 8 ) ;
         Left = TRUE ;
         Text [ en-US ] = "Insert ~reference to" ;
@@ -78,7 +78,7 @@ TabPage TP_FLD_REF
     {
         HelpID = "sw:ListBox:TP_FLD_REF:LB_REFFORMAT";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 88 , 104 ) ;
+        Pos = MAP_APPFONT ( 6 , 104 ) ;
         Size = MAP_APPFONT ( 76 , 75 ) ;
         TabStop = TRUE ;
         DropDown = FALSE ;
@@ -86,8 +86,8 @@ TabPage TP_FLD_REF
     };
     FixedText FT_REFNAME
     {
-        Pos = MAP_APPFONT ( 170 , 93 ) ;
-        Size = MAP_APPFONT ( 84 , 10 ) ;
+        Pos = MAP_APPFONT ( 88 , 155 ) ;
+        Size = MAP_APPFONT ( 80 , 10 ) ;
         Left = TRUE ;
         Text [ en-US ] = "Na~me" ;
     };
@@ -95,15 +95,15 @@ TabPage TP_FLD_REF
     {
         HelpID = "sw:Edit:TP_FLD_REF:ED_REFNAME";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 170 , 104 ) ;
-        Size = MAP_APPFONT ( 84 , 12 ) ;
+        Pos = MAP_APPFONT ( 88 , 167 ) ;
+        Size = MAP_APPFONT ( 80 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
     };
     FixedText FT_REFVALUE
     {
-        Pos = MAP_APPFONT ( 170 , 122 ) ;
-        Size = MAP_APPFONT ( 84 , 8 ) ;
+        Pos = MAP_APPFONT ( 174 , 155 ) ;
+        Size = MAP_APPFONT ( 80 , 8 ) ;
         Text [ en-US ] = "~Value" ;
         Disable = TRUE ;
         Left = TRUE ;
@@ -112,8 +112,8 @@ TabPage TP_FLD_REF
     {
         HelpID = "sw:Edit:TP_FLD_REF:ED_REFVALUE";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 170 , 136 ) ;
-        Size = MAP_APPFONT ( 84 , 12 ) ;
+        Pos = MAP_APPFONT ( 174 , 167 ) ;
+        Size = MAP_APPFONT ( 80 , 12 ) ;
         TabStop = TRUE ;
         Disable = TRUE ;
         Left = TRUE ;
commit b45876bf0f2eeafba0a4f9f8f30cd4279eb2aa3e
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Apr 16 12:09:48 2013 +0000

    provide complete type of CellInfo before it is used
    
    (cherry picked from commit 687d6ed3e4ecb836634bfda71bb5596e18bbc2e1)
    
    Conflicts:
    	sw/source/filter/ww8/WW8TableInfo.hxx
    
    Change-Id: If21c5d7c6db2803f7da59e28c00d47790abffe86

diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 68a3c0d..93ac96c 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -112,7 +112,50 @@ public:
 #endif
 };
 
-class CellInfo;
+class CellInfo
+{
+    SwRect m_aRect;
+    WW8TableNodeInfo * m_pNodeInfo;
+    unsigned long m_nFmtFrmWidth;
+
+public:
+    CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
+
+    CellInfo(const CellInfo & aRectAndTableInfo)
+        : m_aRect(aRectAndTableInfo.m_aRect),
+          m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo),
+          m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth)
+    {
+    }
+
+    ~CellInfo() {}
+
+    bool operator < (const CellInfo & aCellInfo) const;
+
+    long top() const { return m_aRect.Top(); }
+    long bottom() const { return m_aRect.Bottom(); }
+    long left() const { return m_aRect.Left(); }
+    long right() const { return m_aRect.Right(); }
+    long width() const { return m_aRect.Width(); }
+    long height() const { return m_aRect.Height(); }
+    SwRect getRect() const { return m_aRect; }
+    WW8TableNodeInfo * getTableNodeInfo() const
+    { return m_pNodeInfo; }
+    unsigned long getFmtFrmWidth() const
+    {
+        return m_nFmtFrmWidth;
+    }
+
+    void setFmtFrmWidth(unsigned long nFmtFrmWidth)
+    {
+        m_nFmtFrmWidth = nFmtFrmWidth;
+    }
+
+#ifdef DBG_UTIL
+    ::std::string toString() const;
+#endif
+};
+
 typedef ::std::multiset<CellInfo, less<CellInfo> > CellInfoMultiSet;
 typedef boost::shared_ptr<CellInfoMultiSet> CellInfoMultiSetPtr;
 
@@ -308,50 +351,6 @@ public:
     WW8TableNodeInfo * reorderByLayout(const SwTable * pTable);
 };
 
-class CellInfo
-{
-    SwRect m_aRect;
-    WW8TableNodeInfo * m_pNodeInfo;
-    unsigned long m_nFmtFrmWidth;
-
-public:
-    CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
-
-    CellInfo(const CellInfo & aRectAndTableInfo)
-        : m_aRect(aRectAndTableInfo.m_aRect),
-          m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo),
-          m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth)
-    {
-    }
-
-    ~CellInfo() {}
-
-    bool operator < (const CellInfo & aCellInfo) const;
-
-    long top() const { return m_aRect.Top(); }
-    long bottom() const { return m_aRect.Bottom(); }
-    long left() const { return m_aRect.Left(); }
-    long right() const { return m_aRect.Right(); }
-    long width() const { return m_aRect.Width(); }
-    long height() const { return m_aRect.Height(); }
-    SwRect getRect() const { return m_aRect; }
-    WW8TableNodeInfo * getTableNodeInfo() const
-    { return m_pNodeInfo; }
-    unsigned long getFmtFrmWidth() const
-    {
-        return m_nFmtFrmWidth;
-    }
-
-    void setFmtFrmWidth(unsigned long nFmtFrmWidth)
-    {
-        m_nFmtFrmWidth = nFmtFrmWidth;
-    }
-
-#ifdef DBG_UTIL
-    ::std::string toString() const;
-#endif
-};
-
 }
 #endif // WW8_TABLE_INFO_HXX
 
commit e1823ea132c41b16fb165a641ce8388585764124
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 29 09:58:34 2013 +0100

    compile callvirtualmethod with -fnon-call-exceptions
    
    Change-Id: Ibcf70dd5626474bb2a023ce43d7ac661401fd1cb

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index f7153c3..8835eeb 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -58,7 +58,8 @@ else ifeq ($(CPU),I)
 ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_intel
 bridge_asm_objects := call
-bridge_exception_objects := callvirtualmethod cpp2uno except uno2cpp
+bridge_exception_objects := cpp2uno except uno2cpp
+bridge_noncallexception_objects := callvirtualmethod
 else ifeq ($(OS),MACOSX)
 bridges_SELECTED_BRIDGE := gcc3_macosx_intel
 bridge_asm_objects := call
@@ -121,12 +122,12 @@ else ifeq ($(CPU),X)
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
 bridge_asm_objects := call
-bridge_noopt_objects := callvirtualmethod
+bridge_noncallexception_noopt_objects := callvirtualmethod
 bridge_exception_objects := abi cpp2uno except uno2cpp
 else ifeq ($(OS),MACOSX)
 bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64
 bridge_exception_objects := abi call cpp2uno except uno2cpp
-bridge_noopt_objects := callvirtualmethod
+bridge_noncallexception_noopt_objects := callvirtualmethod
 else ifeq ($(COM),MSC)
 bridges_SELECTED_BRIDGE := msvc_win32_x86-64
 bridge_exception_objects := cpp2uno dllinit uno2cpp
@@ -195,6 +196,12 @@ $(eval $(call gb_Library_add_libs,gcc3_uno,\
 endif
 endif
 
+ifeq ($(COM),GCC)
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
+bridges_NON_CALL_EXCEPTIONS_FLAGS := -fnon-call-exceptions
+endif
+endif
+
 $(eval $(call gb_Library_use_libraries,$(gb_CPPU_ENV)_uno,\
 	cppu \
 	sal \
@@ -204,12 +211,21 @@ $(foreach obj,$(bridge_exception_objects),\
 	$(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\
 	bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \
 )
-
+$(foreach obj,$(bridge_noncallexception_objects),\
+	$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
+	bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \
+    , $(bridges_NON_CALL_EXCEPTIONS_FLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS))) \
+)
 $(foreach obj,$(bridge_noopt_objects),\
 	$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
 	bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \
 	, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS))) \
 )
+$(foreach obj,$(bridge_noncallexception_noopt_objects),\
+	$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
+	bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \
+	, $(gb_COMPILERNOOPTFLAGS) $(bridges_NON_CALL_EXCEPTIONS_FLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS))) \
+)
 $(foreach obj,$(bridge_cxx_objects),\
 	$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
 	bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \


More information about the Libreoffice-commits mailing list