mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some '#ifdef AWT_DIALOG' noise

Browse Source 
...that sat there ever since 4bda346777 "initial
checkin - frame for dialogs usuable as UNO service"

Change-Id: I3c8f6fe74d05e5d25950251997354475da02832d
This commit is contained in:
Stephan Bergmann
2017-01-27 12:10:39 +01:00
parent aaa0728d88
commit e8613c6eef
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
svtools/source/uno/genericunodialog.cxx
View File

@@ -237,35 +237,6 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( )
return nReturn; 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) void OGenericUnoDialog::implInitialize(const Any& _rValue)
{ {
try try