svx/inc/float3d.hrc | 2
svx/source/dialog/dlgctrl.cxx | 2
svx/source/dialog/swframeexample.cxx | 4
svx/source/engine3d/dragmt3d.cxx | 2
svx/source/inc/fmitems.hxx | 2
svx/source/inc/fmobj.hxx | 2
svx/source/inc/fmshimp.hxx | 2
svx/source/items/algitem.cxx | 6 -
svx/source/items/e3ditem.cxx | 2
svx/source/items/numfmtsh.cxx | 122 +++++++++-------------
svx/source/sdr/contact/viewcontactofgraphic.cxx | 2
svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 2
svx/source/svdraw/clonelist.cxx | 2
svx/source/svdraw/svdoole2.cxx | 4
svx/source/svdraw/svdpage.cxx | 2
svx/source/svdraw/svdtrans.cxx | 2
svx/source/table/cell.cxx | 6 -
svx/source/table/svdotable.cxx | 4
svx/source/table/tablecontroller.cxx | 4
svx/source/table/tablehandles.cxx | 2
svx/source/tbxctrls/SvxColorChildWindow.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 48 ++++----
svx/source/tbxctrls/fontworkgallery.cxx | 8 -
svx/source/tbxctrls/tbunocontroller.cxx | 14 +-
svx/source/toolbars/extrusionbar.cxx | 4
svx/source/toolbars/fontworkbar.cxx | 4
svx/source/unodraw/unoshape.cxx | 2
27 files changed, 122 insertions(+), 136 deletions(-)
New commits:
commit 063626b994960f7fe8426688203c8aa87e425cb4
Author: Johnny_M <kla...@partyheld.de>
Date: Fri Apr 21 21:27:09 2017 +0200
Translate German comments (rest of svx/ except svx/source/form/)
Change-Id: Ib0fccc41c71902861f450c6184f57be2c5da0811
Reviewed-on: https://gerrit.libreoffice.org/36804
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index 6d1eeceeff04..7d13a16189d8 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -18,7 +18,7 @@
*/
#include <svx/dialogs.hrc>
-// Unterer Teil
+// Lower part
#define CTL_PREVIEW 12
#define CTL_LIGHT_PREVIEW 13
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 25e6f36006d9..760261e00a48 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -717,7 +717,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt)
vcl::Window *pTabPage = getNonLayoutParent(this);
if (pTabPage && WindowType::TABPAGE == pTabPage->GetType())
- static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, RectPoint::MM
); // RectPoint ist dummy
+ static_cast<SvxTabPage*>(pTabPage)->PointChanged( this, RectPoint::MM
); // RectPoint is dummy
return GetFocusPosIndex();
diff --git a/svx/source/dialog/swframeexample.cxx
b/svx/source/dialog/swframeexample.cxx
index 46303069cb86..ec7e38747d17 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -447,13 +447,13 @@ tools::Rectangle
SvxSwFrameExample::DrawInnerFrame_Impl(vcl::RenderContext& rRen
{
DrawRect_Impl(rRenderContext, rRect, rFillColor, rBorderColor);
- // Bereich, zu dem relativ positioniert wird, bestimmen
+ // determine the area relative to which the positioning happens
tools::Rectangle aRect(rRect); // aPagePrtArea = Default
CalcBoundRect_Impl(aRect);
if (nAnchor == RndStdIds::FLY_AT_FLY && &rRect == &aPagePrtArea)
{
- // Testabsatz zeichnen
+ // draw text paragraph
tools::Rectangle aTxt(aTextLine);
sal_Int32 nStep = aTxt.GetHeight() + 2;
sal_uInt16 nLines = static_cast<sal_uInt16>(aParaPrtArea.GetHeight() /
(aTextLine.GetHeight() + 2));
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 8a3b4e8b8ae8..8488f13e3d60 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -611,7 +611,7 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt)
break;
case SdrHdlKind::Upper:
case SdrHdlKind::Lower:
- // constrain to auf Y -> X equal
+ // constrain to Y -> X equal
aScNext.setX(aScFixPos.getX());
break;
default:
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index c017605d7fb5..884fc57e25ad 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -37,7 +37,7 @@ public:
inline FmInterfaceItem& operator=( const FmInterfaceItem &rCpy );
- // "pure virtual Methoden" vom SfxPoolItem
+ // "purely virtual methods" of the SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 75774cdfc4b0..6b9adf61c548 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -31,7 +31,7 @@ class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj
{
FmFormObj( const FmFormObj& ) = delete;
- css::uno::Sequence< css::script::ScriptEventDescriptor > aEvts; //
events des Objects
+ css::uno::Sequence< css::script::ScriptEventDescriptor > aEvts; //
events of the object
css::uno::Sequence< css::script::ScriptEventDescriptor> m_aEventsHistory;
// valid if and only if m_pEnvironmentHistory != NULL, this
are the events which we're set when
// m_pEnvironmentHistory was created
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index f548561badcd..1dd4d20dfa10 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -335,7 +335,7 @@ protected:
const FmFormObj& i_rKnownFormObj
);
- // sammelt in strNames die Namen aller Formulare
+ // collects in strNames the names of all forms
SAL_DLLPRIVATE static void impl_collectFormSearchContexts_nothrow(
const css::uno::Reference< css::uno::XInterface>& _rxStartingPoint,
const OUString& _rCurrentLevelPrefix,
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index d3b416487da6..fb36f4fcdb1d 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -138,7 +138,7 @@ SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream,
sal_uInt16 ) const
sal_uInt16 SvxOrientationItem::GetValueCount() const
{
- return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1
+ return SVX_ORIENTATION_STACKED + 1; // last enum value + 1
}
@@ -292,7 +292,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
{
- // jetzt alles signed
+ // now sign everything
case MID_MARGIN_L_MARGIN:
rVal <<= (sal_Int32)( bConvert ? convertTwipToMm100(nLeftMargin) :
nLeftMargin );
break;
@@ -316,7 +316,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
- long nMaxVal = bConvert ? convertTwipToMm100(SHRT_MAX) : SHRT_MAX; //
Members sind sal_Int16
+ long nMaxVal = bConvert ? convertTwipToMm100(SHRT_MAX) : SHRT_MAX; //
members are sal_Int16
sal_Int32 nVal = 0;
if(!(rVal >>= nVal) || (nVal > nMaxVal))
return false;
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 2c1568ccdc5d..048afaf00ced 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -88,7 +88,7 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8
/*nMemberId*/ ) con
drawing::Direction3D aDirection;
- // Werte eintragen
+ // enter values
aDirection.DirectionX = aVal.getX();
aDirection.DirectionY = aVal.getY();
aDirection.DirectionZ = aVal.getZ();
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 4b077eaec97e..26c5c5c5e33e 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -159,13 +159,12 @@ SvxNumberFormatShell::SvxNumberFormatShell(
SvNumberFormatter* pNumFormatter,
SvxNumberFormatShell::~SvxNumberFormatShell()
{
/*
- * An dieser Stelle wird abhaengig davon, ob die
- * hinzugefuegten, benutzerdefinierten als gueltig
- * erklaert wurden (ValidateNewEntries()), die
- * Add-Liste wieder aus dem Zahlenformatierer entfernt.
+ * At this point, depending on whether the added user-defined were
+ * validated (ValidateNewEntries()), the add list is removed from
+ * the number formatter again.
*
- * Loeschen von Formaten aus dem Formatierer passiert
- * aus Undo-Gruenden nur in der aufrufenden Instanz.
+ * Deleting formats from the formatter happens for Undo reasons
+ * only in the calling instance.
*/
if ( bUndoAddList )
@@ -538,11 +537,11 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16&
nCatLbPos,
short nSelPos = SELPOS_NONE;
- // Sonderbehandlung fuer undefiniertes Zahlenformat:
+ // special treatment for undefined number format:
if ( (eValType == SvxNumberValueType::Undefined) && (nCurFormatKey == 0) )
- PosToCategory_Impl( CAT_ALL, nCurCategory ); // Kategorie = Alle
+ PosToCategory_Impl( CAT_ALL, nCurCategory ); // category = all
else
- nCurCategory = css::util::NumberFormat::UNDEFINED; // Kategorie =
Undefiniert
+ nCurCategory = css::util::NumberFormat::UNDEFINED; // category =
undefined
pCurFmtTable = &(pFormatter->GetFirstEntryTable( nCurCategory,
nCurFormatKey,
@@ -563,10 +562,9 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16&
nCatLbPos,
short SvxNumberFormatShell::FillEntryList_Impl( std::vector<OUString>& rList )
{
- /* Erstellen einer aktuellen Liste von Format-Eintraegen.
- * Rueckgabewert ist die Listenposition des aktuellen Formates.
- * Ist die Liste leer oder gibt es kein aktuelles Format,
- * so wird SELPOS_NONE geliefert.
+ /* Create a current list of format entries. The return value is
+ * the list position of the current format. If the list is empty
+ * or if there is no current format, SELPOS_NONE is delivered.
*/
short nSelPos=0;
sal_uInt16 nPrivCat = CAT_CURRENCY;
@@ -601,10 +599,9 @@ short SvxNumberFormatShell::FillEntryList_Impl(
std::vector<OUString>& rList )
void SvxNumberFormatShell::FillEListWithStd_Impl( std::vector<OUString>& rList,
sal_uInt16 nPrivCat,short
&nSelPos )
{
- /* Erstellen einer aktuellen Liste von Format-Eintraegen.
- * Rueckgabewert ist die Listenposition des aktuellen Formates.
- * Ist die Liste leer oder gibt es kein aktuelles Format,
- * so wird SELPOS_NONE geliefert.
+ /* Create a current list of format entries. The return value is
+ * the list position of the current format. If the list is empty
+ * or if there is no current format, SELPOS_NONE is delivered.
*/
DBG_ASSERT( pCurFmtTable != nullptr, "unknown NumberFormat" );
@@ -669,10 +666,9 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl(
std::vector<OUString>& rL
NfIndexTableOffset
eOffsetStart,
NfIndexTableOffset
eOffsetEnd)
{
- /* Erstellen einer aktuellen Liste von Format-Eintraegen.
- * Rueckgabewert ist die Listenposition des aktuellen Formates.
- * Ist die Liste leer oder gibt es kein aktuelles Format,
- * so wird SELPOS_NONE geliefert.
+ /* Create a current list of format entries. The return value is
+ * the list position of the current format. If the list is empty
+ * or if there is no current format, SELPOS_NONE is delivered.
*/
sal_uInt16 nMyType;
@@ -748,10 +744,9 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl(
std::vector<OUString>& r
short SvxNumberFormatShell::FillEListWithCurrency_Impl( std::vector<OUString>&
rList,
short nSelPos)
{
- /* Erstellen einer aktuellen Liste von Format-Eintraegen.
- * Rueckgabewert ist die Listenposition des aktuellen Formates.
- * Ist die Liste leer oder gibt es kein aktuelles Format,
- * so wird SELPOS_NONE geliefert.
+ /* Create a current list of format entries. The return value is
+ * the list position of the current format. If the list is empty
+ * or if there is no current format, SELPOS_NONE is delivered.
*/
DBG_ASSERT( pCurFmtTable != nullptr, "unknown NumberFormat" );
@@ -782,10 +777,9 @@ short SvxNumberFormatShell::FillEListWithCurrency_Impl(
std::vector<OUString>& r
short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>&
rList,
short nSelPos)
{
- /* Erstellen einer aktuellen Liste von Format-Eintraegen.
- * Rueckgabewert ist die Listenposition des aktuellen Formates.
- * Ist die Liste leer oder gibt es kein aktuelles Format,
- * so wird SELPOS_NONE geliefert.
+ /* Create a current list of format entries. The return value is
+ * the list position of the current format. If the list is empty
+ * or if there is no current format, SELPOS_NONE is delivered.
*/
sal_uInt16 nMyType;
@@ -868,10 +862,9 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys(
std::vector<OUString>& rL
short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<OUString>&
rList,
short nSelPos)
{
- /* Erstellen einer aktuellen Liste von Format-Eintraegen.
- * Rueckgabewert ist die Listenposition des aktuellen Formates.
- * Ist die Liste leer oder gibt es kein aktuelles Format,
- * so wird SELPOS_NONE geliefert.
+ /* Create a current list of format entries. The return value is
+ * the list position of the current format. If the list is empty
+ * or if there is no current format, SELPOS_NONE is delivered.
*/
sal_uInt16 nMyType;
@@ -1060,10 +1053,9 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys(
std::vector<OUString>& r
short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>&
rList,
sal_uInt16 nPrivCat, short
nSelPos )
{
- /* Erstellen einer aktuellen Liste von Format-Eintraegen.
- * Rueckgabewert ist die Listenposition des aktuellen Formates.
- * Ist die Liste leer oder gibt es kein aktuelles Format,
- * so wird SELPOS_NONE geliefert.
+ /* Create a current list of format entries. The return value is
+ * the list position of the current format. If the list is empty
+ * or if there is no current format, SELPOS_NONE is delivered.
*/
sal_uInt16 nMyType;
@@ -1148,10 +1140,10 @@ bool SvxNumberFormatShell::IsRemoved_Impl( size_t nKey )
}
-// Konvertierungs-Routinen:
+// Conversion routines:
void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short&
rCategory)
{
- // Kategorie css::form-Positionen abbilden (->Resource)
+ // map category css::form positions (->resource)
switch ( nPos )
{
case CAT_USERDEFINED: rCategory = css::util::NumberFormat::DEFINED;
break;
@@ -1171,7 +1163,7 @@ void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16
nPos, short& rCategory)
void SvxNumberFormatShell::CategoryToPos_Impl(short nCategory, sal_uInt16&
rPos)
{
- // Kategorie auf css::form-Positionen abbilden (->Resource)
+ // map category to css::form positions (->resource)
switch ( nCategory )
{
case css::util::NumberFormat::DEFINED: rPos = CAT_USERDEFINED;
break;
@@ -1191,10 +1183,10 @@ void SvxNumberFormatShell::CategoryToPos_Impl(short
nCategory, sal_uInt16& rPos)
}
/*
- * Funktion: Formatiert die Zahl nValue abhaengig von rFormatStr
- * und speichert das Ergebnis in rPreviewStr.
- * Input: FormatString, Farbe, zu formatierende Zahl
- * Output: Ausgabestring rPreviewStr
+ * Function: Formats the number nValue dependent on rFormatStr
+ * and stores the result in rPreviewStr.
+ * Input: FormatString, color, number to format
+ * Output: Output string rPreviewStr
*/
void SvxNumberFormatShell::MakePrevStringFromVal(
const OUString& rFormatStr,
@@ -1207,10 +1199,9 @@ void SvxNumberFormatShell::MakePrevStringFromVal(
}
/*
- * Funktion: Liefert den Kommentar fuer einen gegebenen
- * Eintrag zurueck.
- * Input: Nummer des Eintrags
- * Output: Kommentar-String
+ * Function: Returns the comment for a given entry.
+ * Input: Number of the entry
+ * Output: Comment string
*/
void SvxNumberFormatShell::SetComment4Entry(short nEntry, const OUString&
aEntStr)
{
@@ -1222,10 +1213,9 @@ void SvxNumberFormatShell::SetComment4Entry(short
nEntry, const OUString& aEntSt
}
/*
- * Funktion: Liefert den Kommentar fuer einen gegebenen
- * Eintrag zurueck.
- * Input: Nummer des Eintrags
- * Output: Kommentar-String
+ * Function: Returns the comment for a given entry.
+ * Input: Number of the entry
+ * Output: Comment string
*/
OUString SvxNumberFormatShell::GetComment4Entry(short nEntry)
{
@@ -1244,10 +1234,9 @@ OUString SvxNumberFormatShell::GetComment4Entry(short
nEntry)
}
/*
- * Funktion: Liefert die Kategorie- Nummer fuer einen gegebenen
- * Eintrag zurueck.
- * Input: Nummer des Eintrags
- * Output: Kategorie- Nummer
+ * Function: Returns the category number for a given entry.
+ * Input: Number of the entry
+ * Output: Category number
*/
short SvxNumberFormatShell::GetCategory4Entry(short nEntry) const
{
@@ -1279,10 +1268,9 @@ short SvxNumberFormatShell::GetCategory4Entry(short
nEntry) const
}
/*
- * Funktion: Liefert die Information, ob ein Eintrag
- * benutzerspezifisch ist zurueck.
- * Input: Nummer des Eintrags
- * Output: Benutzerspezifisch?
+ * Function: Returns the information about whether an entry is user-specific.
+ * Input: Number of the entry
+ * Output: User-specific?
*/
bool SvxNumberFormatShell::GetUserDefined4Entry(short nEntry)
{
@@ -1304,10 +1292,9 @@ bool SvxNumberFormatShell::GetUserDefined4Entry(short
nEntry)
}
/*
- * Funktion: Liefert den Format- String fuer einen gegebenen
- * Eintrag zurueck.
- * Input: Nummer des Eintrags
- * Output: Format- String
+ * Function: Returns the format string for a given entry.
+ * Input: Number of the entry
+ * Output: Format string
*/
OUString SvxNumberFormatShell::GetFormat4Entry(short nEntry)
{
@@ -1331,10 +1318,9 @@ OUString SvxNumberFormatShell::GetFormat4Entry(short
nEntry)
}
/*
- * Funktion: Liefert die Listen- Nummer fuer einen gegebenen
- * Formatindex zurueck.
- * Input: Nummer des Eintrags
- * Output: Kategorie- Nummer
+ * Function: Returns the list number for a given format index.
+ * Input: Number of the entry
+ * Output: Category number
*/
short SvxNumberFormatShell::GetListPos4Entry(sal_uInt32 nIdx)
{
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx
b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 02f711943a67..505aca582944 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -73,7 +73,7 @@ namespace sdr
void ViewContactOfGraphic::flushGraphicObjects()
{
- // #i102380# The graphic is swapped out. To let that have an
effect ist is necessary to
+ // #i102380# The graphic is swapped out. To let that have an
effect, it is necessary to
// delete copies of the GraphicObject which are not swapped out
and have no SwapHandler set
// (this is what happens when the GraphicObject gets copied to a
SdrGrafPrimitive2D). This
// is best achieved for the VC by clearing the local decomposition
cache. It would be possible
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 8c7814de0f9d..54411079b657 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -39,7 +39,7 @@ namespace drawinglayer
// create unit outline polygon
basegfx::B2DPolygon
aUnitOutline(basegfx::tools::createUnitPolygon());
- // add fill, but only when graphic ist transparent
+ // add fill, but only when graphic is transparent
if(!getSdrLFSTAttribute().getFill().isDefault() && isTransparent())
{
basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index 9f3574c2e6ca..22eabf103513 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -19,7 +19,7 @@
// #i13033#
-// New mechanism to hold a ist of all original and cloned objects for later
+// New mechanism to hold a list of all original and cloned objects for later
// re-creating the connections for contained connectors
#include <clonelist.hxx>
#include <svx/svdoedge.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index c276224d87e9..85b108357464 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1036,7 +1036,7 @@ void SdrOle2Obj::Connect_Impl()
if (pModel && pModel->GetRefDevice() &&
pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
{
- // Kein RefDevice oder RefDevice kein Printer
+ // no RefDevice or RefDevice is not a printer
bool bModified = (*ppObjRef)->IsModified();
Printer* pPrinter = (Printer*) pModel->GetRefDevice();
(*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
@@ -1924,7 +1924,7 @@ void SdrOle2Obj::GetObjRef_Impl()
if ( bWasEnabled )
(*ppObjRef)->EnableSetModified( false );
- // Kein RefDevice oder RefDevice kein Printer
+ // no RefDevice or RefDevice is not a printer
Printer* pPrinter = (Printer*) pModel->GetRefDevice();
(*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index fe27594e9ecc..83281d013a74 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -409,7 +409,7 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum)
pObj->GetViewContact().flushViewObjectContacts();
DBG_ASSERT(pObj->IsInserted(),"The object does not have the status
Inserted.");
- pObj->SetInserted(false); // Ruft u.a. den UserCall
+ pObj->SetInserted(false); // calls UserCall, among other
pObj->SetObjList(nullptr);
pObj->SetPage(nullptr);
if (!bObjOrdNumsDirty) { // optimizing for the case that the last
object has to be removed
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index ff598139f19f..eea32bb04b03 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -499,7 +499,7 @@ void Poly2Rect(const tools::Polygon& rPol,
tools::Rectangle& rRect, GeoStat& rGe
long nShW=GetAngle(aPt3);
nShW-=27000; // ShearWink is measured against a vertical line
- nShW=-nShW; // Negieren, denn '+' ist Rechtskursivierung
+ nShW=-nShW; // negating, because '+' is shearing clock-wise
bool bMirr=aPt3.Y()<0;
if (bMirr) { // "exchange of points" when mirroring
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 8da2f1555a06..32240990c05b 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::container;
static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
{
- // Propertymap fuer einen Outliner Text
+ // property map for an outliner text
static const SfxItemPropertyMapEntry aSvxCellPropertyMap[] =
{
FILL_PROPERTIES
@@ -1150,7 +1150,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString&
rPropertyName, const Any&
{
if( aSet.GetItemState( pMap->nWID ) != SfxItemState::SET )
{
- // Default aus ItemPool holen
+ // fetch the default from ItemPool
if(SfxItemPool::IsWhich(pMap->nWID))
aSet.Put(GetModel()->GetItemPool().GetDefaultItem(pMap->nWID));
}
@@ -1243,7 +1243,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString&
PropertyName )
{
if(!aSet.Count())
{
- // Default aus ItemPool holen
+ // fetch the default from ItemPool
if(SfxItemPool::IsWhich(pMap->nWID))
aSet.Put(GetModel()->GetItemPool().GetDefaultItem(pMap->nWID));
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index db30cc7cbd34..d3ab40c875ee 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1573,7 +1573,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos,
Size* pPaperMin, Size*
TakeTextAnchorRect( rPos, aViewInit );
Size aAnkSiz(aViewInit.GetSize());
- aAnkSiz.Width()--; aAnkSiz.Height()--; // weil GetSize() ein draufaddiert
+ aAnkSiz.Width()--; aAnkSiz.Height()--; // because GetSize() increments by
one
Size aMaxSiz(aAnkSiz.Width(),1000000);
if (pModel!=nullptr)
@@ -2272,7 +2272,7 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat)
rStat.TakeCreateRect(aRect1);
ImpJustifyRect(aRect1);
rStat.SetActionRect(aRect1);
- maRect = aRect1; // fuer ObjName
+ maRect = aRect1; // for ObjName
SetBoundRectDirty();
bSnapRectDirty=true;
return true;
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 49e09878df0f..c21432de3cb8 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1866,7 +1866,7 @@ void SvxTableController::EditCell(const CellPos& rPos,
vcl::Window* pWindow, Tbl
if(nParaAnz==1 && p1stPara)
{
- // Bei nur einem Paragraph
+ // with only one paragraph
if (pOutl->GetText(p1stPara).isEmpty())
{
bEmptyOutliner = true;
@@ -2521,7 +2521,7 @@ bool SvxTableController::GetAttributes(SfxItemSet&
rTargetSet, bool bOnlyHardAtt
OutlinerView* pTextEditOutlinerView =
mpView->GetTextEditOutlinerView();
if(pTextEditOutlinerView)
{
- // FALSE= InvalidItems nicht al Default, sondern als "Loecher"
betrachten
+ // FALSE= consider InvalidItems not as the default, but as
"holes"
rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), false);
rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ) );
}
diff --git a/svx/source/table/tablehandles.cxx
b/svx/source/table/tablehandles.cxx
index 01eb2ce65ae0..aeaa85232925 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -181,7 +181,7 @@ void TableEdgeHdl::CreateB2dIAObject()
if(aInvisible.count())
{
- // also create overlay object vor invisible
parts to allow
+ // also create overlay object for invisible
parts to allow
// a standard HitTest using the primitives
from that overlay object
// (see OverlayTableEdge implementation)
sdr::overlay::OverlayObject* pOverlayObject =
new OverlayTableEdge(aInvisible, false);
diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx
b/svx/source/tbxctrls/SvxColorChildWindow.cxx
index 5b5c399c8ddd..11891d63175b 100644
--- a/svx/source/tbxctrls/SvxColorChildWindow.cxx
+++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx
@@ -26,7 +26,7 @@
SFX_IMPL_DOCKINGWINDOW_WITHID( SvxColorChildWindow, SID_COLOR_CONTROL )
-// Ableitung vom SfxChildWindow als "Behaelter" fuer Animator
+// Derivation from SfxChildWindow as "container" for animator
SvxColorChildWindow::SvxColorChildWindow( vcl::Window* _pParent,
sal_uInt16 nId,
SfxBindings* pBindings,
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 87187f6c5417..46f333287fcf 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -95,7 +95,7 @@ SvxColorValueSet_docking::SvxColorValueSet_docking(
vcl::Window* _pParent ) :
void SvxColorValueSet_docking::MouseButtonDown( const MouseEvent& rMEvt )
{
- // Fuer Mac noch anders handlen !
+ // For Mac still handle differently!
if( rMEvt.IsLeft() )
{
mbLeftButton = true;
@@ -117,7 +117,7 @@ void SvxColorValueSet_docking::MouseButtonDown( const
MouseEvent& rMEvt )
void SvxColorValueSet_docking::MouseButtonUp( const MouseEvent& rMEvt )
{
- // Fuer Mac noch anders handlen !
+ // For Mac still handle differently!
if( rMEvt.IsLeft() )
{
mbLeftButton = true;
@@ -162,8 +162,8 @@ void SvxColorValueSet_docking::DoDrag()
IMPL_LINK_NOARG(SvxColorValueSet_docking, ExecDragHdl, void*, void)
{
- // Als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch die
- // Farbleiste geloescht werden darf
+ // As a link, so that asynchronously without ImpMouseMoveMsg on the
+ // stack the color bar may also be deleted
DoDrag();
}
@@ -250,7 +250,7 @@ void SvxColorDockingWindow::Notify( SfxBroadcaster& , const
SfxHint& rHint )
if ( pPoolItemHint
&& ( dynamic_cast<const
SvxColorListItem*>(pPoolItemHint->GetObject()) != nullptr ) )
{
- // Die Liste der Farben hat sich geaendert
+ // The list of colors has changed
pColorList = static_cast<SvxColorListItem*>(
pPoolItemHint->GetObject() )->GetColorList();
FillValueSet();
}
@@ -285,18 +285,18 @@ void SvxColorDockingWindow::FillValueSet()
void SvxColorDockingWindow::SetSize()
{
- // Groesse fuer ValueSet berechnen
+ // calculate the size for ValueSet
Size aSize = GetOutputSizePixel();
aSize.Width() -= 4;
aSize.Height() -= 4;
- // Zeilen und Spalten berechnen
+ // calculate rows and columns
nCols = (sal_uInt16) ( aSize.Width() / aItemSize.Width() );
nLines = (sal_uInt16) ( (float) aSize.Height() / (float)
aItemSize.Height() /*+ 0.35*/ );
if( nLines == 0 )
nLines++;
- // Scrollbar setzen/entfernen
+ // set/remove scroll bar
WinBits nBits = aColorSet->GetStyle();
if ( static_cast<long>(nLines) * nCols >= nCount )
nBits &= ~WB_VSCROLL;
@@ -304,11 +304,11 @@ void SvxColorDockingWindow::SetSize()
nBits |= WB_VSCROLL;
aColorSet->SetStyle( nBits );
- // ScrollBar ?
+ // scroll bar?
long nScrollWidth = aColorSet->GetScrollWidth();
if( nScrollWidth > 0 )
{
- // Spalten mit ScrollBar berechnen
+ // calculate columns with scroll bar
nCols = (sal_uInt16) ( ( aSize.Width() - nScrollWidth ) /
aItemSize.Width() );
}
aColorSet->SetColCount( nCols );
@@ -317,7 +317,7 @@ void SvxColorDockingWindow::SetSize()
aColorSet->SetLineCount( nLines );
else
{
- aColorSet->SetLineCount(); // sonst wird LineHeight ignoriert
+ aColorSet->SetLineCount(); // otherwise line height is ignored
aColorSet->SetItemHeight( aItemSize.Height() );
}
@@ -344,7 +344,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl,
ValueSet*, void)
{
if ( nLeftSlot == SID_ATTR_FILL_COLOR )
{
- if ( nPos == 1 ) // unsichtbar
+ if ( nPos == 1 ) // invisible
{
XFillStyleItem aXFillStyleItem( drawing::FillStyle_NONE );
pDispatcher->ExecuteList(nLeftSlot, SfxCallMode::RECORD,
@@ -354,8 +354,8 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl,
ValueSet*, void)
{
bool bDone = false;
- // Wenn wir eine DrawView haben und uns im TextEdit-Modus
befinden,
- // wird nicht die Flaechen-, sondern die Textfarbe zugewiesen
+ // If we have a DrawView and we are in TextEdit mode, then
+ // not the area color but the text color is assigned
SfxViewShell* pViewSh = SfxViewShell::Current();
if ( pViewSh )
{
@@ -377,7 +377,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl,
ValueSet*, void)
}
}
}
- else if ( nPos != 1 ) // unsichtbar
+ else if ( nPos != 1 ) // invisible
{
SvxColorItem aLeftColorItem( aColor, nLeftSlot );
pDispatcher->ExecuteList(nLeftSlot, SfxCallMode::RECORD,
@@ -388,7 +388,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl,
ValueSet*, void)
{
if ( nRightSlot == SID_ATTR_LINE_COLOR )
{
- if( nPos == 1 ) // unsichtbar
+ if( nPos == 1 ) // invisible
{
XLineStyleItem aXLineStyleItem( drawing::LineStyle_NONE );
pDispatcher->ExecuteList(nRightSlot, SfxCallMode::RECORD,
@@ -396,7 +396,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl,
ValueSet*, void)
}
else
{
- // Sollte der LineStyle unsichtbar sein, so wird er auf SOLID
gesetzt
+ // If the LineStyle is invisible, it is set to SOLID
SfxViewShell* pViewSh = SfxViewShell::Current();
if ( pViewSh )
{
@@ -424,7 +424,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl,
ValueSet*, void)
{ &aXLineColorItem });
}
}
- else if ( nPos != 1 ) // unsichtbar
+ else if ( nPos != 1 ) // invisible
{
SvxColorItem aRightColorItem( aColor, nRightSlot );
pDispatcher->ExecuteList(nRightSlot, SfxCallMode::RECORD,
@@ -438,13 +438,13 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
rNewSize.Width() -= 4;
rNewSize.Height() -= 4;
- // Spalten und Reihen ermitteln
+ // determine columns and rows
nCols = (sal_uInt16) ( (float) rNewSize.Width() / (float)
aItemSize.Width() + 0.5 );
nLines = (sal_uInt16) ( (float) rNewSize.Height() / (float)
aItemSize.Height() + 0.5 );
if( nLines == 0 )
nLines = 1;
- // Scrollbar setzen/entfernen
+ // set/remove scroll bar
WinBits nBits = aColorSet->GetStyle();
if ( static_cast<long>(nLines) * nCols >= nCount )
nBits &= ~WB_VSCROLL;
@@ -452,18 +452,18 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
nBits |= WB_VSCROLL;
aColorSet->SetStyle( nBits );
- // ScrollBar ?
+ // scroll bar?
long nScrollWidth = aColorSet->GetScrollWidth();
if( nScrollWidth > 0 )
{
- // Spalten mit ScrollBar berechnen
+ // calculate columns with scroll bar
nCols = (sal_uInt16) ( ( ( (float) rNewSize.Width() - (float)
nScrollWidth ) )
/ (float) aItemSize.Width() + 0.5 );
}
if( nCols <= 1 )
nCols = 2;
- // Max. Reihen anhand der gegebenen Spalten berechnen
+ // calculate max. rows using the given columns
long nMaxLines = nCount / nCols;
if( nCount % nCols )
nMaxLines++;
@@ -471,7 +471,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
nLines = sal::static_int_cast< sal_uInt16 >(
std::min< long >( nLines, nMaxLines ) );
- // Groesse des Windows setzen
+ // set size of the window
rNewSize.Width() = nCols * aItemSize.Width() + nScrollWidth + 4;
rNewSize.Height() = nLines * aItemSize.Height() + 4;
}
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index 479c8effcbb6..ec20d84df027 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -106,10 +106,10 @@ void FontWorkGalleryDialog::dispose()
void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId)
{
- // Ueber die Gallery werden die Favoriten eingelesen
+ // the favorites are read via the gallery
sal_uInt32 nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
- // Gallery thema locken
+ // lock gallery theme
GalleryExplorer::BeginLocking(nThemeId);
sal_uInt32 nModelPos;
@@ -142,7 +142,7 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16
nThemeId)
}
}
- // Gallery thema freigeben
+ // release gallery theme
GalleryExplorer::EndLocking(nThemeId);
}
@@ -158,7 +158,7 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16
nThemeId)
std::vector< Bitmap * >::size_type nFavCount =
maFavoritesHorizontal.size();
- // ValueSet Favoriten
+ // ValueSet favorites
if( nFavCount > (nColCount * nLineCount) )
{
WinBits nWinBits = mpCtlFavorites->GetStyle();
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx
b/svx/source/tbxctrls/tbunocontroller.cxx
index 24b72d56e4f0..2d5e6596beda 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -164,16 +164,16 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long
nPoint, bool bErase )
{
if ( !bErase )
{
- // Metric Umrechnen
+ // convert the metric
long nVal = nPoint;
- // ge"andert => neuen Wert setzen
+ // changed => set new value
if ( GetValue() != nVal )
SetValue( nVal );
}
else
{
- // Wert in der Anzeige l"oschen
+ // delete value in the display
SetValue( -1L );
SetText( "" );
}
@@ -183,8 +183,8 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint,
bool bErase )
void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor&
rCurrentFont )
{
- // Sizes-Liste auff"ullen
- sal_Int64 nOldVal = GetValue(); // alten Wert merken
+ // filling up the sizes list
+ sal_Int64 nOldVal = GetValue(); // memorize old value
const FontList* _pFontList = nullptr;
std::unique_ptr<FontList> aHold( new FontList( this ));
_pFontList = aHold.get();
@@ -201,8 +201,8 @@ void SvxFontSizeBox_Impl::UpdateFont( const
css::awt::FontDescriptor& rCurrentFo
{
Fill( nullptr, _pFontList );
}
- SetValue( nOldVal ); // alten Wert wiederherstellen
- m_aCurText = GetText(); // zum R"ucksetzen bei ESC merken
+ SetValue( nOldVal ); // restore old value
+ m_aCurText = GetText(); // memorize to reset at ESC
}
diff --git a/svx/source/toolbars/extrusionbar.cxx
b/svx/source/toolbars/extrusionbar.cxx
index 72f406b0a380..90f395e4da7e 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -47,8 +47,8 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
-// Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also
-// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
+// Declare the default interface. (The slotmap must not be empty, so
+// we enter something which never occurs here (hopefully).)
static SfxSlot aExtrusionBarSlots_Impl[] =
{
{ 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, 0, SfxDisableFlags::NONE, nullptr }
diff --git a/svx/source/toolbars/fontworkbar.cxx
b/svx/source/toolbars/fontworkbar.cxx
index d4786d1bec71..59ed7287adbf 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -168,8 +168,8 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView,
SfxItemSet& rSet )
rSet.Put( SfxStringItem( SID_FONTWORK_SHAPE_TYPE, aFontWorkShapeType ) );
}
-// Standardinterface deklarieren (Die Slotmap darf nicht leer sein, also
-// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
+// Declare the default interface. (The slotmap must not be empty, so
+// we enter something which never occurs here (hopefully).)
static SfxSlot aFontworkBarSlots_Impl[] =
{
{ 0, 0, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr,
nullptr, 0, SfxDisableFlags::NONE, nullptr }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 96f2792408c0..3e082307c517 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1304,7 +1304,7 @@ void SAL_CALL SvxShape::dispose()
// Why isn't this checked here?
SdrPage* pPage = mpObj->GetPage();
- // SdrObject aus der Page loeschen
+ // delete the SdrObject from the page
const size_t nCount = pPage->GetObjCount();
for ( size_t nNum = 0; nNum < nCount; ++nNum )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
