summaryrefslogtreecommitdiff
path: root/sw/source/ui/fldui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx12
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.src3
-rw-r--r--sw/source/ui/fldui/changedb.cxx2
-rw-r--r--sw/source/ui/fldui/changedb.src2
-rw-r--r--sw/source/ui/fldui/flddb.src8
-rw-r--r--sw/source/ui/fldui/flddinf.cxx2
-rw-r--r--sw/source/ui/fldui/flddinf.src3
-rw-r--r--sw/source/ui/fldui/flddok.src8
-rw-r--r--sw/source/ui/fldui/fldedt.cxx17
-rw-r--r--sw/source/ui/fldui/fldfunc.src15
-rw-r--r--sw/source/ui/fldui/fldref.cxx2
-rw-r--r--sw/source/ui/fldui/fldref.src5
-rw-r--r--sw/source/ui/fldui/fldvar.src9
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx14
-rw-r--r--sw/source/ui/fldui/inpdlg.src3
-rw-r--r--sw/source/ui/fldui/javaedit.src9
16 files changed, 82 insertions, 32 deletions
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index a32e6634b2..823ce5570c 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -32,21 +32,14 @@
#undef SW_DLLIMPLEMENTATION
#endif
-
#include <wrtsh.hxx>
#include <fldbas.hxx>
#include <fldmgr.hxx>
-#ifndef _MSGBOX_HXX
#include <vcl/msgbox.hxx>
-#endif
#include <DropDownFieldDialog.hxx>
#include <flddropdown.hxx>
-#ifndef _FLDUI_HRC
#include <fldui.hrc>
-#endif
-#ifndef _SW_DROPDOWNFIELDDIALOG_HRC
#include <DropDownFieldDialog.hrc>
-#endif
using namespace ::com::sun::star;
@@ -124,13 +117,12 @@ void sw::DropDownFieldDialog::Apply()
{
rSh.StartAllAction();
- SwDropDownField * pCopy = (SwDropDownField *) pDropField->Copy();
+ ::std::auto_ptr<SwDropDownField> const pCopy(
+ static_cast<SwDropDownField *>( pDropField->CopyField() ) );
pCopy->SetPar1(sSelect);
rSh.SwEditShell::UpdateFlds(*pCopy);
- delete pCopy;
-
rSh.SetUndoNoResetModified();
rSh.EndAllAction();
}
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.src b/sw/source/ui/fldui/DropDownFieldDialog.src
index 25f6c4ac15..2d5c98cfe5 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.src
+++ b/sw/source/ui/fldui/DropDownFieldDialog.src
@@ -45,6 +45,7 @@ ModalDialog DLG_FLD_DROPDOWN
};
ListBox LB_LISTITEMS
{
+ HelpID = "sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 115 , 99 ) ;
@@ -67,6 +68,7 @@ ModalDialog DLG_FLD_DROPDOWN
};
PushButton PB_NEXT
{
+ HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT";
Pos = MAP_APPFONT ( 139 , 40 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -81,6 +83,7 @@ ModalDialog DLG_FLD_DROPDOWN
};
PushButton PB_EDIT
{
+ HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT";
Pos = MAP_APPFONT ( 139 , 99 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index bd35309e68..17759f7a3b 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -115,7 +115,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
aAddDBPB.SetClickHdl(LINK(this, SwChangeDBDlg, AddDBHdl));
aUsedDBTLB.SetSelectionMode(MULTIPLE_SELECTION);
- aUsedDBTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+ aUsedDBTLB.SetStyle(aUsedDBTLB.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
aUsedDBTLB.SetSpaceBetweenEntries(0);
aUsedDBTLB.SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src
index a461a1d7ac..8c4e21d5b3 100644
--- a/sw/source/ui/fldui/changedb.src
+++ b/sw/source/ui/fldui/changedb.src
@@ -31,6 +31,7 @@
ModalDialog DLG_CHANGE_DB
{
+ HelpID = "sw:ModalDialog:DLG_CHANGE_DB";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 286 , 175 ) ;
@@ -74,6 +75,7 @@ ModalDialog DLG_CHANGE_DB
};
PushButton PB_ADDDB
{
+ HelpID = "sw:PushButton:DLG_CHANGE_DB:PB_ADDDB";
Pos = MAP_APPFONT ( 118 , 90 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Browse..." ;
diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src
index e7bc8b99f9..d88d8790ba 100644
--- a/sw/source/ui/fldui/flddb.src
+++ b/sw/source/ui/fldui/flddb.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_DB
};
ListBox LB_DBTYPE
{
+ HelpID = "sw:ListBox:TP_FLD_DB:LB_DBTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 76 , 104 ) ;
@@ -67,6 +68,7 @@ TabPage TP_FLD_DB
};
Edit ED_DBCONDITION
{
+ HelpID = "sw:Edit:TP_FLD_DB:ED_DBCONDITION";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 137 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -82,6 +84,7 @@ TabPage TP_FLD_DB
};
Edit ED_DBSETNUMBER
{
+ HelpID = "sw:Edit:TP_FLD_DB:ED_DBSETNUMBER";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 167 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -110,6 +113,7 @@ TabPage TP_FLD_DB
};
PushButton PB_ADDDB
{
+ HelpID = "sw:PushButton:TP_FLD_DB:PB_ADDDB";
Pos = MAP_APPFONT ( 198 , 121) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Browse..." ;
@@ -117,6 +121,7 @@ TabPage TP_FLD_DB
RadioButton RB_DBOWNFORMAT
{
+ HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT";
Pos = MAP_APPFONT ( 94 , 153 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
Check = TRUE ;
@@ -124,12 +129,14 @@ TabPage TP_FLD_DB
};
RadioButton RB_DBFORMAT
{
+ HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBFORMAT";
Pos = MAP_APPFONT ( 94 , 166 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text [ en-US ] = "User-defined" ;
};
ListBox LB_DBNUMFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 195 , 164 ) ;
Size = MAP_APPFONT ( 53 , 60 ) ;
@@ -139,6 +146,7 @@ TabPage TP_FLD_DB
};
ListBox LB_DBFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_DB:LB_DBFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 195 , 163 ) ;
Size = MAP_APPFONT ( 53 , 60 ) ;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index dabb6b91e5..9243037bb2 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -89,7 +89,7 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) :
aTypeTLB.SetHelpId(HID_FIELD_DINF_TYPE);
aTypeTLB.SetSelectionMode(SINGLE_SELECTION);
- aTypeTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+ aTypeTLB.SetStyle(aTypeTLB.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
// Font nicht setzen, damit der Font des Controls uebernommen wird!
// Sonst bei falschem Font Bug an OV.
aTypeTLB.SetSpaceBetweenEntries(0);
diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src
index 9f65b88fa3..8f68883456 100644
--- a/sw/source/ui/fldui/flddinf.src
+++ b/sw/source/ui/fldui/flddinf.src
@@ -57,6 +57,7 @@ TabPage TP_FLD_DOKINF
};
ListBox LB_DOKINFSELECTION
{
+ HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 16 ) ;
Size = MAP_APPFONT ( 76 , 163 ) ;
@@ -78,6 +79,7 @@ TabPage TP_FLD_DOKINF
};
ListBox LB_DOKINFFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 16 ) ;
Size = MAP_APPFONT ( 84 , 148 ) ;
@@ -86,6 +88,7 @@ TabPage TP_FLD_DOKINF
};
CheckBox CB_DOKINFFIXEDCONTENT
{
+ HelpID = "sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT";
Pos = MAP_APPFONT ( 170 , 170 ) ;
Size = MAP_APPFONT ( 72 , 10 ) ;
TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src
index 6a60f8b53f..4723a55425 100644
--- a/sw/source/ui/fldui/flddok.src
+++ b/sw/source/ui/fldui/flddok.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_DOK
};
ListBox LB_DOKTYPE
{
+ HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -59,6 +60,7 @@ TabPage TP_FLD_DOK
};
ListBox LB_DOKSELECTION
{
+ HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 15 ) ;
Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -73,6 +75,7 @@ TabPage TP_FLD_DOK
};
ListBox LB_DOKFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 151 ) ;
@@ -83,6 +86,7 @@ TabPage TP_FLD_DOK
};
ListBox LB_DOKNUMFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 151 ) ;
@@ -100,6 +104,7 @@ TabPage TP_FLD_DOK
};
Edit ED_DOKVALUE
{
+ HelpID = "sw:Edit:TP_FLD_DOK:ED_DOKVALUE";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 167 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -109,6 +114,7 @@ TabPage TP_FLD_DOK
};
NumericField ED_DOKLEVEL
{
+ HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKLEVEL";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 167 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -125,6 +131,7 @@ TabPage TP_FLD_DOK
};
NumericField ED_DOKDATEOFF
{
+ HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKDATEOFF";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 167 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -138,6 +145,7 @@ TabPage TP_FLD_DOK
};
CheckBox CB_DOKFIXEDCONTENT
{
+ HelpID = "sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT";
Pos = MAP_APPFONT ( 170 , 170 ) ;
Size = MAP_APPFONT ( 72 , 10 ) ;
TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 76f0fbcfc7..832dabf344 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -195,21 +195,21 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
{
// TabPage erzeugen
SfxTabPage* pTabPage = 0;
- USHORT nHelpId = 0;
+ const char* pHelpId = 0;
switch (nGroup)
{
case GRP_DOC:
pTabPage = SwFldDokPage::Create(this, *(SfxItemSet*)0);
- nHelpId = HID_EDIT_FLD_DOK;
+ pHelpId = HID_EDIT_FLD_DOK;
break;
case GRP_FKT:
pTabPage = SwFldFuncPage::Create(this, *(SfxItemSet*)0);
- nHelpId = HID_EDIT_FLD_FUNC;
+ pHelpId = HID_EDIT_FLD_FUNC;
break;
case GRP_REF:
pTabPage = SwFldRefPage::Create(this, *(SfxItemSet*)0);
- nHelpId = HID_EDIT_FLD_REF;
+ pHelpId = HID_EDIT_FLD_REF;
break;
case GRP_REG:
{
@@ -233,21 +233,22 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
// }
pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
pTabPage = SwFldDokInfPage::Create(this, *pSet);
- nHelpId = HID_EDIT_FLD_DOKINF;
+ pHelpId = HID_EDIT_FLD_DOKINF;
break;
}
case GRP_DB:
pTabPage = SwFldDBPage::Create(this, *(SfxItemSet*)0);
static_cast<SwFldDBPage*>(pTabPage)->SetWrtShell(*pSh);
- nHelpId = HID_EDIT_FLD_DB;
+ pHelpId = HID_EDIT_FLD_DB;
break;
case GRP_VAR:
pTabPage = SwFldVarPage::Create(this, *(SfxItemSet*)0);
- nHelpId = HID_EDIT_FLD_VAR;
+ pHelpId = HID_EDIT_FLD_VAR;
break;
}
- pTabPage->SetHelpId(nHelpId);
+
+ pTabPage->SetHelpId(pHelpId);
static_cast<SwFldPage*>(pTabPage)->SetWrtShell(pSh);
SetTabPage(pTabPage);
diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src
index ca67c448fb..aa5e42b078 100644
--- a/sw/source/ui/fldui/fldfunc.src
+++ b/sw/source/ui/fldui/fldfunc.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_FUNC
};
ListBox LB_FUNCTYPE
{
+ HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -60,6 +61,7 @@ TabPage TP_FLD_FUNC
};
ListBox LB_FUNCSELECTION
{
+ HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCSELECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 14 ) ;
Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -77,6 +79,7 @@ TabPage TP_FLD_FUNC
};
ListBox LB_FUNCFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 14 ) ;
Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -91,6 +94,7 @@ TabPage TP_FLD_FUNC
};
Edit ED_FUNCNAME
{
+ HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -106,6 +110,7 @@ TabPage TP_FLD_FUNC
};
Edit ED_FUNCVALUE
{
+ HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 41 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -122,6 +127,7 @@ TabPage TP_FLD_FUNC
};
Edit ED_FUNCCOND1
{
+ HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 41 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -139,6 +145,7 @@ TabPage TP_FLD_FUNC
};
Edit ED_FUNCCOND2
{
+ HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 68 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -148,6 +155,7 @@ TabPage TP_FLD_FUNC
};
PushButton BT_FUNCMACRO
{
+ HelpID = "sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO";
Pos = MAP_APPFONT ( 204 , 165 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Macro..." ;
@@ -163,6 +171,7 @@ TabPage TP_FLD_FUNC
};
Edit ED_LISTITEM
{
+ HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTITEM";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -172,6 +181,7 @@ TabPage TP_FLD_FUNC
};
PushButton PB_LISTADD
{
+ HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTADD";
Pos = MAP_APPFONT ( 170 , 29 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Hide = TRUE;
@@ -186,6 +196,7 @@ TabPage TP_FLD_FUNC
};
ListBox LB_LISTITEMS
{
+ HelpID = "sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 57 ) ;
Size = MAP_APPFONT ( 83 , 44 ) ;
@@ -195,6 +206,7 @@ TabPage TP_FLD_FUNC
};
PushButton PB_LISTREMOVE
{
+ HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE";
Pos = MAP_APPFONT ( 203 , 104 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Hide = TRUE;
@@ -202,6 +214,7 @@ TabPage TP_FLD_FUNC
};
PushButton PB_LISTUP
{
+ HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTUP";
Pos = MAP_APPFONT ( 203 , 121 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Hide = TRUE;
@@ -209,6 +222,7 @@ TabPage TP_FLD_FUNC
};
PushButton PB_LISTDOWN
{
+ HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN";
Pos = MAP_APPFONT ( 203 , 138 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Hide = TRUE;
@@ -223,6 +237,7 @@ TabPage TP_FLD_FUNC
};
Edit ED_LISTNAME
{
+ HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 167 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 10ee25b477..5b7b70b5f9 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -124,7 +124,7 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
// --> OD 2007-11-21 #i83479#
aSelectionToolTipLB.SetSelectHdl( LINK(this, SwFldRefPage, SubTypeHdl) );
aSelectionToolTipLB.SetDoubleClickHdl( LINK(this, SwFldRefPage, InsertHdl) );
- aSelectionToolTipLB.SetWindowBits( aSelectionToolTipLB.GetWindowBits() | WB_HSCROLL );
+ aSelectionToolTipLB.SetStyle( aSelectionToolTipLB.GetStyle() | WB_HSCROLL );
aSelectionToolTipLB.SetSpaceBetweenEntries(1);
aSelectionToolTipLB.SetHighlightRange();
// <--
diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src
index 8abf02e980..c3aa0f737e 100644
--- a/sw/source/ui/fldui/fldref.src
+++ b/sw/source/ui/fldui/fldref.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_REF
};
ListBox LB_REFTYPE
{
+ HelpID = "sw:ListBox:TP_FLD_REF:LB_REFTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -58,6 +59,7 @@ TabPage TP_FLD_REF
};
ListBox LB_REFSELECTION
{
+ HelpID = "sw:ListBox:TP_FLD_REF:LB_REFSELECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 14 ) ;
Size = MAP_APPFONT ( 166 , 73 ) ;
@@ -82,6 +84,7 @@ TabPage TP_FLD_REF
};
ListBox LB_REFFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_REF:LB_REFFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 104 ) ;
Size = MAP_APPFONT ( 76 , 75 ) ;
@@ -98,6 +101,7 @@ TabPage TP_FLD_REF
};
Edit ED_REFNAME
{
+ HelpID = "sw:Edit:TP_FLD_REF:ED_REFNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 104 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -114,6 +118,7 @@ TabPage TP_FLD_REF
};
Edit ED_REFVALUE
{
+ HelpID = "sw:Edit:TP_FLD_REF:ED_REFVALUE";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 136 ) ;
Size = MAP_APPFONT ( 84 , 12 ) ;
diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src
index eda28b7fb4..4c42c971d2 100644
--- a/sw/source/ui/fldui/fldvar.src
+++ b/sw/source/ui/fldui/fldvar.src
@@ -44,6 +44,7 @@ TabPage TP_FLD_VAR
};
ListBox LB_VARTYPE
{
+ HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 76 , 135 ) ;
@@ -60,6 +61,7 @@ TabPage TP_FLD_VAR
};
ListBox LB_VARSELECTION
{
+ HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARSELECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 14 ) ;
Size = MAP_APPFONT ( 76 , 135 ) ;
@@ -75,6 +77,7 @@ TabPage TP_FLD_VAR
};
ListBox LB_VARFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 123 ) ;
@@ -83,6 +86,7 @@ TabPage TP_FLD_VAR
};
ListBox LB_VARNUMFORMAT
{
+ HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 123 ) ;
@@ -91,6 +95,7 @@ TabPage TP_FLD_VAR
};
CheckBox CB_VARINVISIBLE
{
+ HelpID = "sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE";
Pos = MAP_APPFONT ( 170 , 141 ) ;
Size = MAP_APPFONT ( 84 , 10 ) ;
Text [ en-US ] = "Invisi~ble" ;
@@ -112,6 +117,7 @@ TabPage TP_FLD_VAR
};
ListBox LB_VARCHAPTERLEVEL
{
+ HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL";
Border = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 208 , 123 ) ;
@@ -132,6 +138,7 @@ TabPage TP_FLD_VAR
};
Edit ED_VARSEPARATOR
{
+ HelpID = "sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR";
Pos = MAP_APPFONT ( 208 , 138 ) ;
Size = MAP_APPFONT ( 46 , 12 ) ;
Border = TRUE ;
@@ -148,6 +155,7 @@ TabPage TP_FLD_VAR
};
Edit ED_VARNAME
{
+ HelpID = "sw:Edit:TP_FLD_VAR:ED_VARNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 166 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -163,6 +171,7 @@ TabPage TP_FLD_VAR
};
Edit ED_VARVALUE
{
+ HelpID = "sw:Edit:TP_FLD_VAR:ED_VARVALUE";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 166 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 002b312af8..a197147021 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -32,13 +32,7 @@
#undef SW_DLLIMPLEMENTATION
#endif
-
-
-#define _INPDLG_CXX
-
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
#include <unotools/charclass.hxx>
#include <editeng/unolingu.hxx>
#include <wrtsh.hxx>
@@ -48,12 +42,8 @@
#include <inpdlg.hxx>
#include <fldmgr.hxx>
-#ifndef _FLDUI_HRC
#include <fldui.hrc>
-#endif
-#ifndef _INPDLG_HRC
#include <inpdlg.hrc>
-#endif
/*--------------------------------------------------------------------
@@ -128,7 +118,9 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
//values are formatted - formulas are not
CharClass aCC( SvxCreateLocale( pSetFld->GetLanguage() ));
if( aCC.isNumeric( sFormula ))
- aStr = pSetFld->Expand();
+ {
+ aStr = pSetFld->ExpandField(true);
+ }
else
aStr = sFormula;
aLabelED.SetText( pSetFld->GetPromptText() );
diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src
index f615b68f48..8cd70d8247 100644
--- a/sw/source/ui/fldui/inpdlg.src
+++ b/sw/source/ui/fldui/inpdlg.src
@@ -46,6 +46,7 @@ ModalDialog DLG_FLD_INPUT
};*/
Edit ED_LABEL
{
+ HelpID = "sw:Edit:DLG_FLD_INPUT:ED_LABEL";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 115 , 12 ) ;
@@ -56,6 +57,7 @@ ModalDialog DLG_FLD_INPUT
};
MultiLineEdit ED_EDIT
{
+ HelpID = "sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 32 ) ;
Size = MAP_APPFONT ( 115 , 72 ) ;
@@ -83,6 +85,7 @@ ModalDialog DLG_FLD_INPUT
};
PushButton PB_NEXT
{
+ HelpID = "sw:PushButton:DLG_FLD_INPUT:PB_NEXT";
Pos = MAP_APPFONT ( 139 , 40 ) ;
Size = MAP_APPFONT ( 50 , 15 ) ;
TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src
index ffeb2b84e8..cbcc83f055 100644
--- a/sw/source/ui/fldui/javaedit.src
+++ b/sw/source/ui/fldui/javaedit.src
@@ -33,6 +33,7 @@
// RID_SVXDLG_POSTIT -----------------------------------------------------
ModalDialog DLG_JAVAEDIT
{
+ HelpID = "sw:ModalDialog:DLG_JAVAEDIT";
OutputSize = TRUE ;
SvLook = TRUE ;
Size = MAP_APPFONT ( 248 , 157 ) ;
@@ -45,6 +46,7 @@ ModalDialog DLG_JAVAEDIT
};
Edit ED_TYPE
{
+ HelpID = "sw:Edit:DLG_JAVAEDIT:ED_TYPE";
Border = TRUE ;
Text = "JavaScript" ;
// Nicht uebersetzen!!!
@@ -54,6 +56,7 @@ ModalDialog DLG_JAVAEDIT
};
RadioButton RB_URL
{
+ HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_URL";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 55 , 10 ) ;
TabStop = TRUE ;
@@ -61,6 +64,7 @@ ModalDialog DLG_JAVAEDIT
};
Edit ED_URL
{
+ HelpID = "sw:Edit:DLG_JAVAEDIT:ED_URL";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 27 ) ;
Size = MAP_APPFONT ( 87 , 12 ) ;
@@ -68,6 +72,7 @@ ModalDialog DLG_JAVAEDIT
};
PushButton PB_URL
{
+ HelpID = "sw:PushButton:DLG_JAVAEDIT:PB_URL";
Pos = MAP_APPFONT ( 163 , 26 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
Text = "~..." ;
@@ -75,6 +80,7 @@ ModalDialog DLG_JAVAEDIT
};
RadioButton RB_EDIT
{
+ HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_EDIT";
Pos = MAP_APPFONT ( 12 , 40 ) ;
Size = MAP_APPFONT ( 140 , 10 ) ;
Text [ en-US ] = "~Text" ;
@@ -83,6 +89,7 @@ ModalDialog DLG_JAVAEDIT
};
MultiLineEdit ED_EDIT
{
+ HelpID = "sw:MultiLineEdit:DLG_JAVAEDIT:ED_EDIT";
Border = TRUE ;
Pos = MAP_APPFONT ( 23 , 54 ) ;
Size = MAP_APPFONT ( 155 , 91 ) ;
@@ -116,12 +123,14 @@ ModalDialog DLG_JAVAEDIT
};
ImageButton BTN_PREV
{
+ HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_PREV";
Pos = MAP_APPFONT ( 191 , 60 ) ;
Size = MAP_APPFONT ( 24 , 14 ) ;
Symbol = IMAGEBUTTON_ARROW_LEFT ;
};
ImageButton BTN_NEXT
{
+ HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT";
Pos = MAP_APPFONT ( 217 , 60 ) ;
Size = MAP_APPFONT ( 24 , 14 ) ;
Symbol = IMAGEBUTTON_ARROW_RIGHT ;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 07:02:40 +0000