summaryrefslogtreecommitdiff
path: root/automation
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 15:52:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 15:52:53 +0000
commitb29e18138111e4b8754d3e9f3f34248fd518172c (patch)
tree307efca9e625a5fd6b2ec477815a778515f03f52 /automation
parent3633a5258bf7fbe45a20d3d8aea3a5270938b737 (diff)
INTEGRATION: CWS gh8 (1.9.6); FILE MERGED
2004/10/18 14:25:34 gh 1.9.6.2: #117519#destroy windows on exit 2004/10/15 11:23:00 gh 1.9.6.1: #i35365#return found itemwindow on toolbox immediately
Diffstat (limited to 'automation')
-rw-r--r--automation/source/server/statemnt.hxx37
1 files changed, 31 insertions, 6 deletions
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index 0ed42edf5cf0..75c93ba3f0ac 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: statemnt.hxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: obo $ $Date: 2004-09-09 17:24:17 $
+ * last change: $Author: hr $ $Date: 2004-11-09 16:52:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -137,15 +137,16 @@ class EditWindow;
void SAL_CALL osl_TestToolDebugPrint( const sal_Char *pString );
+#define IsVisible IsReallyVisible
+#define GET_REAL_PARENT() GetWindow( WINDOW_REALPARENT )
+
+
typedef USHORT SearchFlags;
#define SEARCH_NOOVERLAP ((SearchFlags) 0x0001)
#define SEARCH_NO_TOPLEVEL_WIN ((SearchFlags) 0x0002)
#define SEARCH_FOCUS_FIRST ((SearchFlags) 0x0004)
#define SEARCH_FIND_DISABLED ((SearchFlags) 0x0008)
-#define IsVisible IsReallyVisible
-#define GET_REAL_PARENT() GetWindow( WINDOW_REALPARENT )
-
class Search
{
SearchFlags nSearchFlags;
@@ -177,6 +178,28 @@ public:
};
+class DisplayHidWin;
+class StatementCommand;
+class TranslateWin;
+
+struct TTSettings
+{
+ // DisplayHID
+ StatementCommand *pDisplayInstance;
+ DisplayHidWin *pDisplayHidWin;
+ Window *Old;
+ Window *Act;
+ String aOriginalCaption;
+
+ // Translate
+ TranslateWin *pTranslateWin;
+ BOOL bToTop;
+};
+
+
+TTSettings* GetTTSettings();
+
+
#define MAX_RETRIES 9
class StatementList : public SafePointer
{
@@ -450,12 +473,14 @@ private:
class SearchUID : public Search
{
Window *pMaybeResult;
+ Window *pAlternateResult;
SmartId aUId;
BOOL bSearchButtonOnToolbox;
public:
- SearchUID( SmartId aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {}
+ SearchUID( SmartId aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {}
virtual BOOL IsWinOK( Window *pWin );
Window* GetMaybeWin() { return pMaybeResult; }
+ Window* GetAlternateResultWin() { return pAlternateResult; }
};
class SearchActive : public Search
{