summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--filter/qa/complex/filter/detection/typeDetection/TypeDetection.java4
-rw-r--r--filter/source/graphicfilter/idxf/dxftblrd.hxx2
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx2
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx2
-rw-r--r--filter/source/graphicfilter/iras/iras.cxx14
-rw-r--r--filter/source/graphicfilter/itga/itga.cxx2
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/eschesdo.hxx1
-rw-r--r--filter/source/msfilter/msdffimp.cxx8
-rw-r--r--filter/source/msfilter/svdfppt.cxx8
-rw-r--r--forms/qa/integration/forms/CellBinding.java2
-rw-r--r--forms/source/component/DatabaseForm.cxx2
-rw-r--r--forms/source/component/EventThread.hxx2
-rw-r--r--forms/source/component/ListBox.hxx6
-rw-r--r--forms/source/inc/FormComponent.hxx2
-rw-r--r--forms/source/inc/property.hrc2
-rw-r--r--forms/source/richtext/richtextunowrapper.cxx2
-rw-r--r--formula/source/core/resource/core_resource.src4
-rw-r--r--formula/source/ui/dlg/formdlgs.hrc2
-rw-r--r--formula/source/ui/dlg/funcutl.cxx7
-rw-r--r--formula/source/ui/dlg/parawin.hxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx2
-rw-r--r--fpicker/source/office/OfficeFolderPicker.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx4
24 files changed, 42 insertions, 44 deletions
diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index d487c2176a84..c7def3cd16e8 100644
--- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -491,8 +491,8 @@ public class TypeDetection extends ComplexTestCase {
try{
/*
- *als Dateien die typeDetection.props und eine der csv-Dateien
- *benutzten. diese können per dmake einfach auf andere Rechte setzten
+ * As files, use the typeDetection.props and one of the csv files.
+ * Those can, via dmake, simply set rights on others.
*
*/
log.println("### checkStreamLoader() ###");
diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx
index 824b03bf2993..3dd5edc7aa60 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx
@@ -137,7 +137,7 @@ public:
};
-//------------------ Tabellen ------------------------------------------------
+//------------------ Tables --------------------------------------------------
class DXFTables {
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index c78101ebddca..77ab89ddedb7 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -195,7 +195,7 @@ void PCDReader::ReadImage()
sal_uInt8 * pL0; // luminance for each pixel of the 1st row of the current pair of rows
sal_uInt8 * pL1; // luminance for each pixel of the 2nd row of the current pair of rows
sal_uInt8 * pCb; // blue chrominance for each 2x2 pixel of the current pair of rows
- sal_uInt8 * pCr; // red chrominance fuer je 2x2 pixel of the current pair of rows
+ sal_uInt8 * pCr; // red chrominance for each 2x2 pixel of the current pair of rows
sal_uInt8 * pL0N, * pL1N, * pCbN, * pCrN; // like above, but for the next pair of rows
if ( !bStatus )
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index cfb2c4ef5bab..c2961acd93a0 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -55,7 +55,7 @@ class PSDReader {
private:
- SvStream& m_rPSD; // Die einzulesende PSD-Datei
+ SvStream& m_rPSD; // the PSD file to be read in
PSDFileHeader* mpFileHeader;
sal_uInt32 mnXResFixed;
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 5af2a6ad6854..0f6dac97be75 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -40,10 +40,10 @@ class RASReader {
private:
- SvStream& m_rRAS; // Die einzulesende RAS-Datei
+ SvStream& m_rRAS; // the RAS file to be read in
bool mbStatus;
- sal_Int32 mnWidth, mnHeight; // Bildausmass in Pixeln
+ sal_Int32 mnWidth, mnHeight; // image dimensions in pixels
sal_uInt16 mnDstBitsPerPix;
sal_uInt16 mnDstColors;
sal_Int32 mnDepth, mnImageDatSize, mnType;
@@ -59,7 +59,7 @@ public:
bool ReadRAS(Graphic & rGraphic);
};
-//=================== Methoden von RASReader ==============================
+//=================== Methods of RASReader ==============================
RASReader::RASReader(SvStream &rRAS)
: m_rRAS(rRAS)
@@ -109,14 +109,14 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
BitmapPalette aPalette;
bool bOk = true;
- if ( mnDstBitsPerPix <= 8 ) // paletten bildchen
+ if ( mnDstBitsPerPix <= 8 ) // pallets pictures
{
- if ( mnColorMapType == RAS_COLOR_RAW_MAP ) // RAW Colormap wird geskipped
+ if ( mnColorMapType == RAS_COLOR_RAW_MAP ) // RAW color map is skipped
{
sal_uLong nCurPos = m_rRAS.Tell();
bOk = checkSeek(m_rRAS, nCurPos + mnColorMapSize);
}
- else if ( mnColorMapType == RAS_COLOR_RGB_MAP ) // RGB koennen wir auslesen
+ else if ( mnColorMapType == RAS_COLOR_RGB_MAP ) // we can read out the RGB
{
mnDstColors = (sal_uInt16)( mnColorMapSize / 3 );
@@ -192,7 +192,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
}
- // Bitmap-Daten einlesen
+ // read in the bitmap data
mbStatus = ImplReadBody(pAcc.get());
if ( mbStatus )
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index da2b1c120d43..2663ce5a829f 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -104,7 +104,7 @@ public:
bool ReadTGA(Graphic &rGraphic);
};
-//=================== Methoden von TGAReader ==============================
+//=================== Methods of TGAReader ==============================
TGAReader::TGAReader(SvStream &rTGA)
: m_rTGA(rTGA)
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index cf83e13057d6..ee61ed4f538e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -5190,7 +5190,7 @@ void EscherEx::CloseContainer()
void EscherEx::BeginAtom()
{
mnCountOfs = mpOutStrm->Tell();
- mpOutStrm->WriteUInt32( 0 ).WriteUInt32( 0 ); // record header wird spaeter geschrieben
+ mpOutStrm->WriteUInt32( 0 ).WriteUInt32( 0 ); // record header will be written later
}
void EscherEx::EndAtom( sal_uInt16 nRecType, int nRecVersion, int nRecInstance )
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index bde285a83cfc..4aa1ada7e02e 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -35,7 +35,6 @@ class SdrPage;
class ImplEESdrObject
{
css::uno::Reference< css::drawing::XShape > mXShape;
-// XTextRef mXText; // TextRef des globalen Text
css::uno::Any mAny;
tools::Rectangle maRect;
OUString mType;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 518ff24dbab9..9d1f485f2448 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -183,11 +183,11 @@ void Impl_OlePres::Write( SvStream & rStm )
// Always to 1/100 mm, until Mtf-Solution found
// Assumption (no scaling, no origin translation)
DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleX() == Fraction( 1, 1 ),
- "X-Skalierung im Mtf" );
+ "x-scale in the Mtf is wrong" );
DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleY() == Fraction( 1, 1 ),
- "Y-Skalierung im Mtf" );
+ "y-scale in the Mtf is wrong" );
DBG_ASSERT( pMtf->GetPrefMapMode().GetOrigin() == Point(),
- "Origin-Verschiebung im Mtf" );
+ "origin-shift in the Mtf is wrong" );
MapUnit nMU = pMtf->GetPrefMapMode().GetMapUnit();
if( MapUnit::Map100thMM != nMU )
{
@@ -5470,7 +5470,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
if( pImpRec->nShapeId )
{
- // Import-Record-Liste ergaenzen
+ // amend the import record list
if( pOrgObj )
{
pImpRec->pObj = pOrgObj;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d51b2a811b78..fbc20999a81f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1614,7 +1614,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
}
else
{
- OSL_FAIL("SdrPowerPointImport::Ctor(): Persist-Eintrag fehlerhaft! (SJ)");
+ OSL_FAIL("SdrPowerPointImport::Ctor(): Persist entry is flawed! (SJ)");
}
}
}
@@ -4204,7 +4204,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
rIn.ReadUInt16(nLevelAnz);
if (nLevelAnz > nMaxPPTLevels)
{
- OSL_FAIL( "PPTStyleSheet::Ppt-TextStylesheet hat mehr als 5 Ebenen! (SJ)" );
+ OSL_FAIL( "PPTStyleSheet::Ppt-TextStylesheet has more than 5 levels! (SJ)" );
nLevelAnz = nMaxPPTLevels;
}
sal_uInt16 nLev = 0;
@@ -7748,7 +7748,7 @@ void SdrPowerPointImport::ApplyTextAnchorAttributes( PPTTextObj& rTextObj, Sf
eTVA = SDRTEXTVERTADJUST_BLOCK;
eTHA = SDRTEXTHORZADJUST_CENTER;
- // Textverankerung lesen
+ // read text anchor
MSO_Anchor eTextAnchor = (MSO_Anchor)GetPropertyValue( DFF_Prop_anchorText, mso_anchorTop );
switch( eTextAnchor )
@@ -7800,7 +7800,7 @@ void SdrPowerPointImport::ApplyTextAnchorAttributes( PPTTextObj& rTextObj, Sf
eTVA = SDRTEXTVERTADJUST_CENTER;
eTHA = SDRTEXTHORZADJUST_BLOCK;
- // Textverankerung lesen
+ // read text anchor
MSO_Anchor eTextAnchor = (MSO_Anchor)GetPropertyValue( DFF_Prop_anchorText, mso_anchorTop );
switch( eTextAnchor )
diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java
index 342fd0f9d6cc..56d811a25dc5 100644
--- a/forms/qa/integration/forms/CellBinding.java
+++ b/forms/qa/integration/forms/CellBinding.java
@@ -443,7 +443,7 @@ public class CellBinding extends complexlib.ComplexTestCase
private void setCellEmpty( short col, short row ) throws com.sun.star.uno.Exception
{
// as long as #i29130# is not fixed, we do not set the cell to "empty", but to
- // an invalid formular, which serves well for our purpose
+ // an invalid form, which serves well for our purpose
XCellRangeFormula cell = UnoRuntime.queryInterface( XCellRangeFormula.class,
m_document.getSheet( 0 ).getCellByPosition( col, row )
);
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 0261fe1b1404..89f3f0a6892c 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -426,7 +426,7 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro
FillSuccessfulList( aSuccObjList, SubmitButton, MouseEvt );
- // Aggregate Liste to OUString
+ // Aggregate the list to OUString
OUStringBuffer aResult;
OUString aName;
OUString aValue;
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index f6aa8d8799d7..08bde4a99ff6 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -82,7 +82,7 @@ protected:
public:
- // UNO Anbindung
+ // UNO connection
DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject)
virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override;
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 35398ca71d29..9c22ce9b460f 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -132,7 +132,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-// UNO Anbindung
+// UNO connection
DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel)
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
@@ -260,14 +260,14 @@ private:
m_pItemBroadcaster;
protected:
- // UNO Anbindung
+ // UNO connection
virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
public:
explicit OListBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
virtual ~OListBoxControl() override;
- // UNO Anbindung
+ // UNO connection
DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl)
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 9259abf13519..607208941c02 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -591,7 +591,7 @@ private:
css::uno::Type m_aExternalValueType;
// <properties>
- OUString m_aControlSource; // Datenquelle, Name des Feldes
+ OUString m_aControlSource; // data source, name of the field
css::uno::Reference< css::beans::XPropertySet >
m_xLabelControl; // reference to a sibling control (model) which is our label
bool m_bInputRequired;
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index b3ce46adb8c8..73e5e8e1de89 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -294,7 +294,7 @@ namespace frm
#define PROPERTY_ID_TYPEDITEMLIST ( PROPERTY_ID_START + 263 ) // Sequence<Any>
-// start ID fuer aggregierte Properties
+// start ID for aggregated properties
#define PROPERTY_ID_AGGREGATE_ID (PROPERTY_ID_START + 10000)
}
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index bbc64fda97f3..c363a9ee98d8 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -43,7 +43,7 @@ namespace frm
{
const SvxItemPropertySet* getTextEnginePropertySet()
{
- // Propertymap fuer einen Outliner Text
+ // property map for an outliner text
static const SfxItemPropertyMapEntry aTextEnginePropertyMap[] =
{
SVX_UNOEDIT_CHAR_PROPERTIES,
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 4861720ec0f5..584aa1746faa 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -1608,7 +1608,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_API
< "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
< "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union)
< "OFFSET" ; SC_OPCODE_OFFSET; >;
- < "INDEX" ; SC_OPCODE_INDEX; >; // ?? erstes Zeichen = I ??
+ < "INDEX" ; SC_OPCODE_INDEX; >; // ?? first character = I ??
< "AREAS" ; SC_OPCODE_AREAS; >;
< "DOLLAR" ; SC_OPCODE_CURRENCY; >;
< "REPLACE" ; SC_OPCODE_REPLACE; >;
@@ -2472,7 +2472,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES
< "HLOOKUP" ; SC_OPCODE_H_LOOKUP ; >;
< "MULTIRANGE" ; SC_OPCODE_MULTI_AREA ; >; // legacy for range list (union)
< "OFFSET" ; SC_OPCODE_OFFSET ; >;
- < "INDEX" ; SC_OPCODE_INDEX ; >; // ?? erstes Zeichen = I ??
+ < "INDEX" ; SC_OPCODE_INDEX ; >; // ?? first character = I ??
< "AREAS" ; SC_OPCODE_AREAS ; >;
< "DOLLAR" ; SC_OPCODE_CURRENCY ; >;
< "REPLACE" ; SC_OPCODE_REPLACE ; >;
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 57778a87a853..7704ea146e03 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -23,7 +23,7 @@
#define ED_REF 19
#define RB_REF 20
-// Fuer Tabpage
+// For tab page
#define TP_FUNCTION 1
#define TP_STRUCT 2
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index e4e21ab98871..295a7b78ad93 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -338,8 +338,8 @@ void EditBox::GetFocus()
}
}
-//When an Event is cleared, this Routine is
-//first called and a PostUserEvent is sent.
+// When an event is being triggered, this routine is called first and
+// a PostUserEvent is sent.
bool EditBox::PreNotify( NotifyEvent& rNEvt )
{
bool bResult = true;
@@ -375,8 +375,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
return bResult;
}
-//When an Event cleared wurde, this routine is
-//first called.
+// When an event was triggered, this routine is called first.
IMPL_LINK_NOARG(EditBox, ChangedHdl, void*, void)
{
if(pMEdit!=nullptr)
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 7fff5aec6514..b9e02fabadf0 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -138,7 +138,7 @@ public:
void SetArgument(sal_uInt16 no, const OUString& aString);
void SetArgumentFonts(const vcl::Font& aBoldFont,const vcl::Font& aLightFont);
- void SetEdFocus(); //Sichtbare Editzeilen
+ void SetEdFocus(); // visible edit lines
sal_uInt16 GetSliderPos();
void SetSliderPos(sal_uInt16 nSliderPos);
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index f45ceb20895d..7d505a9c8db1 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -169,7 +169,7 @@ void SvtFilePicker::prepareExecute()
}
else
{
- // Default-Standard-Dir setzen
+ // set the default standard dir
INetURLObject aStdDirObj( SvtPathOptions().GetWorkPath() );
getDialog()->SetPath( aStdDirObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
}
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index dd0b34c36b4c..adc7203a304a 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -90,7 +90,7 @@ void SvtFolderPicker::prepareExecute()
getDialog()->SetPath( m_aDisplayDirectory );
else
{
- // Default-Standard-Dir setzen
+ // set the default standard dir
INetURLObject aStdDirObj( SvtPathOptions().GetWorkPath() );
getDialog()->SetPath( aStdDirObj.GetMainURL( INetURLObject::DecodeMechanism::NONE) );
}
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index a002758d46a4..33204d94e994 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -732,7 +732,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath
aPath.sPathName = sPath;
// replace all might existing variables with real values
// Do it before these old paths will be compared against the
- // new path configuration. Otherwise some striungs uses different variables ... but substitution
+ // new path configuration. Otherwise some strings uses different variables ... but substitution
// will produce strings with same content (because some variables are redundant!)
impl_subst(aPath, false);
}
@@ -750,7 +750,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath
std::vector<OUString> lOldVals = impl_readOldFormat(sPath);
// replace all might existing variables with real values
// Do it before these old paths will be compared against the
- // new path configuration. Otherwise some striungs uses different variables ... but substitution
+ // new path configuration. Otherwise some strings uses different variables ... but substitution
// will produce strings with same content (because some variables are redundant!)
impl_subst(lOldVals, fa_getSubstitution(), false);
impl_mergeOldUserPaths(aPath, lOldVals);