diff options
author | Matthias Freund <matti_lx@yahoo.de> | 2013-05-13 20:32:43 +0200 |
---|---|---|
committer | Bosdonnat Cedric <cedric.bosdonnat@free.fr> | 2013-05-14 13:49:32 +0000 |
commit | e76e427ee68f4717a143a20733b09e845d73921d (patch) | |
tree | 3b879c848a76c9d6c94f93e830314cb8b1f7a0d9 /sw/source | |
parent | d90dd83765bfabfe9dbf91c7ece886986620e6d4 (diff) |
fdo#39468 Comment translation GER-ENG in sw/source/ui/shells/ (Part 4)
The last files of this directory. :-)
Change-Id: I94cc2d50c85acd7434f12766094d3edd0cf9d71d
Reviewed-on: https://gerrit.libreoffice.org/3890
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/ui/shells/textsh.cxx | 20 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 26 | ||||
-rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 18 | ||||
-rw-r--r-- | sw/source/ui/shells/txtcrsr.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/shells/txtnum.cxx | 12 |
5 files changed, 36 insertions, 41 deletions
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 0a63d1cd9a6f..6aa8ee576e98 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 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if ( ERRCODE_NONE == aDlg.Execute() ) { - // URL ermitteln + // Determine URL String aStrURL( aDlg.GetPath() ); aStrURL = URIHelper::SmartRel2Abs( INetURLObject(), aStrURL, URIHelper::GetMaybeFileHdl() ); @@ -505,7 +505,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) } } - // Rahmen neu anlegen + // Create new border SwFlyFrmAttrMgr aMgr( sal_True, GetShellPtr(), FRMMGR_TYPE_TEXT ); if(pArgs) { @@ -567,7 +567,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) 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 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) 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 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) 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 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) 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 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) { rSh.StartAllAction(); - // Selektierten Inhalt loeschen + // Delete selected content. SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_SPECIALCHAR)); @@ -1026,7 +1026,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) 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 7a05da52ac37..ce79e21c5501 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 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const } 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 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const 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 @@ void SwTextShell::Execute(SfxRequest &rReq) 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 @@ void SwTextShell::Execute(SfxRequest &rReq) 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 @@ void SwTextShell::Execute(SfxRequest &rReq) 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 @@ void SwTextShell::Execute(SfxRequest &rReq) 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 @@ void SwTextShell::Execute(SfxRequest &rReq) 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 @@ void SwTextShell::Execute(SfxRequest &rReq) 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 @@ void SwTextShell::Execute(SfxRequest &rReq) } 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 7fc50a647943..46595077172b 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -177,7 +177,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) 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 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) 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 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) 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 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) 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 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) 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 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) 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 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) break; default: - // Nichts tun + // Do nothing nSlot = 0; break; @@ -728,6 +728,4 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) 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 2a38f71fcc28..2c09feac936a 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.cxx @@ -163,7 +163,6 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq) 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 ce7bcdd1121a..a9ef38022d16 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 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) 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 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) 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 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) 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 ); @@ -214,5 +213,4 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |