[Libreoffice-commits] core.git: basic/source dbaccess/source editeng/source filter/source include/svx sc/inc sc/source sd/source svl/source svtools/source svx/source sw/inc sw/sdi sw/source toolkit/source vcl/source
Johnny_M
klasse at partyheld.de
Wed Jun 6 11:46:32 UTC 2018
basic/source/inc/opcodes.hxx | 6 +++---
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 4 ++--
editeng/source/editeng/impedit4.cxx | 2 +-
editeng/source/editeng/impedit5.cxx | 4 ++--
filter/source/msfilter/svdfppt.cxx | 8 ++++----
include/svx/camera3d.hxx | 2 +-
include/svx/svdedxv.hxx | 2 +-
include/svx/svdpage.hxx | 12 ++++++------
include/svx/svdpntv.hxx | 2 +-
sc/inc/afmtuno.hxx | 2 +-
sc/source/ui/docshell/autostyl.cxx | 4 ++--
sc/source/ui/docshell/docsh.cxx | 4 ++--
sc/source/ui/docshell/docsh3.cxx | 2 +-
sc/source/ui/drawfunc/fuconstr.cxx | 2 +-
sc/source/ui/drawfunc/fusel.cxx | 2 +-
sc/source/ui/unoobj/chartuno.cxx | 6 +++---
sc/source/ui/view/tabview4.cxx | 2 +-
sd/source/core/sdpage.cxx | 2 +-
svl/source/numbers/zformat.cxx | 2 +-
svtools/source/contnr/svimpbox.cxx | 2 +-
svtools/source/control/tabbar.cxx | 2 +-
svtools/source/dialogs/wizdlg.cxx | 4 ++--
svx/source/dialog/_bmpmask.cxx | 2 +-
svx/source/dialog/fontwork.cxx | 2 +-
svx/source/fmcomp/fmgridcl.cxx | 10 +++++-----
sw/inc/fesh.hxx | 4 ++--
sw/sdi/_textsh.sdi | 2 +-
sw/source/core/fields/ddefld.cxx | 2 +-
sw/source/core/layout/sectfrm.cxx | 2 +-
sw/source/core/table/swtable.cxx | 2 +-
sw/source/uibase/uiview/viewtab.cxx | 2 +-
toolkit/source/awt/vclxwindows.cxx | 2 +-
vcl/source/control/field2.cxx | 2 +-
vcl/source/window/seleng.cxx | 2 +-
vcl/source/window/toolbox.cxx | 2 +-
vcl/source/window/window.cxx | 2 +-
36 files changed, 58 insertions(+), 58 deletions(-)
New commits:
commit abe5a1a55fa56e4db60421861a50671c9f9c4de9
Author: Johnny_M <klasse at partyheld.de>
Date: Sun May 27 18:37:03 2018 +0200
Translate German comments and debug strings
And correct a few comments (translation and grammar)
Change-Id: Ifafa521c683e9ca65aeba8031cd4cbfc1fadc137
Reviewed-on: https://gerrit.libreoffice.org/54888
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index 1f10d2d84943..859ad388aed2 100644
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
@@ -91,11 +91,11 @@ enum class SbiOpcode {
SbOP1_START = NUMBER_,
- SCONST_, // loading a stringconstant (+ID)
+ SCONST_, // loading a string constant (+ID)
CONST_, // Immediate Load (+ value)
ARGN_, // saving a named Arg in Argv (+StringID)
PAD_, // bring string to a firm length (+length)
- // Verzweigungen
+ // branch
JUMP_, // jump (+target)
JUMPT_, // evaluate TOS, conditional jump (+target)
JUMPF_, // evaluate TOS, conditional jump (+target)
@@ -109,7 +109,7 @@ enum class SbiOpcode {
// E/A
CLOSE_, // (+channel/0)
PRCHAR_, // (+char)
- // Verwaltung
+ // management
SETCLASS_, // test set + class names (+StringId)
TESTCLASS_, // Check TOS class (+StringId)
LIB_, // set lib name for declare-procs (+StringId)
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 97ce07c9ccad..08585d56e11b 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -55,10 +55,10 @@ void OTableDesignHelpBar::SetHelpText( const OUString& rText )
void OTableDesignHelpBar::Resize()
{
- // Abmessungen parent window
+ // parent window dimensions
Size aOutputSize( GetOutputSizePixel() );
- // TextWin anpassen
+ // adapt the TextWin
if(m_pTextWin)
m_pTextWin->SetPosSizePixel( Point(STANDARD_MARGIN+1, STANDARD_MARGIN+1),
Size(aOutputSize.Width()-(2*STANDARD_MARGIN)-2,
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index e2f7e2412dd0..8fcf39508d33 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -221,7 +221,7 @@ ErrCode ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel )
for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
- DBG_ASSERT( pNode, "Node not founden: Search&Replace" );
+ DBG_ASSERT( pNode, "Node not found: Search&Replace" );
sal_Int32 nStartPos = 0;
sal_Int32 nEndPos = pNode->Len();
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 12b1b8432533..2b5f4b391b83 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -267,7 +267,7 @@ void ImpEditEngine::UndoActionEnd()
void ImpEditEngine::InsertUndo( EditUndo* pUndo, bool bTryMerge )
{
- DBG_ASSERT( !IsInUndo(), "InsertUndo in Undomodus!" );
+ DBG_ASSERT( !IsInUndo(), "InsertUndo in Undo mode!" );
if ( pUndoMarkSelection )
{
EditUndoMarkSelection* pU = new EditUndoMarkSelection(pEditEngine, *pUndoMarkSelection);
@@ -525,7 +525,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, SetA
bool bParaAttribFound = false;
bool bCharAttribFound = false;
- DBG_ASSERT( aEditDoc.GetObject( nNode ), "Node not founden: SetAttribs" );
+ DBG_ASSERT( aEditDoc.GetObject( nNode ), "Node not found: SetAttribs" );
DBG_ASSERT( GetParaPortions().SafeGetObject( nNode ), "Portion not found: SetAttribs" );
ContentNode* pNode = aEditDoc.GetObject( nNode );
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index b6e5b74a3293..2d263a6e7d16 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -826,12 +826,12 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
MSO_TextFlow eTextFlow = static_cast<MSO_TextFlow>( GetPropertyValue( DFF_Prop_txflTextFlow, 0 ) & 0xFFFF );
switch( eTextFlow )
{
- case mso_txflBtoT : // Bottom to Top non-@, unten -> oben
+ case mso_txflBtoT : // Bottom to Top non-@
nTextRotationAngle += 9000;
break;
- case mso_txflTtoBA : /* #68110# */ // Top to Bottom @-font, oben -> unten
- case mso_txflTtoBN : // Top to Bottom non-@, oben -> unten
- case mso_txflVertN : // Vertical, non-@, oben -> unten
+ case mso_txflTtoBA : /* #68110# */ // Top to Bottom @-font
+ case mso_txflTtoBN : // Top to Bottom non-@
+ case mso_txflVertN : // Vertical, non-@, top to bottom
bVerticalText = !bVerticalText; // nTextRotationAngle += 27000;
break;
// case mso_txflHorzN : // Horizontal non-@, normal
diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx
index 857ba33973b0..c324be998453 100644
--- a/include/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
@@ -61,7 +61,7 @@ public:
void SetFocalLength(double fLen);
double GetFocalLength() const { return fFocalLength; }
- // Bank angle links/rechts
+ // Bank angle left/right
void SetBankAngle(double fAngle);
void SetAutoAdjustProjection(bool bAdjust)
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 97abbc9e2d93..95997db0126d 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -257,7 +257,7 @@ public:
sal_uInt16 GetSelectionLevel() const;
- // Object-MacroModus (e.g. rect as button or sth. like that):
+ // Object MacroMode (e.g. rect as button or sth. like that):
bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin);
void BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index e095f953d1e8..418b3488f094 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -410,12 +410,12 @@ private:
SdrModel& mrSdrModelFromSdrPage;
private:
- sal_Int32 mnWidth; // Seitengroesse
- sal_Int32 mnHeight; // Seitengroesse
- sal_Int32 mnBorderLeft; // Seitenrand links
- sal_Int32 mnBorderUpper; // Seitenrand oben
- sal_Int32 mnBorderRight; // Seitenrand rechts
- sal_Int32 mnBorderLower; // Seitenrand unten
+ sal_Int32 mnWidth; // page size
+ sal_Int32 mnHeight; // page size
+ sal_Int32 mnBorderLeft; // left page margin
+ sal_Int32 mnBorderUpper; // top page margin
+ sal_Int32 mnBorderRight; // right page margin
+ sal_Int32 mnBorderLower; // bottom page margin
std::unique_ptr<SdrLayerAdmin> mpLayerAdmin;
std::unique_ptr<SdrPageProperties> mpSdrPageProperties;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index dc20ac774300..d6822dd54819 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -503,7 +503,7 @@ public:
#endif
/// Must be called by the App when scrolling etc. in order for
- /// an active FormularControl to be moved too
+ /// an active FormControl to be moved too
void VisAreaChanged(const OutputDevice* pOut);
void VisAreaChanged();
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index cb0ed438b70b..cdb1500f1f48 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -99,7 +99,7 @@ public:
ScAutoFormatObj(sal_uInt16 nIndex);
virtual ~ScAutoFormatObj() override;
- // per getImplementation gerufen:
+ // called via getImplementation:
bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; }
void InitFormat( sal_uInt16 nNewIndex );
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index dec13ced11a6..8fd3930b67ea 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -113,7 +113,7 @@ void ScAutoStyleList::AddEntry( sal_uLong nTimeout, const ScRange& rRange, const
if (!aEntries.empty() && nNow != nTimerStart)
{
- OSL_ENSURE(nNow>nTimerStart, "Zeit laeuft rueckwaerts?");
+ OSL_ENSURE(nNow>nTimerStart, "Time is running backwards?");
AdjustEntries((nNow-nTimerStart)*1000);
}
@@ -187,7 +187,7 @@ void ScAutoStyleList::StartTimer( sal_uLong nNow ) // seconds
IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl, Timer *, void)
{
sal_uLong nNow = TimeNow();
- AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit
+ AdjustEntries(aTimer.GetTimeout()); // the set waiting time
ExecuteEntries();
StartTimer(nNow);
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d32eb818910b..59d0d28fa7c2 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2239,7 +2239,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
{
// This is nasty. The Unicode to byte encoding
// may convert typographical quotation marks to ASCII
- // quotation marks, which may interfer with the delimiter,
+ // quotation marks, which may interfere with the delimiter,
// so we have to escape delimiters after the string has
// been encoded. Since this may happen also with UTF-8
// encoded typographical quotation marks if such was
@@ -3265,7 +3265,7 @@ void ScDocShellModificator::SetDocumentModified()
rDoc.PrepareFormulaCalc();
if ( !rDoc.IsImportingXML() )
{
- // AutoCalcShellDisabled temporaer restaurieren
+ // temporarily restore AutoCalcShellDisabled
bool bDisabled = rDoc.IsAutoCalcShellDisabled();
rDoc.SetAutoCalcShellDisabled( bAutoCalcShellDisabled );
rDocShell.SetDocumentModified();
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 028e24dc9bf8..ea1189c3da3a 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -716,7 +716,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
SetDocumentModified();
}
-// Merge (Aenderungen zusammenfuehren)
+// Merge (combine documents)
static inline bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, bool bIgnore100Sec )
{
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 87352f8ab592..df5bb72581fd 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -205,7 +205,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
rViewShell.GetViewData().GetDispatcher().
Execute(nTextSlotId, SfxCallMode::SLOT | SfxCallMode::RECORD);
- // Get the created FuText now and change into EditModus
+ // Get the created FuText now and change into EditMode
FuPoor* pPoor = rViewShell.GetViewData().GetView()->GetDrawFuncPtr();
if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // has no RTTI
{
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 0a773c5f2345..8a15a58ac848 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -484,7 +484,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
rViewShell.GetViewData().GetDispatcher().
Execute(nTextSlotId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
- // Get the created FuText now and change into EditModus
+ // Get the created FuText now and change into EditMode
FuPoor* pPoor = rViewShell.GetViewData().GetView()->GetDrawFuncPtr();
if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // has no RTTI
{
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index c8219756aa93..61670c1b86fa 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -188,7 +188,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
Size aRectSize( aRect.Width, aRect.Height );
if (aRectSize.Width() <= 0)
- aRectSize.setWidth( 5000 ); // Default-Groesse
+ aRectSize.setWidth( 5000 ); // default size
if (aRectSize.Height() <= 0)
aRectSize.setHeight( 5000 );
@@ -383,14 +383,14 @@ uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames()
if ( xObj.is() )
aName = pDocShell->GetEmbeddedObjectContainer().GetEmbeddedObjectName( xObj );
- OSL_ENSURE(nPos<nCount, "huch, verzaehlt?");
+ OSL_ENSURE(nPos<nCount, "oops, miscounted?");
pAry[nPos++] = aName;
}
pObject = aIter.Next();
}
}
}
- OSL_ENSURE(nPos==nCount, "nanu, verzaehlt?");
+ OSL_ENSURE(nPos==nCount, "hey, miscounted?");
return aSeq;
}
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 94a22a950cc2..250f71b32b3a 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -425,7 +425,7 @@ void ScTabView::UpdateScrollBars( HeaderType eHeaderType )
SetScrollBar( *aVScrollTop.get(), nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), bLayoutRTL );
}
- // Bereich testen
+ // test the range
nDiff = lcl_UpdateBar( *aHScrollLeft.get(), nVisXL );
if (nDiff) ScrollX( nDiff, SC_SPLIT_LEFT );
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 377b01ab78f7..5755ce31a413 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2503,7 +2503,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
}
else
{
- // Outliner restaurieren
+ // restore the outliner
pOutl->Init( nOutlMode );
pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() );
pOutl->SetUpdateMode( bUpdateMode );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 1a0b80e30a34..07c9bf2b70cd 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4733,7 +4733,7 @@ const OUString* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16
}
else if ( bString )
{
- // vorwaerts
+ // forward
short const * pType = NumFor[nNumFor].Info().nTypeArray.data() + nPos;
while ( nPos < nCnt && (*pType != NF_SYMBOLTYPE_STRING) &&
(*pType != NF_SYMBOLTYPE_CURRENCY) )
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index b53b403c80f1..24e735a11a0e 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -728,7 +728,7 @@ void SvImpLBox::KeyLeftRight( long nDelta )
nFlags &= (~LBoxFlags::Filling);
ShowCursor( false );
- // neuen Origin berechnen
+ // calculate new origin
long nPos = aHorSBar->GetThumbPos();
Point aOrigin( -nPos, 0 );
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 1c623f210b97..ccad39c6253a 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -937,7 +937,7 @@ void TabBar::MouseMove(const MouseEvent& rMEvt)
void TabBar::MouseButtonDown(const MouseEvent& rMEvt)
{
- // Only terminate EditModus and do not execute click
+ // Only terminate EditMode and do not execute click
// if clicked inside our window,
if (IsInEditMode())
{
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 20ac15d14c20..c73451896e34 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -76,7 +76,7 @@ void WizardDialog::SetEmptyViewMargin()
void WizardDialog::ImplCalcSize( Size& rSize )
{
- // ButtonBar-Hoehe berechnen
+ // calculate ButtonBar height
long nMaxHeight = 0;
ImplWizButtonData* pBtnData = mpFirstBtn;
while ( pBtnData )
@@ -90,7 +90,7 @@ void WizardDialog::ImplCalcSize( Size& rSize )
nMaxHeight += WIZARDDIALOG_BUTTON_OFFSET_Y*2;
rSize.AdjustHeight(nMaxHeight );
- // View-Window-Groesse dazurechnen
+ // add in the view window size
if ( mpViewWindow && mpViewWindow->IsVisible() )
{
Size aViewSize = mpViewWindow->GetSizePixel();
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index aa0eb74fd046..976c28cd0641 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -332,7 +332,7 @@ void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*
if ( ( nSID == SID_BMPMASK_EXEC ) && pItem )
{
const SfxBoolItem* pStateItem = dynamic_cast<const SfxBoolItem*>( pItem );
- assert(pStateItem); //SfxBoolItem erwartet
+ assert(pStateItem); // SfxBoolItem expected
if (pStateItem)
rBmpMask.SetExecState( pStateItem->GetValue() );
}
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 46fee9589025..d5cf5ad3d56c 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -81,7 +81,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState
{
const XFormTextDistanceItem* pStateItem =
dynamic_cast<const XFormTextDistanceItem*>( pItem );
- DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextDistanceItem erwartet");
+ DBG_ASSERT(pStateItem || pItem == nullptr, "XFormTextDistanceItem expected");
rFontWorkDlg.SetDistance_Impl(pStateItem);
break;
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 668fb08a731b..fae0a2cbf853 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1003,14 +1003,14 @@ void FmGridHeader::triggerColumnContextMenu( const ::Point& _rPreferredPos )
VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/colsmenu.ui", "");
VclPtr<PopupMenu> aContextMenu(aBuilder.get_menu("menu"));
- // let derivees modify the menu
+ // let derivatives modify the menu
PreExecuteColumnContextMenu( nColId, *aContextMenu );
aContextMenu->RemoveDisabledEntries( true, true );
// execute the menu
sal_uInt16 nResult = aContextMenu->Execute( this, _rPreferredPos );
- // let derivees handle the result
+ // let derivatives handle the result
PostExecuteColumnContextMenu( nColId, *aContextMenu, nResult );
}
@@ -1453,7 +1453,7 @@ void FmGridControl::markColumn(sal_uInt16 nId)
{
if (GetHeaderBar() && m_nMarkedColumnId != nId)
{
- // deselektieren
+ // deselect
if (m_nMarkedColumnId != BROWSER_INVALIDID)
{
HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(m_nMarkedColumnId) & ~HeaderBarItemBits::FLAT;
@@ -1824,11 +1824,11 @@ Sequence< Any> FmGridControl::getSelectionBookmarks()
{
Any* pBookmarks = aBookmarks.getArray();
- // (I'm not sure if the problem isn't deeper : The szenario : a large table displayed by a grid with a
+ // (I'm not sure if the problem isn't deeper: The scenario: a large table displayed by a grid with a
// thread-safe cursor (dBase). On loading the sdb-cursor started a counting thread. While this counting progress
// was running, I tried do delete 3 records from within the grid. Deletion caused a SeekCursor, which did a
// m_pSeekCursor->moveRelative and a m_pSeekCursor->getPosition.
- // Unfortunally the first call caused a propertyChanged(RECORDCOUNT) which resulted in a repaint of the
+ // Unfortunately the first call caused a propertyChanged(RECORDCOUNT) which resulted in a repaint of the
// navigation bar and the grid. The latter itself will result in SeekRow calls. So after (successfully) returning
// from the moveRelative the getPosition returns an invalid value. And so the SeekCursor fails.
// In the consequence ALL parts of code where two calls to the seek cursor are done, while the second call _relies_ on
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index efc5325e898b..ec4981b66394 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -385,7 +385,7 @@ public:
Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false );
/** Determines whether a frame or its environment is vertically formatted and right-to-left.
- also determines, if frame or its environment is in mongolianlayout (vertical left-to-right)
+ also determines, if frame or its environment is in Mongolian layout (vertical left-to-right)
- add output parameter <bVertL2R> */
bool IsFrameVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
@@ -643,7 +643,7 @@ public:
/// Split cell vertically or horizontally.
void SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight );
- bool Sort(const SwSortOptions&); //Sortieren.
+ bool Sort(const SwSortOptions&); // sorting
void SetRowHeight( const SwFormatFrameSize &rSz );
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index e9c35b2d24dd..28bc1c89f653 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1179,7 +1179,7 @@ interface BaseText
]
SID_ATTR_PARA_ADJUST // status(final|play)
[
- // (0=links, 1=rechts, 2=block, 3=zentriert, )"
+ // (0=left, 1=right, 2=justify, 3=center, )"
ExecMethod = ExecParaAttr ;
StateMethod = GetAttrState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 0c2bfbbb342c..96b4f28324ff 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -161,7 +161,7 @@ void SwIntrnlRefLink::Closed()
else
{
pSh->StartAction();
- // am Doc aufrufen ??
+ // to call at the doc ??
pSh->EndAction();
}
}
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 8f68adf082c7..1a0a8dca9ff1 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2837,7 +2837,7 @@ void SwRootFrame::DeleteEmptySct_()
}
}
else {
- OSL_ENSURE( pSect->GetSection(), "DeleteEmptySct: Halbtoter SectionFrame?!" );
+ OSL_ENSURE( pSect->GetSection(), "DeleteEmptySct: Half-dead SectionFrame?!" );
}
}
}
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index fdc1633e7c73..78d83a4d07ca 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1698,7 +1698,7 @@ SwTableBoxFormat* SwTableBox::CheckBoxFormat( SwTableBoxFormat* pFormat )
pNewFormat->LockModify();
*pNewFormat = *pFormat;
- // Remove values and formulars
+ // Remove values and formulas
pNewFormat->ResetFormatAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
pNewFormat->UnlockModify();
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 4dab2bb0a4bf..cf6ad5d195b7 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -2166,7 +2166,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
pPt ).Pos();
const sal_uInt16 nTotalWidth = static_cast<sal_uInt16>(aRect.Width());
- // Initialize nStart and nEnd initialisieren for nNum == 0
+ // Initialize nStart and nEnd for nNum == 0
int nWidth = 0,
nStart = 0,
nEnd = nTotalWidth;
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 47fd1e02f1cf..8484cd5b2e10 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1319,7 +1319,7 @@ void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
void VCLXRadioButton::ImplClickedOrToggled( bool bToggled )
{
- // In the formulars, RadioChecked is not enabled, call itemStateChanged only for click
+ // In the forms, RadioChecked is not enabled, call itemStateChanged only for click
// In the dialog editor, RadioChecked is enabled, call itemStateChanged only for bToggled
VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
if ( pRadioButton && ( pRadioButton->IsRadioCheckEnabled() == bToggled ) && ( bToggled || pRadioButton->IsStateChanged() ) && maItemListeners.getLength() )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 5b8b4b5cf767..888ce6c20497 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -595,7 +595,7 @@ static bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
}
else if ( nKeyCode == KEY_INSERT )
{
- // you can only set InsertModus for a PatternField if the
+ // you can only set InsertMode for a PatternField if the
// mask is equal at all input positions
if ( !bSameMask )
{
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index b35576ee1bf1..03fdc652bcfa 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -251,7 +251,7 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt )
eSelMode != SelectionMode::Single)
{
// MouseButtonDown in Sel but no CommandEvent yet
- // ==> deselektieren
+ // ==> deselect
sal_uInt16 nModifier = aLastMove.GetModifier() | nLockedMods;
if( nModifier == KEY_MOD1 || IsAlwaysAdding() )
{
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 974f56f837b6..2df527a8cbd4 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1043,7 +1043,7 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
mnLineMode = nDragLineMode;
mnStartLines = pToolBox->mnDockLines;
- // MouseOffset berechnen
+ // calculate MouseOffset
maMouseOff.setX( rRect.Left() - rPos.X() );
maMouseOff.setY( rRect.Top() - rPos.Y() );
maRect = rRect;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index ce0be303d2e8..e9bf6a8f5f4c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -642,7 +642,7 @@ WindowImpl::WindowImpl( WindowType nType )
mnExtendedStyle = WindowExtendedStyle::NONE; // extended style (init in ImplInitWindow)
mnType = nType; // type
mnGetFocusFlags = GetFocusFlags::NONE; // Flags for GetFocus()-Call
- mnWaitCount = 0; // Wait-Count (>1 == Warte-MousePointer)
+ mnWaitCount = 0; // Wait-Count (>1 == "wait" mouse pointer)
mnPaintFlags = ImplPaintFlags::NONE; // Flags for ImplCallPaint
mnParentClipMode = ParentClipMode::NONE; // Flags for Parent-ClipChildren-Mode
mnActivateMode = ActivateModeFlags::NONE; // Will be converted in System/Overlap-Windows
More information about the Libreoffice-commits
mailing list