summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/inc/fldmgr.hxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-06-29 07:11:27 +0000
committerKurt Zenker <kz@openoffice.org>2004-06-29 07:11:27 +0000
commitacc54a676d57c1219ca788c9d5f455193414aa00 (patch)
treecd2a59f030aea6c2d98e5aca900520b35f6c8bf0 /sw/source/ui/inc/fldmgr.hxx
parentINTEGRATION: CWS swqbugfixes02 (1.11.18); FILE MERGED (diff)
downloadcore-acc54a676d57c1219ca788c9d5f455193414aa00.tar.gz
core-acc54a676d57c1219ca788c9d5f455193414aa00.zip
INTEGRATION: CWS swqbugfixes02 (1.9.18); FILE MERGED
2004/06/09 08:57:00 os 1.9.18.1: #i256566# prevent muliple creation of the input field insert dialog
Diffstat (limited to 'sw/source/ui/inc/fldmgr.hxx')
-rw-r--r--sw/source/ui/inc/fldmgr.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index a78daba4709f..5083fc66d342 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fldmgr.hxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: rt $ $Date: 2004-05-19 08:52:22 $
+ * last change: $Author: kz $ $Date: 2004-06-29 08:11:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,7 +95,7 @@ class SbModule;
class SvxMacroItem;
class ListBox;
class SvNumberFormatter;
-
+class Window;
/*--------------------------------------------------------------------
Beschreibung: Die Gruppen von Feldern
--------------------------------------------------------------------*/
@@ -133,6 +133,7 @@ struct SwInsertFld_Data
::com::sun::star::uno::Any aDBDataSource;
::com::sun::star::uno::Any aDBConnection;
::com::sun::star::uno::Any aDBColumn;
+ Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg()
SwInsertFld_Data(USHORT nType, USHORT nSub, const String& rPar1, const String& rPar2,
ULONG nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', BOOL bIsAutoLanguage = TRUE) :
@@ -143,7 +144,8 @@ struct SwInsertFld_Data
nFormatId(nFmtId),
pSh(pShell),
cSeparator(cSep),
- bIsAutomaticLanguage(bIsAutoLanguage) {}
+ bIsAutomaticLanguage(bIsAutoLanguage),
+ pParent(0) {}
SwInsertFld_Data() :
pSh(0),