summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx2
-rw-r--r--editeng/source/editeng/editview.cxx2
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx4
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx2
-rw-r--r--sw/inc/cellfml.hxx2
-rw-r--r--sw/source/core/attr/cellatr.cxx4
-rw-r--r--sw/source/core/text/itrcrsr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx4
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx2
9 files changed, 12 insertions, 12 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index a1c116fe316c..469a773378f2 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2049,7 +2049,7 @@ void ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr
m_pMemoStream->WriteChar( cEOF ).WriteChar( cEOF );
} break;
case MemoFoxPro:
- case MemodBaseIV: // dBase IV-Memofeld with length
+ case MemodBaseIV: // dBase IV-Memofield with length
{
if ( MemodBaseIV == m_aMemoHeader.db_typ )
(*m_pMemoStream).WriteUChar( 0xFF )
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 5343877fc203..212bb3fc2392 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1217,7 +1217,7 @@ const SvxFieldItem* EditView::GetFieldAtSelection() const
if (rAttr.GetStart() == nXPos)
if (rAttr.Which() == EE_FEATURE_FIELD)
{
- DBG_ASSERT(dynamic_cast<const SvxFieldItem* >(rAttr.GetItem() ) != nullptr, "No FeldItem...");
+ DBG_ASSERT(dynamic_cast<const SvxFieldItem* >(rAttr.GetItem() ) != nullptr, "No FieldItem...");
return static_cast<const SvxFieldItem*>(rAttr.GetItem());
}
}
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 2c9202243893..eb1faefe4ac2 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -36,7 +36,7 @@ class FilterConfigItem;
enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-// -----------------------------Feld-Typen-------------------------------
+// -----------------------------Field Types-------------------------------
#define BegDocumnMagic 0xA8A8 /* Begin Document */
#define EndDocumnMagic 0xA8A9 /* End Document */
@@ -65,7 +65,7 @@ enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
#define MapCodFntMagic 0x8AAB /* Map Coded Font */
#define MapDatResMagic 0xC3AB /* Map Data Resource */
-// -----------------------------Order-Typen-------------------------------
+// -----------------------------Order Types-------------------------------
#define GOrdGivArc 0xC6 /* 1 Arc at given position */
#define GOrdCurArc 0x86 /* 1 Arc at current position */
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 54c72df18fb8..617b26446b9a 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -88,7 +88,7 @@ ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits nBits, ScEditWindowLoc
ScHeaderFieldData aData;
lcl_GetFieldData( aData );
- // Feldbefehle:
+ // fields
pEdEngine->SetData( aData );
pEdEngine->SetControlWord( pEdEngine->GetControlWord() | EEControlBits::MARKFIELDS );
mbRTL = ScGlobal::IsSystemRTL();
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 3aa83b22d8ef..96b52b576743 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -91,7 +91,7 @@ protected:
bool m_bValidValue; ///< true: recalculate formula
// find the node in which the formula is located
- // TextFeld -> TextNode,
+ // TextField -> TextNode,
// BoxAttribut -> BoxStartNode
// !!! every derived class must override this !!!
virtual const SwNode* GetNodeOfFormula() const = 0;
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index abc80746442d..26958ececdde 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -81,8 +81,8 @@ SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const
/** Get node type of the node containing this formula
- E.g. TextFeld -> TextNode, or
- BoxAttribute -> BoxStartNode
+ E.g. TextField -> TextNode, or
+ BoxAttribute -> BoxStartNode
Caution: Must override when inheriting.
*/
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index f3770ba31ae3..c5c0733f48ca 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -516,7 +516,7 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, TextFrameIndex const nOfst,
// First all portions without Len at beginning of line are skipped.
// Exceptions are the mean special portions from WhichFirstPortion:
- // Num, ErgoSum, FootnoteNum, FeldReste
+ // Num, ErgoSum, FootnoteNum, FieldRests
// 8477: but also the only Textportion of an empty line with
// Right/Center-Adjustment! So not just pPor->GetExpandPortion() ...
while( pPor && !pPor->GetLen() && ! bInsideFirstField )
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 9ca995ad4486..5e275d36034a 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -859,7 +859,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
&SwWW8ImplReader::Read_F_Shape, // 95
nullptr // eMax - Dummy empty method
};
- OSL_ENSURE( SAL_N_ELEMENTS( aWW8FieldTab ) == eMax+1, "FeldFunc-Table not right" );
+ OSL_ENSURE( SAL_N_ELEMENTS( aWW8FieldTab ) == eMax+1, "FieldFunc table not right" );
WW8PLCFx_FLD* pF = m_xPlcxMan->GetField();
OSL_ENSURE(pF, "WW8PLCFx_FLD - Pointer not available");
@@ -1496,7 +1496,7 @@ eF_ResT SwWW8ImplReader::Read_F_Styleref(WW8FieldDesc*, OUString& rString)
eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
{
sal_uInt16 nSub=0;
- // RegInfoFormat, DefaultFormat for DocInfoFelder
+ // RegInfoFormat, DefaultFormat for DocInfoFields
sal_uInt16 nReg = DI_SUB_AUTHOR;
bool bDateTime = false;
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 07b93273c1a7..83ebb8ddab80 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -3478,7 +3478,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
Point aSttPt( SwEditWin::GetDDStartPosX(), SwEditWin::GetDDStartPosY() );
- // at first, select INetFelder!
+ // at first, select InetFields!
if( TransferBufferType::InetField == m_eBufferType )
{
if( &rSrcSh == &rSh )