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 @@ -2088,7 +2088,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts, inline void HTMLTable::CloseSection( bool bHead ) { // Close the preceding sections if there's already a row - OSL_ENSURE( m_nCurrentRow<=m_nRows, "ungeultige aktuelle Zeile" ); + OSL_ENSURE( m_nCurrentRow<=m_nRows, "invalid current row" ); if( m_nCurrentRow>0 && m_nCurrentRow<=m_nRows ) (*m_pRows)[m_nCurrentRow-1]->SetEndOfGroup(); if( bHead ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index c56a4077c187..9026e8537454 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -127,7 +127,7 @@ using editeng::SvxBorderLine; using namespace ::com::sun::star; -// <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw. +// <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> etc. HTMLOptionEnum<SvxAdjust> aHTMLPAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, SvxAdjust::Left }, diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index cae1fb75bc5f..bd21641eb1c6 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -208,7 +208,7 @@ sal_uInt16 MSWordStyles::BuildGetSlot( const SwFormat& rFormat ) sal_uInt16 MSWordStyles::GetWWId( const SwFormat& rFormat ) { - sal_uInt16 nRet = ww::stiUser; // User-Style als default + sal_uInt16 nRet = ww::stiUser; // user style as default sal_uInt16 nPoolId = rFormat.GetPoolFormatId(); if( nPoolId == RES_POOLCOLL_STANDARD ) nRet = 0; @@ -1163,7 +1163,7 @@ void WW8_WrPlcSepx::WriteFootnoteEndText( WW8Export& rWrt, sal_uLong nCpStt ) while( 6 > nEmptyStt++ ) pTextPos->Append( nCpStt ); - // gleich die Flags am Dop setzen + // set the flags at the Dop right away WW8Dop& rDop = *rWrt.pDop; // Footnote Info switch( rInfo.eNum ) @@ -1885,7 +1885,7 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFormat& rFormat, bool bHea sal_uLong nStart = aIdx.GetIndex(); sal_uLong nEnd = aEnd.GetIndex(); - // Bereich also gueltiger Node + // range, i.e. valid node if ( nStart < nEnd ) { bool bOldKF = m_bOutKF; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 6beaeaefe3fe..9bdba927e7bc 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2813,7 +2813,7 @@ void WW8Export::WriteMainText() // therefore pFib->ccpText may get updated as well // save the StyleId of the last paragraph. Because WW97 take the style // from the last CR, that will be written after footer/Header/footnotes/ - // annotation usw. + // annotation etc. const SwTextNode* pLastNd = m_pCurPam->GetMark()->nNode.GetNode().GetTextNode(); if( pLastNd ) m_nLastFormatId = GetId( static_cast<SwTextFormatColl&>(pLastNd->GetAnyFormatColl()) ); @@ -2983,7 +2983,7 @@ void WW8Export::StoreDoc1() } delete[] pLastSprms; - pSepx->Finish( Fc2Cp( Strm().Tell() ));// Text + Footnote + HdFt als Section-Ende + pSepx->Finish( Fc2Cp( Strm().Tell() ));// Text + Footnote + HdFt as section end m_pMagicTable->Finish( Fc2Cp( Strm().Tell() ),0); pFib->m_fcMac = Strm().Tell(); // End of all texts diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index c99cc38def69..6ba8e5dcd977 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -3341,7 +3341,7 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) */ sal_uLong WW8Export::ReplaceCr( sal_uInt8 nChar ) { - OSL_ENSURE( nChar, "gegen 0 ersetzt bringt WW97/95 zum Absturz" ); + OSL_ENSURE( nChar, "replaced with 0 crashes WW97/95" ); bool bReplaced = false; SvStream& rStrm = Strm(); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 880bb99f79b8..d48b6678024f 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4239,7 +4239,7 @@ void SwWW8ImplReader::DeleteStack(SwFltControlStack* pStck) } else { - OSL_ENSURE( false, "WW-Stack bereits geloescht" ); + OSL_ENSURE( false, "WW stack already deleted" ); } } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index a849d47b6507..5e9036d611ae 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1189,7 +1189,7 @@ private: */ std::unique_ptr<ImportProgress> m_xProgress; - SwMSConvertControls *m_pFormImpl; // Control-Implementierung + SwMSConvertControls *m_pFormImpl; // implementation of control SwFlyFrameFormat* m_pFlyFormatOfJustInsertedGraphic; SwFrameFormat* m_pFormatOfJustInsertedApo; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index e1f2a584a824..222b858cc602 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -379,7 +379,7 @@ struct WW8LSTInfo // sorted by nIdLst (in WW8 used list-Id) WW8aIdSty aIdSty; // Style Id's for each level WW8aCFormat aCharFormat; // Character Style Pointer - SwNumRule* pNumRule; // Pointer to list-template in im Writer + SwNumRule* pNumRule; // Pointer to list-template in Writer sal_uInt32 nIdLst; // WW8Id of this list bool bSimpleList:1;// Flag, if this NumRule only uses one Level bool bUsedInDoc :1;// Flag, if this NumRule is used in the Doc, diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index f0a5f57c4f5b..4050eba5b30e 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -869,7 +869,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) return 0; sal_uInt16 n = (aF.nId <= eMax) ? aF.nId : static_cast<sal_uInt16>(eMax); - sal_uInt16 nI = n / 32; // # des sal_uInt32 + sal_uInt16 nI = n / 32; // # of sal_uInt32 sal_uInt32 nMask = 1 << ( n % 32 ); // Mask for bits if (SAL_N_ELEMENTS(m_nFieldTagAlways) <= nI) @@ -1365,7 +1365,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, OUString& rStr ) // "AUTONR" eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, OUString& rStr ) { - if( !m_pNumFieldType ){ // 1. Mal + if( !m_pNumFieldType ){ // 1st time SwSetExpFieldType aT( &m_rDoc, "AutoNr", nsSwGetSetExpType::GSE_SEQ ); m_pNumFieldType = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aT ); } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 2e379537af25..d3b6709e7443 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1430,7 +1430,7 @@ bool SwWW8ImplReader::SetBorder(SvxBoxItem& rBox, const WW8_BRCVer9* pbrc, for( int i = 0; i < 4; ++i ) { - // ungueltige Borders ausfiltern + // filter out the invalid borders const WW8_BRCVer9& rB = pbrc[ aIdArr[ i ].first ]; if( !rB.isNil() && rB.brcType() ) { diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 726d2094c31f..c006d4beef05 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -241,7 +241,7 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher(const WW8Fib& rFib) // WW7- Sprms static const SprmInfoRow aSprms[] = { - { 0, { 0, L_FIX} }, // "Default-sprm", wird uebersprungen + { 0, { 0, L_FIX} }, // "Default-sprm", is skipped { 2, { 2, L_FIX} }, // "sprmPIstd", pap.istd (style code) { 3, { 3, L_VAR} }, // "sprmPIstdPermute pap.istd permutation { 4, { 1, L_FIX} }, // "sprmPIncLv1" pap.istddifference @@ -441,7 +441,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() //WW8+ Sprms static const SprmInfoRow aSprms[] = { - { 0, { 0, L_FIX} }, // "Default-sprm"/ wird uebersprungen + { 0, { 0, L_FIX} }, // "Default-sprm"/ is skipped {0x4600, { 2, L_FIX} }, // "sprmPIstd" pap.istd;istd (style code);short; {0xC601, { 0, L_VAR} }, // "sprmPIstdPermute" pap.istd;permutation vector {0x2602, { 1, L_FIX} }, // "sprmPIncLvl" pap.istd, pap.lvl;difference @@ -6694,7 +6694,7 @@ WW8_STD* WW8Style::Read1Style(sal_uInt16& rSkip, OUString* pString) } break; default: - OSL_ENSURE(false, "Es wurde vergessen, nVersion zu kodieren!"); + OSL_ENSURE(false, "It was forgotten to code nVersion!"); break; } if (nLenStringBytes > rSkip) diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 6267cf22a201..3272d74b682e 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -216,7 +216,7 @@ static_assert(sizeof (WW8_FFN_BASE) == 6, "this has to match the msword size"); */ struct WW8_FFN : public WW8_FFN_BASE { - // ab Ver8 als Unicode + // from Ver8 on as Unicode OUString sFontname;// 0x6 or 0x40 resp. from Ver8 on zero terminated string that // records name of font. // Maximal size of szFfn is 65 characters. diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 9b0f79c1c626..5960e4092650 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -649,7 +649,7 @@ void SwXMLImport::startDocument() // We need a draw model to be able to set the z order pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel(); // #i52858# - method name changed - // SJ: #i49801# locking the modell to disable repaints + // SJ: #i49801# locking the model to disable repaints SwDrawModel* pDrawModel = pDoc->getIDocumentDrawModelAccess().GetDrawModel(); if ( pDrawModel ) pDrawModel->setLock(true); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 611a5702fe7a..698564ecb960 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2163,7 +2163,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, bool bSplitted = false; while( !bSplitted ) { - OSL_ENSURE( nCol < nRightCol, "Zu weit gelaufen" ); + OSL_ENSURE( nCol < nRightCol, "Ran too far" ); // Can be split after current HTML table column? // If yes, can the created region still be split to @@ -2291,7 +2291,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, OSL_ENSURE( !bHoriSplitMayContinue, "bHoriSplitMayContinue==true" ); OSL_ENSURE( bHoriSplitPossible || nSplitCol == nRightCol, - "bHoriSplitPossible-Flag sollte gesetzt sein" ); + "bHoriSplitPossible flag should be set" ); nSplitCol = nCol + 1; } @@ -2377,7 +2377,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) { // All column that have absolute widths get relative widths; // these widths relate to each over like the original absolute - // widths. The smallest column gets a width that hat the same + // widths. The smallest column gets a width that has the same // value as the smallest column that has an relative width // already. if( 0 == nMinRelColWidth ) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index f7995e5ce6be..3e46fb47b272 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -635,7 +635,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet) { if(m_pCLNrEdt->HasChildPathFocus()) m_pCLNrEdt->GetDownHdl().Call(*m_pCLNrEdt); - // set in ItemSet setzen + // set in ItemSet; // the current settings are already present const SfxPoolItem* pOldItem; diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index da71c54ceadb..ecb592979ad0 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -217,7 +217,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) { m_bReadonly = false; m_bSelectionInReadonly = false; - // #114856# Formular view + // #114856# Form view mbFormView = rVOpt.mbFormView; m_nZoom = rVOpt.m_nZoom ; m_aSnapSize = rVOpt.m_aSnapSize ; @@ -258,7 +258,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) { - // #114856# Formular view + // #114856# Form view mbFormView = rVOpt.mbFormView ; m_nZoom = rVOpt.m_nZoom ; m_aSnapSize = rVOpt.m_aSnapSize ; diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 3ff36e084ac8..74f7c18f725b 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -2188,7 +2188,7 @@ bool SwTransferable::PasteDDE( TransferableDataHelper& rData, } else { - // Einfuegen + // insert SwDDEField aSwDDEField( pDDETyp ); rWrtShell.Insert( aSwDDEField ); } diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 2180e00d1f78..e279bc2d2d98 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -458,7 +458,7 @@ void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle // fully resides inside? if( rRect.IsInside( aRect ) ) { - // dann aufheben + // then cancel delete m_pShadCursor; m_pShadCursor = nullptr; } diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx index e632db2041fc..35468442af77 100644 --- a/sw/source/uibase/frmdlg/colmgr.cxx +++ b/sw/source/uibase/frmdlg/colmgr.cxx @@ -55,7 +55,7 @@ sal_uInt16 SwColMgr::GetGutterWidth( sal_uInt16 nPos ) const nRet = GetCount() > 1 ? aFormatCol.GetGutterWidth() : DEF_GUTTER_WIDTH; else { - OSL_ENSURE(nPos < GetCount() - 1, "Spalte ueberindiziert" ); + OSL_ENSURE(nPos < GetCount() - 1, "column overindexed" ); const SwColumns& rCols = aFormatCol.GetColumns(); nRet = rCols[nPos].GetRight() + rCols[nPos + 1].GetLeft(); } @@ -68,7 +68,7 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos ) aFormatCol.SetGutterWidth(nGutterWidth, nWidth); else { - OSL_ENSURE(nPos < GetCount() - 1, "Spalte ueberindiziert" ); + OSL_ENSURE(nPos < GetCount() - 1, "column overindexed" ); SwColumns& rCols = aFormatCol.GetColumns(); sal_uInt16 nGutterWidth2 = nGutterWidth / 2; rCols[nPos].SetRight(nGutterWidth2); @@ -90,13 +90,13 @@ void SwColMgr::SetLineHeightPercent(short nPercent) // column width sal_uInt16 SwColMgr::GetColWidth(sal_uInt16 nIdx) const { - OSL_ENSURE(nIdx < GetCount(), "Spaltenarray ueberindiziert."); + OSL_ENSURE(nIdx < GetCount(), "Column array overindexed."); return aFormatCol.CalcPrtColWidth(nIdx, nWidth); } void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd) { - OSL_ENSURE(nIdx < GetCount(), "Spaltenarray ueberindiziert."); + OSL_ENSURE(nIdx < GetCount(), "Column array overindexed."); aFormatCol.GetColumns()[nIdx].SetWishWidth(nWd); } diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx index 61835e66bbc9..1875a20beff4 100644 --- a/sw/source/uibase/frmdlg/frmmgr.cxx +++ b/sw/source/uibase/frmdlg/frmmgr.cxx @@ -510,7 +510,7 @@ void SwFlyFrameAttrMgr::DelAttr( sal_uInt16 nId ) void SwFlyFrameAttrMgr::SetLRSpace( long nLeft, long nRight ) { - OSL_ENSURE( LONG_MAX != nLeft && LONG_MAX != nRight, "Welchen Raend setzen?" ); + OSL_ENSURE( LONG_MAX != nLeft && LONG_MAX != nRight, "Which border to set?" ); SvxLRSpaceItem aTmp( static_cast<const SvxLRSpaceItem&>(m_aSet.Get( RES_LR_SPACE )) ); if( LONG_MAX != nLeft ) @@ -522,7 +522,7 @@ void SwFlyFrameAttrMgr::SetLRSpace( long nLeft, long nRight ) void SwFlyFrameAttrMgr::SetULSpace( long nTop, long nBottom ) { - OSL_ENSURE(LONG_MAX != nTop && LONG_MAX != nBottom, "Welchen Raend setzen?" ); + OSL_ENSURE(LONG_MAX != nTop && LONG_MAX != nBottom, "Which border to set?" ); SvxULSpaceItem aTmp( static_cast<const SvxULSpaceItem&>(m_aSet.Get( RES_UL_SPACE )) ); if( LONG_MAX != nTop ) diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index b7d4c95d047e..256f792b05b6 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -217,7 +217,7 @@ void SwInputWindow::ShowWin() OSL_ENSURE(pMgr == nullptr, "FieldManager not deleted"); pMgr = new SwFieldMgr; - // Formular should always begin with "=" , so set here + // Form should always begin with "=" , so set here OUString sEdit('='); if( pMgr->GetCurField() && TYP_FORMELFLD == pMgr->GetCurTypeId() ) { @@ -338,7 +338,7 @@ void SwInputWindow::ApplyFormula() CleanupUglyHackWithUndo(); pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent); - // Formular should always begin with "=", so remove it here again + // Form should always begin with "=", so remove it here again OUString sEdit(comphelper::string::strip(aEdit->GetText(), ' ')); if( !sEdit.isEmpty() && '=' == sEdit[0] ) sEdit = sEdit.copy( 1 ); diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index 70a69d9d1046..dc8672ddddf1 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -95,7 +95,7 @@ void SwScrollbar::SetAuto(bool bSet) { bAuto = bSet; - // hide automatically - automatisch versteckt - then show + // hide automatically - then show if(!bAuto && bVisible && !ScrollBar::IsVisible()) ExtendedShow(); else if(bAuto) |