diff options
| author | Johnny_M <klasse@partyheld.de> | 2017-08-26 01:03:43 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-28 12:03:56 +0200 |
| commit | 06c07c0dc15348c23fe432e7f1c0243486d1e6bf (patch) | |
| tree | 783ef9044e8935b8288aceea1f5c45cca31f4a7c /sw | |
| parent | 9bd3482c933a611f428fce76a0d1a10dd0d4353a (diff) | |
Translate German comments/debug strings (leftovers in dirs starmath to sysui)
Translates leftovers found using a custom regex.
Additionally translated:
- One randomly found comment in /reportdesign
- Test strings in /stoc/test (let's see if it works)
Change-Id: I5f893c194c4b56b5365700928a3b8b63936d03e2
Reviewed-on: https://gerrit.libreoffice.org/41583
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
63 files changed, 90 insertions, 92 deletions
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 0c9edea72da3..5f511bce3532 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -48,7 +48,7 @@ using rtl::OUString; */ virtual void UpdateLinks() = 0; - /** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents. + /** for linking of parts of documents. */ virtual bool GetData(const OUString& rItem, const OUString& rMimeType, css::uno::Any& rValue) const = 0; diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx index 2cdb33e5ab7d..717728f83c99 100644 --- a/sw/inc/IDocumentTimerAccess.hxx +++ b/sw/inc/IDocumentTimerAccess.hxx @@ -27,7 +27,7 @@ class IDocumentTimerAccess { public: /** - Set modus to 'start'. + Set mode to 'start'. */ virtual void StartIdling() = 0; diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index e48346f25124..382af16246b8 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -144,7 +144,7 @@ // Region: Edit #define FN_REFRESH_VIEW (FN_VIEW + 1) /* Refresh/Redraw */ -#define FN_DRAW_WRAP_DLG (FN_VIEW + 3) /* Draw Umlauf-Dlg */ +#define FN_DRAW_WRAP_DLG (FN_VIEW + 3) /* Draw wrapping dlg */ #define FN_RULER (FN_VIEW + 11) /* Horizontal ruler */ #define FN_VIEW_GRAPHIC (FN_VIEW + 13) /* View graphic */ diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 4b47f00bb5d7..424aa738434f 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -627,7 +627,7 @@ public: // and evtl. corrects that items to ensure unique names for that type. This call may // modify/correct entries inside of the given SfxItemSet, and it will apply a name to // the items in question (what is essential to make the named slots associated with - // these items work for the UNO API and thus e.g. for ODF im/export) + // these items work for the UNO API and thus e.g. for ODF import/export) void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet); bool SetFlyFrameAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet ); diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 098956b246b3..ae2fb28042e7 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -219,7 +219,7 @@ class SwHTMLTableLayout SvxAdjust m_eTableAdjust; ///< Alignment of table. bool m_bColsOption : 1; ///< Table has a COLS-option. - bool m_bColTags : 1; ///< Tabelle has COL/COLGRP-tags. + bool m_bColTags : 1; ///< Table has COL/COLGRP tags. bool m_bPrcWidthOption : 1; ///< Width is given in percent. bool m_bUseRelWidth : 1; ///< SwTable gets relative width. diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 4248066dacea..f1d62c69ba18 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -305,7 +305,6 @@ public: // Search all content-bearing boxes of the base line on which this box stands. // rBoxes as a return value for immediate use. - // steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen // bToTop = true -> up to base line, false-> else only line of box. static SwSelBoxes& SelLineFromBox( const SwTableBox* pBox, SwSelBoxes& rBoxes, bool bToTop = true ); diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 71a67778d387..386941e59eb8 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -217,7 +217,7 @@ enum PrepareHint PREP_FOLLOW_FOLLOWS, // Follow is now possibly adjacent. PREP_ADJUST_FRM, // Adjust size via grow/shrink without formatting. PREP_FLY_CHGD, // A FlyFrame has changed its size. - PREP_FLY_ATTR_CHG, // A FlyFrame hat has changed its attributes + PREP_FLY_ATTR_CHG, // A FlyFrame has changed its attributes // (e. g. wrap). PREP_FLY_ARRIVE, // A FlyFrame now overlaps range. PREP_FLY_LEAVE, // A FlyFrame has left range. diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi index 1bbe7faa9b31..3d3a92080705 100644 --- a/sw/sdi/_basesh.sdi +++ b/sw/sdi/_basesh.sdi @@ -152,7 +152,7 @@ interface BaseTextSelection FN_FRAME_TO_ANCHOR // status() [ - /*OS: Datentypen unvertraeglich ?? */ + /*OS: data types incompatible?? */ ExecMethod = Execute ; StateMethod = NoState ; ] @@ -331,13 +331,13 @@ interface BaseTextSelection [ ExecMethod = Execute ; StateMethod = StateStyle ; - FastCall = TRUE; // fuer Macroausfuehrung! + FastCall = TRUE; // for macro execution! ] SID_STYLE_APPLY // status(fina|play) [ ExecMethod = Execute ; StateMethod = StateStyle ; - FastCall = TRUE;// fuer Macroausfuehrung! + FastCall = TRUE;// for macro execution! DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] @@ -383,7 +383,7 @@ interface BaseTextSelection StateMethod = StateStyle ; ] - //OS: Selection.Escape gibt es zusaetzlich zu Window.Escape + //OS: Selection.Escape exists additionally to Window.Escape FN_ESCAPE // status(final|play|rec) [ @@ -403,7 +403,7 @@ interface BaseTextSelection StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] -// Methode fuer Rahmen und Objekte +// Method for frames and objects FN_TOOL_ANCHOR [ StateMethod = GetState ; diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi index 1f73d9ff3c20..734b50c5ebc1 100644 --- a/sw/sdi/_frmsh.sdi +++ b/sw/sdi/_frmsh.sdi @@ -108,7 +108,7 @@ interface BaseTextFrame FN_FRAME_TO_ANCHOR // status() [ - /*OS: Datentypen unvertraeglich ?? */ + /*OS: data types incompatible?? */ ExecMethod = Execute ; StateMethod = NoState ; ] @@ -364,8 +364,8 @@ interface BaseTextFrame DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] -// Abfragefunktionen fuer ImageMaps -// Slots ohne Export +// Query functions for ImageMaps +// Slots without export FN_INSERT_FRAME [ diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index 75d34f07fdc3..e9c35b2d24dd 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -708,7 +708,7 @@ interface BaseText ExecMethod = Execute ; StateMethod = GetState ; ] - //Parameter kann noch nicht aufgezeichnet werden + // parameter can not be recorded yet FN_NUM_NUMBERING_ON // status(final|play) [ ExecMethod = ExecEnterNum ; diff --git a/sw/sdi/wbasesh.sdi b/sw/sdi/wbasesh.sdi index 309981758894..1c83c0712271 100644 --- a/sw/sdi/wbasesh.sdi +++ b/sw/sdi/wbasesh.sdi @@ -18,8 +18,7 @@ interface WebSelection : BaseTextSelection { - // hier kommt nur dann etwas hinein, wenn es im - // kompletten StarWriter nicht benoetigt wird + // here something is placed only if it's not needed in the entire StarWriter } shell SwWebBaseShell diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 3aa7991b4881..5689d1b1d8ad 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2429,7 +2429,7 @@ bool SwCursorShell::IsOverReadOnlyPos( const Point& rPt ) const Point aPt( rPt ); SwPaM aPam( *m_pCurrentCursor->GetPoint() ); GetLayout()->GetCursorOfst( aPam.GetPoint(), aPt ); - // Formular view + // form view return aPam.HasReadonlySel( GetViewOptions()->IsFormView() ); } diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index af7b12c4d505..26144d19c8b6 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -856,7 +856,7 @@ SwField* SwCursorShell::GetCurField( const bool bIncludeInputFieldAtStart ) cons if ( pCurField != nullptr && SwFieldIds::Table == pCurField->GetTyp()->Which() ) { - // TabellenFormel ? wandel internen in externen Namen um + // table formula? convert internal name into external const SwTableNode* pTableNd = IsCursorInTable(); static_cast<SwTableField*>(pCurField)->PtrToBoxNm( pTableNd ? &pTableNd->GetTable() : nullptr ); } @@ -1255,7 +1255,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, // create from internal (for CORE) the external // (for UI) formula const SwTableNode* pTableNd = pTextNd->FindTableNode(); - if( pTableNd ) // steht in einer Tabelle + if( pTableNd ) // is in a table const_cast<SwTableField*>(static_cast<const SwTableField*>(pField))->PtrToBoxNm( &pTableNd->GetTable() ); } } diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index d910d7e2050e..cd1d7f200e7c 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -538,7 +538,7 @@ sal_uInt16 SwPaM::GetPageNum( bool bAtPoint, const Point* pLayPos ) return 0; } -// Formular view - See also SwCursorShell::IsCursorReadonly() +// form view - see also SwCursorShell::IsCursorReadonly() static const SwFrame* lcl_FindEditInReadonlyFrame( const SwFrame& rFrame ) { const SwFrame* pRet = nullptr; diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index e5cf85c91a7b..85005cdf3b86 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -1205,7 +1205,7 @@ void SwRangeRedline::ShowOriginal(sal_uInt16 nLoop, size_t nMyPos) } break; - case nsRedlineType_t::REDLINE_DELETE: // Inhalt wurde eingefuegt + case nsRedlineType_t::REDLINE_DELETE: // Content has been deleted bIsVisible = true; if( 1 <= nLoop ) MoveFromSection(nMyPos); diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index b569004a776b..094201d7c5c3 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -647,14 +647,14 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes, if( bNewFrames && pSctNd ) pSctNd->DelFrames(); - RemoveNode( aRg.aEnd.GetIndex(), 1, false ); // EndNode loeschen + RemoveNode( aRg.aEnd.GetIndex(), 1, false ); // delete EndNode sal_uLong nSttPos = pSttNd->GetIndex(); // this StartNode will be removed later SwStartNode* pTmpSttNd = new SwStartNode( *this, nSttPos+1 ); pTmpSttNd->m_pStartOfSection = pSttNd->m_pStartOfSection; - RemoveNode( nSttPos, 1, false ); // SttNode loeschen + RemoveNode( nSttPos, 1, false ); // delete SttNode pSttNd->m_pStartOfSection = aIdx.GetNode().m_pStartOfSection; rNodes.InsertNode( pSttNd, aIdx ); @@ -964,7 +964,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange) // For other nodes, create a new start node. SwNode * pAktNode = &pRange->aStart.GetNode(); SwNodeIndex aIdx( *pAktNode->StartOfSectionNode() ); - if( pAktNode->IsStartNode() ) // selbst StartNode + if( pAktNode->IsStartNode() ) // is StartNode itself { SwEndNode* pEndNd = pRange->aEnd.GetNode().GetEndNode(); if (pEndNd && pAktNode == pEndNd->m_pStartOfSection) diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 46c5de7cfe8a..91ff4641b0d3 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -626,7 +626,7 @@ bool SwEditShell::InsertURL( const SwFormatINetFormat& rFormat, const OUString& bool bDelText = true; if( !pCursor->IsMultiSelection() ) { - // einfach Selection -> Text ueberpruefen + // simple selection -> check the text const OUString sText(comphelper::string::stripEnd(GetSelText(), ' ')); if( sText == rStr ) bDelText = bInsText = false; diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index f04aed5e2044..a53c16882c34 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -272,7 +272,7 @@ bool SwPageNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) case FIELD_PROP_FORMAT: rAny >>= nSet; - // TODO: woher kommen die defines? + // TODO: where do the defines come from? if(nSet <= SVX_NUM_PAGEDESC ) SetFormat(nSet); else { diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 4850b76cf6e3..067194ca14ff 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -237,7 +237,7 @@ void SwFEShell::SelectFlyFrame( SwFlyFrame& rFrame ) SwViewShellImp *pImpl = Imp(); if( GetWin() ) { - OSL_ENSURE( rFrame.IsFlyFrame(), "SelectFlyFrame will einen Fly" ); + OSL_ENSURE( rFrame.IsFlyFrame(), "SelectFlyFrame wants a Fly" ); // nothing to be done if the Fly already was selected if (GetSelectedFlyFrame() == &rFrame) diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index e3dedeb6398f..a7838151adff 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -3116,11 +3116,11 @@ const Color SwFEShell::GetShapeBackgrd() const // determine page frame of the frame the shape is anchored. const SwFrame* pAnchorFrame = static_cast<SwDrawContact*>(GetUserCall(pSdrObj))->GetAnchorFrame( pSdrObj ); - OSL_ENSURE( pAnchorFrame, "inconsistent modell - no anchor at shape!"); + OSL_ENSURE( pAnchorFrame, "inconsistent model - no anchor at shape!"); if ( pAnchorFrame ) { const SwPageFrame* pPageFrame = pAnchorFrame->FindPageFrame(); - OSL_ENSURE( pPageFrame, "inconsistent modell - no page!"); + OSL_ENSURE( pPageFrame, "inconsistent model - no page!"); if ( pPageFrame ) { aRetColor = pPageFrame->GetDrawBackgrdColor(); @@ -3164,11 +3164,11 @@ bool SwFEShell::IsShapeDefaultHoriTextDirR2L() const // determine page frame of the frame the shape is anchored. const SwFrame* pAnchorFrame = static_cast<SwDrawContact*>(GetUserCall(pSdrObj))->GetAnchorFrame( pSdrObj ); - OSL_ENSURE( pAnchorFrame, "inconsistent modell - no anchor at shape!"); + OSL_ENSURE( pAnchorFrame, "inconsistent model - no anchor at shape!"); if ( pAnchorFrame ) { const SwPageFrame* pPageFrame = pAnchorFrame->FindPageFrame(); - OSL_ENSURE( pPageFrame, "inconsistent modell - no page!"); + OSL_ENSURE( pPageFrame, "inconsistent model - no page!"); if ( pPageFrame ) { bRet = pPageFrame->IsRightToLeft(); diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 5105e919de27..b81f04a952c2 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -1715,7 +1715,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrame *&rpStart, { const SwLayoutFrame *pTmpLeaf = rpEnd; pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf(); - while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->Frame()) < nEX )//erstmal die Zeile ueberspr. + while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->Frame()) < nEX ) // skip the line for now pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf(); while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->Frame()) > nEX ) pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf(); diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index d0eaa4ab9670..d4fdf25a9ad9 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -26,7 +26,7 @@ class SwPaM; class SwDoc; class SvxMacroTableDtor; -// Name eines Textblocks: +// Name of a text block: class SwBlockName { diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index 05f48f4ab131..c1435a5a0029 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -59,7 +59,7 @@ SW_DLLPUBLIC void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, * Collects the uppermost or lowermost Lines of a Box from a Line in an array. * We also store their positions. * - * @see implementation in im ndtbl.cxx + * @see implementation in ndtbl.cxx */ class SwCollectTableLineBoxes { diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index f4a16cacb3a6..c1d166461b22 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -184,7 +184,7 @@ SwPageFrame::SwPageFrame( SwFrameFormat *pFormat, SwFrame* pSib, SwPageDesc *pPg Frame().Height( 0 ); long nWidth = pSh->VisArea().Width(); if ( !nWidth ) - nWidth = 5000; //aendert sich sowieso + nWidth = 5000; // changes anyway Frame().Width ( nWidth ); } else @@ -1333,7 +1333,7 @@ SwTwips SwRootFrame::GrowFrame( SwTwips nDist, bool bTst, bool ) SwTwips SwRootFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool ) { OSL_ENSURE( nDist >= 0, "nDist < 0." ); - OSL_ENSURE( nDist <= Frame().Height(), "nDist > als aktuelle Groesse." ); + OSL_ENSURE( nDist <= Frame().Height(), "nDist greater than current size." ); if ( !bTst ) Frame().SSize().Height() -= nDist; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 4d7b638b4dda..373bab84ea08 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7467,7 +7467,7 @@ bool SwFrame::GetBackgroundBrush( rBack.GetGraphicPos() == GPOS_NONE && !pOpt->IsPagePreview() && !pOpt->IsReadonly() && - // #114856# Formular view + // #114856# Form view !pOpt->IsFormView() && SwViewOption::IsIndexShadings() && !pOpt->IsPDFExport() && diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 5990b101ba4f..02dcbffa9dcd 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4179,7 +4179,7 @@ void SwRowFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA if ( HasFixSize() ) { const SwFormatFrameSize &rFrameSize = GetFormat()->GetFrameSize(); - OSL_ENSURE( rFrameSize.GetSize().Height() > 0, "Hat ihn" ); + OSL_ENSURE( rFrameSize.GetSize().Height() > 0, "Has it" ); } #endif const SwTwips nDiff = aRectFnSet.GetHeight(Frame()) - diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 475f460bc776..14767b6e6f13 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1690,7 +1690,7 @@ SwTableBox::~SwTableBox() SwTableBoxFormat* SwTableBox::CheckBoxFormat( SwTableBoxFormat* pFormat ) { // We might need to create a new format here, because the box must be - // added to the format solely if pFormat has a value or formular. + // added to the format solely if pFormat has a value or form. if( SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_VALUE, false ) || SfxItemState::SET == pFormat->GetItemState( RES_BOXATR_FORMULA, false ) ) { diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx index 093927bd49b8..948a5682648f 100644 --- a/sw/source/core/text/itrtxt.cxx +++ b/sw/source/core/text/itrtxt.cxx @@ -198,7 +198,7 @@ void SwTextIter::CharToLine(const sal_Int32 nChar) ; } -// 1170: beruecksichtigt Mehrdeutigkeiten: +// 1170: takes into account ambiguities: const SwLineLayout *SwTextCursor::CharCursorToLine( const sal_Int32 nPosition ) { CharToLine( nPosition ); diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 4a70a1801eb9..4b7947114d7d 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -321,7 +321,7 @@ bool SwTextPortion::Format_( SwTextFormatInfo &rInf ) if ( !bFull ) { Width( aGuess.BreakWidth() ); - // Vorsicht ! + // Caution! if( !InExpGrp() || InFieldGrp() ) SetLen( rInf.GetLen() ); diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index be96cbc6bf81..44f2b44977da 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -484,7 +484,7 @@ void SwTextFormatter::CalcDropHeight( const sal_uInt16 nLines ) } /** - * We assume hat the font height doesn't change and that at first there + * We assume that the font height doesn't change and that at first there * are at least as many lines, as the DropCap-setting claims */ void SwTextFormatter::GuessDropHeight( const sal_uInt16 nLines ) diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index d4695488382e..16338b9ea823 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -1010,7 +1010,7 @@ bool SwTextFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const SwRect aRect( pAnchoredObj->GetObjRectWithSpaces() ); - // Optimierung + // Optimization SwRectFnSet aRectFnSet(pCurrFrame); if( aRectFnSet.GetLeft(aRect) > aRectFnSet.GetRight(rRect) ) break; diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 9c83bdfcb335..c59c5419b976 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1639,7 +1639,7 @@ bool SwTextNode::Hyphenate( SwInterHyphInfo &rHyphInf ) { // There was a comment here that claimed that the following assertion // shouldn't exist as it's triggered by "Trennung ueber Sonderbereiche", - // whatever that means. + // (hyphenation across special sections?), whatever that means. OSL_ENSURE( pFrame, "!SwTextNode::Hyphenate: can't find any frame" ); return false; } diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 8dc370b6c887..3c79a8315db5 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -428,7 +428,7 @@ SwXTextSection::attach(const uno::Reference< text::XTextRange > & xTextRange) SfxLinkUpdateMode::ALWAYS : SfxLinkUpdateMode::ONCALL ); } - // Undo-Klammerung hier beenden + // end the Undo bracketing here pDoc->GetIDocumentUndoRedo().EndUndo( SwUndoId::INSSECTION, nullptr ); m_pImpl->m_pProps.reset(); m_pImpl->m_bIsDescriptor = false; diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 09b2641a1dca..0040ecb792c2 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1003,7 +1003,7 @@ bool SwXText::Impl::CheckForOwnMember( const SwNode& rSrcNode = rPaM.GetNode(); const SwStartNode* pTmp = rSrcNode.FindSttNodeByType(eSearchNodeType); - //SectionNodes ueberspringen + // skip SectionNodes while(pTmp && pTmp->IsSectionNode()) { pTmp = pTmp->StartOfSectionNode(); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index ad71a22898a4..434dca8e90d6 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2449,7 +2449,7 @@ void SwViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions const & rAcce mpAccOptions->SetStopAnimatedGraphics(! rAccessibilityOptions.GetIsAllowAnimatedGraphics()); mpAccOptions->SetStopAnimatedText(! rAccessibilityOptions.GetIsAllowAnimatedText()); - // Formular view + // Form view // Always set this option, not only if document is read-only: mpOpt->SetSelectionInReadonly(rAccessibilityOptions.IsSelectionInReadonly()); } diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 8b0064ecc0f8..73dead50d7c1 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -175,7 +175,7 @@ void SwPaintQueue::Remove( SwViewShell const *pSh ) void SetSwVisArea( SwViewShell *pSh, const SwRect &rRect ) { - OSL_ENSURE( !pSh->GetWin(), "Drucken mit Window?" ); + OSL_ENSURE( !pSh->GetWin(), "Print with window?" ); pSh->maVisArea = rRect; pSh->Imp()->SetFirstVisPageInvalid(); Point aPt( rRect.Pos() ); diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 79fcaaa67314..105db2d5dca7 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -319,7 +319,7 @@ void SwFltControlStack::StealAttr(const SwNodeIndex& rNode) SwFltStackEntry& rEntry = *m_Entries[nCnt]; if (rEntry.m_aPtPos.m_nNode.GetIndex()+1 == rNode.GetIndex()) { - DeleteAndDestroy(nCnt); // loesche aus dem Stack + DeleteAndDestroy(nCnt); // delete from the stack } } } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 7badbbd29319..35ce89bab0d2 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1980,7 +1980,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SvxCSS1PropertyInfo &rPropInfo, else { eHoriOri = text::HoriOrientation::LEFT; - eHoriRel = text::RelOrientation::FRAME; // wird noch umgeschossen + eHoriRel = text::RelOrientation::FRAME; // to be changed later } } } diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 15b2d6fcb7b0..28444317f1a5 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -324,7 +324,7 @@ void SwHTMLParser::EndContext( HTMLAttrContext *pContext ) { HTMLAttrContext *pCntxt = PopContext(); OSL_ENSURE( pCntxt != pContext, - "Kontext noch im Stack" ); + "Context still on the stack" ); if( pCntxt == pContext ) break; diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index cd3e85d6e372..5eb3c28e07f8 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -491,7 +491,7 @@ IMAGE_SETEVENT: if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs( aFrameSet ); - // Umrandung setzen + // set the border long nHBorderWidth = 0, nVBorderWidth = 0; if( nBorder ) { @@ -1167,7 +1167,7 @@ ANCHOR_SETEVENT: } } - // einen neuen Kontext anlegen + // create a new context HTMLAttrContext *pCntxt = new HTMLAttrContext( HtmlTokenId::ANCHOR_ON ); bool bEnAnchor = false, bFootnoteAnchor = false, bFootnoteEnSymbol = false; diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 38333bbf487c..158b555c518c 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -510,7 +510,7 @@ bool SwHTMLParser::EndSection( bool bLFStripped ) return true; } - OSL_ENSURE( false, "Falsche PaM Position Beenden eines Bereichs" ); + OSL_ENSURE( false, "Wrong PaM position at end of section" ); return false; } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 7c8e2ddb3ae5..367e9a8cdb41 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx |