[Libreoffice-commits] .: sw/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Wed Feb 23 12:28:20 PST 2011
sw/source/ui/chrdlg/break.cxx | 16 ++++++++--------
sw/source/ui/chrdlg/ccoll.cxx | 2 +-
sw/source/ui/chrdlg/chardlg.cxx | 6 +++---
sw/source/ui/chrdlg/drpcps.cxx | 38 +++++++++++++++++++-------------------
sw/source/ui/chrdlg/pardlg.cxx | 3 +--
sw/source/ui/chrdlg/swbreak.src | 4 ++--
sw/source/ui/chrdlg/swuiccoll.cxx | 2 +-
sw/source/ui/chrdlg/tblnumfm.cxx | 2 +-
8 files changed, 36 insertions(+), 37 deletions(-)
New commits:
commit b685b5ac49365450d97f9ff38aa3d0fc74d59e5a
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Wed Feb 23 21:25:53 2011 +0100
translates all code-comments of writer/sw/source/ui/chrdlg
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 933d67f..f18ee00 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -80,7 +80,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, ClickHdl, void *, EMPTYARG )
IMPL_LINK_INLINE_END( SwBreakDlg, ClickHdl, void *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: Handler fuer Aendern Seitenummer
+ Description: Handler for Change Page Number
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
@@ -92,7 +92,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
/*------------------------------------------------------------------------
- Beschreibung: Durch Aendern der Seitennummer wird die Checkbox gecheckt.
+ Description: By changing the Page number the checkbox is checked.
------------------------------------------------------------------------*/
IMPL_LINK_INLINE_START( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG )
@@ -103,10 +103,10 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG )
IMPL_LINK_INLINE_END( SwBreakDlg, PageNumModifyHdl, Edit *, EMPTYARG )
/*------------------------------------------------------------------------
- Beschreibung: Ok-Handler;
- prueft, ob die Seitenummer nPage eine legale Seitennummer
- ist (linke Seiten mit geraden Nummern etc. bei einer Seitenvorlage
- mit wechselnden Seiten)
+ Description: Ok-Handler;
+ checks whether pagenumber nPage is a legal pagenumber
+ (left pages with even numbers etc. for a page template
+ with alternating pages)
------------------------------------------------------------------------*/
IMPL_LINK( SwBreakDlg, OkHdl, Button *, EMPTYARG )
@@ -114,7 +114,7 @@ IMPL_LINK( SwBreakDlg, OkHdl, Button *, EMPTYARG )
if(aPageNumBox.IsChecked()) {
// In case of differing page descriptions, test validity
const USHORT nPos = aPageCollBox.GetSelectEntryPos();
- // auf Position 0 steht 'Ohne'.
+ // position 0 says 'Without'.
const SwPageDesc *pPageDesc;
if ( 0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos )
pPageDesc = rSh.FindPageDescByName( aPageCollBox.GetSelectEntry(),
@@ -225,7 +225,7 @@ void SwBreakDlg::CheckEnable()
bEnable &= bPage;
if ( bEnable )
{
- // auf Position 0 steht 'Ohne' Seitenvorlage.
+ // position 0 says 'Without' page template.
const USHORT nPos = aPageCollBox.GetSelectEntryPos();
if ( 0 == nPos || LISTBOX_ENTRY_NOTFOUND == nPos )
bEnable = FALSE;
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx
index 24bf73c..8961b13 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/ui/chrdlg/ccoll.cxx
@@ -149,7 +149,7 @@ CommandStruct SwCondCollItem::aCmds[] =
TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem)
/****************************************************************************
- Item fuer den Transport der Bedingungstabelle
+ Item for the transport of the condition table
****************************************************************************/
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 9328c9d..e451e07 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -52,7 +52,7 @@
#include <uitool.hxx>
#include <fmtinfmt.hxx>
#include <macassgn.hxx>
-#include <chrdlg.hxx> // der Dialog
+#include <chrdlg.hxx> // the dialog
#include <swmodule.hxx>
#include <poolfmt.hxx>
@@ -116,7 +116,7 @@ SwCharDlg::~SwCharDlg()
}
/*--------------------------------------------------------------------
- Beschreibung: FontList setzen
+ Description: set FontList
--------------------------------------------------------------------*/
void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
@@ -287,7 +287,7 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet)
bModified |= aNameED.IsModified();
bModified |= aTargetFrmLB.GetSavedValue() != aTargetFrmLB.GetText();
- //zuerst die gueltigen Einstellungen setzen
+ // set valid settings first
String sEntry = aVisitedLB.GetSelectEntry();
USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT);
aINetFmt.SetVisitedFmtId(nId);
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 9bc149c..b6f8cc5 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -171,7 +171,7 @@ inline void SwDropCapsPict::InitPrinter( void )
}
/****************************************************************************
-Default-String aus Zeichenanzahl erzeugen (A, AB, ABC, ...)
+ Create Default-String from character-count (A, AB, ABC, ...)
****************************************************************************/
@@ -230,7 +230,7 @@ void SwDropCapsPict::UpdatePaintSettings( void )
SwDropCapsPage* pPage = ( SwDropCapsPage* ) GetParent();
if (!pPage->aTemplateBox.GetSelectEntryPos())
{
- // Font an Absatzanfang erfragen
+ // query the Font at paragraph's beginning
pPage->rSh.SttCrsrMove();
pPage->rSh.Push();
pPage->rSh.ClearMark();
@@ -251,7 +251,7 @@ void SwDropCapsPict::UpdatePaintSettings( void )
}
else
{
- // Font an Zeichenvorlage erfragen
+ // query Font at character template
SwCharFmt *pFmt = pPage->rSh.GetCharStyle(
pPage->aTemplateBox.GetSelectEntry(),
SwWrtShell::GETSTYLE_CREATEANY );
@@ -325,7 +325,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
for (USHORT i = 0; i < LINES; ++i)
DrawRect(Rectangle(Point(BORDER, nY0 + i * mnTotLineH), Size(aOutputSizePixel.Width() - 2 * BORDER, mnLineH)));
- // Texthintergrund mit Abstand (240 twips ~ 1 Zeilenhoehe)
+ // Text background with gap (240 twips ~ 1 line height)
ULONG lDistance = mnDistance;
USHORT nDistW = (USHORT) (ULONG) (((lDistance * 100) / 240) * mnTotLineH) / 100;
SetFillColor( maBackColor );
@@ -335,7 +335,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/)
aTextSize.Width() += nDistW;
DrawRect( Rectangle( Point( BORDER, nY0 ), aTextSize ) );
- // Text zeichnen
+ // draw Text
DrawPrev( Point( BORDER, nY0 - mnLeading ) );
}
@@ -567,7 +567,7 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) :
USHORT nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
bHtmlMode = nHtmlMode & HTMLMODE_ON ? TRUE : FALSE;
- //Im Vorlagendialog kann der Text nicht beeinflusst werden
+ // In the template dialog the text is not influenceable
aTextText.Enable( !bFormat );
aTextEdit.Enable( !bFormat );
@@ -627,7 +627,7 @@ Page: Reset-Overload
void SwDropCapsPage::Reset(const SfxItemSet &rSet)
{
- // Zeichen, Zeilen, Abstand und Text
+ // Characters, lines, gap and text
SwFmtDrop aFmtDrop((SwFmtDrop &) rSet.Get(RES_PARATR_DROP));
if (aFmtDrop.GetLines() > 1)
{
@@ -674,7 +674,7 @@ void SwDropCapsPage::Reset(const SfxItemSet &rSet)
}
/****************************************************************************
-Page: Click-Handler der CheckBox
+Page: CheckBox's Click-Handler
****************************************************************************/
@@ -709,7 +709,7 @@ IMPL_LINK( SwDropCapsPage, ClickHdl, Button *, EMPTYARG )
}
/****************************************************************************
-Page: Click-Handler der CheckBox
+Page: CheckBox's Click-Handler
****************************************************************************/
@@ -725,7 +725,7 @@ IMPL_LINK( SwDropCapsPage, WholeWordHdl, CheckBox *, EMPTYARG )
}
/****************************************************************************
-Page: Modify-Handler der SpinFields
+Page: SpinFields' Modify-Handler
****************************************************************************/
@@ -733,7 +733,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
{
String sPreview;
- // Ggf. Text setzen
+ // set text if applicable
if (pEdit == &aDropCapsField)
{
USHORT nVal;
@@ -763,7 +763,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
if (bSetText)
aTextEdit.SetText(sPreview);
}
- else if (pEdit == &aTextEdit) // Ggf. Anzahl setzen
+ else if (pEdit == &aTextEdit) // set quantity if applicable
{
USHORT nTmp = aTextEdit.GetText().Len();
aDropCapsField.SetValue(Max((USHORT)1, nTmp));
@@ -771,7 +771,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
sPreview = aTextEdit.GetText().Copy(0, nTmp);
}
- // Bild anpassen
+ // adjust image
if (pEdit == &aDropCapsField || pEdit == &aTextEdit)
pPict->SetText (sPreview);
else if (pEdit == &aLinesField)
@@ -785,7 +785,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
}
/****************************************************************************
-Page: Select-Handler der Template-Box.
+Page: Template-Box' Select-Handler.
*****************************************************************************/
@@ -811,13 +811,13 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet )
BOOL bOn = aDropCapsBox.IsChecked();
if(bOn)
{
- // Anzahl, Zeilen, Abstand
+ // quantity, lines, gap
aFmt.GetChars() = (BYTE) aDropCapsField.GetValue();
aFmt.GetLines() = (BYTE) aLinesField.GetValue();
aFmt.GetDistance() = (USHORT) aDistanceField.Denormalize(aDistanceField.GetValue(FUNIT_TWIP));
aFmt.GetWholeWord() = aWholeWordCB.IsChecked();
- // Vorlage
+ // template
if (aTemplateBox.GetSelectEntryPos())
aFmt.SetCharFmt(rSh.GetCharStyle(aTemplateBox.GetSelectEntry()));
}
@@ -828,14 +828,14 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet )
aFmt.GetDistance() = 0;
}
- // Attribute setzen
+ // set attributes
const SfxPoolItem* pOldItem;
if(0 == (pOldItem = GetOldItem( rSet, FN_FORMAT_DROPCAPS )) ||
aFmt != *pOldItem )
rSet.Put(aFmt);
- // Harte Textformatierung
- // Bug 24974: In Gestalter/Vorlagenkatoplog macht das keinen Sinn!!
+ // hard text formatting
+ // Bug 24974: in designer/template catalog this doesn't make sense!!
if( !bFormat && aDropCapsBox.IsChecked() )
{
String sText(aTextEdit.GetText());
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 9273d56..528ba28 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -215,8 +215,7 @@ void SwParaDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
}
else if( TP_PARA_EXT == nId )
{
- // Seitenumbruch nur, wenn der Cursor im Body-Bereich und nicht in
- // einer Tabelle steht
+ // pagebreak only when the cursor is in the body-area and not in a table
const USHORT eType = rSh.GetFrmType(0,TRUE);
if( !(FRMTYPE_BODY & eType) ||
rSh.GetSelectionType() & nsSelectionType::SEL_TBL )
diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src
index c626278..0a8c761 100644
--- a/sw/source/ui/chrdlg/swbreak.src
+++ b/sw/source/ui/chrdlg/swbreak.src
@@ -36,7 +36,7 @@ ModalDialog DLG_BREAK
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 161 , 114 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Umbruch einfügen : Umbruch einf³gen */
+ /* ### ATTENTION: New Text in resource? Insert break : Insert break */
Text [ en-US ] = "Insert Break" ;
Moveable = TRUE ;
OKButton BT_OK
@@ -114,7 +114,7 @@ ModalDialog DLG_BREAK
{
Pos = MAP_APPFONT ( 12 , 79 ) ;
Size = MAP_APPFONT ( 84 , 10 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Seitennummer ~ändern : Seitennummer ~õndern */
+ /* ### ATTENTION: New text in resource? Change page number : Change page number */
Text [ en-US ] = "Change page ~number" ;
TabStop = TRUE ;
};
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index e5ac715..0e91fa8 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -104,7 +104,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
aTbLinks.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN);
aTbLinks.SetSelectionMode( SINGLE_SELECTION );
aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT );
- aTbLinks.Resize(); // OS: Hack fuer richtige Selektion
+ aTbLinks.Resize(); // OS: Hack for the right selection
aTbLinks.SetSpaceBetweenEntries( 0 );
aTbLinks.SetHelpId(HID_COND_COLL_TABLIST);
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index f0efccf..7ff91d1 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -48,7 +48,7 @@
SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet)
: SfxSingleTabDialog( pParent, rSet, 0 )
{
- // TabPage erzeugen
+ // Create TabPage
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
More information about the Libreoffice-commits
mailing list