[Libreoffice-commits] core.git: svtools/source

[Stephan Bergmann]

 svtools/source/uno/genericunodialog.cxx |   29 -----------------------------
 1 file changed, 29 deletions(-)

New commits:
commit e8613c6eefbb157c612bdba49f1876e57e81e0ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 27 12:10:39 2017 +0100

    Remove some '#ifdef AWT_DIALOG' noise
    
    ...that sat there ever since 4bda34677755729bd3a10353ea5b7bb9998ccc9b "initial
    checkin - frame for dialogs usuable as UNO service"
    
    Change-Id: I3c8f6fe74d05e5d25950251997354475da02832d

diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index c7a1713..894d904 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -237,35 +237,6 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute(  )
     return nReturn;
 }
 
-#ifdef AWT_DIALOG
-
-void SAL_CALL OGenericUnoDialog::endExecute(  ) throw(RuntimeException)
-{
-    UnoDialogEntryGuard aGuard( *this );
-    if (!m_bExecuting)
-        throw RuntimeException();
-
-    {
-        ::osl::MutexGuard aExecutionGuard(m_aExecutionMutex);
-        OSL_ENSURE(m_pDialog, "OGenericUnoDialog::endExecute : executing which dialog ?");
-            // m_bExecuting is true but we have no dialog ?
-        if (!m_pDialog)
-            throw RuntimeException();
-
-        if (!m_pDialog->IsInExecute())
-            // we tightly missed it... another thread finished the execution of the dialog,
-            // but did not manage it to reset m_bExecuting, it currently tries to acquire
-            // m_aMutex or m_aExecutionMutex
-            // => nothing to do
-            return;
-
-        m_pDialog->EndDialog(RET_CANCEL);
-        m_bCanceled = sal_True;
-    }
-}
-#endif
-
-
 void OGenericUnoDialog::implInitialize(const Any& _rValue)
 {
     try