[Libreoffice-commits] .: Branch 'gr2' - 67 commits - starmath/source sw/inc sw/prj sw/qa sw/source sw/uiconfig sw/util
Martin Hosken
mhosken at kemper.freedesktop.org
Thu Mar 10 00:16:46 PST 2011
starmath/source/accessibility.cxx | 2
starmath/source/cfgitem.cxx | 5
starmath/source/document.cxx | 2
starmath/source/edit.cxx | 4
starmath/source/format.cxx | 2
starmath/source/mathmlexport.cxx | 2
starmath/source/mathmlimport.cxx | 2
starmath/source/node.cxx | 4
starmath/source/rect.cxx | 4
starmath/source/smres.src | 1
starmath/source/symbol.cxx | 2
starmath/source/toolbox.cxx | 4
starmath/source/view.cxx | 8
starmath/source/visitors.cxx | 2
sw/inc/rcid.hrc | 5
sw/inc/shellio.hxx | 4
sw/inc/tabcol.hxx | 5
sw/inc/viewopt.hxx | 4
sw/prj/build.lst | 2
sw/qa/core/CVE/CVE-2007-0245-1.rtf | 21
sw/qa/core/CVE/CVE-2009-0200-1.doc |binary
sw/qa/core/CVE/CVE-2009-0201-1.doc |binary
sw/qa/core/CVE/CVE-2009-3301-1.doc |binary
sw/qa/core/CVE/CVE-2009-3302-1.doc |binary
sw/qa/core/CVE/CVE-2009-3302-2.doc |binary
sw/qa/core/CVE/CVE-2010-3451-1.rtf | 2072 +++++++++++++++++++++++++++
sw/qa/core/CVE/CVE-2010-3452-1.rtf | 1
sw/qa/core/CVE/CVE-2010-3453-1.doc |binary
sw/qa/core/CVE/CVE-2010-3454-1.doc |binary
sw/qa/core/filters-test.cxx | 243 +++
sw/qa/core/makefile.mk | 63
sw/qa/core/swdoc-test.cxx | 58
sw/source/core/attr/format.cxx | 2
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/bastyp/tabcol.cxx | 3
sw/source/core/crsr/bookmrk.cxx | 2
sw/source/core/crsr/crossrefbookmark.cxx | 3
sw/source/core/doc/docdraw.cxx | 2
sw/source/core/doc/docfld.cxx | 2
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/doctxm.cxx | 4
sw/source/core/doc/tblrwcl.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 7
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/edit/edlingu.cxx | 2
sw/source/core/fields/authfld.cxx | 5
sw/source/core/fields/chpfld.cxx | 4
sw/source/core/fields/dbfld.cxx | 12
sw/source/core/fields/ddefld.cxx | 4
sw/source/core/fields/docufld.cxx | 54
sw/source/core/fields/expfld.cxx | 10
sw/source/core/fields/fldbas.cxx | 4
sw/source/core/fields/flddropdown.cxx | 4
sw/source/core/fields/macrofld.cxx | 4
sw/source/core/fields/reffld.cxx | 8
sw/source/core/fields/scrptfld.cxx | 4
sw/source/core/fields/usrfld.cxx | 4
sw/source/core/graphic/grfatr.cxx | 2
sw/source/core/inc/bookmrk.hxx | 2
sw/source/core/inc/notxtfrm.hxx | 5
sw/source/core/inc/pagefrm.hrc | 47
sw/source/core/inc/pagefrm.hxx | 42
sw/source/core/layout/atrfrm.cxx | 10
sw/source/core/layout/dbg_lay.cxx | 1
sw/source/core/layout/layact.cxx | 12
sw/source/core/layout/makefile.mk | 4
sw/source/core/layout/pagefrm.src | 17
sw/source/core/layout/paintfrm.cxx | 177 +-
sw/source/core/ole/ndole.cxx | 6
sw/source/core/para/paratr.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/itradj.cxx | 2
sw/source/core/text/pormulti.cxx | 3
sw/source/core/text/txtfly.cxx | 4
sw/source/core/text/txtfly.hxx | 1
sw/source/core/txtnode/fmtatr2.cxx | 2
sw/source/core/unocore/SwXTextDefaults.cxx | 3
sw/source/core/unocore/unochart.cxx | 26
sw/source/core/unocore/unocrsrhelper.cxx | 84 -
sw/source/core/unocore/unodraw.cxx | 221 +-
sw/source/core/unocore/unofield.cxx | 18
sw/source/core/unocore/unoframe.cxx | 2
sw/source/core/unocore/unoidx.cxx | 17
sw/source/core/unocore/unomap.cxx | 85 -
sw/source/core/unocore/unoparagraph.cxx | 4
sw/source/core/unocore/unoport.cxx | 4
sw/source/core/unocore/unoportenum.cxx | 4
sw/source/core/unocore/unoredline.cxx | 10
sw/source/core/unocore/unoredlines.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 6
sw/source/core/unocore/unosect.cxx | 30
sw/source/core/unocore/unosett.cxx | 28
sw/source/core/unocore/unotbl.cxx | 22
sw/source/core/view/pagepreviewlayout.cxx | 4
sw/source/core/view/viewsh.cxx | 11
sw/source/filter/basflt/fltini.cxx | 29
sw/source/filter/html/htmlplug.cxx | 2
sw/source/filter/html/swhtml.hxx | 5
sw/source/filter/rtf/rtftbl.cxx | 4
sw/source/filter/rtf/swparrtf.cxx | 12
sw/source/filter/ww8/docxattributeoutput.cxx | 20
sw/source/filter/ww8/docxattributeoutput.hxx | 7
sw/source/filter/ww8/docxexport.cxx | 1
sw/source/filter/ww8/docxexport.hxx | 2
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/rtfattributeoutput.hxx | 6
sw/source/filter/ww8/rtfexport.cxx | 1
sw/source/filter/ww8/rtfexport.hxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 1
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/wrtw8sty.cxx | 21
sw/source/filter/ww8/wrtww8.hxx | 18
sw/source/filter/ww8/ww8attributeoutput.hxx | 4
sw/source/filter/ww8/ww8par.cxx | 31
sw/source/filter/ww8/ww8par.hxx | 1
sw/source/filter/ww8/ww8par2.cxx | 71
sw/source/filter/ww8/ww8par3.cxx | 16
sw/source/filter/ww8/ww8scan.cxx | 24
sw/source/filter/xml/swxml.cxx | 10
sw/source/filter/xml/xmlexpit.cxx | 12
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/filter/xml/xmlimpit.cxx | 12
sw/source/filter/xml/xmlmeta.cxx | 2
sw/source/filter/xml/xmltble.cxx | 4
sw/source/filter/xml/xmltexte.cxx | 2
sw/source/ui/chrdlg/chrdlg.src | 1
sw/source/ui/chrdlg/paradlg.src | 3
sw/source/ui/chrdlg/swbreak.src | 2
sw/source/ui/config/usrpref.cxx | 3
sw/source/ui/config/viewopt.cxx | 12
sw/source/ui/dialog/abstract.src | 3
sw/source/ui/dialog/dialog.src | 2
sw/source/ui/dialog/docstdlg.cxx | 3
sw/source/ui/dialog/docstdlg.hrc | 2
sw/source/ui/dialog/docstdlg.src | 33
sw/source/ui/docvw/docvw.src | 3
sw/source/ui/docvw/romenu.hxx | 1
sw/source/ui/envelp/envfmt.cxx | 35
sw/source/ui/envelp/envfmt.hrc | 6
sw/source/ui/envelp/envimg.cxx | 3
sw/source/ui/envelp/envlop.hrc | 6
sw/source/ui/envelp/envlop1.cxx | 4
sw/source/ui/envelp/envprt.hrc | 6
sw/source/ui/envelp/label.hrc | 6
sw/source/ui/envelp/label1.cxx | 4
sw/source/ui/envelp/labelcfg.cxx | 3
sw/source/ui/envelp/labfmt.cxx | 39
sw/source/ui/envelp/labfmt.hrc | 6
sw/source/ui/envelp/labimg.cxx | 3
sw/source/ui/envelp/labprt.cxx | 2
sw/source/ui/envelp/labprt.hrc | 4
sw/source/ui/envelp/labprt.hxx | 2
sw/source/ui/envelp/mailmrge.cxx | 3
sw/source/ui/envelp/mailmrge.hrc | 2
sw/source/ui/envelp/mailmrge.src | 1
sw/source/ui/fldui/DropDownFieldDialog.cxx | 2
sw/source/ui/fldui/changedb.cxx | 10
sw/source/ui/fldui/changedb.hrc | 4
sw/source/ui/fldui/flddb.cxx | 18
sw/source/ui/fldui/flddinf.cxx | 20
sw/source/ui/fldui/flddok.cxx | 32
sw/source/ui/fldui/fldedt.cxx | 18
sw/source/ui/fldui/fldfunc.cxx | 28
sw/source/ui/fldui/fldfunc.hxx | 2
sw/source/ui/fldui/fldmgr.cxx | 142 -
sw/source/ui/fldui/fldpage.cxx | 28
sw/source/ui/fldui/fldpage.hxx | 2
sw/source/ui/fldui/fldref.cxx | 74
sw/source/ui/fldui/fldtdlg.cxx | 24
sw/source/ui/fldui/fldtdlg.hrc | 12
sw/source/ui/fldui/fldui.src | 52
sw/source/ui/fldui/fldvar.cxx | 116 -
sw/source/ui/fldui/fldvar.hxx | 2
sw/source/ui/fldui/fldwrap.cxx | 14
sw/source/ui/fldui/inpdlg.cxx | 14
sw/source/ui/fldui/javaedit.cxx | 6
sw/source/ui/fldui/javaedit.src | 1
sw/source/ui/fldui/xfldui.cxx | 6
sw/source/ui/fmtui/fmtui.src | 1
sw/source/ui/fmtui/tmpdlg.src | 5
sw/source/ui/frmdlg/frmui.src | 2
sw/source/ui/inc/docstdlg.hxx | 2
sw/source/ui/index/idxmrk.src | 1
sw/source/ui/misc/bookmark.src | 2
sw/source/ui/misc/docfnote.src | 1
sw/source/ui/misc/glosbib.src | 1
sw/source/ui/misc/glossary.src | 7
sw/source/ui/misc/insfnote.src | 1
sw/source/ui/misc/num.src | 1
sw/source/ui/misc/numberingtypelistbox.cxx | 3
sw/source/ui/misc/redlndlg.src | 1
sw/source/ui/misc/srtdlg.src | 4
sw/source/ui/ribbar/inputwin.src | 10
sw/source/ui/ribbar/workctrl.src | 21
sw/source/ui/shells/shells.src | 1
sw/source/ui/shells/textsh2.cxx | 5
sw/source/ui/table/chartins.src | 2
sw/source/ui/table/rowht.src | 2
sw/source/ui/table/tabledlg.src | 1
sw/source/ui/table/tautofmt.src | 2
sw/source/ui/uno/unodispatch.cxx | 3
sw/source/ui/uno/unofreg.cxx | 3
sw/source/ui/uno/unotxvw.cxx | 3
sw/source/ui/utlui/attrdesc.src | 14
sw/source/ui/utlui/initui.src | 3
sw/source/ui/utlui/navipi.src | 16
sw/uiconfig/sglobal/menubar/menubar.xml | 1
sw/uiconfig/sweb/menubar/menubar.xml | 1
sw/uiconfig/swform/menubar/menubar.xml | 1
sw/uiconfig/swreport/menubar/menubar.xml | 1
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/uiconfig/swxform/menubar/menubar.xml | 1
sw/util/makefile.mk | 1
214 files changed, 3539 insertions(+), 1342 deletions(-)
New commits:
commit eb9618162ca53f898673cb457c5768fda168208e
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Wed Mar 9 21:56:51 2011 +0000
Fix build breakage caused by commit 6165ef7...
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index f5c3bed..59fa978 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -28,6 +28,8 @@
#ifndef _TABCOL_HXX
#define _TABCOL_HXX
+#include <tools/solar.h>
+
#ifndef INCLUDED_VECTOR
#include <vector>
#define INCLUDED_VECTOR
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index 78581f8..fc4eb2c 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -29,10 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
#include "tabcol.hxx"
+#include <limits.h> //for LONG_MAX
SwTabCols::SwTabCols( USHORT nSize ) :
nLeftMin( 0 ),
commit 6165ef7c953ff7fdd9a52e3a516a0500a8ee5b0f
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Wed Mar 9 21:36:23 2011 +0000
Remove last traces of SvLongs
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index ad179f3..f5c3bed 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -28,11 +28,6 @@
#ifndef _TABCOL_HXX
#define _TABCOL_HXX
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_LONGS
-#include <svl/svstdarr.hxx>
-#endif
-
#ifndef INCLUDED_VECTOR
#include <vector>
#define INCLUDED_VECTOR
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index e83dfa0..00fd59e 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-#define _SVSTDARR_LONGS
#define _SVSTDARR_USHORTS
#include <ctype.h>
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index f41ab01..5bc0766 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -32,7 +32,6 @@
#define _SVSTDARR_STRINGSDTOR
#define _SVSTDARR_USHORTS
-#define _SVSTDARR_LONGS
#define _SVSTDARR_ULONGS
#include <hintids.hxx>
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 301bb9c..8bdeb15 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -116,7 +116,6 @@
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_USHORTS
#define _SVSTDARR_USHORTSSORT
-#define _SVSTDARR_LONGS
#include <svl/svstdarr.hxx>
#endif
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index da5e5db..d409fb9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -35,7 +35,6 @@
#include <vcl/sound.hxx>
#include <tools/poly.hxx>
-#define _SVSTDARR_LONGS
#include <svl/svstdarr.hxx>
#include <svx/xoutbmp.hxx>
#include <sfx2/progress.hxx>
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index a5385da..65ad568 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -28,14 +28,11 @@
#ifndef _SWHTML_HXX
#define _SWHTML_HXX
-#if !defined(_SVSTDARR_XUB_STRLEN_DECL) || !defined(_SVSTDARR_LONGS_DECL) || \
+#if !defined(_SVSTDARR_XUB_STRLEN_DECL) || \
!defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL)
#ifndef _SVSTDARR_XUB_STRLEN_DECL
#define _SVSTDARR_XUB_STRLEN
#endif
-#ifndef _SVSTDARR_LONGS_DECL
-#define _SVSTDARR_LONGS
-#endif
#ifndef _SVSTDARR_USHORTS_DECL
#define _SVSTDARR_USHORTS
#endif
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index d0d608a..de99469 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -38,7 +38,6 @@
#include <tools/pstm.hxx>
#define _SVSTDARR_LONGSSORT
-#define _SVSTDARR_LONGS
#include <svl/svstdarr.hxx>
#include <editeng/paperinf.hxx>
#include <editeng/tstpitem.hxx>
commit aa9a3810fc2fda1b2ccda46e210172cc76d4f36d
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date: Wed Mar 9 17:14:52 2011 +0000
Remove use of SvLongs from txtfly.[ch]xx
Note that this commit is forced by changes in editeng.
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index d76a1be..36512cb 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -1834,10 +1834,10 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
Range aRange( Min( nTmpTop, nTmpBottom ), Max( nTmpTop, nTmpBottom ) );
- SvLongs *pTmp = pTextRanger[ 0 ]->GetTextRanges( aRange );
+ LongDqPtr pTmp = pTextRanger[ 0 ]->GetTextRanges( aRange );
MSHORT nCount;
- if( 0 != ( nCount = pTmp->Count() ) )
+ if( 0 != ( nCount = pTmp->size() ) )
{
MSHORT nIdx = 0;
while( nIdx < nCount && (*pTmp)[ nIdx ] < nXPos )
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 82f78c3..2fdaef7 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -27,7 +27,6 @@
************************************************************************/
#ifndef _TXTFLY_HXX
#define _TXTFLY_HXX
-#include <svl/svarray.hxx>
#include "swtypes.hxx"
#include "swrect.hxx"
commit 108d9a7b62570af70bf5ef44cb4c77277bab4c68
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Wed Mar 9 02:56:18 2011 +0100
Translate german comments
This translates the remaining german code comments in writer/sw/source/ui/fldui
to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index e08187c..63fdfb9 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -52,7 +52,7 @@ class SelectionListBox : public ListBox
public:
SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId );
- // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten
+ // detect selection via Ctrl or Alt and evaluate with SelectHdl
BOOL IsCallAddSelection() const {return bCallAddSelection;}
void ResetCallAddSelection() {bCallAddSelection = FALSE;}
};
diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx
index abe6b86..3c2b92d 100644
--- a/sw/source/ui/fldui/fldwrap.cxx
+++ b/sw/source/ui/fldui/fldwrap.cxx
@@ -56,20 +56,20 @@ SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, USHORT nId) :
SfxChildWindow(pParentWindow, nId),
m_pDocSh(0)
{
- // Flackern der Buttons vermeiden:
+ // avoid flickering of buttons:
m_aUpdateTimer.SetTimeout(200);
m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl));
}
IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG )
{
- GetWindow()->Activate(); // Dialog aktualisieren
+ GetWindow()->Activate(); // update dialog
return 0;
}
/*--------------------------------------------------------------------
- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren
+ Description: newly initialise dialog after Doc switch
--------------------------------------------------------------------*/
BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *)
{
@@ -78,7 +78,7 @@ BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *)
if (m_pDocSh != GetOldDocShell())
{
m_aUpdateTimer.Stop();
- bRet = TRUE; // Sofortiges Update
+ bRet = TRUE; // immediate Update
}
else
m_aUpdateTimer.Start();
@@ -110,13 +110,13 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId,
}
/*--------------------------------------------------------------------
- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren
+ Description: newly initialise dialog after Doc switch
--------------------------------------------------------------------*/
BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
{
BOOL bRet;
- if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel
+ if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // update immediately, Doc switch
{
pDlgInterface->ReInitDlg();
}
@@ -165,7 +165,7 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId,
BOOL SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
{
BOOL bRet;
- if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel
+ if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // update immediately, Doc switch
{
pDlgInterface->ReInitDlg();
}
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index d6fecac..ef42e20 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -52,7 +52,7 @@
/*--------------------------------------------------------------------
- Beschreibung: Feldeinfuegen bearbeiten
+ Description: edit field-insert
--------------------------------------------------------------------*/
SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
@@ -74,7 +74,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
aNextBT (this, SW_RES(PB_NEXT )),
aHelpBT (this, SW_RES(PB_HELP ))
{
- // Font fuers Edit umschalten
+ // switch font for Edit
Font aFont(aEditED.GetFont());
aFont.SetWeight(WEIGHT_LIGHT);
aEditED.SetFont(aFont);
@@ -92,10 +92,10 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
aHelpBT.SetPosPixel(aPos);
}
- // Auswertung hier
+ // evaluation here
String aStr;
if( RES_INPUTFLD == pField->GetTyp()->Which() )
- { // Es ist eine Eingabefeld
+ { // it is an input field
//
pInpFld = (SwInputField*)pField;
aLabelED.SetText( pInpFld->GetPar2() );
@@ -108,7 +108,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
break;
case INP_USR:
- // Benutzerfeld
+ // user field
if( 0 != ( pUsrType = (SwUserFieldType*)rSh.GetFldType(
RES_USERFLD, pInpFld->GetPar1() ) ) )
aStr = pUsrType->GetContent();
@@ -117,7 +117,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
}
else
{
- // es ist eine SetExpression
+ // it is a SetExpression
pSetFld = (SwSetExpField*)pField;
String sFormula(pSetFld->GetFormula());
//values are formatted - formulas are not
@@ -153,7 +153,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType )
}
/*--------------------------------------------------------------------
- Beschreibung: Schliessen
+ Description: Close
--------------------------------------------------------------------*/
void SwFldInputDlg::Apply()
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index a87dad9..5118e28 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -89,7 +89,7 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
pFileDlg(NULL),
pOldDefDlgParent(NULL)
{
- // Handler installieren
+ // install handler
aPrevBtn.SetClickHdl( LINK( this, SwJavaEditDialog, PrevHdl ) );
aNextBtn.SetClickHdl( LINK( this, SwJavaEditDialog, NextHdl ) );
aOKBtn.SetClickHdl( LINK( this, SwJavaEditDialog, OKHdl ) );
@@ -113,7 +113,7 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
if( !bNew )
SetText( SW_RES( STR_JAVA_EDIT ) );
else
- // neu anlegen
+ // newly create
SetText( SW_RES( STR_JAVA_INSERT ) );
FreeResource();
@@ -170,7 +170,7 @@ void SwJavaEditDialog::CheckTravel()
if(!bNew)
{
- // Traveling nur bei mehr als einem Feld
+ // Traveling only when more than one field
pSh->StartAction();
pSh->CreateCrsr();
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx
index 5395a11..55aa048 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/ui/fldui/xfldui.cxx
@@ -42,7 +42,7 @@
#include <comphelper/processfactory.hxx>
#include <fldmgr.hxx>
#include <dbmgr.hxx>
-#include <wrtsh.hxx> // Actives Fenster
+#include <wrtsh.hxx> // active window
#include <view.hxx>
#include <swmodule.hxx>
@@ -63,8 +63,8 @@ using namespace ::com::sun::star::beans;
// ---------------------------------------------------------------------------
/*--------------------------------------------------------------------
- Beschreibung: Ist das Datenbankfeld numerisch?
- Anm: Im Fehlerfall wird TRUE returnt.
+ Description: Is the database field numeric?
+ remark: in case of error TURE is returned
--------------------------------------------------------------------*/
BOOL SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName,
commit 5129d014d258e24523e58314d538d4e3d55b2913
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Wed Mar 9 02:38:51 2011 +0100
Translate german comments
This translates german code comments in writer/sw/source/ui/fldui to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/fldui/fldtdlg.hrc b/sw/source/ui/fldui/fldtdlg.hrc
index dcec8a7..b07ee0d 100644
--- a/sw/source/ui/fldui/fldtdlg.hrc
+++ b/sw/source/ui/fldui/fldtdlg.hrc
@@ -30,7 +30,7 @@
#define RC_FLDTDLG_BEGIN 0
-// Datenbankfeld-TabPage:
+// database field TabPage:
#define RC_TP_DB_START (RC_FLDTDLG_BEGIN)
#define FT_DBTYPE (RC_TP_DB_START + 1)
#define LB_DBTYPE (RC_TP_DB_START + 2)
@@ -50,7 +50,7 @@
#define FT_ADDDB (RC_TP_DB_START + 16)
#define PB_ADDDB (RC_TP_DB_START + 17)
-// Dokumentinfo-TabPage:
+// Documentinfo-TabPage:
#define RC_TP_DOCINF_START (RC_TP_DB_END)
#define FT_DOKINFTYPE (RC_TP_DOCINF_START + 1)
#define TLB_DOKINFTYPE (RC_TP_DOCINF_START + 2)
@@ -64,7 +64,7 @@
#define STR_DOKINF_INFO (RC_TP_DOCINF_START + 10)
#define RC_TP_DOCINF_END (RC_TP_DOCINF_START + 11)
-// Variablen-TabPage:
+// Variable-TabPage:
#define RC_TP_VAR_START (RC_TP_DOCINF_END)
#define FT_VARTYPE (RC_TP_VAR_START + 1)
#define LB_VARTYPE (RC_TP_VAR_START + 2)
@@ -88,7 +88,7 @@
#define BT_VARDELETE (RC_TP_VAR_START + 20)
#define RC_TP_VAR_END (RC_TP_VAR_START + 21)
-// Dokument-TabPage:
+// Document-TabPage:
#define RC_TP_DOC_START (RC_TP_VAR_END)
#define FT_DOKTYPE (RC_TP_DOC_START + 1)
#define LB_DOKTYPE (RC_TP_DOC_START + 2)
@@ -108,7 +108,7 @@
#define BMP_DOKROOT_CLOSED (RC_TP_DOC_START + 16)
#define RC_TP_DOC_END (RC_TP_DOC_START + 17)
-// Funktion-TabPage:
+// Function-TabPage:
#define RC_TP_FUNC_START (RC_TP_DOC_END)
#define FT_FUNCTYPE (RC_TP_FUNC_START + 1)
#define LB_FUNCTYPE (RC_TP_FUNC_START + 2)
@@ -137,7 +137,7 @@
#define FT_LISTNAME (RC_TP_FUNC_START + 25)
#define ED_LISTNAME (RC_TP_FUNC_START + 26)
-// Referenz-TabPage:
+// Reference-TabPage:
#define RC_TP_REF_START (RC_TP_FUNC_END)
#define FT_REFTYPE (RC_TP_REF_START + 1)
#define LB_REFTYPE (RC_TP_REF_START + 2)
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
index 809ad77..6e3407a 100644
--- a/sw/source/ui/fldui/fldui.src
+++ b/sw/source/ui/fldui/fldui.src
@@ -30,17 +30,17 @@
#include "helpid.h"
/*--------------------------------------------------------------------
- Beschreibung: Strings fuer die Types
+ Description: strings for the types
--------------------------------------------------------------------*/
String STR_FLD_EDIT_DLG
{
Text [ en-US ] = "Edit Fields" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Strings fuer die Types
+ Description: strings for the types
--------------------------------------------------------------------*/
//
- // Bereich Dokument
+ // range document
//
String STR_DATEFLD
{
@@ -83,7 +83,7 @@ String STR_EXTUSERFLD
Text [ en-US ] = "Sender" ;
};
//
- // Bereich Funktionen
+ // range functions
//
String STR_SETFLD
{
@@ -150,7 +150,7 @@ String STR_DROPDOWN
Text [ en-US ] = "Input list" ;
};
//
- // Bereich Referenzen
+ // range references
//
String STR_SETREFFLD
{
@@ -161,7 +161,7 @@ String STR_GETREFFLD
Text [ en-US ] = "Insert Reference" ;
};
//
- // Bereich Datenbank
+ // range database
//
String STR_DBFLD
{
@@ -192,7 +192,7 @@ String STR_HIDDENTXTFLD
Text [ en-US ] = "Hidden text" ;
};
//
- // Bereich Benutzerfelder
+ // range user fields
//
String STR_USERFLD
{
@@ -215,14 +215,14 @@ String STR_HIDDENPARAFLD
Text [ en-US ] = "Hidden Paragraph" ;
};
//
- // Bereich DokumentInfo
+ // range DocumentInfo
//
String STR_DOCINFOFLD
{
Text [ en-US ] = "DocInformation" ;
};
/*--------------------------------------------------------------------
- Beschreibung: SubCmd-Strings
+ Description: SubCmd-Strings
--------------------------------------------------------------------*/
String FLD_DATE_STD
{
@@ -241,7 +241,7 @@ String FLD_TIME_FIX
Text [ en-US ] = "Time (fixed)" ;
};
//
- // SubCmd Statistik
+ // SubCmd Statistic
//
String FLD_STAT_TABLE
{
@@ -271,7 +271,7 @@ String FLD_STAT_PAGE
{
Text [ en-US ] = "Pages" ;
};
- // SubCmd DDETypen
+ // SubCmd DDETypes
//
String FMT_DDE_HOT
{
@@ -286,7 +286,7 @@ String FLD_INPUT_TEXT
TEXT = "[Text]" ;
};
/*--------------------------------------------------------------------
- Beschreibung: SubType Extuser
+ Description: SubType Extuser
--------------------------------------------------------------------*/
String FLD_EU_FIRMA
{
@@ -357,7 +357,7 @@ String FLD_PAGEREF_ON
Text [ en-US ] = "on" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Pfadname
+ Description: path name
--------------------------------------------------------------------*/
// Formate FileName
String FMT_FF_NAME
@@ -385,7 +385,7 @@ String FMT_FF_UI_RANGE
Text [ en-US ] = "Category" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Format Kapitel
+ Description: format chapter
--------------------------------------------------------------------*/
String FMT_CHAPTER_NAME
{
@@ -404,7 +404,7 @@ String FMT_CHAPTER_NAMENO
Text [ en-US ] = "Chapter number and name" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Formate
+ Description: formats
--------------------------------------------------------------------*/
String FMT_NUM_ABC
{
@@ -443,7 +443,7 @@ String FMT_NUM_PAGESPECIAL
Text [ en-US ] = "Text" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Author
+ Description: Author
--------------------------------------------------------------------*/
String FMT_AUTHOR_NAME
{
@@ -454,7 +454,7 @@ String FMT_AUTHOR_SCUT
Text [ en-US ] = "Initials" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Varibale setzen
+ Description: set variable
--------------------------------------------------------------------*/
String FMT_SETVAR_SYS
{
@@ -489,7 +489,7 @@ String FMT_DBFLD_SYS
Text [ en-US ] = "System" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Ablagefelder
+ Description: storage fields
--------------------------------------------------------------------*/
String FMT_REG_AUTHOR
{
@@ -504,7 +504,7 @@ String FMT_REG_DATE
Text [ en-US ] = "Date" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Formate Referenzen
+ Description: formats references
--------------------------------------------------------------------*/
String FMT_REF_TEXT
{
@@ -551,7 +551,7 @@ String FMT_REF_NUMBER_FULL_CONTEXT
Text [ en-US ] = "Number (full context)";
};
/*--------------------------------------------------------------------
- Beschreibung: Platzhalter
+ Description: paceholder
--------------------------------------------------------------------*/
String FMT_MARK_TEXT
{
@@ -574,14 +574,14 @@ String FMT_MARK_OLE
Text [ en-US ] = "Object" ;
};
/*--------------------------------------------------------------------
- Beschreibung: Nur-Text
+ Description: text only
--------------------------------------------------------------------*/
String FMT_TEXT
{
TEXT = "Text" ;
};
/*--------------------------------------------------------------------
- Beschreibung: globale String-Ressourcen
+ Description: global String resources
--------------------------------------------------------------------*/
String STR_ALL
{
@@ -592,7 +592,7 @@ String STR_INSERT
Text [ en-US ] = "Insert" ;
};
/*--------------------------------------------------------------------
- Beschreibung: AustauschStrings fuer Edit/NameFT
+ Description: ExchangeStrings for Edit/NameFT
--------------------------------------------------------------------*/
String STR_COND
{
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index f685f0f..33678b9 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -105,7 +105,7 @@ void SwFldVarPage::Reset(const SfxItemSet& )
{
SavePos(&aTypeLB);
- Init(); // Allgemeine initialisierung
+ Init(); // general initialisation
aTypeLB.SetUpdateMode(FALSE);
aTypeLB.Clear();
@@ -114,7 +114,7 @@ void SwFldVarPage::Reset(const SfxItemSet& )
if (!IsFldEdit())
{
- // TypeListBox initialisieren
+ // initialise TypeListBox
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
for (short i = rRg.nStart; i < rRg.nEnd; ++i)
@@ -144,7 +144,7 @@ void SwFldVarPage::Reset(const SfxItemSet& )
}
}
- // alte Pos selektieren
+ // select old Pos
RestorePos(&aTypeLB);
aTypeLB.SetDoubleClickHdl (LINK(this, SwFldVarPage, InsertHdl));
@@ -196,10 +196,10 @@ void SwFldVarPage::Reset(const SfxItemSet& )
IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG )
{
- // Alte ListBoxPos sichern
+ // save old ListBoxPos
const USHORT nOld = GetTypeSel();
- // Aktuelle ListBoxPos
+ // current ListBoxPos
SetTypeSel(aTypeLB.GetSelectEntryPos());
if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
@@ -218,7 +218,7 @@ IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG )
}
aValueED.SetDropEnable(FALSE);
- UpdateSubType(); // Auswahl-Listboxen initialisieren
+ UpdateSubType(); // initialise selection-listboxes
}
bInit = FALSE;
@@ -261,7 +261,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
{
case TYP_USERFLD:
{
- // Benutzertyp aendern oder anlegen
+ // change or create user type
SwUserFieldType* pType = (SwUserFieldType*)
GetFldMgr().GetFldType(RES_USERFLD, nSelPos);
@@ -269,7 +269,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
{
if (!IsFldEdit())
{
- if (pBox || (bInit && !IsRefresh())) // Nur bei Interaktion mit Maus
+ if (pBox || (bInit && !IsRefresh())) // only when interacting via mouse
{
aNameED.SetText(pType->GetName());
@@ -287,7 +287,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
}
else
{
- if (pBox) // Nur bei Interaktion mit Maus
+ if (pBox) // only when interacting via mouse
{
aNameED.SetText(aEmptyStr);
aValueED.SetText(aEmptyStr);
@@ -313,8 +313,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX);
aNumFormatLB.SelectEntryPos(0);
}
- // gibt es ein entprechendes SetField
- if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
+ // is there a corresponding SetField
+ if (IsFldEdit() || pBox) // only when interacting via mouse
{
if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -332,18 +332,18 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
pSh->GetFldType(RES_SETEXPFLD, sName);
if (pSetTyp && pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING)
- aNumFormatLB.SelectEntryPos(0); // Textuell
+ aNumFormatLB.SelectEntryPos(0); // textual
}
}
}
}
if (IsFldEdit())
{
- // GetFormula fuehrt bei Datumsformaten zu Problemen,
- // da nur der numerische Wert ohne Formatierung returned wird.
- // Muss aber verwendet werden, da sonst bei GetPar2 nur der vom
- // Kalkulator errechnete Wert angezeigt werden wuerde
- // (statt test2 = test + 1)
+ // GetFormula leads to problems with date formats because
+ // only the numeric value without formating is returned.
+ // It must be used though because otherwise in GetPar2 only
+ // the value calculated by Kalkulator would be displayed
+ // (instead of test2 = test + 1)
aValueED.SetText(((SwSetExpField*)GetCurField())->GetFormula());
}
aValueED.SetDropEnable(TRUE);
@@ -372,7 +372,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
if (!IsFldEdit())
aNameED.SetText(sName);
- // gibt es ein entprechendes SetField
+ // is there a corresponding SetField
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
pSh = ::GetActiveWrtShell();
@@ -383,9 +383,9 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
if(pSetTyp)
{
- if (pSetTyp->GetType() & nsSwGetSetExpType::GSE_STRING) // Textuell?
+ if (pSetTyp->GetType() & nsSwGetSetExpType::GSE_STRING) // textual?
bFormat = TRUE;
- else // Numerisch
+ else // numeric
bNumFmt = TRUE;
}
}
@@ -409,19 +409,19 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
sName = aSelectionLB.GetSelectEntry();
aNameED.SetText( sName );
- // User- oder SetField ?
+ // User- or SetField ?
USHORT nInpType = 0;
nInpType = static_cast< USHORT >(GetFldMgr().GetFldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD);
if (nInpType) // SETEXPFLD
{
- // gibt es ein entprechendes SetField
+ // is there a corresponding SetField
SwSetExpFieldType* pSetTyp = (SwSetExpFieldType*)
GetFldMgr().GetFldType(RES_SETEXPFLD, sName);
if(pSetTyp)
{
- if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // Textuell?
+ if (pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING) // textual?
{
aNumFormatLB.Clear();
@@ -441,7 +441,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
case TYP_DDEFLD:
aValueFT.SetText(SW_RESSTR(STR_DDE_CMD));
- if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
+ if (IsFldEdit() || pBox) // only when interacting via mouse
{
if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -452,8 +452,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
{
aNameED.SetText(pType->GetName());
- //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet
+ //JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
+ // That's not considered here yet
String sCmd( pType->GetCmd() );
USHORT nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' );
sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos );
@@ -487,7 +487,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aValueED.SetText( ((SwSetExpField*)GetCurField())->
GetFormula() );
- if( IsFldEdit() || pBox ) // Nur bei Interaktion mit Maus
+ if( IsFldEdit() || pBox ) // only when interacting via mouse
aNameED.SetText( aSelectionLB.GetSelectEntry() );
if( pFldTyp )
@@ -509,12 +509,12 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
bValue = FALSE;
aValueFT.SetText( SW_RESSTR( STR_OFFSET ));
- if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus
+ if (IsFldEdit() || pBox) // only when interacting via mouse
aNameED.SetText(aEmptyStr);
if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
- bValue = TRUE; // SubType OFF - kennt keinen Offset
+ bValue = TRUE; // SubType OFF - knows no Offset
if (IsFldEdit())
aValueED.SetText(String::CreateFromInt32(((SwRefPageSetField*)GetCurField())->GetOffset()));
}
@@ -557,7 +557,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aChapterLevelLB.Show(bChapterLevel);
aInvisibleCB.Enable(bInvisible);
- ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update
+ ModifyHdl(); // apply/insert/delete status update
aNumFormatLB.SetUpdateMode(TRUE);
aFormatLB.SetUpdateMode(TRUE);
@@ -589,7 +589,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
}
/*--------------------------------------------------------------------
- Beschreibung: Typen in der SelectionBox erneuern
+ Description: renew types in SelectionBox
--------------------------------------------------------------------*/
void SwFldVarPage::UpdateSubType()
{
@@ -600,7 +600,7 @@ void SwFldVarPage::UpdateSubType()
if(GetSelectionSel() != LISTBOX_ENTRY_NOTFOUND)
sOldSel = aSelectionLB.GetEntry(GetSelectionSel());
- // Auswahl-Listbox fuellen
+ // fill Selection-Listbox
aSelectionLB.SetUpdateMode(FALSE);
aSelectionLB.Clear();
@@ -653,7 +653,7 @@ void SwFldVarPage::UpdateSubType()
(!((SwRefPageSetField*)GetCurField())->IsOn() && !i))
sOldSel = *aList[i];
- // Alle Eintr?ge zur Auswahl zulassen:
+ // allow all entries for selection:
nPos = aSelectionLB.InsertEntry(*aList[i]);
aSelectionLB.SetEntryData(nPos, reinterpret_cast<void*>(i));
break;
@@ -683,7 +683,7 @@ void SwFldVarPage::UpdateSubType()
if (!aSelectionLB.GetSelectEntryCount())
{
aSelectionLB.SelectEntryPos(0);
- pLB = &aSelectionLB; // Alle Controls neu initialisieren
+ pLB = &aSelectionLB; // newly initialise all controls
}
}
@@ -710,7 +710,7 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId)
nOldNumFormat = aNumFormatLB.GetFormat();
}
- // Format-Listbox fuellen
+ // fill Format-Listbox
aFormatLB.Clear();
aNumFormatLB.Clear();
BOOL bSpecialFmt = FALSE;
@@ -824,7 +824,7 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId)
}
/*--------------------------------------------------------------------
- Beschreibung: Modify
+ Description: Modify
--------------------------------------------------------------------*/
IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG )
{
@@ -848,19 +848,19 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG )
nLen = sName.Len();
Selection aSel(aNameED.GetSelection());
aNameED.SetText( sName );
- aNameED.SetSelection( aSel ); // Cursorpos restaurieren
+ aNameED.SetSelection( aSel ); // restore Cursorpos
}
break;
}
- // Buttons ueberpruefen
+ // check buttons
switch (nTypeId)
{
case TYP_DDEFLD:
if( nLen )
{
- // Gibts schon einen entsprechenden Type
+ // is there already a corrensponding type
bInsert = bApply = TRUE;
SwFieldType* pType = GetFldMgr().GetFldType(RES_DDEFLD, sName);
@@ -876,7 +876,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG )
case TYP_USERFLD:
if( nLen )
{
- // Gibts schon einen entsprechenden Type
+ // is there already a corresponding type
SwFieldType* pType = GetFldMgr().GetFldType(RES_USERFLD, sName);
SwWrtShell *pSh = GetWrtShell();
@@ -886,9 +886,9 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG )
bDelete = !pSh->IsUsed( *pType );
pType = GetFldMgr().GetFldType(RES_SETEXPFLD, sName);
- if (!pType) // Kein Namenskonflikt mit Variablen
+ if (!pType) // no name conflict with variables
{
- // Benutzerfelder duerfen auch ohne Inhalt eingefuegt werden!
+ // user fields can also be inserted without content!
// Bug #56845
bInsert = bApply = TRUE;
}
@@ -1010,7 +1010,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
if (nFormat != LISTBOX_ENTRY_NOTFOUND)
nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat);
- if (pType) // Aendern
+ if (pType) // change
{
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
@@ -1025,9 +1025,9 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
{
ULONG nFmt = nNumFormatPos == 0 ? 0 : aNumFormatLB.GetFormat();
if (nFmt)
- { // Sprache auf Office-Sprache umstellen, da String im Office
- // Format vom Kalkulator erwartet wird und so in den Dlg
- // eingegeben werden sollte
+ { // Switch language to office-language because Kalkulator expects
+ // String in office format and it should be fed into dialog like
+ // that
nFmt = SwValueField::GetSystemFormat(pSh->GetNumberFormatter(), nFmt);
}
((SwUserFieldType*)pType)->SetContent(aValueED.GetText(), nFmt);
@@ -1039,8 +1039,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
{
if (nFormat != LISTBOX_ENTRY_NOTFOUND)
{
- //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ //JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
+ // That's not being considered here yet.
USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
((SwDDEFieldType*)pType)->SetCmd(sValue);
@@ -1052,7 +1052,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
pSh->EndAllAction();
}
}
- else // Neu
+ else // new
{
if(nTypeId == TYP_USERFLD)
{
@@ -1069,7 +1069,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
aType.SetContent( sValue, nNumFormatPos == 0 ? 0 : aNumFormatLB.GetFormat() );
aSelectionLB.InsertEntry(sName);
aSelectionLB.SelectEntry(sName);
- GetFldMgr().InsertFldType( aType ); // Userfld Neu
+ GetFldMgr().InsertFldType( aType ); // Userfld new
}
}
}
@@ -1077,20 +1077,20 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
{
if (nFormat != LISTBOX_ENTRY_NOTFOUND)
{
- //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ //JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
+ // That's not being considered here yet.
USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
SwDDEFieldType aType(sName, sValue, (USHORT)nFormat);
aSelectionLB.InsertEntry(sName);
aSelectionLB.SelectEntry(sName);
- GetFldMgr().InsertFldType(aType); // DDE-Feld Neu
+ GetFldMgr().InsertFldType(aType); // DDE-Field new
}
}
}
if (IsFldEdit())
- GetFldMgr().GetCurFld(); // FieldManager Updaten
+ GetFldMgr().GetCurFld(); // update FieldManager
UpdateSubType();
}
@@ -1150,9 +1150,9 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& )
if (nFormat && nFormat != ULONG_MAX && aNumFormatLB.IsAutomaticLanguage())
{
- // Sprache auf Office-Sprache umstellen, da String im Office-
- // Format vom Kalkulator erwartet wird und so in den Dlg
- // eingegeben werden sollte
+ // Switch language to office language because Kalkulator expects
+ // String in office format and it should be fed into the dialog
+ // like that
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
pSh = ::GetActiveWrtShell();
@@ -1282,7 +1282,7 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMEvt = rNEvt.GetMouseEvent();
- if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl
+ if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt or Ctrl
bCallAddSelection = TRUE;
}
commit 311d7cc1eded8e7d3b048f3b78da6e812658e246
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Tue Mar 8 15:58:12 2011 +0100
Translate german comments
This translates more german code comments in writer/sw/source/ui/fldui to
english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index ac77c61..ab084a4 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -79,7 +79,7 @@ SwFldPage::~SwFldPage()
}
/*--------------------------------------------------------------------
- Beschreibung: TabPage initialisieren
+ Description: initialise TabPage
--------------------------------------------------------------------*/
void SwFldPage::Init()
@@ -89,15 +89,15 @@ void SwFldPage::Init()
m_bFldEdit = 0 == GetTabDialog();
- // FieldManager neu initialisieren wichtig fuer
- // Dok-Wechsel (fldtdlg:ReInitTabPage)
+ // newly initialise FieldManager. important for
+ // Dok-Switch (fldtdlg:ReInitTabPage)
m_pCurFld = m_aMgr.GetCurFld();
if( bNewMode != m_bFldDlgHtmlMode )
{
m_bFldDlgHtmlMode = bNewMode;
- // Bereichslistbox initialisieren
+ // initialise Rangelistbox
if( m_bFldDlgHtmlMode && m_bFirstHTMLInit )
{
m_bFirstHTMLInit = FALSE;
@@ -117,7 +117,7 @@ void SwFldPage::Init()
}
/*--------------------------------------------------------------------
- Beschreibung: Seite neu initialisieren
+ Description: newly initialise page
--------------------------------------------------------------------*/
void SwFldPage::ActivatePage()
@@ -126,7 +126,7 @@ void SwFldPage::ActivatePage()
}
/*--------------------------------------------------------------------
- Beschreibung: Kompletter Reset; neues Feld editieren
+ Description: complete reset; edit new field
--------------------------------------------------------------------*/
void SwFldPage::EditNewField( BOOL bOnlyActivate )
@@ -142,7 +142,7 @@ void SwFldPage::EditNewField( BOOL bOnlyActivate )
}
/*--------------------------------------------------------------------
- Beschreibung: Feld einfuegen
+ Description: insert field
--------------------------------------------------------------------*/
BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
@@ -153,7 +153,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
SwView* pView = GetActiveView();
SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr();
- if (!IsFldEdit()) // Neues Feld einfuegen
+ if (!IsFldEdit()) // insert new field
{
SwInsertFld_Data aData(nTypeId, nSubType, rPar1, rPar2, nFormatId, 0, cSeparator, bIsAutomaticLanguage );
//#i26566# provide parent for SwWrtShell::StartInputFldDlg
@@ -197,7 +197,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
}
}
- else // Feld aendern
+ else // change field
{
SwField *const pTmpFld = m_pCurFld->CopyField();
@@ -247,7 +247,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
{
if( pFmtFld->GetFld() == m_pCurFld)
{
- pTyp->Add(pFmtFld); // Feld auf neuen Typ umhaengen
+ pTyp->Add(pFmtFld); // put field on new type
pTmpFld->ChgTyp(pTyp);
break;
}
@@ -267,7 +267,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
case TYP_INPUTFLD:
{
- // User- oder SetField ?
+ // User- or SetField ?
if (m_aMgr.GetFldType(RES_USERFLD, sPar1) == 0 &&
!(pTmpFld->GetSubType() & INP_TXT)) // SETEXPFLD
{
@@ -338,7 +338,7 @@ void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
}
/*--------------------------------------------------------------------
- Beschreibung: Einfuegen von neuen Feldern
+ Description: Insert new fields
--------------------------------------------------------------------*/
IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
@@ -350,7 +350,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
pDlg->InsertHdl();
if (pBtn)
- pBtn->GrabFocus(); // Wegen InputField-Dlg
+ pBtn->GrabFocus(); // because of InputField-Dlg
}
else
{
@@ -362,7 +362,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
}
/*--------------------------------------------------------------------
- Beschreibung: "Einfuegen"-Button Enablen/Disablen
+ Description: enable/disable "Insert"-Button
--------------------------------------------------------------------*/
void SwFldPage::EnableInsert(BOOL bEnable)
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index afcf9ce..7b62330 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -73,7 +73,7 @@ protected:
void EnableInsert(BOOL bEnable = TRUE);
inline BOOL IsFldEdit() const { return m_bFldEdit; }
- // Feld einfuegen
+ // insert field
BOOL InsertFld( USHORT nTypeId,
USHORT nSubType,
const String& rPar1,
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 0c93a67..cf59590 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -181,16 +181,16 @@ void SwFldRefPage::Reset(const SfxItemSet& )
}
SetSelectionSel(LISTBOX_ENTRY_NOTFOUND);
SetTypeSel(LISTBOX_ENTRY_NOTFOUND);
- Init(); // Allgemeine initialisierung
+ Init(); // general initialisation
- // TypeListBox initialisieren
+ // initialise TypeListBox
aTypeLB.SetUpdateMode(FALSE);
aTypeLB.Clear();
- // Typ-Listbox fuellen
+ // fill Type-Listbox
USHORT nPos;
- // Referenz setzen / einfuegen
+ // set/insert reference
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
for (short i = rRg.nStart; i < rRg.nEnd; ++i)
@@ -212,7 +212,7 @@ void SwFldRefPage::Reset(const SfxItemSet& )
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_NUMITEM);
// <--
- // mit den Sequence-Typen auffuellen
+ // fill up with the sequence types
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
pSh = ::GetActiveWrtShell();
@@ -230,25 +230,25 @@ void SwFldRefPage::Reset(const SfxItemSet& )
}
}
- // Textmarken - jetzt immer (wegen Globaldokumenten)
+ // text marks - now always (because of globaldocuments)
nPos = aTypeLB.InsertEntry(sBookmarkTxt);
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_BOOKMARK);
- // Fussnoten:
+ // footnotes:
if( pSh->HasFtns() )
{
nPos = aTypeLB.InsertEntry(sFootnoteTxt);
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_FOOTNOTE);
}
- // Endnoten:
+ // endnotes:
if ( pSh->HasFtns(true) )
{
nPos = aTypeLB.InsertEntry(sEndnoteTxt);
aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_ENDNOTE);
}
- // alte Pos selektieren
+ // select old Pos
if (!IsFldEdit())
RestorePos(&aTypeLB);
@@ -289,17 +289,17 @@ void SwFldRefPage::Reset(const SfxItemSet& )
IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
{
- // Alte ListBoxPos sichern
+ // save old ListBoxPos
const USHORT nOld = GetTypeSel();
- // Aktuelle ListBoxPos
+ // current ListBoxPos
SetTypeSel(aTypeLB.GetSelectEntryPos());
if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
{
if (IsFldEdit())
{
- // Positionen selektieren
+ // select positions
String sName;
USHORT nFlag = 0;
@@ -351,7 +351,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
break;
}
- if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke
+ if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // reference to deleted mark
{
USHORT nPos = aTypeLB.InsertEntry(sName);
aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nFlag));
@@ -371,7 +371,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
{
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
- // Auswahl-Listbox fuellen
+ // fill selection-ListBox
UpdateSubType();
BOOL bName = FALSE; nFldDlgFmtSel = 0;
@@ -387,7 +387,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
{
case TYP_GETREFFLD:
if (REFFLDFLAG & (USHORT)(ULONG)aTypeLB.GetEntryData(nOld))
- // dann bleibt die alte bestehen
+ // the the old one stays
nFldDlgFmtSel = aFormatLB.GetSelectEntryPos();
bName = TRUE;
break;
@@ -398,13 +398,13 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
case REFFLDFLAG_BOOKMARK:
bName = TRUE;
- // kein break!!!
+ // no break!!!
default:
if( REFFLDFLAG & nTypeId )
{
USHORT nOldId = (USHORT)(ULONG)aTypeLB.GetEntryData(nOld);
if( nOldId & REFFLDFLAG || nOldId == TYP_GETREFFLD )
- // dann bleibt die alte bestehen
+ // then the old one stays
nFldDlgFmtSel = aFormatLB.GetSelectEntryPos();
}
break;
@@ -413,7 +413,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
aNameED.Enable(bName);
aNameFT.Enable(bName);
- // Format-Listbox fuellen
+ // fill Format-Listbox
USHORT nSize = FillFormatLB(nTypeId);
BOOL bFormat = nSize != 0;
aFormatLB.Enable(bFormat);
@@ -475,7 +475,7 @@ IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG )
}
/*--------------------------------------------------------------------
- Beschreibung: Typen in SelectionLB erneuern
+ Description: renew types in SelectionLB
--------------------------------------------------------------------*/
void SwFldRefPage::UpdateSubType()
@@ -510,10 +510,10 @@ void SwFldRefPage::UpdateSubType()
if( REFFLDFLAG & nTypeId )
{
- if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
+ if (nTypeId == REFFLDFLAG_BOOKMARK) // text marks!
{
aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
- // alle Textmarken besorgen
+ // get all text marks
IDocumentMarkAccess* const pMarkAccess = pSh->getIDocumentMarkAccess();
for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin();
ppMark != pMarkAccess->getBookmarksEnd();
@@ -617,7 +617,7 @@ void SwFldRefPage::UpdateSubType()
else
{
aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
- // zum Seq-FeldTyp die Felder besorgen:
+ // get the fields to Seq-FieldType:
SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(
nTypeId & ~REFFLDFLAG, RES_SETEXPFLD );
@@ -678,7 +678,7 @@ void SwFldRefPage::UpdateSubType()
{
aSelectionLB.SetUpdateMode(TRUE);
- // Enable oder Disable
+ // enable or disable
BOOL bEnable = aSelectionLB.GetEntryCount() != 0;
aSelectionLB.Enable( bEnable );
aSelectionFT.Enable( bEnable );
@@ -690,7 +690,7 @@ void SwFldRefPage::UpdateSubType()
aSelectionLB.SelectEntryPos(0);
}
- if (IsFldEdit() && !aSelectionLB.GetSelectEntryCount()) // Falls die Referenz schon geloescht wurde...
+ if (IsFldEdit() && !aSelectionLB.GetSelectEntryCount()) // in case the reference was already deleted...
aNameED.SetText(sOldSel);
}
// <--
@@ -704,10 +704,10 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId)
if (nFormatSel != LISTBOX_ENTRY_NOTFOUND)
sOldSel = aFormatLB.GetEntry(nFormatSel);
- // Format-Listbox fuellen
+ // fill Format-Listbox
aFormatLB.Clear();
- // Referenz hat weniger als die Beschriftung
+ // refernce has less that the annotation
USHORT nSize( 0 );
bool bAddCrossRefFormats( false );
switch (nTypeId)
@@ -784,7 +784,7 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId)
}
/*--------------------------------------------------------------------
- Beschreibung: Modify
+ Description: Modify
--------------------------------------------------------------------*/
IMPL_LINK( SwFldRefPage, ModifyHdl, Edit *, EMPTYARG )
@@ -835,7 +835,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
{
SwFieldType* pType = GetFldMgr().GetFldType(RES_SETEXPFLD, aName);
- if(!pType) // Nur einfuegen, wenn es den Namen noch nicht gibt
+ if(!pType) // Only insert when the name doesn't exist yet
{
aSelectionLB.InsertEntry(aName);
aSelectionLB.Enable();
@@ -854,13 +854,13 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
{
pSh = ::GetActiveWrtShell();
}
- if (nTypeId == REFFLDFLAG_BOOKMARK) // TextMarken!
+ if (nTypeId == REFFLDFLAG_BOOKMARK) // text marks!
{
aName = aNameED.GetText();
nTypeId = TYP_GETREFFLD;
nSubType = REF_BOOKMARK;
}
- else if (REFFLDFLAG_FOOTNOTE == nTypeId) // Fussnoten
+ else if (REFFLDFLAG_FOOTNOTE == nTypeId) // footnotes
{
SwSeqFldList aArr;
_SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 );
@@ -876,12 +876,12 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo );
if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
- bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde
+ bModified = TRUE; // can happen with fields of which the references were deleted
}
else if (IsFldEdit())
aVal = String::CreateFromInt32( pRefFld->GetSeqNo() );
}
- else if (REFFLDFLAG_ENDNOTE == nTypeId) // Endnoten
+ else if (REFFLDFLAG_ENDNOTE == nTypeId) // endnotes
{
SwSeqFldList aArr;
_SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 );
@@ -897,7 +897,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo );
if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
- bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde
+ bModified = TRUE; // can happen with fields of which the reference was deleted
}
else if (IsFldEdit())
aVal = String::CreateFromInt32( pRefFld->GetSeqNo() );
@@ -944,9 +944,9 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
}
}
// <--
- else // SeqenceFelder
+ else // SeqenceFields
{
- // zum Seq-FeldTyp die Felder besorgen:
+ // get fields for Seq-FeldType:
SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(
nTypeId & ~REFFLDFLAG, RES_SETEXPFLD );
if( pType )
@@ -965,7 +965,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo );
if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo())
- bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde
+ bModified = TRUE; // can happen with fields of which the reference was deleted
}
else if (IsFldEdit())
aVal = String::CreateFromInt32( pRefFld->GetSeqNo() );
@@ -989,7 +989,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
}
- ModifyHdl(); // Insert ggf enablen/disablen
+ ModifyHdl(); // enable/disable insert if applicable
return FALSE;
}
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index db2e9b6..3265847 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -67,7 +67,7 @@
/*--------------------------------------------------------------------
- Beschreibung: Der Traeger des Dialoges
+ Description: carrier of the dialog
--------------------------------------------------------------------*/
@@ -84,11 +84,11 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent)
GetOKButton().SetText(String(SW_RES(STR_FLD_INSERT)));
GetOKButton().SetHelpId(HID_FIELD_INSERT);
- GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
+ GetOKButton().SetHelpText(aEmptyStr); // so that generated help text is used
GetCancelButton().SetText(String(SW_RES(STR_FLD_CLOSE)));
GetCancelButton().SetHelpId(HID_FIELD_CLOSE);
- GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird
+ GetCancelButton().SetHelpText(aEmptyStr); // so that generated help text is used
FreeResource();
@@ -152,16 +152,16 @@ void SwFldDlg::Initialize(SfxChildWinInfo *pInfo)
if ( GetStyle() & WB_SIZEABLE )
SetSizePixel( pInfo->aSize );
- // Initiale Gr"o\se aus pInfo merken
+ // remember initial size from pInfo
aSize = GetSizePixel();
- // Soll das FloatingWindow eingezoomt werden ?
+ // should the FloatingWindow get zoomed?
if ( pInfo->nFlags & SFX_CHILDWIN_ZOOMIN )
RollUp();
}
else
{
- // Initiale Gr"o\se aus Resource oder ctor merken
+ // remember initial size from resource or ctor
aSize = GetSizePixel();
Size aParentSize = GetParent()->GetOutputSizePixel();
@@ -209,7 +209,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( USHORT nID )
}
/*--------------------------------------------------------------------
- Beschreibung: Einfuegen von neuen Feldern anstossen
+ Description: kick off inserting of new fields
--------------------------------------------------------------------*/
IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG )
@@ -219,14 +219,14 @@ IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG )
SfxTabPage* pPage = GetTabPage(GetCurPageId());
pPage->FillItemSet(*(SfxItemSet*)0);
- GetOKButton().GrabFocus(); // Wegen InputField-Dlg
+ GetOKButton().GrabFocus(); // because of InputField-Dlg
}
return 0;
}
/*--------------------------------------------------------------------
- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren
+ Description: newly initialise dialog after Doc-Switch
--------------------------------------------------------------------*/
void SwFldDlg::ReInitDlg()
@@ -263,7 +263,7 @@ void SwFldDlg::ReInitDlg()
}
/*--------------------------------------------------------------------
- Beschreibung: Nach Dok-Wechsel TabPage neu initialisieren
+ Description: newly initialise TabPage after Doc-Switch
--------------------------------------------------------------------*/
void SwFldDlg::ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate )
@@ -271,11 +271,11 @@ void SwFldDlg::ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate )
SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId);
if ( pPage )
- pPage->EditNewField( bOnlyActivate ); // TabPage neu initialisieren
+ pPage->EditNewField( bOnlyActivate ); // newly initialise TabPage
}
/*--------------------------------------------------------------------
- Beschreibung: Nach Aktivierung einige TabPages neu initialisieren
+ Description: newly initialise after activation of a few TabPages
--------------------------------------------------------------------*/
void SwFldDlg::Activate()
commit f87296bbe715696888fa1b12efdb86ad7da94040
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Tue Mar 8 15:30:06 2011 +0100
Translate german comments
This translates more german code comments in writer/sw/source/ui/fldui to
english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 2b96b72..bf6275f 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -94,9 +94,9 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) :
GetOKButton()->SetClickHdl(LINK(this, SwFldEditDlg, OKHdl));
- // Buttons selbst positionieren, da sie sonst bei unterschiedlichen
- // Fontgroessen im Wald stehen, und da PB im SingleTabDlg feste Pixelgroessen
- // fuer seine Buttons und die Dialogbreite verwendet.
+ // position buttons ourselves because otherwise when font sizes are
+ // varying, they are in the woods, and because PB uses fixed pixel sizes
+ // for its buttons and dialog width in SingleTabDlg.
aPrevBT.SetPosPixel(Point(GetOKButton()->GetPosPixel().X(), aPrevBT.GetPosPixel().Y()));
USHORT nWidth = static_cast< USHORT >(GetOKButton()->GetOutputSize().Width() / 2 - 3);
Size aNewSize(LogicToPixel(Size(nWidth, GetOKButton()->GetOutputSize().Height())));
@@ -121,7 +121,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) :
}
/*--------------------------------------------------------------------
- Beschreibung: Controlls initialisieren
+ Description: initialise controls
--------------------------------------------------------------------*/
void SwFldEditDlg::Init()
{
@@ -136,7 +136,7 @@ void SwFldEditDlg::Init()
if(!pCurFld)
return;
- // Traveling nur bei mehr als einem Feld
+ // Traveling only when more than one field
pSh->StartAction();
pSh->CreateCrsr();
@@ -162,7 +162,7 @@ void SwFldEditDlg::Init()
SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
{
- // TabPage erzeugen
+ // create TabPage
SfxTabPage* pTabPage = 0;
USHORT nHelpId = 0;
@@ -240,7 +240,7 @@ void SwFldEditDlg::InsertHdl()
}
/*--------------------------------------------------------------------
- Beschreibung: Aendern des Feldes anstossen
+ Description: kick off changing of the field
--------------------------------------------------------------------*/
IMPL_LINK( SwFldEditDlg, OKHdl, Button *, EMPTYARG )
{
@@ -260,12 +260,12 @@ IMPL_LINK( SwFldEditDlg, OKHdl, Button *, EMPTYARG )
short SwFldEditDlg::Execute()
{
- // Ohne TabPage kein Dialog
+ // without TabPage no dialog
return GetTabPage() ? Dialog::Execute() : RET_CANCEL;
}
/*--------------------------------------------------------------------
- Beschreibung: Traveling zwishen Feldern gleichen Typs
+ Description: Traveling between fields of the same type
--------------------------------------------------------------------*/
IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
{
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 1eef3d0..0ab0f69 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -107,7 +107,7 @@ SwFldFuncPage::~SwFldFuncPage()
void SwFldFuncPage::Reset(const SfxItemSet& )
{
SavePos(&aTypeLB);
- Init(); // Allgemeine initialisierung
+ Init(); // general initialisation
aTypeLB.SetUpdateMode(FALSE);
aTypeLB.Clear();
@@ -116,10 +116,10 @@ void SwFldFuncPage::Reset(const SfxItemSet& )
if (!IsFldEdit())
{
- // TypeListBox initialisieren
+ // initialise TypeListBox
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
- // Typ-Listbox fuellen
+ // fill Typ-Listbox
for(short i = rRg.nStart; i < rRg.nEnd; ++i)
{
nTypeId = GetFldMgr().GetTypeId(i);
@@ -140,7 +140,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& )
}
}
- // alte Pos selektieren
+ // select old Pos
RestorePos(&aTypeLB);
aTypeLB.SetDoubleClickHdl (LINK(this, SwFldFuncPage, InsertHdl));
@@ -193,10 +193,10 @@ void SwFldFuncPage::Reset(const SfxItemSet& )
IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG )
{
- // Alte ListBoxPos sichern
+ // save old ListBoxPos
const USHORT nOld = GetTypeSel();
- // Aktuelle ListBoxPos
+ // current ListBoxPos
SetTypeSel(aTypeLB.GetSelectEntryPos());
if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
@@ -209,10 +209,10 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG )
{
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
- // Auswahl-Listbox fuellen
+ // fill Selection-Listbox
UpdateSubType();
- // Format-Listbox fuellen
+ // fill Format-Listbox
aFormatLB.Clear();
USHORT nSize = GetFldMgr().GetFormatCount(nTypeId, FALSE, IsFldDlgHtmlMode());
@@ -236,7 +236,7 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG )
BOOL bShowSelection = FALSE;
BOOL bFormat = nSize != 0;
- // fuer Conditional Text zwei Controls
+ // two controls for conditional text
BOOL bDropDown = TYP_DROPDOWN == nTypeId;
BOOL bCondTxtFld = TYP_CONDTXTFLD == nTypeId;
@@ -478,13 +478,13 @@ IMPL_LINK( SwFldFuncPage, ListEnableHdl, void*, EMPTYARG)
}
/*--------------------------------------------------------------------
- Beschreibung: Typen in der SelectionBox erneuern
+ Description: renew types in SelectionBox
--------------------------------------------------------------------*/
void SwFldFuncPage::UpdateSubType()
{
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
- // Auswahl-Listbox fuellen
+ // fill Selction-Listbox
aSelectionLB.SetUpdateMode(FALSE);
aSelectionLB.Clear();
@@ -525,7 +525,7 @@ void SwFldFuncPage::UpdateSubType()
}
/*--------------------------------------------------------------------
- Beschreibung: MacroBrowser aufrufen, Listbox mit Macros fuellen
+ Description: call MacroBrowser, fill Listbox with Macros
--------------------------------------------------------------------*/
IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
{
@@ -606,7 +606,7 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& )
InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
}
- ModifyHdl(); // Insert ggf enablen/disablen
+ ModifyHdl(); // enable/disable Insert if applicable
return FALSE;
}
@@ -615,7 +615,7 @@ String SwFldFuncPage::TurnMacroString(const String &rMacro)
{
if (rMacro.Len())
{
- // Inhalt von aName umdrehen
+ // reverse content of aName
String sTmp, sBuf;
USHORT nPos = 0;
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 3ad41fb..f49e732 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -82,7 +82,7 @@ class SwFldFuncPage : public SwFldPage
DECL_LINK( ListModifyHdl, Control*);
DECL_LINK( ListEnableHdl, void*);
- // Macro ausw„hlen
+ // select Macro
DECL_LINK( MacroHdl, Button * );
void UpdateSubType();
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index e7ecd49..d4786d0 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -60,9 +60,9 @@
#include <svl/zformat.hxx>
#include <vcl/mnemonic.hxx>
#include <view.hxx>
-#include <wrtsh.hxx> // Actives Fenster
-#include <doc.hxx> // Actives Fenster
-#include <docsh.hxx> // Actives Fenster
+#include <wrtsh.hxx> // active window
+#include <doc.hxx> // active window
+#include <docsh.hxx> // active window
#include <swmodule.hxx>
#include <charatr.hxx>
#include <fmtinfmt.hxx>
@@ -97,7 +97,7 @@ using namespace ::com::sun::star;
using namespace nsSwDocInfoSubType;
/*--------------------------------------------------------------------
- Beschreibung: Gruppen der Felder
+ Description: groups of fields
--------------------------------------------------------------------*/
enum
{
@@ -126,15 +126,15 @@ enum
GRP_WEB_DOC_END = GRP_WEB_DOC_BEGIN + 9,
GRP_WEB_FKT_BEGIN = GRP_WEB_DOC_END + 2,
- GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // Die Gruppe ist leer!
+ GRP_WEB_FKT_END = GRP_WEB_FKT_BEGIN + 0, // the group is empty!
- GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // Die Gruppe ist leer!
+ GRP_WEB_REF_BEGIN = GRP_WEB_FKT_END + 6, // the group is empty!
GRP_WEB_REF_END = GRP_WEB_REF_BEGIN + 0,
GRP_WEB_REG_BEGIN = GRP_WEB_REF_END + 2,
GRP_WEB_REG_END = GRP_WEB_REG_BEGIN + 1,
- GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // Die Gruppe ist leer!
+ GRP_WEB_DB_BEGIN = GRP_WEB_REG_END, // the group is empty!
GRP_WEB_DB_END = GRP_WEB_DB_BEGIN + 0,
GRP_WEB_VAR_BEGIN = GRP_WEB_DB_END + 5,
@@ -142,35 +142,31 @@ enum
};
/*--------------------------------------------------------------------
- Beschreibung: Formate in der richtigen Reihenfolge
+ Description: formats in the correct order
--------------------------------------------------------------------*/
static const USHORT aSetFmt[] =
{
-// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_???
-// uebereinstimmen
+// at first the order has to match the ResourceIds for FMT_SETVAR_???
0,
0
};
static const USHORT aGetFmt[] =
{
-// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_GETVAR_???
-// uebereinstimmen
+// at first the order has to match the ResourceIds for FMT_GETVAR_???
0
};
static const USHORT aUsrFmt[] =
{
-// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_???
-// uebereinstimmen
+// at first the order has to match the ResourceIds for FMT_SETVAR_???
0,
nsSwExtendedSubType::SUB_CMD
};
static const USHORT aDBFmt[] =
{
-// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_DBFLD_???
-// uebereinstimmen
+// at first the order has to match the ResourceIds for FMT_DBFLD_???
nsSwExtendedSubType::SUB_OWN_FMT
};
@@ -179,7 +175,7 @@ static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT);
static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT);
/*--------------------------------------------------------------------
- Beschreibung: Feldtypen und Subtypes
+ Description: field types and subtypes
--------------------------------------------------------------------*/
struct SwFldPack
{
@@ -193,7 +189,7 @@ struct SwFldPack
};
/*--------------------------------------------------------------------
- Beschreibung: Strings und Formate
+ Description: strings and formats
--------------------------------------------------------------------*/
static const SwFldPack aSwFlds[] =
{
@@ -249,7 +245,7 @@ static const SwFldPack aSwFlds[] =
};
/*--------------------------------------------------------------------
- Beschreibung: Zugriff auf die Shell
+ Description: access to the shell
--------------------------------------------------------------------*/
static SwWrtShell* lcl_GetShell()
@@ -264,8 +260,7 @@ static SwWrtShell* lcl_GetShell()
inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); }
/*--------------------------------------------------------------------
- Beschreibung: FieldManager regelt das Einfuegen und Updaten
- von Feldern
+ Description: FieldManager controls inserting and updating of fields
--------------------------------------------------------------------*/
SwFldMgr::SwFldMgr(SwWrtShell* pSh ) :
@@ -274,7 +269,7 @@ SwFldMgr::SwFldMgr(SwWrtShell* pSh ) :
pWrtShell(pSh),
bEvalExp(TRUE)
{
- // aktuelles Feld ermitteln falls vorhanden
+ // determine current field if existing
GetCurFld();
}
@@ -284,7 +279,7 @@ SwFldMgr::~SwFldMgr()
}
/*--------------------------------------------------------------------
- Beschreibung: RefMark ueber Namen organisieren
+ Description: organise RefMark by names
--------------------------------------------------------------------*/
BOOL SwFldMgr::CanInsertRefMark( const String& rStr )
@@ -296,7 +291,7 @@ BOOL SwFldMgr::CanInsertRefMark( const String& rStr )
{
USHORT nCnt = pSh->GetCrsrCnt();
- // der letzte Crsr muss keine aufgespannte Selektion
+ // the last Crsr doesn't have to be a spanned selection
if( 1 < nCnt && !pSh->SwCrsrShell::HasSelection() )
--nCnt;
@@ -306,7 +301,7 @@ BOOL SwFldMgr::CanInsertRefMark( const String& rStr )
}
/*--------------------------------------------------------------------
- Beschreibung: Zugriff ueber ResIds
+ Description: access over ResIds
--------------------------------------------------------------------*/
void SwFldMgr::RemoveFldType(USHORT nResId, const String& rName )
@@ -342,7 +337,7 @@ SwFieldType* SwFldMgr::GetFldType(USHORT nResId, const String& rName) const
/*--------------------------------------------------------------------
- Beschreibung: Aktuelles Feld ermitteln
+ Description: determine current field
--------------------------------------------------------------------*/
SwField* SwFldMgr::GetCurFld()
{
@@ -352,8 +347,7 @@ SwField* SwFldMgr::GetCurFld()
else
pCurFld = NULL;
- // Strings und Format initialisieren
- //
+ // initialise strings and format
aCurPar1.Erase();
aCurPar2.Erase();
sCurFrame.Erase();
@@ -362,9 +356,8 @@ SwField* SwFldMgr::GetCurFld()
if(!pCurFld)
return 0;
- // Aktuelle Werte aufbereiten Parameter 1 und Parameter 2
- // als auch das Format ermitteln
- //
+ // preprocess current values; determine parameter 1 and parameter 2
+ // as well as the format
const USHORT nTypeId = pCurFld->GetTypeId();
nCurFmt = pCurFld->GetFormat();
@@ -385,7 +378,7 @@ SwField* SwFldMgr::GetCurFld()
}
/*--------------------------------------------------------------------
- Beschreibung: Gruppen-Bereich liefern
+ Description: provide group range
--------------------------------------------------------------------*/
@@ -417,7 +410,7 @@ static SwFldGroupRgn const aWebRanges[] =
}
/*--------------------------------------------------------------------
- Beschreibung: GroupId bestimmen
+ Description: determine GroupId
--------------------------------------------------------------------*/
USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const
@@ -447,8 +440,8 @@ USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const
}
/*--------------------------------------------------------------------
- Beschreibung: Namen zur TypeId ermitteln
- ZUGRIFF ueber TYP_....
+ Description: determine names to TypeId
+ ACCESS over TYP_....
--------------------------------------------------------------------*/
@@ -465,7 +458,7 @@ const String& SwFldMgr::GetTypeStr(USHORT nPos)
USHORT nFldWh = aSwFlds[ nPos ].nTypeId;
- // Sonderbehandlung fuer Datum/Zeit Felder (ohne var/fix)
+ // special treatment for date/time fields (without var/fix)
if( TYP_DATEFLD == nFldWh )
{
static String g_aDate( SW_RES( STR_DATEFLD ) );
@@ -481,7 +474,7 @@ const String& SwFldMgr::GetTypeStr(USHORT nPos)
}
/*--------------------------------------------------------------------
- Beschreibung: Pos in der Liste bestimmen
+ Description: determine Pos in the list
--------------------------------------------------------------------*/
@@ -503,7 +496,7 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId)
}
/*--------------------------------------------------------------------
- Beschreibung: Subtypen eines Feldes lokalisieren
+ Description: localise subtypes of a field
--------------------------------------------------------------------*/
BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
@@ -520,7 +513,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
case TYP_SETREFFLD:
case TYP_GETREFFLD:
{
- // Referenzen sind keine Felder
+ // references are no fields
pSh->GetRefMarks( &rToFill );
break;
}
@@ -531,7 +524,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
case TYP_INPUTFLD:
{ String* pNew = new SW_RESSTR(aSwFlds[nPos].nSubTypeStart);
rToFill.Insert(pNew, rToFill.Count());
- // Weiter bei generischen Typen
+ // move on at generic types
}
case TYP_DDEFLD:
case TYP_SEQFLD:
@@ -579,7 +572,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
default:
{
- // statische SubTypes
+ // static SubTypes
if(nPos != USHRT_MAX)
{
USHORT nCount;
@@ -612,8 +605,8 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
}
/*--------------------------------------------------------------------
- Beschreibung: Format ermitteln
- ZUGRIFF ueber TYP_....
+ Description: determine format
+ ACCESS over TYP_....
--------------------------------------------------------------------*/
@@ -634,7 +627,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co
return 2;
if (nTypeId == TYP_FILENAMEFLD)
- nEnd -= 2; // Kein Bereich oder Vorlage
+ nEnd -= 2; // no range or template
switch(nStart)
{
@@ -670,7 +663,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co
}
/*--------------------------------------------------------------------
- Beschreibung: FormatString zu einem Typ ermitteln
+ Description: determine FormatString to a type
--------------------------------------------------------------------*/
@@ -689,7 +682,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const
nStart = aSwFlds[nPos].nFmtBegin;
if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId)
- nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren
+ nFormatId &= ~FF_FIXED; // mask out Fixed-Flag
if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd)
aRet = SW_RESSTR((USHORT)(nStart + nFormatId));
@@ -721,7 +714,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const
}
/*--------------------------------------------------------------------
- Beschreibung: FormatId aus Pseudo-ID ermitteln
+ Description: determine FormatId from Pseudo-ID
--------------------------------------------------------------------*/
USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const
@@ -801,7 +794,7 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const
}
/*--------------------------------------------------------------------
- Beschreibung: Traveling
+ Description: Traveling
--------------------------------------------------------------------*/
@@ -822,7 +815,7 @@ BOOL SwFldMgr::GoNextPrev( BOOL bNext, SwFieldType* pTyp )
if (pTyp && pTyp->Which() == RES_DBFLD)
{
- // Fuer Feldbefehl-bearbeiten (alle DB-Felder anspringen)
+ // for fieldcommand-edit (hop to all DB fields)
return pSh->MoveFldType( 0, bNext, USHRT_MAX, RES_DBFLD );
}
@@ -830,7 +823,7 @@ BOOL SwFldMgr::GoNextPrev( BOOL bNext, SwFieldType* pTyp )
}
/*--------------------------------------------------------------------
- Beschreibung: Feldtypen einfuegen
+ Description: insert field types
--------------------------------------------------------------------*/
@@ -843,7 +836,7 @@ void SwFldMgr::InsertFldType(SwFieldType& rType)
}
/*--------------------------------------------------------------------
- Beschreibung: Aktuelle TypeId ermitteln
+ Description: determine current TypeId
--------------------------------------------------------------------*/
@@ -853,7 +846,7 @@ USHORT SwFldMgr::GetCurTypeId() const
}
/*--------------------------------------------------------------------
- Beschreibung: Ueber String Feld einfuegen oder Update
+ Description: Over string insert field or update
--------------------------------------------------------------------*/
@@ -874,7 +867,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
return FALSE;
switch(rData.nTypeId)
- { // ACHTUNG dieses Feld wird ueber einen gesonderten Dialog eingefuegt
+ { // ATTENTION this field is inserted by a seperate dialog
case TYP_POSTITFLD:
{
SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD);
@@ -1029,8 +1022,8 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
}
case TYP_DDEFLD:
{
- //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ //JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
+ // That's not yet considered here.
String sCmd( rData.sPar2 );
USHORT nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
@@ -1104,7 +1097,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
pFld = new SwDBField(pTyp);
pFld->SetSubType(nSubType);
- if( !(nSubType & nsSwExtendedSubType::SUB_OWN_FMT) ) // Datenbankformat ermitteln
+ if( !(nSubType & nsSwExtendedSubType::SUB_OWN_FMT) ) // determinee database format
{
Reference< XDataSource> xSource;
rData.aDBDataSource >>= xSource;
@@ -1136,7 +1129,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
String sPar1;
SwDBData aDBData;
- // DBName aus rData.sPar1 extrahieren. Format: DBName.TableName.CommandType.ExpStrg
+ // excract DBName from rData.sPar1. Format: DBName.TableName.CommandType.ExpStrg
if ((nTablePos = rData.sPar1.Search(DB_DELIM)) != STRING_NOTFOUND)
aDBData.sDataSource = rData.sPar1.Copy(0, nTablePos++);
if ((nCmdTypePos = rData.sPar1.Search(DB_DELIM, nTablePos)) != STRING_NOTFOUND)
@@ -1200,7 +1193,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
SwUserFieldType* pTyp =
(SwUserFieldType*)pCurShell->GetFldType(RES_USERFLD, rData.sPar1);
- // nur wenn vorhanden
+ // only if existing
if(!pTyp)
{
pTyp = (SwUserFieldType*)pCurShell->InsertFldType(
@@ -1221,13 +1214,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
SwSetExpFieldType* pTyp = (SwSetExpFieldType*)
pCurShell->GetFldType(RES_SETEXPFLD, rData.sPar1);
- // kein Experssion Type mit dem Namen vorhanden -> anlegen
+ // no Experssion Type with this name existing -> create
if(pTyp)
{
SwSetExpField* pExpFld =
new SwSetExpField(pTyp, aEmptyStr, nFormatId);
- // Typ vom SwSetExpFieldType nicht veraendern:
+ // Don't change type of SwSetExpFieldType:
USHORT nOldSubType = pExpFld->GetSubType();
pExpFld->SetSubType(nOldSubType | (nSubType & 0xff00));
@@ -1249,14 +1242,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
pFld = pInpFld;
}
- // Dialog starten
- //
+ // start dialog
pCurShell->StartInputFldDlg(pFld, FALSE, rData.pParent);
break;
}
case TYP_SETFLD:
{
- if (!rData.sPar2.Len()) // Leere Variablen sind nicht erlaubt
+ if (!rData.sPar2.Len()) // empty variables are not allowed
return FALSE;
SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType(
@@ -1289,7 +1281,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
}
case TYP_GETFLD:
{
- // gibt es ein entprechendes SetField
+ // is there a corresponding SetField
SwSetExpFieldType* pSetTyp = (SwSetExpFieldType*)
pCurShell->GetFldType(RES_SETEXPFLD, rData.sPar1);
@@ -1384,7 +1376,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
USHORT nLang = GetCurrLanguage();
pFld->SetLanguage(nLang);
- // Einfuegen
+ // insert
pCurShell->StartAllAction();
pCurShell->Insert(*pFld);
@@ -1403,7 +1395,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
else if( TYP_GETREFFLD == rData.nTypeId )
pFld->GetTyp()->Modify( 0, 0 );
- // temporaeres Feld loeschen
+ // delete temporary field
delete pFld;
pCurShell->EndAllAction();
@@ -1411,7 +1403,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
}
/*--------------------------------------------------------------------
- Beschreibung: Felder Update
+ Description: fields update
--------------------------------------------------------------------*/
@@ -1420,7 +1412,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
const String& rPar2,
SwField * _pTmpFld) // #111840#
{
- // Format aendern
+ // change format
OSL_ENSURE(pCurFld, "no field at CursorPos");
bool bDelete = false;
@@ -1454,8 +1446,8 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
{
case TYP_DDEFLD:
{
- //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ //JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
+ // That's not yet considered here!
USHORT nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
break;
@@ -1559,8 +1551,8 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
break;
}
- // Format setzen
- // Format wegen NumberFormatter vor SetPar2 einstellen!
+ // set format
+ // setup format before SetPar2 because of NumberFormatter!
pTmpFld->ChangeFormat(nFormat);
if(bSetPar1)
@@ -1568,7 +1560,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
if( bSetPar2 )
pTmpFld->SetPar2( sPar2 );
- // Update anschmeissen
+ // kick off update
if(nTypeId == TYP_DDEFLD ||
nTypeId == TYP_USERFLD ||
nTypeId == TYP_USRINPFLD)
@@ -1589,7 +1581,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat,
}
/*--------------------------------------------------------------------
- Beschreibung: ExpressionFields explizit evaluieren
+ Description: explicitly evaluate ExpressionFields
--------------------------------------------------------------------*/
void SwFldMgr::EvalExpFlds(SwWrtShell* pSh)
{
@@ -1661,7 +1653,7 @@ void SwFieldType::_GetFldName()
STR_DROPDOWN
};
- // Infos fuer Felder einfuegen
+ // insert infos for fields
SwFieldType::pFldNames = new SvStringsDtor( (BYTE)coFldCnt, 2 );
for( USHORT nIdx = 0; nIdx < coFldCnt; ++nIdx )
{
commit 87f893ba1ff6073e9624784521d8927f28adb2c4
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Tue Mar 8 14:50:12 2011 +0100
Translate german comments
This translates german code comments in writer/sw/source/ui/fldui to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 3a98567..f83d769 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star;
/*--------------------------------------------------------------------
- Beschreibung: Feldeinfuegen bearbeiten
+ Description: edit insert-field
--------------------------------------------------------------------*/
sw::DropDownFieldDialog::DropDownFieldDialog( Window *pParent, SwWrtShell &rS,
SwField* pField, BOOL bNextButton ) :
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index a6d2bf3..76476e0 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -68,7 +68,7 @@ using namespace ::com::sun::star::lang;
/*--------------------------------------------------------------------
- Beschreibung: Feldeinfuegen bearbeiten
+ Description: edit insert-field
--------------------------------------------------------------------*/
SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), SW_RES(DLG_CHANGE_DB)),
@@ -113,7 +113,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
}
/*--------------------------------------------------------------------
- Beschreibung: Datenbank-Listboxen initialisieren
+ Description: initialise database listboxes
--------------------------------------------------------------------*/
void SwChangeDBDlg::FillDBPopup()
{
@@ -203,7 +203,7 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName)
}
/*--------------------------------------------------------------------
- Beschreibung: Dialog zerstoeren
+ Description: destroy dialog
--------------------------------------------------------------------*/
SwChangeDBDlg::~SwChangeDBDlg()
{
@@ -211,7 +211,7 @@ SwChangeDBDlg::~SwChangeDBDlg()
}
/*--------------------------------------------------------------------
- Beschreibung: Schliessen
+ Description: close
--------------------------------------------------------------------*/
void SwChangeDBDlg::Apply()
{
@@ -282,7 +282,7 @@ IMPL_LINK( SwChangeDBDlg, TreeSelectHdl, SvTreeListBox *, EMPTYARG )
}
/*--------------------------------------------------------------------
- Beschreibung: Datenbankname fuer Anzeige wandeln
+ Description: convert database name for display
--------------------------------------------------------------------*/
void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
{
diff --git a/sw/source/ui/fldui/changedb.hrc b/sw/source/ui/fldui/changedb.hrc
index e121a97..c37089a 100644
--- a/sw/source/ui/fldui/changedb.hrc
+++ b/sw/source/ui/fldui/changedb.hrc
@@ -28,7 +28,7 @@
#ifndef _CHANGEDB_HRC
#define _CHANGEDB_HRC
-// Elemente -----------------------------------------------------------------
+// elements -----------------------------------------------------------------
#define FT_DESC 1
#define FT_DOCDBTEXT 2
@@ -46,7 +46,7 @@
/*--------------------------------------------------------------------
- Beschreibung: Bitmaps
+ Description: Bitmaps
--------------------------------------------------------------------*/
#define IMG_COLLAPSE 18002 /*RID_SVXIMG_COLLAPSEDNODE*/
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index ae04256..6a044ca 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -86,7 +86,7 @@ SwFldDBPage::~SwFldDBPage()
}
/*--------------------------------------------------------------------
- Beschreibung: TabPage initialisieren
+ Description: initialise TabPage
--------------------------------------------------------------------*/
void SwFldDBPage::Reset(const SfxItemSet&)
{
@@ -102,7 +102,7 @@ void SwFldDBPage::Reset(const SfxItemSet&)
if (!IsFldEdit())
{
- // TypeListBox initialisieren
+ // initialise TypeListBox
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
for(i = rRg.nStart; i < rRg.nEnd; ++i)
@@ -119,7 +119,7 @@ void SwFldDBPage::Reset(const SfxItemSet&)
aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
}
- // alte Pos selektieren
+ // select old Pos
if (GetTypeSel() != LISTBOX_ENTRY_NOTFOUND)
aTypeLB.SelectEntryPos(GetTypeSel());
@@ -206,7 +206,7 @@ BOOL SwFldDBPage::FillItemSet(SfxItemSet& )
if (!aData.sDataSource.getLength())
aData = pSh->GetDBData();
- if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl
+ if(aData.sDataSource.getLength()) // without database no new field command
{
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
String aVal(aValueED.GetText());
@@ -273,10 +273,10 @@ USHORT SwFldDBPage::GetGroup()
IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
{
- // Alte ListBoxPos sichern
+ // save old ListBoxPos
const USHORT nOld = GetTypeSel();
- // Aktuelle ListBoxPos
+ // current ListBoxPos
SetTypeSel(aTypeLB.GetSelectEntryPos());
if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
@@ -319,7 +319,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
aNumFormatLB.Show();
aFormatLB.Hide();
- if (pBox) // Typ wurde vom User geaendert
+ if (pBox) // type was changed by user
aDBFormatRB.Check();
if (IsFldEdit())
@@ -336,7 +336,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
case TYP_DBNUMSETFLD:
bSetNo = TRUE;
- // kein break!
+ // no break!
case TYP_DBNEXTSETFLD:
bCond = TRUE;
if (IsFldEdit())
@@ -486,7 +486,7 @@ IMPL_LINK( SwFldDBPage, AddDBHdl, PushButton *, EMPTYARG )
}
/*--------------------------------------------------------------------
- Beschreibung: Modify
+ Description: Modify
--------------------------------------------------------------------*/
IMPL_LINK( SwFldDBPage, ModifyHdl, Edit *, EMPTYARG )
{
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index eb5bc6e..f3f584b 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -82,8 +82,8 @@ 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);
- // Font nicht setzen, damit der Font des Controls uebernommen wird!
- // Sonst bei falschem Font Bug an OV.
+ // Don't set font, so that the control's font is adobted!
+ // Otherwise at wrong font bug to OV.
aTypeTLB.SetSpaceBetweenEntries(0);
aTypeTLB.SetNodeDefaultImages();
@@ -101,14 +101,14 @@ SwFldDokInfPage::~SwFldDokInfPage()
void SwFldDokInfPage::Reset(const SfxItemSet& )
{
- Init(); // Allgemeine initialisierung
+ Init(); // general initialisation
- // TypeListBox initialisieren
+ // initialise TypeListBox
aTypeTLB.SetUpdateMode(FALSE);
aTypeTLB.Clear();
pSelEntry = 0;
- // SubTypes in der TypeLB anzeigen
+ // display SubTypes in TypeLB
USHORT nTypeId = TYP_DOCINFOFLD;
SvLBoxEntry* pEntry = 0;
@@ -186,7 +186,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
}
}
- // alte Pos selektieren
+ // select old Pos
if (pSelEntry != 0)
{
aTypeTLB.Select(pSelEntry);
@@ -219,10 +219,10 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG )
{
- // Alte ListBoxPos sichern
+ // save old ListBoxPos
SvLBoxEntry* pOldEntry = pSelEntry;
- // Aktuelle ListBoxPos
+ // current ListBoxPos
pSelEntry = aTypeTLB.FirstSelected();
if(!pSelEntry)
@@ -377,7 +377,7 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG )
USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType)
{
- // Format-Listbox fuellen
+ // fill Format-Listbox
USHORT nTypeId = TYP_DOCINFOFLD;
EnableInsert(nSubType != USHRT_MAX);
@@ -399,7 +399,7 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType)
if (nSubType < DI_CREATE || nSubType == DI_DOCNO || nSubType == DI_EDIT|| nSubType == DI_CUSTOM )
{
- // Format Box ist fuer Title und Time leer
+ // Format Box is empty for Title and Time
}
else
{
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 6e80ae7..17b67e5 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -93,9 +93,9 @@ SwFldDokPage::~SwFldDokPage()
void SwFldDokPage::Reset(const SfxItemSet& )
{
SavePos(&aTypeLB);
- Init(); // Allgemeine initialisierung
+ Init(); // general initialisation
- // TypeListBox initialisieren
+ // initialise TypeListBox
const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup());
aTypeLB.SetUpdateMode(FALSE);
@@ -106,7 +106,7 @@ void SwFldDokPage::Reset(const SfxItemSet& )
if (!IsFldEdit())
{
- // Typ-Listbox fuellen
+ // fill Type-Listbox
for(short i = rRg.nStart; i < rRg.nEnd; ++i)
{
nTypeId = GetFldMgr().GetTypeId(i);
@@ -153,7 +153,7 @@ void SwFldDokPage::Reset(const SfxItemSet& )
}
}
- // alte Pos selektieren
+ // select old Pos
RestorePos(&aTypeLB);
aTypeLB.SetUpdateMode(TRUE);
@@ -194,10 +194,10 @@ void SwFldDokPage::Reset(const SfxItemSet& )
IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG )
{
- // Alte ListBoxPos sichern
+ // save old ListBoxPos
const USHORT nOld = GetTypeSel();
- // Aktuelle ListBoxPos
+ // current ListBoxPos
SetTypeSel(aTypeLB.GetSelectEntryPos());
if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND)
@@ -212,7 +212,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG )
{
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
- // Auswahl-Listbox fuellen
+ // fill Selection-Listbox
aSelectionLB.Clear();
if (nTypeId != USHRT_MAX)
@@ -304,7 +304,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG )
aSelectionLB.Enable( bEnable );
aSelectionFT.Enable( bEnable );
- // Format-Listbox fuellen
+ // fill Format-Listbox
USHORT nSize = FillFormatLB(nTypeId);
BOOL bValue = FALSE, bLevel = FALSE, bNumFmt = FALSE, bOffset = FALSE;
@@ -320,7 +320,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG )
nFmtType = NUMBERFORMAT_DATE;
aValueFT.SetText(sDateOffset);
- aDateOffsetED.SetFirst(-31); // Ein Monat
+ aDateOffsetED.SetFirst(-31); // one month
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list