[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/source

[Miklos Vajna]

 desktop/source/lib/init.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit a65afae1eacd33546b5ceee12e510d4f2849feb1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jul 20 10:46:51 2016 +0200

    desktop: fix mismerge
    
    Change-Id: I53a85128e7bc390aeccac4bd32e8b8adb00ae5a1

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e11d547..6f7df98 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1515,8 +1515,6 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma
     }
 
     bool bResult = false;
-
-    std::size_t nView = SfxLokHelper::getView();
     if (bNotifyWhenFinished && pDocument->mpCallbackFlushHandlers[nView])
     {
         bResult = comphelper::dispatchCommand(aCommand, comphelper::containerToSequence(aPropertyValuesVector),