[Libreoffice-commits] core.git: 2 commits - dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/CppunitTest_dbaccess_macros_test.mk sd/CppunitTest_sd_import_tests.mk sfx2/source sw/CppunitTest_sw_ww8export.mk

[Caolán McNamara]

 dbaccess/CppunitTest_dbaccess_firebird_test.mk |    1 +
 dbaccess/CppunitTest_dbaccess_macros_test.mk   |    1 +
 sd/CppunitTest_sd_import_tests.mk              |    1 +
 sfx2/source/doc/docfile.cxx                    |   22 +++++++++++++++-------
 sw/CppunitTest_sw_ww8export.mk                 |    1 +
 5 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit d4cb9c3a8851cb874fd8b6c77d4d7521da7579b7
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Jul 27 21:43:22 2016 +0100

    temp tinderbox fix
    
    Change-Id: Id233762e6b8547078544c55b2932462a10749882

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 7af4a77..a77589b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -416,16 +416,24 @@ Reference < XContent > SfxMedium::GetContent() const
     if ( !pImpl->aContent.get().is() )
     {
         Reference < css::ucb::XContent > xContent;
+        Reference < css::ucb::XCommandEnvironment > xEnv;
 
-        // tdf#95144 add a default css::ucb::XCommandEnvironment
-        // in order to have http and https protocol manage certificates 
correctly
-        css:: uno::Reference< task::XInteractionHandler > xIH(
-                css::task::InteractionHandler::createWithParent( 
comphelper::getProcessComponentContext(), nullptr ) );
+        try
+        {
+            // tdf#95144 add a default css::ucb::XCommandEnvironment
+            // in order to have http and https protocol manage certificates 
correctly
+            css:: uno::Reference< task::XInteractionHandler > xIH(
+                    css::task::InteractionHandler::createWithParent( 
comphelper::getProcessComponentContext(), nullptr ) );
 
-        css::uno::Reference< css::ucb::XProgressHandler > xProgress;
-        ::ucbhelper::CommandEnvironment* pCommandEnv = new 
::ucbhelper::CommandEnvironment(new comphelper::SimpleFileAccessInteraction( 
xIH ), xProgress);
+            css::uno::Reference< css::ucb::XProgressHandler > xProgress;
+            ::ucbhelper::CommandEnvironment* pCommandEnv = new 
::ucbhelper::CommandEnvironment(new comphelper::SimpleFileAccessInteraction( 
xIH ), xProgress);
 
-        Reference < css::ucb::XCommandEnvironment > xEnv(static_cast< 
css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY);
+            xEnv = Reference < css::ucb::XCommandEnvironment >(static_cast< 
css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY);
+        }
+        catch(...)
+        {
+            //temp tinderbox fix
+        }
 
         const SfxUnoAnyItem* pItem = 
SfxItemSet::GetItem<SfxUnoAnyItem>(pImpl->m_pSet, SID_CONTENT, false);
         if ( pItem )
commit 01c12dd928f6d0e65d458295c3863314e8483269
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Jul 27 21:43:07 2016 +0100

    add uui component to some other places
    
    Change-Id: Ic703b509bac0a57e0780bbb83537e7e4323a79d0

diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk 
b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index f438dfd..491f853 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -61,6 +61,7 @@ $(eval $(call 
gb_CppunitTest_use_components,dbaccess_firebird_test,\
     ucb/source/core/ucb1 \
     ucb/source/ucp/file/ucpfile1 \
     unotools/util/utl \
+    uui/util/uui \
     xmloff/util/xo \
 ))
 
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk 
b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 1afdac5..6a2bbc1 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -97,6 +97,7 @@ $(eval $(call 
gb_CppunitTest_use_components,dbaccess_macros_test,\
     unotools/util/utl \
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
+    uui/util/uui \
     xmloff/util/xo \
 ))
 
diff --git a/sd/CppunitTest_sd_import_tests.mk 
b/sd/CppunitTest_sd_import_tests.mk
index 0440e3d..adebcf0 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -106,6 +106,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sd_import_tests,\
     unotools/util/utl \
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
+    uui/util/uui \
     xmloff/util/xo \
     xmlsecurity/util/xsec_fw \
     xmlsecurity/util/xmlsecurity \
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index fa0f33e..a92d22b 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
     unotools/util/utl \
     unoxml/source/service/unoxml \
     unoxml/source/rdf/unordf \
+    uui/util/uui \
     $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
     xmloff/util/xo \
 ))

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits