[Libreoffice-commits] .: 2 commits - sw/source
Martin Kepplinger
mkepplinger at kemper.freedesktop.org
Sun Jun 5 07:42:30 PDT 2011
sw/source/ui/misc/bookmark.cxx | 25 +++---
sw/source/ui/misc/docfnote.cxx | 42 ++++------
sw/source/ui/misc/glosbib.cxx | 21 ++---
sw/source/ui/misc/glosdoc.cxx | 54 +++++++-------
sw/source/ui/misc/glossary.cxx | 69 ++++++++---------
sw/source/ui/misc/glossary.hrc | 8 +-
sw/source/ui/misc/glshell.cxx | 13 +--
sw/source/ui/misc/insfnote.cxx | 4 -
sw/source/ui/misc/insrule.cxx | 6 -
sw/source/ui/misc/linenum.cxx | 38 ++++-----
sw/source/ui/misc/num.cxx | 10 +-
sw/source/ui/misc/num.src | 4 -
sw/source/ui/misc/outline.cxx | 54 ++++++--------
sw/source/ui/misc/pgfnote.cxx | 32 +++-----
sw/source/ui/misc/redlndlg.cxx | 100 +++++++++++++-------------
sw/source/ui/misc/srtdlg.cxx | 14 +--
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 6 -
17 files changed, 242 insertions(+), 258 deletions(-)
New commits:
commit 8b2caf283d213f194cf2725d1c1e301285513dc4
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Sun Jun 5 16:41:02 2011 +0200
Translate german comments
Translate the remaining german code comments in writer/sw/source/ui/misc
to english!
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc
index 52208bc..8f43937 100644
--- a/sw/source/ui/misc/glossary.hrc
+++ b/sw/source/ui/misc/glossary.hrc
@@ -26,7 +26,7 @@
************************************************************************/
-// Box Textbausteine
+// Box text blocks
#define FT_SHORTNAME 1
#define ED_SHORTNAME 2
#define FT_NAME 3
@@ -63,7 +63,7 @@
#define FN_GL_REPLACE_TEXT 78
#define WIN_EXAMPLE_DUMMY 79
-// Box Bibliothek Textbausteine
+// Box library text blocks
#define FL_EDIT 1
#define FL_BIB 2
#define ED_BIB 3
@@ -73,10 +73,10 @@
#define BT_OK 100
-// beide
+// both
#define LB_BIB 80
-// Dialog Namensaenderung
+// Dialog name changing
#define FT_ON 1
#define FT_OS 2
#define FT_NN 3
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index 480d815..df8465f 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -52,7 +52,7 @@
#include <IDocumentUndoRedo.hxx>
#include <glosdoc.hxx>
#include <shellio.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
+#include <initui.hxx> // for ::GetGlossaries()
#include <cmdid.h>
#include <swerror.h>
#include <misc.hrc>
@@ -216,8 +216,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rS
SwTextBlocks* pGroup = GetGroupDoc( rGroup );
if( pGroup && pGroup->GetCount() )
{
- // erfrage welche View registriert ist. Im WebWriter gibts es keine
- // normale View
+ // query which view is registered. In WebWriter there is no normal view
sal_uInt16 nViewId = 0 != &SwView::Factory() ? 2 : 6;
String sLongName = pGroup->GetLongName(pGroup->GetIndex( rShortName ));
@@ -240,7 +239,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rS
pDocSh->SetGroupName( rGroup );
}
- // Dokumenttitel setzen
+ // set document title
SfxViewFrame* pFrame = bShow ? SfxViewFrame::LoadDocument( *xDocSh, nViewId ) : SfxViewFrame::LoadHiddenDocument( *xDocSh, nViewId );
String aDocTitle(SW_RES( STR_GLOSSARY ));
aDocTitle += ' ';
@@ -253,8 +252,8 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rS
xDocSh->GetWrtShell()->InsertGlossary( *pGroup, rShortName );
if( !xDocSh->GetDoc()->getPrinter( false ) )
{
- // wir erzeugen einen default SfxPrinter.
- // Das ItemSet wird vom Sfx geloescht!
+ // we create a default SfxPrinter.
+ // ItemSet is deleted by Sfx!
SfxItemSet *pSet = new SfxItemSet( xDocSh->GetDoc()->GetAttrPool(),
FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
@@ -262,7 +261,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rS
0 );
SfxPrinter* pPrinter = new SfxPrinter( pSet );
- // und haengen ihn ans Dokument.
+ // and append it to the document.
xDocSh->GetDoc()->setPrinter( pPrinter, true, true );
}
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index efbe591..14eea45 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -56,7 +56,7 @@
static sal_Bool bFootnote = sal_True;
/*------------------------------------------------------------------------
- Beschreibung: Einfuegen der Fussnote durch OK
+ Description: inserting a footnote with OK
------------------------------------------------------------------------*/
void SwInsFootNoteDlg::Apply()
@@ -170,7 +170,7 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
{
Apply();
- // Hier zur naechsten Fuss/Endnote wandern
+ // go to the next foot/endnote here
rSh.ResetSelect(0, sal_False);
if (pBtn == &aNextBT)
rSh.GotoNextFtnAnchor();
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
index b341d04..170187b 100644
--- a/sw/source/ui/misc/insrule.cxx
+++ b/sw/source/ui/misc/insrule.cxx
@@ -68,7 +68,7 @@ SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent ) :
pExampleVS->SetDoubleClickHdl(LINK(this, SwInsertGrfRulerDlg, DoubleClickHdl));
pExampleVS->GrabFocus();
- // Grafiknamen ermitteln
+ // determine graphic name
GalleryExplorer::BeginLocking(GALLERY_THEME_RULERS);
GalleryExplorer::FillObjList( GALLERY_THEME_RULERS, aGrfNames );
pExampleVS->SetHelpId(HID_VS_RULER);
@@ -126,7 +126,7 @@ void SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt )
sal_uInt16 nItemId = rUDEvt.GetItemId();
Point aBLPos = aRect.TopLeft();
- // Itemzaehlung beginnt bei 1, und die 1. ist die einfache Linie
+ // item count starts with 1 and the 1st is the simple line
if(nItemId > 1)
{
Graphic aGraphic;
@@ -170,7 +170,7 @@ void SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt )
}
else
{
- // Text fuer einfache Linie painten
+ // paint text for simple line
Font aOldFont = pDev->GetFont();
Font aFont = pDev->GetFont();
Size aSize = aFont.GetSize();
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 72f76f8..4bd6f46 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -57,7 +57,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) :
SfxSingleTabDialog(&pVw->GetViewFrame()->GetWindow(), 0, 0),
pSh(pVw->GetWrtShellPtr())
{
- // TabPage erzeugen
+ // create TabPage
SetTabPage(SwLineNumberingPage::Create(this, *(SfxItemSet*)0));
GetOKButton()->SetClickHdl(LINK(this, SwLineNumberingDlg, OKHdl));
@@ -123,7 +123,7 @@ SwLineNumberingPage::SwLineNumberingPage( Window* pParent,
FreeResource();
SwLineNumberingDlg *pDlg = (SwLineNumberingDlg *)GetParent();
pSh = pDlg->GetWrtShell();
- // Zeichenvorlagen
+ // char styles
::FillCharStyleListBox(aCharStyleLB, pSh->GetView().GetDocShell());
}
@@ -155,31 +155,31 @@ void SwLineNumberingPage::Reset( const SfxItemSet& )
}
}
- // Format
+ // format
sal_uInt16 nSelFmt = rInf.GetNumType().GetNumberingType();
aFormatLB.SelectNumberingType(nSelFmt);
- // Position
+ // position
aPosLB.SelectEntryPos((sal_uInt16)rInf.GetPos());
- // Offset
+ // offset
sal_uInt16 nOffset = rInf.GetPosFromLeft();
if (nOffset == USHRT_MAX)
nOffset = 0;
aOffsetMF.SetValue(aOffsetMF.Normalize(nOffset), FUNIT_TWIP);
- // Numerierungsoffset
+ // numbering offset
aNumIntervalNF.SetValue(rInf.GetCountBy());
- // Teiler
+ // divider
aDivisorED.SetText(rInf.GetDivider());
- // Teileroffset
+ // divider offset
aDivIntervalNF.SetValue(rInf.GetDividerCountBy());
- // Zaehlen
+ // count
aCountEmptyLinesCB.Check(rInf.IsCountBlankLines());
aCountFrameLinesCB.Check(rInf.IsCountInFlys());
aRestartEachPageCB.Check(rInf.IsRestartEachPage());
@@ -193,7 +193,7 @@ void SwLineNumberingPage::Reset( const SfxItemSet& )
}
/*--------------------------------------------------------------------
- Beschreibung: Modify
+ Description: modify
--------------------------------------------------------------------*/
IMPL_LINK( SwLineNumberingPage, ModifyHdl, Edit *, EMPTYARG )
{
@@ -207,7 +207,7 @@ IMPL_LINK( SwLineNumberingPage, ModifyHdl, Edit *, EMPTYARG )
}
/*--------------------------------------------------------------------
- Beschreibung: On/Off
+ Description: On/Off
--------------------------------------------------------------------*/
IMPL_LINK( SwLineNumberingPage, LineOnOffHdl, CheckBox *, EMPTYARG )
{
@@ -243,7 +243,7 @@ sal_Bool SwLineNumberingPage::FillItemSet( SfxItemSet& )
{
SwLineNumberInfo aInf(pSh->GetLineNumberInfo());
- // Zeichenvorlagen
+ // char styles
String sCharFmtName(aCharStyleLB.GetSelectEntry());
SwCharFmt *pCharFmt = pSh->FindCharFmtByName(sCharFmtName);
@@ -260,27 +260,27 @@ sal_Bool SwLineNumberingPage::FillItemSet( SfxItemSet& )
if (pCharFmt)
aInf.SetCharFmt(pCharFmt);
- // Format
+ // format
SvxNumberType aType;
aType.SetNumberingType(aFormatLB.GetSelectedNumberingType());
aInf.SetNumType(aType);
- // Position
+ // position
aInf.SetPos((LineNumberPosition)aPosLB.GetSelectEntryPos());
- // Offset
+ // offset
aInf.SetPosFromLeft((sal_uInt16)aOffsetMF.Denormalize(aOffsetMF.GetValue(FUNIT_TWIP)));
- // Numerierungsoffset
+ // numbering offset
aInf.SetCountBy((sal_uInt16)aNumIntervalNF.GetValue());
- // Teiler
+ // divider
aInf.SetDivider(aDivisorED.GetText());
- // Teileroffset
+ // divider offset
aInf.SetDividerCountBy((sal_uInt16)aDivIntervalNF.GetValue());
- // Zaehlen
+ // count
aInf.SetCountBlankLines(aCountEmptyLinesCB.IsChecked());
aInf.SetCountInFlys(aCountFrameLinesCB.IsChecked());
aInf.SetRestartEachPage(aRestartEachPageCB.IsChecked());
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 2b8f5e7..c24f397 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -166,7 +166,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
aRelativeCB.SetClickHdl(LINK(this, SwNumPositionTabPage, RelativeHdl));
aStandardPB.SetClickHdl(LINK(this, SwNumPositionTabPage, StandardHdl));
- // Ebenen einfuegen
+ // insert levels
for(sal_uInt16 i = 1; i <= MAXLEVEL; i++)
aLevelLB.InsertEntry(String::CreateFromInt32(i));
String sEntry(String::CreateFromAscii("1 - "));
@@ -294,7 +294,7 @@ void SwNumPositionTabPage::InitControls()
if(bSameAdjust)
{
- sal_uInt16 nPos = 1; // zentriert
+ sal_uInt16 nPos = 1; // centered
if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT)
nPos = 0;
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
@@ -685,7 +685,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
}
else if(pFld == &aIndentMF)
{
- //jetzt muss mit dem FirstLineOffset auch der AbsLSpace veraendert werden
+ // now AbsLSpace also has to be modified by FirstLineOffset
long nDiff = nValue + aNumFmt.GetFirstLineOffset();
long nAbsLSpace = aNumFmt.GetAbsLSpace();
aNumFmt.SetAbsLSpace(sal_uInt16(nAbsLSpace + nDiff));
@@ -957,7 +957,7 @@ SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog()
void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
{
- //Namen der Vorlagen und Metric setzen
+ // set styles' names and metric
String sNumCharFmt, sBulletCharFmt;
SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFmt );
SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt );
@@ -985,7 +985,7 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage)
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
- // Zeichenvorlagen sammeln
+ // collect char styles
ListBox rCharFmtLB(this);
rCharFmtLB.Clear();
rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src
index 3d5f83f..a0540c9 100644
--- a/sw/source/ui/misc/num.src
+++ b/sw/source/ui/misc/num.src
@@ -36,7 +36,7 @@
/**************************************************************************/
/* */
-/* TabPage Positionen */
+/* TabPage positions */
/* */
/**************************************************************************/
TabPage TP_NUM_POSITION
@@ -296,7 +296,7 @@ TabPage TP_NUM_POSITION
/**************************************************************************/
/* */
-/* Dialog fuer Test der Svx-Implementation */
+/* dialog for Svx-implementation's test */
/* */
/**************************************************************************/
TabDialog DLG_SVXTEST_NUM_BULLET
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6c0438b..f140ec0 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -60,7 +60,7 @@
#include <viewopt.hxx>
#include <svtools/ctrlbox.hxx>
#include <helpid.h>
-#include <globals.hrc> // fuer Vorlagenname 'keins'
+#include <globals.hrc> // for template name 'none'
#include <misc.hrc>
#include <outline.hrc>
#include <paratr.hxx>
@@ -100,7 +100,7 @@ public:
};
/*------------------------------------------------------------------------
- Beschreibung: selektierten Eintrag merken
+ Description: remember selected entry
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
{
@@ -111,9 +111,9 @@ IMPL_LINK_INLINE_START( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
IMPL_LINK_INLINE_END( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
/*------------------------------------------------------------------------
- Beschreibung: Setzen der vom Benutzer vergebenen Namen
- Parameter: Liste der vom Benutzer vergebenen Namen;
- nicht vom Benutzer benannte Positionen sind 0.
+ Description: set user defined names
+ Parameter: list of user defined names;
+ unknown positions for the user are 0.
------------------------------------------------------------------------*/
void SwNumNamesDlg::SetUserNames(const String *pList[])
{
@@ -133,7 +133,7 @@ void SwNumNamesDlg::SetUserNames(const String *pList[])
}
/*------------------------------------------------------------------------
- Beschreibung: OK-Button freischalten, wenn Text im Edit steht.
+ Description: unlock OK-Button when text is in Edit
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
{
@@ -143,7 +143,7 @@ IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
IMPL_LINK_INLINE_END( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
/*------------------------------------------------------------------------
- Beschreibung: DoubleClickHdl
+ Description: DoubleClickHdl
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwNumNamesDlg, DoubleClickHdl, ListBox *, EMPTYARG )
{
@@ -183,7 +183,7 @@ sal_uInt16 SwOutlineTabDialog::nNumLevel = 1;
SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent,
const SfxItemSet* pSwItemSet,
SwWrtShell &rSh) :
- //der UserString wird danach richtig gesetzt
+ // the UserString is set correctly afterwards
SfxTabDialog(pParent, SW_RES(DLG_TAB_OUTLINE), pSwItemSet, sal_False, &aEmptyStr),
aNullStr(C2S("____")),
aFormMenu(SW_RES(MN_FORM)),
@@ -211,14 +211,14 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent,
for( i = 0; i < MAXLEVEL; ++i )
{
- // wurde die Vorlage noch nicht angelegt, dann ist sie noch an dieserPosition
+ // if the style wasn't created yet, it's still at this position
if( !rWrtSh.GetParaStyle( sHeadline =
SwStyleNameMapper::GetUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i),
sHeadline )) )
aCollNames[i] = sHeadline;
}
- // Erfragen der Gliederungsebenen der Textvorlagen
+ // query the text templates' outlining levels
const sal_uInt16 nCount = rWrtSh.GetTxtFmtCollCount();
for(i = 0; i < nCount; ++i )
{
@@ -265,7 +265,7 @@ IMPL_LINK( SwOutlineTabDialog, CancelHdl, Button *, EMPTYARG )
IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn )
{
- //PopupMenu auffuellen
+ // fill PopupMenu
for( sal_uInt16 i = 0; i < SwChapterNumRules::nMaxRules; ++i )
{
const SwNumRulesWithName *pRules = pChapterNumRules->GetRules(i);
@@ -352,9 +352,8 @@ sal_uInt16 SwOutlineTabDialog::GetLevel(const String &rFmtName) const
short SwOutlineTabDialog::Ok()
{
SfxTabDialog::Ok();
- // bei allen erzeugten Vorlagen die Ebenen setzen, muss
- // geschehen, um evtl. aufgehobene Zuordnungen
- // auch wieder zu loeschen
+ // set levels for all created templates; has to be done in order to
+ // delete possibly cancelled assignments again.
// #130443#
// encapsulate changes into a action to avoid effects on the current cursor
@@ -482,8 +481,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
void SwOutlineSettingsTabPage::Update()
{
- // falls eine Vorlage fuer diese Ebene bereits selektiert wurde,
- // diese in der ListBox auswaehlean
+ // if a template was already selected for this level, select it in the ListBox
aCollBox.Enable(USHRT_MAX != nActLevel);
if(USHRT_MAX == nActLevel)
{
@@ -637,7 +635,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox )
sal_uInt8 i;
const String aCollName(pBox->GetSelectEntry());
- //0xFFFF darf hier nicht sein (disable)
+ //0xFFFF not allowed here (disable)
sal_uInt16 nTmpLevel = lcl_BitToLevel(nActLevel);
String sOldName( pCollNames[nTmpLevel] );
@@ -649,7 +647,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox )
else
{
pCollNames[nTmpLevel] = aCollName;
- // wird die Vorlage bereits verwendet ?
+ // template already in use?
for( i = 0; i < MAXLEVEL; ++i)
if(i != nTmpLevel && pCollNames[i] == aCollName )
pCollNames[i] = aEmptyStr;
@@ -789,18 +787,18 @@ SwOutlineSettingsTabPage::~SwOutlineSettingsTabPage()
void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
{
pSh = pShell;
- // Erfragen der NumRules dieses Dokumentes
+ // query this document's NumRules
pNumRule = ((SwOutlineTabDialog*)GetTabDialog())->GetNumRule();
pCollNames = ((SwOutlineTabDialog*)GetTabDialog())->GetCollNames();
aPreviewWIN.SetNumRule(pNumRule);
aPreviewWIN.SetOutlineNames(pCollNames);
- // Startwert setzen - nActLevel muss hier 1 sein
+ // set start value - nActLevel must be 1 here
sal_uInt16 nTmpLevel = lcl_BitToLevel(nActLevel);
const SwNumFmt& rNumFmt = pNumRule->Get( nTmpLevel );
aStartEdit.SetValue( rNumFmt.GetStart() );
- // Poolformate fuer Ueberschriften anlegen
+ // create pool formats for headlines
String sStr;
sal_uInt16 i;
for( i = 0; i < MAXLEVEL; ++i )
@@ -813,7 +811,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
sStr += String::CreateFromInt32(MAXLEVEL);
aLevelLB.InsertEntry( sStr );
- // Erfragen der Gliederungsebenen der Textvorlagen
+ // query the texttemplates' outlining levels
const sal_uInt16 nCount = pSh->GetTxtFmtCollCount();
for( i = 0; i < nCount; ++i )
{
@@ -835,11 +833,11 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
}
aLevelLB.SelectEntryPos(nTmp-1);//nTmp);//#outline level,zhaojianwei
- // Zeichenvorlagen sammeln
+ // collect char styles
aCharFmtLB.Clear();
aCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
- // Zeichenvorlagen
+ // char styles
::FillCharStyleListBox(aCharFmtLB,
pSh->GetView().GetDocShell());
Update();
@@ -929,7 +927,7 @@ sal_uInt16 lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, sal_uInt1
}
/*--------------------------------------------------
- Vorschau der Numerierung painten
+ paint numbering's preview
--------------------------------------------------*/
void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
{
@@ -957,9 +955,9 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
nWidthRelation = nWidthRelation / 4;
}
else
- nWidthRelation = 30; // Kapiteldialog
+ nWidthRelation = 30; // chapter dialog
- //Hoehe pro Ebene
+ // height per level
sal_uInt16 nXStep = sal_uInt16(aSize.Width() / (3 * MAXLEVEL));
if(MAXLEVEL < 10)
nXStep /= 2;
@@ -986,7 +984,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
{
nStart++;
}
- if(nStart) // damit moeglichs Vorgaenger und Nachfolger gezeigt werden
+ if(nStart) // so that possible predecessors and successors are showed
nStart--;
SwNumberTree::tNumberVector aNumVector;
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 2e899cf..4abda6d 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -67,9 +67,8 @@ static sal_uInt16 aPageRg[] = {
};
/*------------------------------------------------------------------------
- Beschreibung: Handler fuer umschalten zwischen den unterschiedlichen
- Arten, wie die Hoehe des Fussnotenbereiches angegeben
- werden kann.
+ Description: handler to switch between the different possibilities
+ how the footnote region's height can be set.
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwFootNotePage, HeightPage, Button *, EMPTYARG )
{
@@ -88,7 +87,7 @@ IMPL_LINK_INLINE_START( SwFootNotePage, HeightMetric, Button *, EMPTYARG )
IMPL_LINK_INLINE_END( SwFootNotePage, HeightMetric, Button *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: Handler Grenzwerte
+ Description: handler limit values
------------------------------------------------------------------------*/
IMPL_LINK( SwFootNotePage, HeightModify, MetricField *, EMPTYARG )
{
@@ -178,8 +177,7 @@ SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet &rSet)
void SwFootNotePage::Reset(const SfxItemSet &rSet)
{
- // Falls noch kein Bsp vorhanden Init hier sonst im Activate
- //
+ // if no example exists, otherwise Init here in Activate
SwPageFtnInfo* pDefFtnInfo = 0;
const SwPageFtnInfo* pFtnInfo;
const SfxPoolItem* pItem = SfxTabPage::GetItem(rSet, FN_PARAM_FTN_INFO);
@@ -189,12 +187,12 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
}
else
{
- // wenn "Standard" betaetigt wird, wird das Fussnotenitem geloescht,
- // deswegen muss hier eine Fussnotenstruktur erzeugt werden
+ // when "standard" is being activated the footnote item is deleted,
+ // that's why a footnote structure has to be created here
pDefFtnInfo = new SwPageFtnInfo();
pFtnInfo = pDefFtnInfo;
}
- // Hoehe Fussnotenbereich
+ // footnote area's height
SwTwips lHeight = pFtnInfo->GetHeight();
if(lHeight)
{
@@ -270,15 +268,15 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
aLineTypeBox.SetColor( pFtnInfo->GetLineColor() );
- // Position
+ // position
aLinePosBox.SelectEntryPos( static_cast< sal_uInt16 >(pFtnInfo->GetAdj()) );
- // Breite
+ // width
Fraction aTmp( 100, 1 );
aTmp *= pFtnInfo->GetWidth();
aLineLengthEdit.SetValue( static_cast<long>(aTmp) );
- // Abstand Fussnotenbereich
+ // gap footnote area
aDistEdit.SetValue(aDistEdit.Normalize(pFtnInfo->GetTopDist()),FUNIT_TWIP);
aLineDistEdit.SetValue(
aLineDistEdit.Normalize(pFtnInfo->GetBottomDist()), FUNIT_TWIP);
@@ -287,23 +285,23 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Description: stuff attributes into the set, when OK
--------------------------------------------------------------------*/
sal_Bool SwFootNotePage::FillItemSet(SfxItemSet &rSet)
{
SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO));
- // Das ist das Original
+ // that's the original
SwPageFtnInfo &rFtnInfo = aItem.GetPageFtnInfo();
- // Hoehe Fussnotenbereich
+ // footnote area's height
if(aMaxHeightBtn.IsChecked())
rFtnInfo.SetHeight( static_cast< SwTwips >(
aMaxHeightEdit.Denormalize(aMaxHeightEdit.GetValue(FUNIT_TWIP))));
else
rFtnInfo.SetHeight(0);
- // Abstand Fussnotenbereich
+ // gap footnote area
rFtnInfo.SetTopDist( static_cast< SwTwips >(
aDistEdit.Denormalize(aDistEdit.GetValue(FUNIT_TWIP))));
rFtnInfo.SetBottomDist( static_cast< SwTwips >(
@@ -380,7 +378,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet)
lMaxHeight *= 8;
lMaxHeight /= 10;
- // Maximalwerte setzen
+ // set maximum values
HeightModify(0);
}
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index aef9050..f802815 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -99,13 +99,13 @@ SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent,
}
/*--------------------------------------------------------------------
- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren
+ Description: newly initialise dialog after document switch
--------------------------------------------------------------------*/
sal_Bool SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh)
{
sal_Bool bRet;
- if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == sal_True) // Sofort aktualisieren, Dok-Wechsel
+ if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == sal_True) // update immediately, doc switch!
((SwModelessRedlineAcceptDlg*)GetWindow())->Activate();
return bRet;
@@ -126,17 +126,17 @@ void SwModelessRedlineAcceptDlg::Activate()
{
SwView *pView = ::GetActiveView();
- if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
- return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
+ if (!pView) // can happen when switching to another app, when a Listbox in dialog
+ return; // had the focus previously (actually THs Bug)
SwDocShell *pDocSh = pView->GetDocShell();
if (pChildWin->GetOldDocShell() != pDocSh)
- { // Dok-Wechsel
+ { // doc-switch
SwWait aWait( *pDocSh, sal_False );
SwWrtShell* pSh = pView->GetWrtShellPtr();
- pChildWin->SetOldDocShell(pDocSh); // Rekursion vermeiden (durch Modified-Hdl)
+ pChildWin->SetOldDocShell(pDocSh); // avoid recursion (using modified-Hdl)
sal_Bool bMod = pSh->IsModified();
SfxBoolItem aShow(FN_REDLINE_SHOW, sal_True);
@@ -217,7 +217,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt) :
pActLB->InsertEntry(sFmtCollSet);
pActLB->InsertEntry(sAutoFormat);
pTPView->ShowUndo(sal_True);
- pTPView->DisableUndo(); // Noch gibts keine UNDO-Events
+ pTPView->DisableUndo(); // no UNDO events yet
}
pActLB->SelectEntryPos(0);
@@ -234,7 +234,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt) :
pTable->SetTabs(aStaticTabs);
- // Minimalgroesse setzen
+ // set minimum size
Size aMinSz(aTabPagesCTRL.GetMinSizePixel());
Point aPos(aTabPagesCTRL.GetPosPixel());
@@ -255,11 +255,11 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt) :
pTable->SetDeselectHdl(LINK(this, SwRedlineAcceptDlg, DeselectHdl));
pTable->SetCommandHdl(LINK(this, SwRedlineAcceptDlg, CommandHdl));
- // Flackern der Buttons vermeiden:
+ // avoid flickering of buttons:
aDeselectTimer.SetTimeout(100);
aDeselectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, SelectHdl));
- // Mehrfachselektion der selben Texte vermeiden:
+ // avoid multiple selection of the same texts:
aSelectTimer.SetTimeout(100);
aSelectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, GotoHdl));
}
@@ -283,7 +283,7 @@ void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
aRedlineParents.DeleteAndDestroy(nStart, aRedlineParents.Count() - nStart);
}
- // Parents einfuegen
+ // insert parents
InsertParents(nStart);
InitAuthors();
@@ -313,7 +313,7 @@ void SwRedlineAcceptDlg::InitAuthors()
sal_Bool bIsNotFormated = sal_False;
sal_uInt16 i;
- // Autoren ermitteln
+ // determine authors
for ( i = 0; i < nCount; i++)
{
const SwRedline& rRedln = pSh->GetRedline(i);
@@ -406,7 +406,7 @@ void SwRedlineAcceptDlg::Resize()
}
/*--------------------------------------------------------------------
- Beschreibung: Nach Aktivierung neu initialisieren
+ Description: newly initialise after activation
--------------------------------------------------------------------*/
void SwRedlineAcceptDlg::Activate()
{
@@ -419,14 +419,14 @@ void SwRedlineAcceptDlg::Activate()
aUsedSeqNo.Remove((sal_uInt16)0, aUsedSeqNo.Count());
- if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
- return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
+ if (!pView) // can happen when switching to another app, when a Listbox in the dialog
+ return; // had the focus previously (actually THs Bug)
- // Hat sich was geaendert?
+ // did something change?
SwWrtShell* pSh = pView->GetWrtShellPtr();
sal_uInt16 nCount = pSh->GetRedlineCount();
- // Anzahl und Pointer ueberpruefen
+ // check the number of pointers
SwRedlineDataParent *pParent = 0;
sal_uInt16 i;
@@ -436,7 +436,7 @@ void SwRedlineAcceptDlg::Activate()
if (i >= aRedlineParents.Count())
{
- // Neue Eintraege wurden angehaengt
+ // new entries have been appended
Init(i);
return;
}
@@ -444,7 +444,7 @@ void SwRedlineAcceptDlg::Activate()
pParent = aRedlineParents[i];
if (&rRedln.GetRedlineData() != pParent->pData)
{
- // Redline-Parents wurden eingefuegt, geaendert oder geloescht
+ // Redline-Parents were inserted, changed or deleted
if ((i = CalcDiff(i, sal_False)) == USHRT_MAX)
return;
continue;
@@ -455,7 +455,7 @@ void SwRedlineAcceptDlg::Activate()
if (!pRedlineData && pBackupData)
{
- // Redline-Childs wurden geloescht
+ // Redline-Childs were deleted
if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
return;
continue;
@@ -466,7 +466,7 @@ void SwRedlineAcceptDlg::Activate()
{
if (pRedlineData != pBackupData->pChild)
{
- // Redline-Childs wurden eingefuegt, geaendert oder geloescht
+ // Redline-Childs were inserted, changed or deleted
if ((i = CalcDiff(i, sal_True)) == USHRT_MAX)
return;
continue;
@@ -480,12 +480,12 @@ void SwRedlineAcceptDlg::Activate()
if (nCount != aRedlineParents.Count())
{
- // Redlines wurden am Ende geloescht
+ // Redlines were deleted at the end
Init(nCount);
return;
}
- // Kommentar ueberpruefen
+ // check comment
for (i = 0; i < nCount; i++)
{
const SwRedline& rRedln = pSh->GetRedline(i);
@@ -495,7 +495,7 @@ void SwRedlineAcceptDlg::Activate()
{
if (pParent->pTLBParent)
{
- // Nur Kommentar aktualisieren
+ // update only comment
String sComment(rRedln.GetComment());
sComment.SearchAndReplaceAll((sal_Unicode)_LF,(sal_Unicode)' ');
pTable->SetEntryText(sComment, pParent->pTLBParent, 3);
@@ -522,9 +522,9 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
SwRedlineDataParent *pParent = aRedlineParents[nStart];
const SwRedline& rRedln = pSh->GetRedline(nStart);
- if (bChild) // Sollte eigentlich nie vorkommen, aber sicher ist sicher...
+ if (bChild) // should actually never happen, but just in case...
{
- // Alle Childs des Eintrags wegwerfen und neu initialisieren
+ // throw away all entry's childs and initialise newly
SwRedlineDataChildPtr pBackupData = (SwRedlineDataChildPtr)pParent->pNext;
SwRedlineDataChildPtr pNext;
@@ -539,28 +539,28 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
}
pParent->pNext = 0;
- // Neue Childs einfuegen
+ // insert new childs
InsertChilds(pParent, rRedln, nAutoFmt);
pTable->SetUpdateMode(sal_True);
return nStart;
}
- // Wurden Eintraege geloescht?
+ // have entries been deleted?
const SwRedlineData *pRedlineData = &rRedln.GetRedlineData();
sal_uInt16 i;
for ( i = nStart + 1; i < aRedlineParents.Count(); i++)
{
if (aRedlineParents[i]->pData == pRedlineData)
{
- // Eintraege von nStart bis i-1 entfernen
+ // remove entries from nStart to i-1
RemoveParents(nStart, i - 1);
pTable->SetUpdateMode(sal_True);
return nStart - 1;
}
}
- // Wurden Eintraege eingefuegt?
+ // entries been inserted?
sal_uInt16 nCount = pSh->GetRedlineCount();
pRedlineData = aRedlineParents[nStart]->pData;
@@ -568,7 +568,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
{
if (&pSh->GetRedline(i).GetRedlineData() == pRedlineData)
{
- // Eintraege von nStart bis i-1 einfuegen
+ // insert entries from nStart to i-1
InsertParents(nStart, i - 1);
pTable->SetUpdateMode(sal_True);
return nStart - 1;
@@ -576,7 +576,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild)
}
pTable->SetUpdateMode(sal_True);
- Init(nStart); // Alle Eintraege bis zum Ende abgleichen
+ Init(nStart); // adjust all entries until the end
return USHRT_MAX;
}
@@ -594,7 +594,7 @@ void SwRedlineAcceptDlg::InsertChilds(SwRedlineDataParent *pParent, const SwRedl
{
sal_uInt16 nPos;
- if (pParent->pData->GetSeqNo() && !aUsedSeqNo.Insert(pParent, nPos)) // Gibts schon
+ if (pParent->pData->GetSeqNo() && !aUsedSeqNo.Insert(pParent, nPos)) // already there
{
if (pParent->pTLBParent)
{
@@ -666,14 +666,14 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
SvLBoxEntryArr aLBoxArr;
- // Wegen Bug der TLB, die bei Remove den SelectHandler IMMER ruft:
+ // because of Bug of TLB that ALWAYS calls the SelectHandler at Remove:
pTable->SetSelectHdl(aOldSelectHdl);
pTable->SetDeselectHdl(aOldDeselectHdl);
sal_Bool bChildsRemoved = sal_False;
pTable->SelectAll(sal_False);
- // Hinter dem letzten Eintrag Cursor setzen, da sonst Performance-Problem in TLB.
- // TLB wuerde sonst bei jedem Remove den Cursor erneut umsetzen (teuer)
+ // set the cursor after the last entry because otherwise performance problem in TLB.
+ // TLB would otherwise reset the cursor at every Remove (expensive)
sal_uInt16 nPos = Min((sal_uInt16)nCount, (sal_uInt16)aRedlineParents.Count());
SvLBoxEntry *pCurEntry = NULL;
while( ( pCurEntry == NULL ) && ( nPos > 0 ) )
@@ -720,14 +720,14 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
}
}
- // TLB von hinten abraeumen
+ // clear TLB from behind
long nIdx = (long)aLBoxArr.Count() - 1L;
while (nIdx >= 0)
pTable->RemoveEntry(aLBoxArr[ static_cast< sal_uInt16 >(nIdx--) ]);
pTable->SetSelectHdl(LINK(this, SwRedlineAcceptDlg, SelectHdl));
pTable->SetDeselectHdl(LINK(this, SwRedlineAcceptDlg, DeselectHdl));
- // Durch Remove wurde leider wieder dauernd von der TLB selektiert...
+ // unfortunately by Remove it was selected from the TLB always again ...
pTable->SelectAll(sal_False);
aRedlineParents.DeleteAndDestroy( nStart, nEnd - nStart + 1);
@@ -741,10 +741,10 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd)
String sParent;
sal_uInt16 nCount = pSh->GetRedlineCount();
- nEnd = Min((sal_uInt16)nEnd, (sal_uInt16)(nCount - 1)); // Handelt auch nEnd=USHRT_MAX (bis zum Ende) ab
+ nEnd = Min((sal_uInt16)nEnd, (sal_uInt16)(nCount - 1)); // also treats nEnd=USHRT_MAX (until the end)
if (nEnd == USHRT_MAX)
- return; // Keine Redlines im Dokument
+ return; // no redlines in the document
RedlinData *pData;
SvLBoxEntry *pParent;
@@ -954,7 +954,7 @@ IMPL_LINK( SwRedlineAcceptDlg, FilterChangedHdl, void*, EMPTYARG )
IMPL_LINK( SwRedlineAcceptDlg, DeselectHdl, void*, EMPTYARG )
{
- // Flackern der Buttons vermeiden:
+ // avoid flickering of buttons:
aDeselectTimer.Start();
return 0;
@@ -1001,7 +1001,7 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG )
if (pTable->IsSelected(pActEntry))
{
pSelEntry = pActEntry = pTable->NextSelected(pSelEntry);
- continue; // Nicht zweimal selektieren
+ continue; // don't select twice
}
}
else
@@ -1058,7 +1058,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
sal_uInt16 nPos = GetRedlinePos(*pTopEntry);
- // Bei geschuetzten Bereichen kommentieren disablen
+ // disable commenting for protected areas
if ((pRed = pSh->GotoRedline(nPos, sal_True)) != 0)
{
if( pSh->IsCrsrPtAtEnd() )
@@ -1159,7 +1159,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
String sMsg(((const SvxPostItTextItem&)pOutSet->Get(SID_ATTR_POSTIT_TEXT)).GetValue());
- // Kommentar einfuegen bzw aendern
+ // insert / change comment
pSh->SetRedlineComment(sMsg);
sMsg.SearchAndReplaceAll((sal_Unicode)_LF,(sal_Unicode)' ');
pTable->SetEntryText(sMsg, pEntry, 3);
@@ -1180,11 +1180,11 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
{
bSortDir = sal_True;
if (nRet - MN_SORT_ACTION == 4 && pTable->GetSortedCol() == 0xffff)
- break; // Haben wir schon
+ break; // we already have it
nSortMode = nRet - MN_SORT_ACTION;
if (nSortMode == 4)
- nSortMode = 0xffff; // unsortiert bzw sortiert nach Position
+ nSortMode = 0xffff; // unsorted / sorted by position
if (pTable->GetSortedCol() == nSortMode)
bSortDir = !pTable->GetSortDirection();
@@ -1192,7 +1192,7 @@ IMPL_LINK( SwRedlineAcceptDlg, CommandHdl, void*, EMPTYARG )
SwWait aWait( *::GetActiveView()->GetDocShell(), sal_False );
pTable->SortByCol(nSortMode, bSortDir);
if (nSortMode == 0xffff)
- Init(); // Alles neu fuellen
+ Init(); // newly fill everything
}
break;
}
@@ -1209,8 +1209,8 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData)
{
sal_uInt16 nPos = rExtraData.Search(C2S("AcceptChgDat:"));
- // Versuche, den Alignment-String "ALIGN:(...)" einzulesen; wenn
- // er nicht vorhanden ist, liegt eine "altere Version vor
+ // try to read the alignment string "ALIGN:(...)"; if none existing,
+ // it's an old version
if (nPos != STRING_NOTFOUND)
{
sal_uInt16 n1 = rExtraData.Search('(', nPos);
@@ -1219,7 +1219,7 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData)
sal_uInt16 n2 = rExtraData.Search(')', n1);
if (n2 != STRING_NOTFOUND)
{
- // Alignment-String herausschneiden
+ // cut out the alignment string
String aStr = rExtraData.Copy(nPos, n2 - nPos + 1);
aStr.Erase(0, n1 - nPos + 1);
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 6d8c8f0..c115b1c 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -95,8 +95,7 @@ void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
}
/*--------------------------------------------------------------------
- Beschreibung: Fuer Tabellenselektion sel. Zeilen und Spalten
- feststellen
+ Description: determine lines and columns for table selection
--------------------------------------------------------------------*/
sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
{
@@ -106,7 +105,7 @@ sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
_FndBox aFndBox( 0, 0 );
- // suche alle Boxen / Lines
+ // look for all boxes / lines
{
SwSelBoxes aSelBoxes;
::GetTblSel( rSh, aSelBoxes );
@@ -123,7 +122,7 @@ sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
}
/*--------------------------------------------------------------------
- Beschreibung: Init-Liste
+ Description: init list
--------------------------------------------------------------------*/
SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) :
@@ -212,7 +211,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) :
aColLbl.SetText(aColTxt);
}
- // Initialisieren
+ // initialise
Link aLk = LINK(this,SwSortDlg, CheckHdl);
aKeyCB1.SetClickHdl( aLk );
aKeyCB2.SetClickHdl( aLk );
@@ -313,12 +312,11 @@ sal_Unicode SwSortDlg::GetDelimChar() const
}
/*--------------------------------------------------------------------
- Beschreibung: An die Core weiterreichen
+ Description: pass on to the Core
--------------------------------------------------------------------*/
void SwSortDlg::Apply()
{
- // Alte Einstellung speichern
- //
+ // save all settings
bCheck1 = aKeyCB1.IsChecked();
bCheck2 = aKeyCB2.IsChecked();
bCheck3 = aKeyCB3.IsChecked();
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 0e16b9e..d1da2c4 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -76,14 +76,14 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) :
pImplDlg = new SwRedlineAcceptDlg(this, sal_True);
pImplDlg->Initialize(GetExtraData());
- pImplDlg->Activate(); // Zur Initialisierung der Daten
+ pImplDlg->Activate(); // for data's initialisation
FreeResource();
}
SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg()
{
- AcceptAll(sal_False); // Alles uebriggebliebene ablehnen
+ AcceptAll(sal_False); // refuse everything remaining
pImplDlg->FillInfo(GetExtraData());
delete pImplDlg;
@@ -106,7 +106,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( sal_Bool bAccept )
if (pFilterTP->IsDate() || pFilterTP->IsAuthor() ||
pFilterTP->IsRange() || pFilterTP->IsAction())
{
- pFilterTP->CheckDate(sal_False); // Alle Filter abschalten
+ pFilterTP->CheckDate(sal_False); // turn off all filters
pFilterTP->CheckAuthor(sal_False);
pFilterTP->CheckRange(sal_False);
pFilterTP->CheckAction(sal_False);
commit 8b14e061822a2fee85a433c945f3ecacdb24ed5e
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Sun Jun 5 15:35:28 2011 +0200
Translate german comments
Translate a part of german code comments in writer/sw/source/ui/misc to
english!
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 49d2c40..7475039 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -78,33 +78,32 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox )
}
- aOkBtn.Enable(!bSelEntries); // neue Textmarke
- aDeleteBtn.Enable(bSelEntries); // loeschbar?
+ aOkBtn.Enable(!bSelEntries); // new text mark
+ aDeleteBtn.Enable(bSelEntries); // deletable?
return 0;
}
/*------------------------------------------------------------------------
- Beschreibung: Callback zum Loeschen einer Textmarke
+ Description: callback to delete a text mark
-----------------------------------------------------------------------*/
IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG )
{
- // Textmarken aus der ComboBox entfernen
+ // remove text marks from the ComboBox
for (sal_uInt16 i = aBookmarkBox.GetSelectEntryCount(); i; i-- )
aBookmarkBox.RemoveEntry(aBookmarkBox.GetSelectEntryPos(i - 1));
aBookmarkBox.SetText(aEmptyStr);
- aDeleteBtn.Enable(sal_False); // keine weiteren Eintraege vorhanden
+ aDeleteBtn.Enable(sal_False); // no further entries there
- aOkBtn.Enable(); // Im OK Handler wird geloescht
+ aOkBtn.Enable(); // the OK handler deletes
return 0;
}
/*------------------------------------------------------------------------
- Beschreibung: Callback fuer OKButton. Fuegt eine neue Textmarke
- an die akt. Position ein. Geloeschte Textmarken werden auch am Modell
- entfernt.
+ Description: callback for OKButton. Inserts a new text mark to the
+ current position. Deleted text marks are also deleted in the model.
-----------------------------------------------------------------------*/
void SwInsertBookmarkDlg::Apply()
{
@@ -120,7 +119,7 @@ void SwInsertBookmarkDlg::Apply()
aReq.Done();
}
- // Textmarke einfuegen
+ // insert text mark
sal_uInt16 nLen = aBookmarkBox.GetText().Len();
SwBoxEntry aTmpEntry(aBookmarkBox.GetText(), 0 );
@@ -140,7 +139,7 @@ void SwInsertBookmarkDlg::Apply()
}
/*------------------------------------------------------------------------
- Beschreibung: CTOR
+ Description: CTOR
-----------------------------------------------------------------------*/
SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRequest& rRequest ) :
@@ -159,7 +158,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRe
aDeleteBtn.SetClickHdl(LINK(this, SwInsertBookmarkDlg, DeleteHdl));
- // Combobox mit vorhandenen Bookmarks fuellen
+ // fill Combobox with existing bookmarks
IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
sal_uInt16 nId = 0;
for( IDocumentMarkAccess::const_iterator_t ppBookmark = pMarkAccess->getBookmarksBegin();
@@ -225,7 +224,7 @@ sal_uInt16 BookmarkCombo::GetSelectEntryCount() const
}
/*------------------------------------------------------------------------
- Beschreibung: Position in der Listbox (der ComboBox)
+ Description: position inside of the listbox (the ComboBox)
-----------------------------------------------------------------------*/
sal_uInt16 BookmarkCombo::GetSelectEntryPos( sal_uInt16 nSelIndex ) const
{
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 5226749..6eccde9 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -184,7 +184,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
else
{
const SwFtnInfo &rInf = pSh->GetFtnInfo();
- // Position (Seite, Kapitel) setzen
+ // set position (page, chapter)
if ( rInf.ePos == FTNPOS_PAGE )
{
aPosPageBox.Check();
@@ -198,16 +198,16 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
aNumCountBox.RemoveEntry(aNumChapter);
bPosDoc = sal_True;
}
- // Verweistexte
+ // reference tests
aContEdit.SetText(rInf.aQuoVadis);
aContFromEdit.SetText(rInf.aErgoSum);
- // gesammelt wo
+ // collected
SelectNumbering(rInf.eNum);
}
- // Numerierung
- // Art
+ // numbering
+ // art
aNumViewBox.SelectNumberingType( pInf->aFmt.GetNumberingType());
aOffsetFld.SetValue(pInf->nFtnOffset + 1);
aPrefixED.SetText(pInf->GetPrefix());
@@ -222,8 +222,8 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
aFtnCharAnchorTemplBox.SelectEntry( pCharFmt->GetName() );
aFtnCharAnchorTemplBox.SaveValue();
- // Vorlagen - Sonderbereiche
- // Absatz
+ // styles special regions
+ // paragraph
SfxStyleSheetBasePool* pStyleSheetPool = pSh->GetView().GetDocShell()->GetStyleSheetPool();
pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SWSTYLEBIT_EXTRA);
SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
@@ -255,7 +255,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
}
}
- // Seite
+ // page
for( i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i )
aPageTemplBox.InsertEntry(SwStyleNameMapper::GetUIName( i, aEmptyStr ));
@@ -281,10 +281,9 @@ SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet
}
/*------------------------------------------------------------------------
- Beschreibung: Unterschiedliche Arten der Numerierung; da die Listbox
- unterschiedlich viele Eintraege hat, hier Funktionen
- fuer das Setzen und Erfragen der gemeinten Art
- der Numerierung.
+ Description: Different kinds of numbering; because the Listbox has
+ varying numbers of entries, here are functions to
+ set and query the intended kind of numbering.
------------------------------------------------------------------------*/
void SwEndNoteOptionPage::SelectNumbering(int eNum)
{
@@ -320,7 +319,7 @@ int SwEndNoteOptionPage::GetNumbering() const
void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
{
pSh = &rShell;
- // Zeichenvorlagen sammeln
+ // collect character templates
aFtnCharTextTemplBox.Clear();
aFtnCharAnchorTemplBox.Clear();
::FillCharStyleListBox(aFtnCharTextTemplBox,
@@ -331,10 +330,8 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote
- auf der Seite.
- In diesem Fall koennen alle Numerierungsarten verwendet
- werden.
+ Description: Handler behind the button to collect the footnote at the
+ page. In this case all kinds of numbering can be used.
------------------------------------------------------------------------*/
@@ -368,10 +365,9 @@ IMPL_LINK( SwEndNoteOptionPage, NumCountHdl, ListBox*, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler hinter dem Button fuer Sammeln der Fussnote
- am Kapitel oder Dokumentende.
- In diesem Fall kann keine seitenweise Numerierung verwendet
- werden.
+ Description: Handler behind the button to collect the footnote at the
+ chapter or end of the document. In this case no pagewise
+ numbering can be used.
------------------------------------------------------------------------*/
@@ -428,7 +424,7 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
pInf->SetAnchorCharFmt( lcl_GetCharFormat( pSh,
aFtnCharAnchorTemplBox.GetSelectEntry() ) );
- // Absatzvorlage
+ // paragraph template
sal_uInt16 nPos = aParaTemplBox.GetSelectEntryPos();
if(LISTBOX_ENTRY_NOTFOUND != nPos)
{
@@ -438,7 +434,7 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
pInf->SetFtnTxtColl(*pColl);
}
- // Seitenvorlage
+ // page template
pInf->ChgPageDesc( pSh->FindPageDescByName(
aPageTemplBox.GetSelectEntry(), sal_True ) );
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 7ebec76..52dfd5e 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -180,8 +180,7 @@ void SwGlossaryGroupDlg::Apply()
const String sDelGroup = pDelEntry->GetToken(0, '\t');
if( sDelGroup == aActGroup )
{
- //soll die aktuelle Gruppe geloescht werden, muss die akt. Gruppe
- //umgesetzt werden
+ //when the current group is deleted, the current group has to be relocated
if(aGroupTLB.GetEntryCount())
{
SvLBoxEntry* pFirst = aGroupTLB.First();
@@ -202,7 +201,7 @@ void SwGlossaryGroupDlg::Apply()
}
}
- //erst umbenennen, falls es schon eins gab
+ //don't rename before there was one
if(pRenamedArr && pRenamedArr->Count())
{
sal_uInt16 nCount = pRenamedArr->Count();
@@ -295,8 +294,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton )
}
GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData();
String sEntry(pUserData->sGroupName);
- // befindet sich der zu loeschende Name schon unter den
- // den neuen - dann weg damit
+ // if the name to be deleted is among the new ones - get rid of it
sal_Bool bDelete = sal_True;
if(pInsertedArr && pInsertedArr->Count())
{
@@ -313,7 +311,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton )
}
}
- // moeglicherweise sollte es schon umbenannt werden?
+ // it should probably be renamed?
if(bDelete)
{
if(pRenamedArr && pRenamedArr->Count())
@@ -364,8 +362,7 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG )
sNewName += String::CreateFromInt32(aPathLB.GetSelectEntryPos());
OSL_ENSURE(!pGlosHdl->FindGroupName(sNewName), "group already available!");
- // befindet sich der umzubenennende Name unter den
- // den neuen - dann austauschen
+ // if the name to be renamed is among the new ones - replace
sal_Bool bDone = sal_False;
if(pInsertedArr && pInsertedArr->Count())
{
@@ -426,7 +423,7 @@ IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG )
nPos = aGroupTLB.GetEntryPos(sEntry, 0);
- //ist es nicht case sensitive muss man selbst suchen
+ //if it's not case sensitive you have to search for yourself
if( 0xffffffff == nPos)
{
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
@@ -468,9 +465,9 @@ sal_Bool SwGlossaryGroupDlg::IsDeleteAllowed(const String &rGroup)
{
sal_Bool bDel = (!pGlosHdl->IsReadOnly(&rGroup));
- // OM: befindet sich der Name unter den den neuen Bereichsnamen,
- // dann ist er auch loeschbar! Bei noch nicht existenten Bereichsnamen
- // liefert ReadOnly naemlich sal_True.
+ // OM: if the name is among the new region name, it is deletable
+ // as well! Because for non existing region names ReadOnly issues
+ // sal_True.
if(pInsertedArr && pInsertedArr->Count())
{
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index d06234d..aec1c15 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -105,7 +105,7 @@ String lcl_CheckFileName( const String& rNewFilePath,
}
/*------------------------------------------------------------------------
- Beschreibung: Liefert den Namen der Default-Gruppe
+ Description: supplies the default group's name
------------------------------------------------------------------------*/
String SwGlossaries::GetDefName()
{
@@ -114,7 +114,7 @@ String SwGlossaries::GetDefName()
}
/*------------------------------------------------------------------------
- Beschreibung: Liefert die Anzahl der Textbausteingruppen
+ Description: supplies the number of text block groups
------------------------------------------------------------------------*/
sal_uInt16 SwGlossaries::GetGroupCnt()
{
@@ -122,12 +122,12 @@ sal_uInt16 SwGlossaries::GetGroupCnt()
}
/*------------------------------------------------------------------------
- Beschreibung: Liefert den Gruppennamen
+ Description: supplies the group's name
------------------------------------------------------------------------*/
sal_Bool SwGlossaries::FindGroupName(String & rGroup)
{
- // enthaelt der Gruppenname keinen Pfad, kann hier ein passender
- // Gruppeneintrag gesucht werden;
+ // if the group name doesn't contain a path, a suitable group entry
+ // can the searched for here;
sal_uInt16 nCount = GetGroupCnt();
sal_uInt16 i;
for(i= 0; i < nCount; i++)
@@ -139,8 +139,8 @@ sal_Bool SwGlossaries::FindGroupName(String & rGroup)
return sal_True;
}
}
- //man darf zweimal suchen, denn bei mehreren Verzeichnissen koennte
- //der caseinsensitive Name mehrfach auftreten
+ // you can search two times because for more directories the case sensitive
+ // name could occur multiple times
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
for(i = 0; i < nCount; i++)
{
@@ -179,12 +179,12 @@ String SwGlossaries::GetGroupTitle( const String& rGroupName )
}
/*------------------------------------------------------------------------
- Beschreibung: Liefert das Textbaustein-Dokument der Gruppe rName
+ Description: supplies the group rName's text block document
------------------------------------------------------------------------*/
SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName,
sal_Bool bCreate) const
{
- // gfs. in die Liste der Textbausteine eintragen
+ // insert to the list of text blocks if applicable
if(bCreate && m_pGlosArr)
{
const String aName(rName);
@@ -198,7 +198,7 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName,
break;
}
if(i == nCount)
- { // Baustein nicht in der Liste
+ { // block not in the list
String *pTmp = new String(aName);
m_pGlosArr->Insert(pTmp, m_pGlosArr->Count());
}
@@ -207,16 +207,16 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName,
}
/*------------------------------------------------------------------------
- Beschreibung: Loeschen Textblock
+ Description: delete a text block
------------------------------------------------------------------------*/
void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) {
delete pBlock;
}
/*------------------------------------------------------------------------
- Beschreibung: Erzeugt ein neues Dokument mit dem Gruppenname
- Wird temp. auch als File angelegt, damit die
- Gruppen auch spaeter (ohne Zugriff) vorhanden sind.
+ Description: Creates a new document with the group name. temporarly
+ also created as file so that groups remain there later
+ (without access).
------------------------------------------------------------------------*/
sal_Bool SwGlossaries::NewGroupDoc(String& rGroupName, const String& rTitle)
{
@@ -300,7 +300,7 @@ sal_Bool SwGlossaries::RenameGroupDoc(
}
/*------------------------------------------------------------------------
- Beschreibung: Loescht eine Textbausteingruppe
+ Description: Deletes a text block group
------------------------------------------------------------------------*/
sal_Bool SwGlossaries::DelGroupDoc(const String &rName)
{
@@ -316,9 +316,9 @@ sal_Bool SwGlossaries::DelGroupDoc(const String &rName)
aTmp += SwGlossaries::GetExtension();
sFileURL += INET_PATH_TOKEN;
sFileURL += aTmp;
- // Auch, wenn das File nicht existiert, muss es aus der Liste
- // der Textbausteinbereiche entfernt werden
- // Kein && wegen CFfront
+ // Even if the file doesn't exist it hast to be deleted from
+ // the list of text block regions
+ // no && because of CFfront
sal_Bool bRemoved = SWUnoHelper::UCB_DeleteFile( sFileURL );
OSL_ENSURE(bRemoved, "file has not been removed");
RemoveFileFromList( aName );
@@ -326,7 +326,7 @@ sal_Bool SwGlossaries::DelGroupDoc(const String &rName)
}
/*------------------------------------------------------------------------
- Beschreibung: DTOR
+ Description: DTOR
------------------------------------------------------------------------*/
SwGlossaries::~SwGlossaries()
{
@@ -351,7 +351,7 @@ SwGlossaries::~SwGlossaries()
}
/*------------------------------------------------------------------------
- Beschreibung: Bausteindokument einlesen
+ Description: read a block document
------------------------------------------------------------------------*/
SwTextBlocks* SwGlossaries::GetGlosDoc( const String &rName, sal_Bool bCreate ) const
{
@@ -388,7 +388,7 @@ SwTextBlocks* SwGlossaries::GetGlosDoc( const String &rName, sal_Bool bCreate )
}
/*------------------------------------------------------------------------
- Beschreibung: Zugriff auf die Liste der Name; diese wird gfs. eingelesen
+ Description: access to the list of names; read in if applicable
------------------------------------------------------------------------*/
SvStrings* SwGlossaries::GetNameList()
{
@@ -417,7 +417,7 @@ SvStrings* SwGlossaries::GetNameList()
}
if(!m_pGlosArr->Count())
{
- // Der Standard-Baustein steht im ersten Teil des Pfades
+ // the standard block is inside of the path's first part
String *pTmp = new String( SwGlossaries::GetDefName() );
(*pTmp) += GLOS_DELIM;
(*pTmp) += '0';
@@ -428,7 +428,7 @@ SvStrings* SwGlossaries::GetNameList()
}
/*------------------------------------------------------------------------
- Beschreibung: CTOR
+ Description: CTOR
------------------------------------------------------------------------*/
SwGlossaries::SwGlossaries() :
m_pPathArr(0),
@@ -439,11 +439,11 @@ SwGlossaries::SwGlossaries() :
}
/*------------------------------------------------------------------------
- Beschreibung: Neuen Pfad einstellen und internes Array neu aufbauen
+ Description: set new path and recreate internal array
------------------------------------------------------------------------*/
/* --------------------------------------------------
-* #61050# Doppelte Pfade fuehren zu Verwirrung - als raus damit
+* #61050# double paths cause irritation - get rid of it
* --------------------------------------------------*/
sal_Bool lcl_FindSameEntry(const SvStrings& rDirArr, const String& rEntryURL)
{
@@ -499,7 +499,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
(m_sErrPath.Len() && (bPathChanged || m_sOldErrPath != m_sErrPath)) )
{
m_sOldErrPath = m_sErrPath;
- // Falscher Pfad, d.h. AutoText-Verzeichnis existiert nicht
+ // wrong path, that means AutoText directory doesn't exist
ErrorHandler::HandleError( *new StringErrorInfo(
ERR_AUTOPATH_ERROR, m_sErrPath,
@@ -597,7 +597,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName )
{
sal_uInt16 nCount = GetGroupCnt();
- //wenn der Gruppenname intern erzeugt wurde, dann steht auch hier der Pfad drin
+ // when the group name was created internally the path is here as well
String sGroup(GroupName);
String sGroupName(sGroup.GetToken(0, GLOS_DELIM));
String sPath = sGroup.GetToken(1, GLOS_DELIM);
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 4aa38a8..89d8dd8 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -68,7 +68,7 @@
#include <glossary.hxx>
#include <gloshdl.hxx>
#include <glosbib.hxx>
-#include <initui.hxx> // fuer ::GetGlossaries()
+#include <initui.hxx> // for ::GetGlossaries()
#include <glosdoc.hxx>
#include <macassgn.hxx>
#include <swevent.hxx>
@@ -134,7 +134,7 @@ struct GroupUserData
};
/*------------------------------------------------------------------------
- Beschreibung: Dialog fuer neuen Bausteinnamen
+ Description: dialog for new block name
------------------------------------------------------------------------*/
class SwNewGlosNameDlg : public ModalDialog
{
@@ -192,7 +192,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent,
}
/*------------------------------------------------------------------------
- Beschreibung: aktuell eingestellte Gruppe erfragen / setzen
+ Description: query / set currently set group
------------------------------------------------------------------------*/
String SwGlossaryDlg::GetCurrGroup()
{
@@ -249,7 +249,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
{
SvtLinguConfig aLocalLinguConfig;
- // Static-Pointer initialisieren
+ // initialise static-pointer
if( !::GetCurrGlosGroup() )
::SetCurrGlosGroup(new String);//(SwGlossaries::GetDefName());
@@ -284,7 +284,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
aCategoryBox.SetHelpId(HID_MD_GLOS_CATEGORY);
aCategoryBox.SetStyle(aCategoryBox.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT);
aCategoryBox.GetModel()->SetSortMode(SortAscending);
- aCategoryBox.SetHighlightRange(); // ueber volle Breite selektieren
+ aCategoryBox.SetHighlightRange(); // select over full width
aCategoryBox.SetNodeDefaultImages( );
aCategoryBox.SetAccessibleName(SW_RES(STR_ACCESS_SW_CATEGORY));
aCategoryBox.SetAccessibleRelationLabeledBy(&aInsertTipCB);
@@ -304,7 +304,7 @@ SwGlossaryDlg::~SwGlossaryDlg()
}
/*------------------------------------------------------------------------
- Beschreibung: Auswahl neue Gruppe
+ Description: select new group
------------------------------------------------------------------------*/
IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
{
@@ -318,7 +318,7 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
(*pGlosGroup) += GLOS_DELIM;
(*pGlosGroup) += String::CreateFromInt32(pGroupData->nPathIdx);
pGlossaryHdl->SetCurGroup(*pGlosGroup);
- // Aktuellen Textbaustein setzen
+ // set current text block
bReadOnly = pGlossaryHdl->IsReadOnly();
EnableShortName( !bReadOnly );
aEditBtn.Enable(!bReadOnly);
@@ -334,13 +334,13 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
}
else
ShowAutoText(aEmptyStr, aEmptyStr);
- //Controls aktualisieren
+ // update controls
NameModify(&aShortNameEdit);
if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) )
{
SfxRequest aReq( pSh->GetView().GetViewFrame(), FN_SET_ACT_GLOSSARY );
String sTemp(*::GetCurrGlosGroup());
- // der nullte Pfad wird nicht aufgezeichnet!
+ // the zeroth path is not being recorded!
if('0' == sTemp.GetToken(1, GLOS_DELIM).GetChar(0))
sTemp = sTemp.GetToken(0, GLOS_DELIM);
aReq.AppendItem(SfxStringItem(FN_SET_ACT_GLOSSARY, sTemp));
@@ -357,7 +357,7 @@ void SwGlossaryDlg::Apply()
{
SfxRequest aReq( pSh->GetView().GetViewFrame(), FN_INSERT_GLOSSARY );
String sTemp(*::GetCurrGlosGroup());
- // der nullte Pfad wird nicht aufgezeichnet!
+ // the zeroth path is not being recorded!
if('0' == sTemp.GetToken(1, GLOS_DELIM).GetChar(0))
sTemp = sTemp.GetToken(0, GLOS_DELIM);
aReq.AppendItem(SfxStringItem(FN_INSERT_GLOSSARY, sTemp));
@@ -373,12 +373,12 @@ void SwGlossaryDlg::Apply()
}
/* --------------------------------------------------
- * existiert der Titel in der ausgewaehlten Gruppe?
+ * does the title exist in the selected group?
* --------------------------------------------------*/
SvLBoxEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock,
const String& rShort)
{
- //evtl. vorhandenen Eintrag in der TreeListBox suchen
+ // look for possible entry in TreeListBox
SvLBoxEntry* pEntry = aCategoryBox.FirstSelected();
if(pEntry)
{
@@ -415,8 +415,7 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit )
sal_Bool bNotFound = !DoesBlockExist(aName, sShortSearch);
if(bNameED)
{
- // ist der Text durch einen Klick in die Listbox in das
- // Edit gekommem?
+ // did the text get in to the Listbbox in the Edit with a click?
if(bNotFound)
{
aShortNameEdit.SetText( lcl_GetValidShortCut( aName ) );
@@ -490,7 +489,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
break;
case FN_GL_DEFINE_TEXT:
bNoAttr = sal_True;
- // Kein break!!!
+ // no break!!!
case FN_GL_DEFINE:
{
const String aStr(aNameED.GetText());
@@ -512,13 +511,13 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
pChild->SetUserData(new String(aShortName));
aNameED.SetText(aStr);
aShortNameEdit.SetText(aShortName);
- NameModify(&aNameED); // fuer Schalten der Buttons
+ NameModify(&aNameED); // for toggling the buttons
if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) )
{
SfxRequest aReq(pSh->GetView().GetViewFrame(), FN_NEW_GLOSSARY);
String sTemp(*::GetCurrGlosGroup());
- // der nullte Pfad wird nicht aufgezeichnet!
+ // the zeroth path is not being recorded!
if('0' == sTemp.GetToken(1, GLOS_DELIM).GetChar(0))
sTemp = sTemp.GetToken(0, GLOS_DELIM);
aReq.AppendItem(SfxStringItem(FN_NEW_GLOSSARY, sTemp));
@@ -659,7 +658,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
}
/*--------------------------------------------------------------------
- Beschreibung: Dialog Verwaltung Bereiche
+ Description: dialog manage regions
--------------------------------------------------------------------*/
IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG )
{
@@ -736,13 +735,13 @@ IMPL_LINK( SwGlossaryDlg, BibHdl, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Initialisierung; aus Ctor und nach Bearbeiten Bereiche
+ Description: initialisation; from Ctor and after editing regions
------------------------------------------------------------------------*/
void SwGlossaryDlg::Init()
{
aCategoryBox.SetUpdateMode( sal_False );
aCategoryBox.Clear();
- // Textbausteinbereiche anzeigen
+ // display text block regions
const sal_uInt16 nCnt = pGlossaryHdl->GetGroupCnt();
SvLBoxEntry* pSelEntry = 0;
const String sSelStr(::GetCurrGlosGroup()->GetToken(0, GLOS_DELIM));
@@ -772,7 +771,7 @@ void SwGlossaryDlg::Init()
if(sSelStr == pData->sGroupName && nSelPath == nPath)
pSelEntry = pEntry;
- //Eintraege fuer die Gruppen auffuellen
+ // fill entries for the groups
{
pGlossaryHdl->SetCurGroup(sGroupName, sal_False, sal_True);
const sal_uInt16 nCount = pGlossaryHdl->GetGlossaryCnt();
@@ -785,7 +784,7 @@ void SwGlossaryDlg::Init()
}
}
}
- // Aktuelle Gruppe setzen und Textbausteine anzeigen
+ // set current group and display text blocks
if(!pSelEntry)
{
//find a non-readonly group
@@ -834,7 +833,7 @@ void SwGlossaryDlg::Init()
IMPL_LINK_INLINE_START( SwGlossaryDlg, EditHdl, Button *, EMPTYARG )
{
-//EndDialog darf nicht im MenuHdl aufgerufen werden
+// EndDialog must not be called in MenuHdl
if(aEditBtn.GetCurItemId() == FN_GL_EDIT )
{
SwTextBlocks *pGroup = ::GetGlossaries()->GetGroupDoc ( GetCurrGrpName () );
@@ -848,7 +847,7 @@ IMPL_LINK_INLINE_START( SwGlossaryDlg, EditHdl, Button *, EMPTYARG )
IMPL_LINK_INLINE_END( SwGlossaryDlg, EditHdl, Button *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: KeyInput fuer ShortName - Edits ohne Spaces
+ Description: KeyInput for ShortName - Edits without Spaces
------------------------------------------------------------------------*/
IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
{
@@ -895,7 +894,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox )
}
/* --------------------------------------------------
- * TreeListBox fuer Gruppen und Bausteine
+ * TreeListBox for groups and blocks
* --------------------------------------------------*/
SwGlTreeListBox::SwGlTreeListBox(Window* pParent, const ResId& rResId) :
SvTreeListBox(pParent, rResId),
@@ -924,7 +923,7 @@ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt )
{
Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ));
SvLBoxEntry* pEntry = GetEntry( aPos );
- // Hilfe gibt es nur fuer die Gruppennamen
+ // there's only help for groups' names
if(pEntry)
{
SvLBoxTab* pTab;
@@ -1003,7 +1002,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag(
sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry)
{
- // TODO: Readonly - Ueberpruefung fehlt noch!
+ // TODO: Readonly - check still missing!
SvLBoxEntry* pSrcParent = GetParent(pEntry) ? GetParent(pEntry) : pEntry;
SvLBoxEntry* pDestParent =
GetParent(pDragEntry ) ? GetParent(pDragEntry ) : pDragEntry ;
@@ -1018,12 +1017,12 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget,
)
{
pDragEntry = 0;
- if(!pTarget) //An den Anfang verschieben
+ if(!pTarget) // move to the beginning
{
pTarget = GetEntry(0);
}
- // 1. wird in verschiedene Gruppen verschoben?
- // 2. darf in beiden Gruppen geschrieben werden?
+ // 1. move to different groups?
+ // 2. allowed to write in both groups?
SvLBoxEntry* pSrcParent = GetParent(pEntry);
SvLBoxEntry* pDestParent =
GetParent(pTarget) ? GetParent(pTarget) : pTarget;
@@ -1054,7 +1053,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget,
GetModel()->Remove(pEntry);
}
}
- return sal_False; //sonst wird der Eintrag automatisch vorgenommen
+ return sal_False; // otherwise the entry is being set automatically
}
sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget,
@@ -1064,9 +1063,9 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget,
)
{
pDragEntry = 0;
- // 1. wird in verschiedene Gruppen verschoben?
- // 2. darf in beiden Gruppen geschrieben werden?
- if(!pTarget) //An den Anfang verschieben
+ // 1. move in different groups?
+ // 2. allowed to write to both groups?
+ if(!pTarget) // move to the beginning
{
pTarget = GetEntry(0);
}
@@ -1101,7 +1100,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget,
pChild->SetUserData(new String(sShortName));
}
}
- return sal_False; //sonst wird der Eintrag automatisch vorgenommen
+ return sal_False; // otherwise the entry is being set automatically
}
String SwGlossaryDlg::GetCurrGrpName() const
More information about the Libreoffice-commits
mailing list