Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3890
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3890/1
fdo#39468 Comment translation GER-ENG in sw/source/ui/shells/ (Part 4)
The last files of this directory. :-)
Change-Id: I94cc2d50c85acd7434f12766094d3edd0cf9d71d
---
M sw/source/ui/shells/textsh.cxx
M sw/source/ui/shells/textsh1.cxx
M sw/source/ui/shells/txtattr.cxx
M sw/source/ui/shells/txtcrsr.cxx
M sw/source/ui/shells/txtnum.cxx
5 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 0a63d1c..6aa8ee5 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -74,7 +74,7 @@
#include <textsh.hxx>
#include <frmfmt.hxx>
#include <tablemgr.hxx>
-#include <swundo.hxx> // fuer Undo-IDs
+#include <swundo.hxx> // for Undo-IDs
#include <shellio.hxx>
#include <frmdlg.hxx>
#include <usrpref.hxx>
@@ -215,7 +215,7 @@
if ( ERRCODE_NONE == aDlg.Execute() )
{
- // URL ermitteln
+ // Determine URL
String aStrURL( aDlg.GetPath() );
aStrURL = URIHelper::SmartRel2Abs(
INetURLObject(), aStrURL, URIHelper::GetMaybeFileHdl() );
@@ -505,7 +505,7 @@
}
}
- // Rahmen neu anlegen
+ // Create new border
SwFlyFrmAttrMgr aMgr( sal_True, GetShellPtr(), FRMMGR_TYPE_TEXT );
if(pArgs)
{
@@ -567,7 +567,7 @@
aSet.Put(aMgr.GetAttrSet());
aSet.SetParent( aMgr.GetAttrSet().GetParent() );
- // Minimalgroesse in Spalten loeschen
+ // Delete minimum size in columns.
SvxBoxInfoItem aBoxInfo((SvxBoxInfoItem &)aSet.Get(SID_ATTR_BORDER_INNER));
const SvxBoxItem& rBox = (const SvxBoxItem&)aSet.Get(RES_BOX);
aBoxInfo.SetMinDist(sal_False);
@@ -592,7 +592,7 @@
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
aMgr.SetAttrSet(*pOutSet);
- // beim ClickToEditFeld erst die Selektion loeschen
+ // At first delete the selection at the ClickToEditField.
if( rShell.IsInClickToEdit() )
rShell.DelRight();
@@ -751,7 +751,7 @@
if( pMacro )
aHLinkItem.SetMacro(HYPERDLG_EVENT_MOUSEOUT_OBJECT, *pMacro);
- // Text des Links besorgen
+ // Get the text of the Link.
rSh.StartAction();
rSh.CreateCrsr();
rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT,sal_True);
@@ -960,10 +960,10 @@
aFontName = aFont.GetFamilyName();
}
- Font aNewFont(aFontName, Size(1,1)); // Size nur wg. CTOR
+ Font aNewFont(aFontName, Size(1,1)); // Size only because CTOR.
if( !aChars.Len() )
{
- // Eingestellten Font als Default
+ // Set selected font as default.
SfxAllItemSet aAllSet( rSh.GetAttrPool() );
aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
@@ -1004,7 +1004,7 @@
{
rSh.StartAllAction();
- // Selektierten Inhalt loeschen
+ // Delete selected content.
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_SPECIALCHAR));
@@ -1026,7 +1026,7 @@
GetI18NScriptTypeOfLanguage( (sal_uInt16)GetAppLanguage() ) ));
}
- // Zeichen einfuegen
+ // Insert character.
rSh.Insert( aChars );
// #108876# a font attribute has to be set always due to a guessed script type
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 7a05da5..ce79e21 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -68,7 +68,7 @@
#include <docstat.hxx>
#include <outline.hxx>
#include <tablemgr.hxx>
-#include <swundo.hxx> // fuer Undo-IDs
+#include <swundo.hxx> // for Undo-IDs
#include <reffld.hxx>
#include <docsh.hxx>
#include <mdiexp.hxx>
@@ -152,8 +152,8 @@
}
aCoreSet.Put( SfxUInt16Item( SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,
rWrtSh.GetScalingOfSelectedText() ) );
- // Das CHRATR_BACKGROUND-Attribut wird fuer den Dialog in
- // ein RES_BACKGROUND verwandelt und wieder zurueck ...
+ // The CHRATR_BACKGROUND attribute will be converted for the
+ // dialogue in a RES_BACKGROUND and back again ...
const SfxPoolItem *pTmpBrush;
if( SFX_ITEM_SET == aCoreSet.GetItemState( RES_CHRATR_BACKGROUND, sal_True, &pTmpBrush ) )
{
@@ -199,7 +199,7 @@
sal_Bool bInsert = sal_False;
xub_StrLen nInsert = 0;
- // aus ungeklaerter Ursache ist das alte Item wieder im Set
+ // The old item is for unknown reasons back in the set again.
if( !bSelectionPut && SFX_ITEM_SET == aTmpSet.GetItemState(FN_PARAM_SELECTION, sal_False,
&pSelectionItem) )
{
String sInsert = ((const SfxStringItem*)pSelectionItem)->GetValue();
@@ -592,7 +592,7 @@
case FN_AUTOFORMAT_REDLINE_APPLY:
{
SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
- // das muss fuer die Nachbearbeitung immer sal_False sein
+ // This must always be sal_False for the postprocessing.
aFlags.bAFmtByInput = sal_False;
aFlags.bWithRedlining = sal_True;
rWrtSh.AutoFormat( &aFlags );
@@ -636,7 +636,7 @@
case FN_AUTOFORMAT_APPLY:
{
SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags());
- // das muss fuer die Nachbearbeitung immer sal_False sein
+ // This must always be sal_False for the postprocessing.
aFlags.bAFmtByInput = sal_False;
rWrtSh.AutoFormat( &aFlags );
rReq.Done();
@@ -658,7 +658,7 @@
break;
case FN_AUTO_CORRECT:
{
- // erstmal auf Blank defaulten
+ // At first set to blank as default.
sal_Unicode cChar = ' ';
rWrtSh.AutoCorrect( *SvxAutoCorrCfg::Get().GetAutoCorrect(), cChar );
rReq.Done();
@@ -892,7 +892,7 @@
aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE,
::GetHtmlMode(GetView().GetDocShell())));
- // Tabulatoren, DefaultTabs ins ItemSet Stecken
+ // Tabulators: Put DefaultTabs into ItemSet
const SvxTabStopItem& rDefTabs = (const SvxTabStopItem&)
GetPool().GetDefaultItem(RES_PARATR_TABSTOP);
@@ -900,11 +900,11 @@
SfxUInt16Item aDefDistItem( SID_ATTR_TABSTOP_DEFAULTS, nDefDist );
aCoreSet.Put( aDefDistItem );
- // Aktueller Tab
+ // Current tabulator
SfxUInt16Item aTabPos( SID_ATTR_TABSTOP_POS, 0 );
aCoreSet.Put( aTabPos );
- // linker Rand als Offset
+ // Left border as offset
//#i24363# tab stops relative to indent
const long nOff =
rWrtSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT) ?
((SvxLRSpaceItem&)aCoreSet.Get( RES_LR_SPACE )).GetTxtLeft() : 0;
@@ -915,14 +915,14 @@
if ( bUseCurCrsr )
::PrepareBoxInfo( aCoreSet, rWrtSh );
- //aktuelles Seitenformat
+ // Current page format
::SwToSfxPageDescAttr( aCoreSet );
sal_uInt16 nDefPage = 0;
if( pItem )
nDefPage = ((SfxUInt16Item *)pItem)->GetValue();
- // Numerierungseigenschaften
+ // Properties of numbering
if( rWrtSh.GetDoc()->GetCurrNumRule( *pPaM->GetPoint() ) )
{
SfxBoolItem aStart( FN_NUMBER_NEWSTART, rWrtSh.IsNumRuleStart( pPaM ) );
@@ -949,7 +949,7 @@
}
else if ( NULL != pDlg && pDlg->Execute() == RET_OK )
{
- // Defaults evtl umsetzen
+ // Apply defaults if nessecary.
pSet = (SfxItemSet*)pDlg->GetOutputItemSet();
sal_uInt16 nNewDist;
if( SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, sal_False,
&pItem ) &&
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 7fc50a6..4659507 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -177,7 +177,7 @@
SwWrtShell& rWrtSh = GetShell();
SwTxtFmtColl* pColl = 0;
- // nur gesetzt, wenn gesamter Absatz selektiert ist und AutoUpdateFmt gesetzt ist
+ // Is only set if the whole paragraph is selected and AutoUpdateFmt is set.
if( rWrtSh.HasSelection() && rWrtSh.IsSelFullPara() )
{
pColl = rWrtSh.GetCurTxtFmtColl();
@@ -189,7 +189,7 @@
switch ( nSlot )
{
case FN_TXTATR_INET:
- // Sonderbehandlung der PoolId des SwFmtInetFmt
+ // Special treatment of the PoolId of the SwFmtInetFmt
if(bArgs)
{
const SfxPoolItem& rItem = pArgs->Get(nWhich );
@@ -215,7 +215,7 @@
case FN_GROW_FONT_SIZE:
bGrow = sal_True;
- // kein break !!
+ // No break !!
case FN_SHRINK_FONT_SIZE:
{
SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, rPool );
@@ -236,7 +236,7 @@
if (bGrow)
{
if( lSize == lFontMaxSz )
- break; // das wars, hoeher gehts nicht
+ break; // That's all, further up is not possible
if( ( lSize += lFontInc ) > lFontMaxSz )
lSize = lFontMaxSz;
}
@@ -273,7 +273,7 @@
sal_uInt8 ePropL;
const SfxItemSet* pArgs = rReq.GetArgs();
- // gleich beide Attribute holen, ist nicht teuerer !!
+ // Get both attributes immediately isn't more expensive!!
SfxItemSet aSet( GetPool(),
RES_PARATR_LINESPACING, RES_PARATR_ADJUST,
RES_FRAMEDIR, RES_FRAMEDIR,
@@ -505,14 +505,14 @@
SwWrtShell &rSh = GetShell();
SfxItemPool& rPool = GetPool();
SfxItemSet aCoreSet(rPool, aTxtFmtCollSetRange);
- rSh.GetCurAttr(aCoreSet); // *alle* Textattribute von der Core erfragen
+ rSh.GetCurAttr(aCoreSet); // Request *all* text attributes from the core.
SfxWhichIter aIter(rSet);
sal_uInt16 nSlot = aIter.FirstWhich();
sal_Bool bFlag = sal_False;
SfxBoolItem aFlagItem;
const SfxPoolItem* pItem = 0;
- int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen
+ int eAdjust = -1; // Illegal value to recognize DONTCARE.
SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, sal_False, &pItem);
if( SFX_ITEM_DEFAULT == eState )
@@ -711,7 +711,7 @@
break;
default:
- // Nichts tun
+ // Do nothing
nSlot = 0;
break;
@@ -727,7 +727,5 @@
rSet.Put(aCoreSet,sal_False);
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx
index 2a38f71..2c09fea 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/ui/shells/txtcrsr.cxx
@@ -163,7 +163,6 @@
rReq.Done();
}
-
void SwTextShell::ExecMoveCol(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index ce7bcdd..a9ef380 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -39,7 +39,7 @@
void SwTextShell::ExecEnterNum(SfxRequest &rReq)
{
- //wg. Aufzeichnung schon vor dem evtl. Shellwechsel
+ //Because the record before any shell exchange.
switch(rReq.GetSlot())
{
case FN_NUM_NUMBERING_ON:
@@ -136,7 +136,7 @@
SvxNumberFormat aFmt( aSvxRule.GetLevel( n ) );
if ( n && bHtml )
{
- // 1/2" fuer HTML
+ // 1/2" for HTML
aFmt.SetLSpace(720);
aFmt.SetAbsLSpace(n * 720);
}
@@ -155,7 +155,7 @@
aSet.Put( SfxBoolItem( SID_PARAM_NUM_PRESET,sal_False ));
- // vor dem Dialog wird der HtmlMode an der DocShell versenkt
+ // Before the dialogue of the HTML mode will be droped at the Docshell.
pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -185,9 +185,8 @@
const bool bCreateList = (pCurRule == 0);
GetShell().SetCurNumRule( aSetRule, bCreateList );
}
- // wenn der Dialog mit OK verlassen wurde, aber nichts ausgewaehlt
- // wurde dann muss die Numerierung zumindest eingeschaltet werden,
- // wenn sie das noch nicht ist
+ // If the Dialog was leaved with OK but nothing was chosen then the
+ // numbering must be at least activated, if it is not already.
else if( !pCurRule && SFX_ITEM_SET == aSet.GetItemState( SID_ATTR_NUMBERING_RULE,
sal_False, &pItem ))
{
rReq.AppendItem( *pItem );
@@ -213,6 +212,5 @@
return;
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
To view, visit https://gerrit.libreoffice.org/3890
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94cc2d50c85acd7434f12766094d3edd0cf9d71d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>
Context
- [PATCH] fdo#39468 Comment translation GER-ENG in sw/source/ui/shells... · Matthias Freund (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.