[Libreoffice-commits] core.git: sd/source
Johnny_M
klasse at partyheld.de
Mon Jul 3 09:48:43 UTC 2017
sd/source/core/drawdoc3.cxx | 2 +-
sd/source/core/sdpage2.cxx | 2 +-
sd/source/ui/docshell/docshell.cxx | 2 +-
sd/source/ui/func/fudraw.cxx | 4 ++--
sd/source/ui/func/fuediglu.cxx | 8 ++++----
sd/source/ui/func/fuinsfil.cxx | 2 +-
sd/source/ui/func/fusel.cxx | 8 ++++----
sd/source/ui/inc/DrawViewShell.hxx | 2 +-
sd/source/ui/inc/OutlineView.hxx | 2 +-
sd/source/ui/inc/Window.hxx | 2 +-
sd/source/ui/inc/cfgids.hxx | 2 +-
sd/source/ui/inc/fupoor.hxx | 10 +++++-----
sd/source/ui/view/viewshe2.cxx | 2 +-
13 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit e8c7a49c49cfde6e22cb5fea0d07e68409de61af
Author: Johnny_M <klasse at partyheld.de>
Date: Sun Jul 2 14:24:27 2017 +0200
Translate German comments and debug strings (leftovers in dirs scaddins to sd)
Translates leftovers found using a custom regex and manually checking
the rest of the affected file.
Additionally:
- A few spelling fixes
Change-Id: If54a0ecc58a429ee1c63abd43411c50304dab176
Reviewed-on: https://gerrit.libreoffice.org/39450
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index a20f3b4c83e8..16a33155df95 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1436,7 +1436,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if (pSourceDoc)
{
std::vector<StyleReplaceData> aReplList; // List of replaced stylesheets
- bool bLayoutReloaded = false; // Wurde ex. Layout wieder geladen?
+ bool bLayoutReloaded = false; // Was ex. layout reloaded?
// LayoutName, Page and Notes page
if (rLayoutName.isEmpty())
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index ca65178faad5..f9eefaad0c5e 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -83,7 +83,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName,
/*********************************************************************
|* Name of the layout of the page
\********************************************************************/
- OUString aOldLayoutName(maLayoutName); // merken
+ OUString aOldLayoutName(maLayoutName); // memorize
OUStringBuffer aBuf(rLayoutName);
aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE);
maLayoutName = aBuf.makeStringAndClear();
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 1ae312469225..e0e7791da206 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -100,7 +100,7 @@ SFX_IMPL_OBJECTFACTORY(
void DrawDocShell::Construct( bool bClipboard )
{
mbInDestruction = false;
- SetSlotFilter(); // setzt Filter zurueck
+ SetSlotFilter(); // resets the filter
mbOwnDocument = mpDoc == nullptr;
if( mbOwnDocument )
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 068a3e03cb91..d1e023eed8c6 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -515,8 +515,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if ((eDragMode == SdrDragMode::Rotate) && (eHit == SdrHitKind::MarkedObject))
{
- // The goal of this request is show always the rotation-arrow for 3D-objects at rotation-modus
- // Independent of the settings at Extras->Optionen->Grafik "Objekte immer verschieben"
+ // The goal of this request is show always the rotation arrow for 3D-objects at rotation mode
+ // Independent of the settings at Tools->Options->Draw "Objects always moveable"
// 2D-objects acquit in an other way. Otherwise, the rotation of 3d-objects around any axes
// wouldn't be possible per default.
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index bdb72cccccc6..53c6a8450b66 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -279,25 +279,25 @@ bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
if (nCode == KEY_UP)
{
- // Scroll nach oben
+ // scroll up
nX = 0;
nY =-1;
}
else if (nCode == KEY_DOWN)
{
- // Scroll nach unten
+ // scroll down
nX = 0;
nY = 1;
}
else if (nCode == KEY_LEFT)
{
- // Scroll nach links
+ // scroll left
nX =-1;
nY = 0;
}
else if (nCode == KEY_RIGHT)
{
- // Scroll nach rechts
+ // scroll right
nX = 1;
nY = 0;
}
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index b4c2787c8f12..9b15e53d8245 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -681,7 +681,7 @@ bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
// transfer Outliner content to SdDrawDocument
pOlView->PrepareClose();
- // einlesen wie im Zeichenmodus
+ // read in like in the character mode
if (InsSDDinDrMode(pMedium))
{
::Outliner* pOutliner = pOlView->GetViewByWindow(mpWindow)->GetOutliner();
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 29e0e4490ce7..b50642259255 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -931,25 +931,25 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt)
sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
if (nCode == KEY_UP)
{
- // Scroll nach oben
+ // scroll up
nX = 0;
nY =-1;
}
else if (nCode == KEY_DOWN)
{
- // Scroll nach unten
+ // scroll down
nX = 0;
nY = 1;
}
else if (nCode == KEY_LEFT)
{
- // Scroll nach links
+ // scroll left
nX =-1;
nY = 0;
}
else if (nCode == KEY_RIGHT)
{
- // Scroll nach rechts
+ // scroll right
nX = 1;
nY = 0;
}
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 3b5377deb9f4..56083d5a2f4d 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -307,7 +307,7 @@ public:
administrator.
@return
The number of layers managed by the layer tab control. The
- returned value is independent of whether the layer modus is
+ returned value is independent of whether the layer mode is
currently active and the tab control is visible.
*/
int GetTabLayerCount() const;
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 552bfa041595..15869e25c454 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -95,7 +95,7 @@ public:
void Paint (const ::tools::Rectangle& rRect, ::sd::Window* pWin);
- // Callbacks fuer LINKs
+ // Callbacks for LINKs
DECL_LINK( ParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, void );
DECL_LINK( ParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, void );
DECL_LINK( DepthChangedHdl, ::Outliner::DepthChangeHdlParam, void );
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index a2658b72406c..0d47a487035e 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -126,7 +126,7 @@ public:
void UpdateMapMode();
- double GetVisibleX(); // Interface fuer ScrollBars
+ double GetVisibleX(); // interface for ScrollBars
double GetVisibleY();
void SetVisibleXY(double fX, double fY);
double GetVisibleWidth();
diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx
index 5b86cad4d6c8..d56cc0a23b1d 100644
--- a/sd/source/ui/inc/cfgids.hxx
+++ b/sd/source/ui/inc/cfgids.hxx
@@ -22,7 +22,7 @@
#include <sfx2/sfx.hrc>
-// Item-Ids fuer Config-Items
+// Item IDs for config items
#define SDCFG_IMPRESS (SFX_ITEMTYPE_SD_BEGIN + 1)
#define SDCFG_DRAW (SFX_ITEMTYPE_SD_BEGIN + 3)
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index be0e2163bb14..fcb32009cab0 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -46,10 +46,10 @@ class Window;
class FuPoor : public SimpleReferenceComponent
{
public:
- static const int HITPIX = 2; // Hit-Toleranz in Pixel
- static const int HITLOG = 53; // Hit tolerance in mm100
- static const int DRGPIX = 2; // Drag MinMove in Pixel
- static const int DRGLOG = 53; // Minimal drag move in mm100
+ static const int HITPIX = 2; // hit tolerance in pixel
+ static const int HITLOG = 53; // hit tolerance in mm100
+ static const int DRGPIX = 2; // minimal drag move in pixel
+ static const int DRGLOG = 53; // minimal drag move in mm100
virtual void DoExecute( SfxRequest& rReq );
@@ -64,7 +64,7 @@ public:
virtual void DoPaste();
virtual void DoPasteUnformatted();
- // Mouse- & Key-Events; Returnwert=sal_True: Event wurde bearbeitet
+ // mouse & key events; return value = sal_True: event has been handled
virtual bool KeyInput(const KeyEvent& rKEvt);
virtual bool MouseMove(const MouseEvent& );
virtual bool MouseButtonUp(const MouseEvent& rMEvt);
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 7d311f64a3f0..e0b40d1d1515 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -851,7 +851,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
Fraction aScaleWidth (aDrawSize.Width(), aObjAreaSize.Width() );
Fraction aScaleHeight(aDrawSize.Height(), aObjAreaSize.Height() );
- aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj
+ aScaleWidth.ReduceInaccurate(10); // compatible to the SdrOle2Obj
aScaleHeight.ReduceInaccurate(10);
pSdClient->SetSizeScale(aScaleWidth, aScaleHeight);
More information about the Libreoffice-commits
mailing list