[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 2 commits - configure.ac embedserv/source solenv/gbuild

[Andras Timar]

 configure.ac                           |    2 +-
 embedserv/source/embed/docholder.cxx   |   10 ++++++----
 solenv/gbuild/platform/com_MSC_defs.mk |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 1319974cc731804bb33abd30378b34a772c4354b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 3 10:39:18 2015 -0700

    build with VS2013 abd SDK 7.1A
    
    Change-Id: I290ad517f9f37f6551f62b042752f552ee31b502

diff --git a/configure.ac b/configure.ac
index cfaf3a7..4cdb969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3552,7 +3552,7 @@ if test "$_os" = "WINNT"; then
                 ;;
             120)
                 COMEX=15
-                WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.1A 8.1 8.0"
+                WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.1A 8.1 8.0 7.1A"
                 ;;
             esac
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 2c6dc19..7590a7b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -47,7 +47,7 @@ gb_COMPILERDEFS := \
 	-D_MT \
 	-D_DLL \
 	-DCPPU_ENV=$(gb_CPPU_ENV) \
-	$(if $(findstring 110_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
+	$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
 
 ifeq ($(CPUNAME),INTEL)
 gb_COMPILERDEFS += \
commit 16ee0801699624df1ffd2c4ad37cec639c330a86
Author: Mike Kaganski <mikekaganski at hotmail.com>
Date:   Sun May 3 22:59:49 2015 +1000

    tdf#66232: Cannot open files by COM2
    
    As suggested by comment 13 of the bug, the problem is caused
    by commit b248624126c271c88381d3dad6e04fc954f65779 by Noel Grandin.
    
    1. DocumentHolder::DocumentFrame(): XDesktop2 cannot be directly
    queried for XFrame2. And in this case, simple XFrame is enough.
    
    2. DocumentHolder::CloseFrame(): m_xFrame->dispose() violates an
    assert because of NULL reference. Reverted to previous code.
    
    3. Following commit debde4fdc443f522562ee29def4c27512d64609a by
    Andras Timar (supposed to fix the bug), found two places where
    previously used to be UNO_QUERY, but now UNO_QUERY_THROW is used.
    These places are reverted to use UNO_QUERY.
    
    Change-Id: Ifb9e74367d5dd99ba12166abdd443b29a8018aeb
    Reviewed-on: https://gerrit.libreoffice.org/15607
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 8568c7226cfb732e17fa42b365b9fce3a8264691)

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 3263c9b..89098f3 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -363,7 +363,7 @@ HRESULT DocumentHolder::InPlaceActivate(
             LoadDocInFrame( sal_True );
 
             uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(comphelper::getComponentContext(m_xFactory));
-            xDesktop->getFrames()->append( uno::Reference<frame::XFrame>(m_xFrame, uno::UNO_QUERY_THROW) );
+            xDesktop->getFrames()->append( uno::Reference<frame::XFrame>(m_xFrame, uno::UNO_QUERY) );
 
             // determine the menuhandle to get menutitems.
             if(m_xLayoutManager.is()) {
@@ -694,7 +694,9 @@ void DocumentHolder::CloseFrame()
         catch( const uno::Exception& ) {
         }
     else {
-        m_xFrame->dispose();
+        uno::Reference<lang::XComponent> xComp(m_xFrame, uno::UNO_QUERY);
+        if (xComp.is())
+            xComp->dispose();
     }
 
     m_xFrame = uno::Reference< frame::XFrame2 >();
@@ -770,13 +772,13 @@ uno::Reference< frame::XFrame2 > DocumentHolder::DocumentFrame()
     {
         uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create(comphelper::getComponentContext(m_xFactory));
 
-        uno::Reference<frame::XFrame2> xFrame(xDesktop,uno::UNO_QUERY);
+        uno::Reference<frame::XFrame> xFrame(xDesktop,uno::UNO_QUERY);
 
         // the frame will be registered on desktop here, later when the document
         // is loaded into the frame in ::show() method the terminate listener will be removed
         // this is so only for outplace activation
         if( xFrame.is() )
-            m_xFrame.set( xFrame->findFrame( OUString("_blank"), 0 ), uno::UNO_QUERY_THROW );
+            m_xFrame.set( xFrame->findFrame( OUString("_blank"), 0 ), uno::UNO_QUERY );
 
         uno::Reference< util::XCloseBroadcaster > xBroadcaster(
             m_xFrame, uno::UNO_QUERY );