summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Hartmann <gh@openoffice.org>2008-02-15 11:14:42 +0000
committerGregor Hartmann <gh@openoffice.org>2008-02-15 11:14:42 +0000
commit2e778c48f99150d23f7e5e3dfc8abaca57a5861c (patch)
tree8a2c1eef5128ff5e96e03a903d67bc044baa3a05
parent2815aaeb30c5795526124c428ab0442d342b3148 (diff)
undo previous checkin since it was not intended
-rw-r--r--automation/source/server/server.cxx14
-rw-r--r--automation/source/server/sta_list.cxx5
-rw-r--r--automation/source/server/statemnt.hxx8
3 files changed, 7 insertions, 20 deletions
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 08aa7dfae0da..9e04d379dc0b 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: server.cxx,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: gh $ $Date: 2008-02-15 11:28:59 $
+ * last change: $Author: gh $ $Date: 2008-02-15 12:14:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -678,15 +678,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
if ( StatementList::bExecuting )
m_pDbgWin->AddText( "In Execute " );
if ( StatementList::IsInReschedule() )
- {
- m_pDbgWin->AddText( "In Reschedule FocusWindow: 0x" );
- m_pDbgWin->AddText(
- String::CreateFromInt64(
- sal::static_int_cast< sal_Int64 >(
- reinterpret_cast< sal_IntPtr >(GetpApp()->GetFocusWindow())),
- 16 ));
- m_pDbgWin->AddText( " " );
- }
+ m_pDbgWin->AddText( "In Reschedule " );
m_pDbgWin->AddText( "Leaving CommandHdl\n" );
#endif
return 0; // Garnicht erst irgendwelchen blödsinn machen
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 79e5f0b26a01..0286da36d3d4 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sta_list.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: gh $ $Date: 2008-02-15 11:28:59 $
+ * last change: $Author: gh $ $Date: 2008-02-15 12:14:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -95,7 +95,6 @@ TTProfiler *StatementList::pProfiler = NULL;
StatementList *StatementList::pFirst = NULL;
BOOL StatementList::bReadingCommands = FALSE;
BOOL StatementList::bIsInReschedule = FALSE;
-USHORT StatementList::nModalCount = 0;
Window *StatementList::pLastFocusWindow = NULL;
BOOL StatementList::bWasDragManager = FALSE;
BOOL StatementList::bWasPopupMenu = FALSE;
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index c6c1b49761ae..1db920c22b87 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: statemnt.hxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: gh $ $Date: 2008-02-15 11:28:59 $
+ * last change: $Author: gh $ $Date: 2008-02-15 12:14:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -208,7 +208,6 @@ protected:
static StatementList *pCurrentProfileStatement;
static BOOL bIsInReschedule;
- static USHORT nModalCount;
static Window *pLastFocusWindow; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen
static BOOL bWasDragManager; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen
static BOOL bWasPopupMenu; // Wenn dieses sich ändert wird Safe Reschedule abgebrochen
@@ -226,7 +225,6 @@ public:
static BOOL IsInReschedule() { return bIsInReschedule; }
void SafeReschedule( BOOL bYield = FALSE ) // Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird
{
- nModalCount = Application::GetModalModeCount();
bIsInReschedule = TRUE;
pLastFocusWindow = GetpApp()->GetFocusWindow();
bWasDragManager = false /*!= DragManager::GetDragManager()*/;
@@ -243,7 +241,6 @@ public:
bWasDragManager = FALSE;
pLastFocusWindow = NULL;
bIsInReschedule = FALSE;
- nModalCount = 0;
}
static BOOL MaybeResetSafeReschedule()
{ // Implementierung muß hier zwar nicht sein, ist aber übersichtlicher so
@@ -251,7 +248,6 @@ public:
return FALSE;
if ( pLastFocusWindow != GetpApp()->GetFocusWindow()
- || ( Application::GetModalModeCount() > nModalCount )
// || ( DragManager::GetDragManager() && !bWasDragManager )
|| ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu )
|| ( StarBASIC::IsRunning() && !bBasicWasRunning ) )