[Libreoffice-commits] .: 4 commits - sw/source
Martin Kepplinger
mkepplinger at kemper.freedesktop.org
Thu Mar 31 06:56:56 PDT 2011
sw/source/ui/fmtui/tmpdlg.cxx | 34 +++----
sw/source/ui/frmdlg/colex.cxx | 18 +--
sw/source/ui/frmdlg/colmgr.cxx | 12 +-
sw/source/ui/frmdlg/column.cxx | 131 +++++++++++++---------------
sw/source/ui/frmdlg/cption.cxx | 6 -
sw/source/ui/frmdlg/frmdlg.cxx | 6 -
sw/source/ui/frmdlg/frmmgr.cxx | 33 +++----
sw/source/ui/frmdlg/frmpage.cxx | 182 +++++++++++++++++++--------------------
sw/source/ui/frmdlg/frmui.src | 10 +-
sw/source/ui/frmdlg/uiborder.cxx | 2
sw/source/ui/frmdlg/wrap.cxx | 24 ++---
11 files changed, 225 insertions(+), 233 deletions(-)
New commits:
commit 4e77ef6acd78efeec6621dff8d7e1fbfeabde154
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Mar 31 15:53:48 2011 +0200
Translate german code comments
Translate the remaining german code comments in writer/sw/source/ui/frmdlg to
english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index b420a65..230d170 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -27,7 +27,7 @@
#include "frmui.hrc"
/*-----------------------------------------------------------------------
- Beschreibung: V-Align
+ Description: V-Align
-----------------------------------------------------------------------*/
String STR_TOP
{
@@ -46,7 +46,7 @@ String STR_CENTER_HORI
Text [ en-US ] = "~Center" ;
};
/*-----------------------------------------------------------------------
- Beschreibung: V-Rel
+ Description: V-Rel
-----------------------------------------------------------------------*/
String STR_TOPPRT
{
@@ -54,13 +54,13 @@ String STR_TOPPRT
};
/*-----------------------------------------------------------------------
- Beschreibung: H-Rel
+ Description: H-Rel
-----------------------------------------------------------------------*/
/*-----------------------------------------------------------------------
- Beschreibung: V-Rel Zeichenausrichtungen
+ Description: V-Rel character alignment
-----------------------------------------------------------------------*/
/*-----------------------------------------------------------------------
- Beschreibung: Zeichenausrichtungen fuer frmsh.cxx - Kontextmenue
+ Description: character alignment for frmsh.cxx - context menu
-----------------------------------------------------------------------*/
String STR_TOP_BASE
{
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 9a60449..78e02d5 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -55,7 +55,7 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) :
{
SetText(SW_RESSTR(STR_FRMUI_BORDER));
- // TabPage erzeugen
+ // create TabPage
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER );
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 8980b27..213cc95 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -73,7 +73,7 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Boo
pWrtShell(pSh)
{
- // TabPage erzeugen
+ // create TabPage
SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(this, rSet);
pNewPage->SetFormatUsed(sal_False, bDrawMode);
pNewPage->SetShell(pWrtShell);
@@ -178,7 +178,7 @@ SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet &rSet)
void SwWrapTabPage::Reset(const SfxItemSet &rSet)
{
- //Contour fuer Draw, Grafik und OLE (Einfuegen/Grafik/Eigenschaften fehlt noch!)
+ //Contour for Draw, Graphic and OLE (Insert/Graphic/Properties still missing!)
if( bDrawMode )
{
aWrapOutlineCB.Show();
@@ -284,9 +284,9 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
{
pBtn->Check();
WrapTypeHdl(pBtn);
- // Hier wird fuer Zeichenobjekte, die im Moment auf Durchlauf stehen,
- // schon mal der Default "Kontur an" vorbereitet, falls man spaeter auf
- // irgendeinen Umlauf umschaltet.
+ // For character objects that currently are in passage, the default
+ // "contour on" is prepared here, in case we switch to any other
+ // passage later.
if (bDrawMode && !aWrapOutlineCB.IsEnabled())
aWrapOutlineCB.Check();
}
@@ -295,7 +295,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)rSet.Get(RES_UL_SPACE);
const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)rSet.Get(RES_LR_SPACE);
- // Abstand zum Text
+ // gap to text
aLeftMarginED.SetValue(aLeftMarginED.Normalize(rLR.GetLeft()), FUNIT_TWIP);
aRightMarginED.SetValue(aRightMarginED.Normalize(rLR.GetRight()), FUNIT_TWIP);
aTopMarginED.SetValue(aTopMarginED.Normalize(rUL.GetUpper()), FUNIT_TWIP);
@@ -306,7 +306,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Description: stuff attributes into the set when OK
--------------------------------------------------------------------*/
sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
{
@@ -411,7 +411,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Bsp - Update
+ Description: example update
--------------------------------------------------------------------*/
void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -430,7 +430,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
const SwFmtFrmSize& rFrmSize = (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE);
Size aSize = rFrmSize.GetSize();
- // Rand
+ // Margin
const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)rSet.Get(RES_UL_SPACE);
const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)rSet.Get(RES_LR_SPACE);
nOldLeftMargin = static_cast< sal_uInt16 >(rLR.GetLeft());
@@ -496,7 +496,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
if (aVal.nVPos <= aVal.nMaxHeight)
nTop = aVal.nMaxVPos - aVal.nHeight;
else
- nTop = nBottom = 0; // Kein Umlauf
+ nTop = nBottom = 0; // no passage
}
else
nTop = aVal.nMaxVPos - aVal.nHeight - aVal.nVPos;
@@ -616,7 +616,7 @@ int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Bereichspruefung
+ Description: range check
--------------------------------------------------------------------*/
IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
{
@@ -682,7 +682,7 @@ IMPL_LINK( SwWrapTabPage, ContourHdl, CheckBox *, EMPTYARG )
aWrapOutsideCB.Enable(!bEnable);
bEnable = !aWrapOutlineCB.IsChecked();
- if (bEnable == bContourImage) // damit es nicht immer flackert
+ if (bEnable == bContourImage) // so that it doesn't always flicker
{
bContourImage = !bEnable;
ApplyImageList();
commit 35d56fa46acbd20e9a8fe88090d56e7ab12f77e4
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Mar 31 15:44:25 2011 +0200
Translate german code comments
Translate more german code comments to english. This is contributed under the
terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple license.
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 230dcf9..a9fccc6 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -55,7 +55,7 @@
#include <svx/svxdlg.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Der Traeger des Dialoges
+ Description: the dialog's carrier
--------------------------------------------------------------------*/
SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
Window* pParent,
@@ -77,7 +77,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
sal_uInt16 nHtmlMode = ::GetHtmlMode(m_pWrtShell->GetView().GetDocShell());
m_bHTMLMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON);
- // BspFont fuer beide Bsp-TabPages
+ // example font for both example TabPages
//
if(pStr)
{
@@ -114,7 +114,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
if(0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS))
RemoveTabPage(TP_BORDER);
RemoveTabPage(TP_COLUMN);
- // kein break
+ // no break
case DLG_FRM_OLE:
RemoveTabPage(TP_FRM_URL);
RemoveTabPage(TP_MACRO_ASSIGN);
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index d2c3a41..52db350 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -63,7 +63,7 @@ static sal_uInt16 aFrmMgrRange[] = {
0};
/*--------------------------------------------------------------------
- Beschreibung: Rahmen-Attribute ueber Shell ermitteln
+ Description: determine frame attributes via Shell
--------------------------------------------------------------------*/
SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nType ) :
aSet( (SwAttrPool&)pSh->GetAttrPool(), aFrmMgrRange ),
@@ -75,7 +75,7 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, sal_uInt8 nTyp
{
if ( bNewFrm )
{
- // Defaults einstellen:
+ // set Defaults:
sal_uInt16 nId = 0;
switch ( nType )
{
@@ -113,7 +113,7 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( sal_Bool bNew, SwWrtShell* pSh, const SfxItemS
}
/*--------------------------------------------------------------------
- Beschreibung: Initialisieren
+ Description: Initialise
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::UpdateAttrMgr()
{
@@ -139,7 +139,7 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm()
}
/*--------------------------------------------------------------------
- Beschreibung: Bestehenden Fly-Frame aendern
+ Description: change existing Fly-Frame
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::UpdateFlyFrm()
{
@@ -172,7 +172,7 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
}
/*--------------------------------------------------------------------
- Beschreibung: Rahmen einfuegen
+ Description: insert frame
--------------------------------------------------------------------*/
sal_Bool SwFlyFrmAttrMgr::InsertFlyFrm()
{
@@ -180,7 +180,7 @@ sal_Bool SwFlyFrmAttrMgr::InsertFlyFrm()
sal_Bool bRet = 0 != pOwnSh->NewFlyFrm( aSet );
- // richtigen Mode an der Shell einschalten, Rahmen wurde aut. selektiert.
+ // turn on the right mode at the shell, frame got selected automatically.
if ( bRet )
{
_UpdateFlyFrm();
@@ -192,10 +192,9 @@ sal_Bool SwFlyFrmAttrMgr::InsertFlyFrm()
}
/*------------------------------------------------------------------------
- Beschreibung: Rahmen des Typs eAnchorType einfuegen. Position und
- Groesse werden explizit angegeben.
- Nicht erlaubte Werte des Aufzaehlungstypes werden
- korrigiert.
+ Description: insert frames of type eAnchorType. Position and size are
+ being set explicitely.
+ Not-allowed values of the enumeration type get corrected.
------------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
const Point &rPos,
@@ -219,7 +218,7 @@ void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType,
}
/*--------------------------------------------------------------------
- Beschreibung: Anker setzen
+ Description: set anchor
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
{
@@ -240,7 +239,7 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
}
/*------------------------------------------------------------------------
- Beschreibung: Setzen des Attributs fuer Spalten
+ Description: set the attribute for columns
------------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
{
@@ -248,7 +247,7 @@ void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
}
/*--------------------------------------------------------------------
- Beschreibung: Absolute Position setzen
+ Description: set absolute position
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
{
@@ -264,7 +263,7 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
}
/*--------------------------------------------------------------------
- Beschreibung: Metriken auf Korrektheit pruefen
+ Description: check metrics for correctness
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
const SwPosition* pToCharCntntPos,
@@ -413,7 +412,7 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
rVal.nMaxVPos = aBoundRect.Height() - rVal.nHeight;
}
- // Maximale Breite Hoehe
+ // maximum width height
const SwTwips nH = ( rVal.nHoriOrient != text::HoriOrientation::NONE )
? aBoundRect.Left()
: rVal.nHPos;
@@ -507,7 +506,7 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
}
/*--------------------------------------------------------------------
- Beschreibung: Korrektur fuer Umrandung
+ Description: correction for border
--------------------------------------------------------------------*/
SwTwips SwFlyFrmAttrMgr::CalcTopSpace()
{
@@ -538,7 +537,7 @@ SwTwips SwFlyFrmAttrMgr::CalcRightSpace()
}
/*--------------------------------------------------------------------
- Beschreibung: Attribut aus dem Set loeschen
+ Description: erase attribute from the set
--------------------------------------------------------------------*/
void SwFlyFrmAttrMgr::DelAttr( sal_uInt16 nId )
{
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index ae02ebe..814c36d 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -113,26 +113,26 @@ struct StringIdPair_Impl
#define MAX_PERCENT_WIDTH 254L
#define MAX_PERCENT_HEIGHT 254L
-#define LB_FRAME 0x00000001L // Textbereich des Absatzes
-#define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege
-#define LB_VERT_FRAME 0x00000004L // Vertikaler Textbereich des Absatzes
-#define LB_VERT_PRTAREA 0x00000008L // Vertikaler Textbereich des Absatzes + Einzuege
-#define LB_REL_FRM_LEFT 0x00000010L // Linker Absatzrand
-#define LB_REL_FRM_RIGHT 0x00000020L // Rechter Absatzrand
-
-#define LB_REL_PG_LEFT 0x00000040L // Linker Seitenrand
-#define LB_REL_PG_RIGHT 0x00000080L // Rechter Seitenrand
-#define LB_REL_PG_FRAME 0x00000100L // Gesamte Seite
-#define LB_REL_PG_PRTAREA 0x00000200L // Textbereich der Seite
-
-#define LB_FLY_REL_PG_LEFT 0x00000400L // Linker Rahmenrand
-#define LB_FLY_REL_PG_RIGHT 0x00000800L // Rechter Rahmenrand
-#define LB_FLY_REL_PG_FRAME 0x00001000L // Gesamte Rahmen
-#define LB_FLY_REL_PG_PRTAREA 0x00002000L // Rahmeninneres
-
-#define LB_REL_BASE 0x00010000L // Zeichenausrichtung Basis
-#define LB_REL_CHAR 0x00020000L // Zeichenausrichtung Zeichen
-#define LB_REL_ROW 0x00040000L // Zeichenausrichtung Zeile
+#define LB_FRAME 0x00000001L // text region of the paragraph
+#define LB_PRTAREA 0x00000002L // text region of the paragraph + indentions
+#define LB_VERT_FRAME 0x00000004L // vertical text region of the paragraph
+#define LB_VERT_PRTAREA 0x00000008L // vertival text region of the paragraph + indentions
+#define LB_REL_FRM_LEFT 0x00000010L // left paragraph edge
+#define LB_REL_FRM_RIGHT 0x00000020L // right paragraph edge
+
+#define LB_REL_PG_LEFT 0x00000040L // left page edge
+#define LB_REL_PG_RIGHT 0x00000080L // right page edge
+#define LB_REL_PG_FRAME 0x00000100L // whole page
+#define LB_REL_PG_PRTAREA 0x00000200L // text region of the page
+
+#define LB_FLY_REL_PG_LEFT 0x00000400L // left frame edge
+#define LB_FLY_REL_PG_RIGHT 0x00000800L // right frame edge
+#define LB_FLY_REL_PG_FRAME 0x00001000L // whole frame
+#define LB_FLY_REL_PG_PRTAREA 0x00002000L // inside of the frame
+
+#define LB_REL_BASE 0x00010000L // character alignment Base
+#define LB_REL_CHAR 0x00020000L // character alignment Character
+#define LB_REL_ROW 0x00040000L // character alignment Row
#define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame
#define LB_FLY_VERT_PRTAREA 0x00200000L // vertical frame text area
@@ -173,7 +173,7 @@ static RelationMap aAsCharRelationMap[] =
};
/*--------------------------------------------------------------------
- Beschreibung: Seite verankert
+ Description: site anchored
--------------------------------------------------------------------*/
#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
LB_REL_PG_RIGHT)
@@ -207,7 +207,7 @@ static FrmMap aVPageHtmlMap[] =
};
/*--------------------------------------------------------------------
- Beschreibung: Rahmen verankert
+ Description: frame anchored
--------------------------------------------------------------------*/
#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT)
@@ -244,7 +244,7 @@ static FrmMap aVFlyHtmlMap[] =
};
/*--------------------------------------------------------------------
- Beschreibung: Absatz verankert
+ Description: paragraph anchored
--------------------------------------------------------------------*/
#define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
@@ -290,7 +290,7 @@ static FrmMap aVParaHtmlMap[] =
};
/*--------------------------------------------------------------------
- Beschreibung: Relativ zum Zeichen verankert
+ Description: anchored relative to the character
--------------------------------------------------------------------*/
#define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
@@ -354,7 +354,7 @@ static FrmMap aVCharHtmlAbsMap[] =
};
/*--------------------------------------------------------------------
- Beschreibung: Als Zeichen verankert
+ Description: anchored as character
--------------------------------------------------------------------*/
static FrmMap aVAsCharMap[] =
{
@@ -614,7 +614,7 @@ sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
}
/*--------------------------------------------------------------------
- Beschreibung: StandardRahmenTabPage
+ Description: standard frame TabPage
--------------------------------------------------------------------*/
namespace
{
@@ -739,7 +739,7 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
}
/*--------------------------------------------------------------------
- Beschreibung: Dtor
+ Description: Dtor
--------------------------------------------------------------------*/
SwFrmPage::~SwFrmPage()
{
@@ -812,7 +812,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
if (bFormat)
{
- // Bei Formaten keine Ankerbearbeitung
+ // at formats no anchor editing
aAnchorAtPageRB.Enable( sal_False );
aAnchorAtParaRB.Enable( sal_False );
aAnchorAtCharRB.Enable( sal_False );
@@ -840,7 +840,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
if ( nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE )
{
OSL_ENSURE(pSh , "shell not found");
- //OS: nur fuer die Variante Einfuegen/Grafik/Eigenschaften
+ //OS: only for the variant Insert/Graphic/Properties
if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_GRF_REALSIZE, sal_False, &pItem))
aGrfSize = ((const SvxSizeItem*)pItem)->GetSize();
else
@@ -889,7 +889,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
aHeightED.SetRefValue( nSpace );
}
- // Allgemeiner Initialisierungteil
+ // General Initialisation part
switch(rAnchor.GetAnchorId())
{
case FLY_AT_PAGE: aAnchorAtPageRB.Check(); break;
@@ -958,7 +958,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
//lock PercentFields
aWidthED.LockAutoCalculation(sal_True);
aHeightED.LockAutoCalculation(sal_True);
- RangeModifyHdl(&aWidthED); // Alle Maximalwerte initial setzen
+ RangeModifyHdl(&aWidthED); // set all maximum values initially
aHeightED.LockAutoCalculation(sal_False);
aWidthED.LockAutoCalculation(sal_False);
@@ -971,7 +971,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Description: stuff attributes into the set when OK
--------------------------------------------------------------------*/
sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
{
@@ -1034,7 +1034,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
if ( pVMap )
{
- // Ausrichtung Vertikal
+ // alignment vertical
SwFmtVertOrient aVertOrient( (const SwFmtVertOrient&)
rOldSet.Get(RES_VERT_ORIENT) );
@@ -1053,8 +1053,8 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
if ( eVOri == text::VertOrientation::NONE &&
( bNew || (bAtVertPosModified || bMod) || nOldV != eVOri) )
{
- // Vertikale Position
- // fuer zeichengebundene Rahmen Offset umrechenen
+ // vertival position
+ // recalculate offset for character bound frames
SwTwips nY = static_cast< SwTwips >(aAtVertPosED.Denormalize(aAtVertPosED.GetValue(FUNIT_TWIP)));
if (eAnchorId == FLY_AS_CHAR)
{
@@ -1079,11 +1079,11 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
}
}
- //Size setzen
- //Neuer Sonderfall: Ist die Groesse von pMgr(0, 0), so werden die
- //Eigenschaften fuer eine Grafik festgelegt, die noch gar nicht geladen
- //ist. Dann wird hier kein SetSize() gemacht, wenn die
- //Groesseneinstellungen vom Anwender nicht veraendert wurden.
+ // set size
+ // new exception: when the size of pMgr(, 0), then the properties
+ // for a graphic that isn't even loaded, are set. Then no SetSize
+ // is done here when the size settings were not changed by the
+ // user.
const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& )rOldSet.Get(RES_FRM_SIZE);
SwFmtFrmSize aSz( rOldSize );
@@ -1159,7 +1159,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Horizontale und vertikale Pos initialisieren
+ Description: initialise horizonal and vertical Pos
--------------------------------------------------------------------*/
void SwFrmPage::InitPos(RndStdIds eId,
sal_uInt16 nH,
@@ -1237,8 +1237,8 @@ void SwFrmPage::InitPos(RndStdIds eId,
aHorizontalDLB.Enable( bEnable );
aHorizontalFT.Enable( bEnable );
- // aktuelle Pos selektieren
- // Horizontal
+ // select current Pos
+ // horizontal
if ( nH == USHRT_MAX )
{
nH = nOldH;
@@ -1311,11 +1311,11 @@ sal_uInt16 SwFrmPage::FillPosLB(const FrmMap* _pMap,
? 0L
: ::lcl_GetLBRelationsForRelations( _nRel );
- // Listbox fuellen
+ // fill Listbox
size_t nCount = ::lcl_GetFrmMapCount(_pMap);
for (size_t i = 0; _pMap && i < nCount; ++i)
{
-// Warum nicht von links/von innen bzw. von oben?
+// Why not from the left/from inside or from above?
{
SvxSwFramePosString::StringId eStrId = aMirrorPagesCB.IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
// --> OD 2009-08-31 #mongolianlayout#
@@ -1327,7 +1327,7 @@ sal_uInt16 SwFrmPage::FillPosLB(const FrmMap* _pMap,
String sEntry(aFramePosString.GetString(eStrId));
if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
{
- // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen
+ // don't insert entries when frames are character bound
_rLB.InsertEntry(sEntry);
}
// i#22341 - add condition to handle map <aVCharMap>
@@ -1470,7 +1470,7 @@ sal_uLong SwFrmPage::FillRelLB( const FrmMap* _pMap,
_rLB.SelectEntry(sSelEntry);
else
{
- // Warscheinlich Ankerwechsel. Daher aehnliche Relation suchen
+ // Probably anchor switch. So look for similar relation
switch (_nRel)
{
case text::RelOrientation::FRAME: _nRel = text::RelOrientation::PAGE_FRAME; break;
@@ -1623,7 +1623,7 @@ RndStdIds SwFrmPage::GetAnchor()
}
/*--------------------------------------------------------------------
- Beschreibung: Bsp - Update
+ Description: Bsp - Update
--------------------------------------------------------------------*/
void SwFrmPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -1633,7 +1633,7 @@ void SwFrmPage::ActivatePage(const SfxItemSet& rSet)
//lock PercentFields
aWidthED.LockAutoCalculation(sal_True);
aHeightED.LockAutoCalculation(sal_True);
- RangeModifyHdl(&aWidthED); // Alle Maximalwerte initial setzen
+ RangeModifyHdl(&aWidthED); // set all maximum values initially
aHeightED.LockAutoCalculation(sal_False);
aWidthED.LockAutoCalculation(sal_False);
aFollowTextFlowCB.SaveValue();
@@ -1645,9 +1645,8 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet)
{
FillItemSet( *_pSet );
- //FillItemSet setzt den Anker nicht in den Set, wenn er mit dem
- //Original uebereinstimmt. Fuer die anderen Pages brauchen wir aber
- //den aktuellen Anker.
+ //FillItemSet doesn't set the anchor into the set when it matches
+ //the original. But for the other pages we need the current anchor.
SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
: ((SwFrmDlg*)GetParent()->GetParent())->GetWrtShell();
RndStdIds eAnchorId = (RndStdIds)GetAnchor();
@@ -1659,7 +1658,7 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Links/rechts mit Innen/aussen tauschen
+ Description: swap left/right with inside/outside
--------------------------------------------------------------------*/
IMPL_LINK( SwFrmPage, MirrorHdl, CheckBox *, EMPTYARG )
{
@@ -1684,8 +1683,8 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT);
}
- if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
- RangeModifyHdl(&aWidthED); // Werte wieder korrigieren
+ if (pBtn) // only when Handler was called by change of the controller
+ RangeModifyHdl(&aWidthED); // correct the values again
if (pBtn == &aRelWidthCB)
ModifyHdl(&aWidthED);
@@ -1696,7 +1695,7 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn )
}
/*--------------------------------------------------------------------
- Beschreibung: Bereichspruefung
+ Description: range check
--------------------------------------------------------------------*/
IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
{
@@ -1717,7 +1716,7 @@ IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
if ( pHMap )
{
- // Ausrichtung Horizontal
+ // alignment horizonal
sal_uInt16 nMapPos = GetMapPos(pHMap, aHorizontalDLB);
short nAlign = GetAlignment(pHMap, nMapPos, aHorizontalDLB, aHoriRelationLB);
short nRel = GetRelation(pHMap, aHoriRelationLB);
@@ -1730,7 +1729,7 @@ IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
if ( pVMap )
{
- // Ausrichtung Vertikal
+ // alignment vertical
sal_uInt16 nMapPos = GetMapPos(pVMap, aVerticalDLB);
short nAlign = GetAlignment(pVMap, nMapPos, aVerticalDLB, aVertRelationLB);
short nRel = GetRelation(pVMap, aVertRelationLB);
@@ -1749,21 +1748,21 @@ IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
aVal.nHPos = nAtHorzPosVal;
aVal.nVPos = nAtVertPosVal;
- aMgr.ValidateMetrics(aVal, mpToCharCntntPos, sal_True); // Einmal, um Referenzwerte fuer prozentuale Werte zu erhalten
+ aMgr.ValidateMetrics(aVal, mpToCharCntntPos, sal_True); // one time, to get reference values for percental values
- // Referenzwerte fuer fuer Prozentwerte setzen (100%) ...
+ // set reference values for percental values (100%) ...
aWidthED.SetRefValue(aVal.aPercentSize.Width());
aHeightED.SetRefValue(aVal.aPercentSize.Height());
- // ... und damit Breite und Hoehe korrekt umrechnen
+ // ... and correctly convert width and height with it
SwTwips nWidth = static_cast< SwTwips >(aWidthED. DenormalizePercent(aWidthED.GetValue(FUNIT_TWIP)));
SwTwips nHeight = static_cast< SwTwips >(aHeightED.DenormalizePercent(aHeightED.GetValue(FUNIT_TWIP)));
aVal.nWidth = nWidth;
aVal.nHeight = nHeight;
- aMgr.ValidateMetrics(aVal, mpToCharCntntPos); // Nochmal um mit korrekter Breite und Hoehe alle restlichen Werte zu ermitteln
+ aMgr.ValidateMetrics(aVal, mpToCharCntntPos); // one more time, to determine all remaining values with correct width and height.
- // alle Spalten muessen passen
+ // all columns have to be correct
if(GetTabDialog()->GetExampleSet() &&
SFX_ITEM_DEFAULT <= GetTabDialog()->GetExampleSet()->GetItemState(RES_COL))
{
@@ -1776,14 +1775,14 @@ IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
rCol.GetColumns()[i]->GetRight() +
MINFLY;
}
- aVal.nMinWidth -= MINFLY;//einen hatten wir schon mit drin!
+ aVal.nMinWidth -= MINFLY;//one was already in there!
}
}
nWidth = aVal.nWidth;
nHeight = aVal.nHeight;
- // Mindestbreite auch fuer Vorlage
+ // minimum range also for template
aHeightED.SetMin(aHeightED.NormalizePercent(aVal.nMinHeight), FUNIT_TWIP);
aWidthED. SetMin(aWidthED.NormalizePercent(aVal.nMinWidth), FUNIT_TWIP);
@@ -1877,7 +1876,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
aAtVertPosFT.Enable( bEnable );
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // only when Handler was called by changing of the controller
RangeModifyHdl( 0 );
sal_uInt16 nRel = 0;
@@ -1899,15 +1898,15 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
else
bAtVertPosModified = sal_True;
- // Sonderbehandlung fuer HTML-Mode mit horz-vert-Abhaengigkeiten
+ // special treatment for HTML-Mode with horizonal-vertical-dependencies
if(bHtmlMode && nHtmlMode&HTMLMODE_SOME_ABS_POS &&
(FLY_AT_CHAR == GetAnchor()))
{
sal_Bool bSet = sal_False;
if(bHori)
{
- // rechts ist nur unterhalb erlaubt - von links nur oben
- // von links am Zeichen -> unterhalb
+ // right is allowed only above - from the left only above
+ // from the left at character -> below
if((text::HoriOrientation::LEFT == nAlign || text::HoriOrientation::RIGHT == nAlign) &&
0 == aVerticalDLB.GetSelectEntryPos())
{
@@ -1959,7 +1958,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
}
/*--------------------------------------------------------------------
- Beschreibung: Horizontale Pos
+ Description: horizonal Pos
--------------------------------------------------------------------*/
IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
{
@@ -1987,7 +1986,7 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
}
}
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // Only when Handler was called by changing of the controller
RangeModifyHdl(0);
return 0;
@@ -2133,8 +2132,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
{
if(!bReset)
{
- // Wert wurde von Umlauf-Tabpage geaendert und muss
- // mit Modify-Flag gesetzt werden
+ // value was changed by circulation-Tabpage and
+ // has to be set with Modify-Flag
aWidthED.SetUserValue(nWidth, FUNIT_TWIP);
}
else
@@ -2145,8 +2144,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
{
if (!bReset)
{
- // Wert wurde von Umlauf-Tabpage geaendert und muss
- // mit Modify-Flag gesetzt werden
+ // values was changed by circulation-Tabpage and
+ // has to be set with Modify-Flag
aHeightED.SetUserValue(nHeight, FUNIT_TWIP);
}
else
@@ -2180,7 +2179,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
else
aAutoHeightCB.Hide();
- // Umlauf-Abstand fuer zeichengebundene Rahmen organisieren
+ // organise circulation-gap for character bound frames
const SvxULSpaceItem &rUL = (const SvxULSpaceItem &)rSet.Get(RES_UL_SPACE);
nUpperBorder = rUL.GetUpper();
nLowerBorder = rUL.GetLower();
@@ -2191,7 +2190,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
aFixedRatioCB.SaveValue();
}
- // Spalten
+ // columns
SwFmtCol aCol( (const SwFmtCol&)rSet.Get(RES_COL) );
::FitToActualSize( aCol, (sal_uInt16)rSize.GetWidth() );
@@ -2232,8 +2231,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
rVert.GetPos());
}
- // Transparent fuers Bsp
- // Umlauf fuers Bsp
+ // Transparent for example
+ // circulation for example
const SwFmtSurround& rSurround = (const SwFmtSurround&)rSet.Get(RES_SURROUND);
aExampleWN.SetWrap ( static_cast< sal_uInt16 >(rSurround.GetSurround()) );
@@ -2243,8 +2242,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
aExampleWN.SetTransparent(!rOpaque.GetValue());
}
- // ggf auf Prozent umschalten
- RangeModifyHdl(&aWidthED); // Referenzwerte setzen (fuer 100%)
+ // switch to percent if applicable
+ RangeModifyHdl(&aWidthED); // set reference values (for 100%)
if (rSize.GetWidthPercent() == 0xff || rSize.GetHeightPercent() == 0xff)
aFixedRatioCB.Check(sal_True);
@@ -2388,14 +2387,14 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
switch (nPos)
{
- case 1: // Auf linken bzw geraden Seiten spiegeln
+ case 1: // mirror at left / even pages
aLeftPagesRB.Check();
aMirrorHorzBox.Check(sal_True);
break;
- case 2: // Auf allen Seiten spiegeln
+ case 2: // mirror on all pages
aAllPagesRB.Check();
break;
- case 3: // Auf rechten bzw ungeraden Seiten spiegeln
+ case 3: // mirror on right / odd pages
aRightPagesRB.Check();
break;
default:
@@ -2496,7 +2495,7 @@ IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG )
xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aVal);
if ( pGrfDlg->Execute() == ERRCODE_NONE )
- { // ausgewaehlten Filter merken
+ { // remember selected filter
aFilterName = pGrfDlg->GetCurrentFilter();
aNewGrfName = INetURLObject::decode( pGrfDlg->GetPath(),
INET_HEX_ESCAPE,
@@ -2504,9 +2503,8 @@ IMPL_LINK( SwGrfExtPage, BrowseHdl, Button *, EMPTYARG )
RTL_TEXTENCODING_UTF8 );
aConnectED.SetModifyFlag();
aConnectED.SetText( aNewGrfName );
- //Spiegeln zuruecksetzen, da u. U. eine Bitmap
- //gegen eine andere Art von Grafik ausgetauscht worden ist,
- //die nicht gespiegelt werden kann.
+ //reset mirrors because maybe a Bitmap was swapped with
+ //another type of graphic that cannot be mirrored.
aMirrorVertBox.Check(sal_False);
aMirrorHorzBox.Check(sal_False);
aAllPagesRB .Enable(sal_False);
@@ -2548,7 +2546,7 @@ IMPL_LINK( SwGrfExtPage, MirrorHdl, CheckBox *, EMPTYARG )
}
/*--------------------------------------------------------------------
- Beschreibung: BeispielWindow
+ Description: example window
--------------------------------------------------------------------*/
BmpWindow::BmpWindow( Window* pPar, sal_uInt16 nId,
const Graphic& rGraphic, const BitmapEx& rBmp ) :
@@ -2618,7 +2616,7 @@ void BmpWindow::SetGraphic(const Graphic& rGrf)
}
/***************************************************************************
- Beschreibung: URL und ImageMap an Rahmen einstellen
+ Description: set URL and ImageMap at frames
***************************************************************************/
SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
@@ -2835,8 +2833,8 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
if(!bFormat)
{
- // Grafik einfuegen - Eigenschaften
- // bNew ist nicht gesetzt, deswegen ueber Selektion erkennen
+ // insert graphic - properties
+ // bNew is not set, so recognise by selection
String aTmpName1;
if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_NAME, sal_False, &pItem))
{
commit d6949616dcbad8c278a405f1864f3af100342e91
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Mar 31 14:55:35 2011 +0200
Translate german comments
Translate more code comments in writer/sw/source/ui/frmdlg from german to
english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx
index 25b95d2..b1ec601 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/ui/frmdlg/colex.cxx
@@ -52,7 +52,7 @@
#include "colmgr.hxx"
/*-----------------------------------------------------------------------
- Beschreibung: Uebernahme der aktualisierten Werte aus dem Set
+ Description: acquisition of the updates values from the set
-----------------------------------------------------------------------*/
void SwPageExample::UpdateExample( const SfxItemSet& rSet )
{
@@ -62,7 +62,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
{
- // Ausrichtung
+ // alignment
pPage = (const SvxPageItem*)&rSet.Get( nWhich );
if ( pPage )
@@ -73,14 +73,14 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
{
- // Orientation und Size aus dem PageItem
+ // Orientation and Size from PageItem
const SvxSizeItem& rSize = (const SvxSizeItem&)rSet.Get( nWhich );
SetSize( rSize.GetSize() );
}
nWhich = RES_LR_SPACE;
if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
{
- // linken und rechten Rand einstellen
+ // set left and right border
const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rSet.Get( nWhich );
SetLeft( rLRSpace.GetLeft() );
@@ -96,7 +96,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
{
- // oberen und unteren Rand einstellen
+ // set upper and lower border
const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)rSet.Get( nWhich );
SetTop( rULSpace.GetUpper() );
@@ -109,7 +109,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
}
- // Kopfzeilen-Attribute auswerten
+ // evaluate header-attributes
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_HEADERSET),
sal_False, &pItem ) )
@@ -219,7 +219,7 @@ void SwColExample::DrawPage( const Point& rOrg,
if ( GetUsage() == SVX_PAGE_MIRROR && !bSecond )
{
- // fuer gespiegelt drehen
+ // rotate for mirrored
nL = GetRight();
nR = GetLeft();
}
@@ -360,7 +360,7 @@ void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ )
SetFillColor( aGrayColor );
- //Spaltentrenner?
+ //column seperator?
long nLength = aLogSize.Height() - 2 * aTL.Y();
Point aUp( aTL );
Point aDown( aTL.X(), nLength );
@@ -487,7 +487,7 @@ void SwPageGridExample::DrawPage( const Point& rOrg,
if ( GetUsage() == SVX_PAGE_MIRROR && !bSecond )
{
- // fuer gespiegelt drehen
+ // rotate for mirrored
nL = GetRight();
nR = GetLeft();
}
diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/ui/frmdlg/colmgr.cxx
index 255ac45..bb8d1d2 100644
--- a/sw/source/ui/frmdlg/colmgr.cxx
+++ b/sw/source/ui/frmdlg/colmgr.cxx
@@ -41,7 +41,7 @@
// PRIVATE METHODES ------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Spaltenbreite auf aktuelle Breite einstellen
+ Description: set column width to current width
------------------------------------------------------------------------*/
void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth)
{
@@ -56,7 +56,7 @@ void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth)
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Setzen Spaltenanzahl und Gutterwidth
+ Description: set column quantity and Gutterwidth
------------------------------------------------------------------------*/
void SwColMgr::SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth)
{
@@ -94,7 +94,7 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos )
}
/*------------------------------------------------------------------------
- Beschreibung: Hoehe Trennlinie
+ Description: height seperation line
------------------------------------------------------------------------*/
short SwColMgr::GetLineHeightPercent() const
{
@@ -108,7 +108,7 @@ void SwColMgr::SetLineHeightPercent(short nPercent)
}
/*------------------------------------------------------------------------
- Beschreibung: Spaltenbreite
+ Description: column width
------------------------------------------------------------------------*/
sal_uInt16 SwColMgr::GetColWidth(sal_uInt16 nIdx) const
{
@@ -124,7 +124,7 @@ void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd)
}
/*--------------------------------------------------------------------
- Beschreibung: Groesse neu setzen
+ Description: newly set size
--------------------------------------------------------------------*/
void SwColMgr::SetActualWidth(sal_uInt16 nW)
{
@@ -133,7 +133,7 @@ void SwColMgr::SetActualWidth(sal_uInt16 nW)
}
/*--------------------------------------------------------------------
- Beschreibung: ctor
+ Description: ctor
--------------------------------------------------------------------*/
SwColMgr::SwColMgr(const SfxItemSet& rSet, sal_uInt16 nActWidth) :
aFmtCol((const SwFmtCol&)rSet.Get(RES_COL)),
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index e48c0a3..058a622 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -82,7 +82,7 @@
SV_IMPL_PTRARR( SwColumns, SwColumnPtr )
/*--------------------------------------------------------------------
- Beschreibung: Statische Daten
+ Description: static data
--------------------------------------------------------------------*/
static const sal_uInt16 nVisCols = 3;
@@ -201,12 +201,12 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) :
aApplyToLB.RemoveEntry( nPagePos );
OSL_ENSURE( pColPgSet, "" );
- // TabPage erzeugen
+ // create TabPage
SwColumnPage* pPage = (SwColumnPage*) SwColumnPage::Create( this,
*pColPgSet );
pTabPage = pPage;
- //Groesse anpassen
+ // adjust size
Size aPageSize(pTabPage->GetSizePixel());
Size aDlgSize(GetOutputSizePixel());
aDlgSize.Height() = aPageSize.Height();
@@ -298,7 +298,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
{
- //aktuelle Selektion auswerten
+ // evaluate current selection
SfxItemSet* pSet = 0;
switch(nOldSelection)
{
@@ -326,9 +326,9 @@ IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
if(pSelectionSet && SFX_ITEM_SET == pSelectionSet->GetItemState(RES_COL))
{
- //Bereich mit Spalten einfuegen
+ //insert region with columns
const SwFmtCol& rColItem = (const SwFmtCol&)pSelectionSet->Get(RES_COL);
- //nur, wenn es auch Spalten gibt!
+ //only if there actually are columns!
if(rColItem.GetNumCols() > 1)
rWrtShell.GetView().GetViewFrame()->GetDispatcher()->Execute(
FN_INSERT_REGION, SFX_CALLMODE_ASYNCHRON, *pSelectionSet );
@@ -350,7 +350,7 @@ IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
if(pPageSet && SFX_ITEM_SET == pPageSet->GetItemState(RES_COL) && bPageChanged)
{
- // aktuellen PageDescriptor ermitteln und damit den Set fuellen
+ // deterine current PageDescriptor and fill the Set with it
const sal_uInt16 nCurIdx = rWrtShell.GetCurPageDesc();
SwPageDesc aPageDesc(rWrtShell.GetPageDesc(nCurIdx));
SwFrmFmt &rFmt = aPageDesc.GetMaster();
@@ -364,7 +364,7 @@ IMPL_LINK(SwColumnDlg, OkHdl, OKButton*, EMPTYARG)
rWrtShell.StartAction();
rWrtShell.Push();
rWrtShell.SetFlyFrmAttr( aTmp );
- //die Rahmenselektion wieder aufheben
+ // undo the frame selction again
if(rWrtShell.IsFrmSelected())
{
rWrtShell.UnSelectFrm();
@@ -409,7 +409,7 @@ void SwColumnPage::ResetColWidth()
}
/*--------------------------------------------------------------------
- Beschreibung: Jetzt als TabPage
+ Description: Now as TabPage
--------------------------------------------------------------------*/
SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
@@ -492,7 +492,7 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
aDefaultVS.SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
- // Controls fuer Zusaetzebereich beim MoreButton anmelden
+ // announce Controls for additional region at the MoreButton
Link aCLNrLk = LINK(this, SwColumnPage, ColModify);
aCLNrEdt.SetLoseFocusHdl(aCLNrLk);
aCLNrEdt.SetUpHdl(aCLNrLk);
@@ -610,7 +610,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
if(bFrm)
{
- if(bFormat) // hier gibt es keine Size
+ if(bFormat) // there is no size here
pColMgr->SetActualWidth(FRAME_FORMAT_WIDTH);
else
{
@@ -643,7 +643,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: TabPage erzeugen
+ Description: create TabPage
--------------------------------------------------------------------*/
SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
{
@@ -651,15 +651,14 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Attribute in den Set stopfen bei OK
+ Description: stuff attributes into the Set when OK
--------------------------------------------------------------------*/
sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet)
{
if(aCLNrEdt.HasChildPathFocus())
aCLNrEdt.GetDownHdl().Call(&aCLNrEdt);
- // Im ItemSet setzen
- // Die aktuellen Einstellungen sind
- // schon vorhanden
+ // set in ItemSet setzen
+ // the current settings are already present
//
const SfxPoolItem* pOldItem;
const SwFmtCol& rCol = pColMgr->GetColumns();
@@ -683,15 +682,15 @@ sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet)
}
/*--------------------------------------------------------------------
- Beschreibung: ColumnManager updaten
+ Description: update ColumnManager
--------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
{
long nGutterWidth = pColMgr->GetGutterWidth();
if(nCols > 1)
{
- // Ermitteln, ob die schmalste Spalte zu schmal ist
- // fuer den eingestellten Spaltenabstand
+ // Determine whether the most narrow column is too narrow
+ // for the adjusted column gap
long nMin = nColWidth[0];
sal_uInt16 i;
@@ -702,8 +701,8 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
if(!bAutoWidth)
{
pColMgr->SetAutoWidth(sal_False);
- // falls der Benutzer nicht die Gesamtbreite vergeben hat,
- // den fehlenden Betrag auf die letzte Spalte addieren.
+ // when the user didn't allocate the whole width,
+ // add the missing amount to the last column.
long nSum = 0;
for(i = 0; i < nCols; ++i)
nSum += nColWidth[i];
@@ -727,7 +726,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
}
- // keins ist ausgeschaltet
+ // nothing is turned off
const sal_uInt16 nPos = aLineTypeDLB.GetSelectEntryPos();
sal_Bool bEnable = 0 != nPos;
aLineHeightEdit.Enable( bEnable );
@@ -761,13 +760,13 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
nCols = 0;
}
- //Maximalwerte setzen
+ //set maximum values
aCLNrEdt.SetMax(Max(1L,
Min(long(nMaxCols), long( pColMgr->GetActualSize() / (nGutterWidth + MINLAY)) )));
aCLNrEdt.SetLast(aCLNrEdt.GetMax());
aCLNrEdt.Reformat();
- //Beispielfenster anregen
+ //prompt example window
if(!bLockUpdate)
{
if(bFrm)
@@ -783,7 +782,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
}
/*------------------------------------------------------------------------
- Beschreibung: Initialisierung
+ Description: Initialisation
------------------------------------------------------------------------*/
void SwColumnPage::Init()
{
@@ -793,7 +792,7 @@ void SwColumnPage::Init()
aAutoWidthBox.Check( bAutoWidth );
sal_Int32 nColumnWidthSum = 0;
- // Setzen der Breiten
+ // set the widths
sal_uInt16 i;
for(i = 0; i < nCols; ++i)
{
@@ -813,10 +812,10 @@ void SwColumnPage::Init()
nColWidth[i] = nColumnWidthSum;
}
SwColLineAdj eAdj = pColMgr->GetAdjust();
- if( COLADJ_NONE == eAdj ) // der Dialog kennt kein NONE!
+ if( COLADJ_NONE == eAdj ) // the dialog doesn't know a NONE!
{
eAdj = COLADJ_TOP;
- //ohne Adjust auch kein Linientyp
+ //without Adjust no line type
aLineTypeDLB.SelectEntryPos( 0 );
aLineHeightEdit.SetValue( 100 );
}
@@ -842,21 +841,20 @@ void SwColumnPage::Init()
UpdateCols();
Update();
- // Maximale Spaltenzahl setzen
- // Werte kleiner als 1 sind nicht erlaubt
+ // set maximum number of columns
+ // values below 1 are not allowed
aCLNrEdt.SetMax(Max(1L,
Min(long(nMaxCols), long( pColMgr->GetActualSize() / nMinWidth) )));
}
/*------------------------------------------------------------------------
- Beschreibung: Die Anzahl der Spalten hat sich veraendert -- hier werden
- die Controls fuer die Bearbeitung der Spalten entsprechend
- der Spaltenzahl en- oder disabled.
- Falls es mehr als nVisCols (= 3) Spalten gibt, werden
- alle Edit enabled und die Buttons fuer das Scrollen
- ebenfalls.
- Andernfalls werden die Edits jeweils fuer die entsprechenden
- Spaltenzahl enabled; eine Spalte kann nicht bearbeitet werden.
+ Description: The number of columns has changed -- here the controls for
+ editing of the columns are en- or disabled according to the
+ column number.
+ In case there are more than nVisCols (=3) all Edit are being
+ enabled and the buttons for scrolling too.
+ Otherwise Edits are being enabled according to the column
+ numbers; one column can not be edited.
------------------------------------------------------------------------*/
void SwColumnPage::UpdateCols()
{
@@ -871,7 +869,7 @@ void SwColumnPage::UpdateCols()
}
else if( bEdit )
{
- // hier gibt es absichtlich kaum noch breaks
+ // here are purposely hardly any breaks
switch(nCols)
{
case 3: bEnable3 = sal_True;
@@ -950,11 +948,9 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler, der bei einer Veraenderung der Spaltenzahl
- gerufen wird.
- Eine Aenderung der Spaltenzahl ueberschreibt eventuelle
- Breiteneinstellungen des Benutzers; alle Spalten sind
- gleich breit.
+ Description: Handler that is called at alteration of the column number.
+ An alteration of the column number overwrites potential
+ user's width settings; all columns are equally wide.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
{
@@ -983,13 +979,12 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
}
/*------------------------------------------------------------------------
- Beschreibung: Modify- Handler fuer eine Aenderung der Spaltenbreite
- oder des Spaltenabstandes.
- Diese Aenderungen wirken sich erst zeitversetzt aus.
- Durch eine Aenderung der Spaltenbreite wird die automatische
- Berechnung der Spaltenbreite ausser Kraft gesetzt; erst
- eine Aenderung der Spaltenzahl kehrt wieder zu diesem
- Default zurueck.
+ Description: Modify handler for an alteration of the column width or
+ the column gap.
+ These changes take effect time-displaced. With an
+ alteration of the column width the automatic calculation
+ of the column width is overruled; only an alteration
+ of the column number leads back to that default.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, GapModify, PercentField *, pFld )
{
@@ -1070,9 +1065,9 @@ IMPL_LINK( SwColumnPage, EdModify, PercentField *, pField )
}
/*------------------------------------------------------------------------
- Beschreibung: Handler hinter der Checkbox fuer automatische Breite.
- Ist die Box gecheckt, koennen keine expliziten Werte
- fuer die Spaltenbreite eingegeben werden.
+ Description: Handler behind the Checkbox for automatic width.
+ When the box is checked no expicit values for the column
+ width can be entered.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
{
@@ -1092,7 +1087,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
}
/*------------------------------------------------------------------------
- Beschreibung: Raufscrollen der Inhalte der Edits.
+ Description: scroll up the contents of the edits
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
{
@@ -1106,7 +1101,7 @@ IMPL_LINK( SwColumnPage, Up, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Runterscrollen der Inhalte der Edits.
+ Description: scroll down the contents of the edits.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
{
@@ -1120,16 +1115,16 @@ IMPL_LINK( SwColumnPage, Down, Button *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Relikt aus alten Zeiten - jetzt direkt ohne time
- * Timer- Handler; angetriggert durch eine Aenderung der
- Spaltenbreite oder des Spaltenabstandes.
+ Description: relict from ancient times - now directly without time
+ handler; triggered by an alteration of the column width
+ or the column gap.
------------------------------------------------------------------------*/
IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
{
DBG_PROFSTART(columnhdl) ;
if(pModifiedField)
{
- // Finden der veraenderten Spalte
+ // find the changed column
sal_uInt16 nChanged = nFirstVis;
if(pModifiedField == &aEd2)
++nChanged;
@@ -1140,7 +1135,7 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
pModifiedField->DenormalizePercent(pModifiedField->GetValue(FUNIT_TWIP));
long nDiff = nNewWidth - nColWidth[nChanged];
- // wenn es die letzte Spalte ist
+ // when it's the last column
if(nChanged == nCols - 1)
{
nColWidth[0] -= nDiff;
@@ -1169,7 +1164,7 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
}
/*------------------------------------------------------------------------
- Beschreibung: Aktualisierung der Anzeige
+ Description: Update the view
------------------------------------------------------------------------*/
void SwColumnPage::Update()
{
@@ -1202,7 +1197,7 @@ void SwColumnPage::Update()
}
/*--------------------------------------------------------------------
- Beschreibung: Update Bsp
+ Description: Update Bsp
--------------------------------------------------------------------*/
void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
{
@@ -1242,7 +1237,7 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
long nDistance = rBox.GetDistance();
const sal_uInt16 nTotalWish = bFormat ? FRAME_FORMAT_WIDTH : sal_uInt16(rSize.GetWidth() - 2 * nDistance);
- // Maximalwerte der Spaltenbreiten setzen
+ // set maximum values of column width
SetPageWidth(nTotalWish);
if(pColMgr->GetActualSize() != nTotalWish)
@@ -1251,17 +1246,17 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
Init();
}
sal_Bool bPercent;
- // im Rahmenformat nur relative Angaben
+ // only relative data in frame format
if ( bFormat || (rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff) )
{
- // Wert fuer 100% setzen
+ // set value for 100%
aEd1.SetRefValue(nTotalWish);
aEd2.SetRefValue(nTotalWish);
aEd3.SetRefValue(nTotalWish);
aDistEd1.SetRefValue(nTotalWish);
aDistEd2.SetRefValue(nTotalWish);
- // Auf %-Darstellung umschalten
+ // switch to %-view
bPercent = sal_True;
}
else
@@ -1308,7 +1303,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
aAutoWidthBox.Check(sal_False);
aDistEd1.SetPrcntValue(0);
ColModify(0);
- // jetzt noch das Breitenverhaeltnisse auf 2 : 1 bzw. 1 : 2 stellen
+ // now set the width ratio to 2 : 1 or 1 : 2 respectively
sal_uInt16 nSmall = pColMgr->GetActualSize() / 3;
if(nItem == 4)
{
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 6a82164..e6deb8c 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -377,7 +377,7 @@ void SwCaptionDialog::DrawSample()
String aStr;
String sCaption = aTextEdit.GetText();
- // Nummer
+ // number
String sFldTypeName = aCategoryBox.GetText();
sal_Bool bNone = sFldTypeName == sNone;
if( !bNone )
@@ -386,7 +386,7 @@ void SwCaptionDialog::DrawSample()
aFormatBox.GetSelectEntryPos() );
if( SVX_NUM_NUMBER_NONE != nNumFmt )
{
- // Kategorie
+ // category
//#i61007# order of captions
if( !bOrderNumberingFirst )
{
@@ -543,7 +543,7 @@ void SwSequenceOptionDialog::Apply()
}
else if( aFldTypeName.Len() && nLvl < MAXLEVEL )
{
- // dann muessen wir das mal einfuegen
+ // then we have to insert that
SwSetExpFieldType aFldType( rSh.GetDoc(), aFldTypeName, nsSwGetSetExpType::GSE_SEQ );
aFldType.SetDelimiter( cDelim );
aFldType.SetOutlineLvl( nLvl );
commit ef2d61e1152ac414c0b395df0bb4ecf7a370345b
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Mar 31 13:14:13 2011 +0200
Translate german code comments
This translates all german code comments in writer/sw/source/ui/fmtui to
english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 9edb36d..e88c26b 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -57,12 +57,12 @@
#include <viewopt.hxx>
#include <pgfnote.hxx>
#include <pggrid.hxx>
-#include <tmpdlg.hxx> // der Dialog
-#include <column.hxx> // Spalten
-#include <drpcps.hxx> // Initialen
-#include <frmpage.hxx> // Rahmen
-#include <wrap.hxx> // Rahmen
-#include <frmmgr.hxx> // Rahmen
+#include <tmpdlg.hxx> // the dialog
+#include <column.hxx> // columns
+#include <drpcps.hxx> // initials
+#include <frmpage.hxx> // frames
+#include <wrap.hxx> // frames
+#include <frmmgr.hxx> // frames
#include <ccoll.hxx> // CondColl
#include <swuiccoll.hxx>
#include <docstyle.hxx> //
@@ -91,7 +91,7 @@
extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell();
/*--------------------------------------------------------------------
- Beschreibung: Der Traeger des Dialoges
+ Description: the dialog's carrier
--------------------------------------------------------------------*/
SwTemplateDlg::SwTemplateDlg(Window* pParent,
@@ -114,10 +114,10 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
nHtmlMode = ::GetHtmlMode(pWrtShell->GetView().GetDocShell());
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- // TabPages zusammenfieseln
+ // tinker TabPages together
switch( nRegion )
{
- // Zeichenvorlagen
+ // character templates
case SFX_STYLE_FAMILY_CHAR:
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
@@ -145,7 +145,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
RemoveTabPage(TP_CHAR_TWOLN);
}
break;
- // Absatzvorlagen
+ // paragraph templates
case SFX_STYLE_FAMILY_PARA:
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!");
@@ -230,7 +230,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
}
}
break;
- // Rahmenvorlagen
+ // frame templates
case SFX_STYLE_FAMILY_FRAME:
{
AddTabPage(TP_FRM_STD, SwFrmPage::Create,
@@ -253,7 +253,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
break;
}
- // Seitenvorlagen
+ // page templates
case SFX_STYLE_FAMILY_PAGE:
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
@@ -274,7 +274,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ),
pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ),
sal_False,
- 1 ); // nach der Verwalten-Page
+ 1 ); // after the manage-page
if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
@@ -298,7 +298,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
}
break;
- // Numerierungsvorlagen
+ // numbering templates
case SFX_STYLE_FAMILY_PSEUDO:
{
AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
@@ -355,7 +355,7 @@ short SwTemplateDlg::Ok()
}
else
//JP 09.01.98 Bug #46446#:
- // das ist der Ok - Handler also muss auf OK defaultet werden!
+ // that's the Ok-Handler, so OK has to be default!
nRet = RET_OK;
return nRet;
}
@@ -370,7 +370,7 @@ const SfxItemSet* SwTemplateDlg::GetRefreshedSet()
void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
- //Namen der Vorlagen und Metric setzen
+ // set template's and metric's names
String sNumCharFmt, sBulletCharFmt;
SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFmt);
SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt);
@@ -551,7 +551,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
- // Zeichenvorlagen sammeln
+ // collect character templates
ListBox rCharFmtLB(this);
rCharFmtLB.Clear();
rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
More information about the Libreoffice-commits
mailing list