sc/source/ui/drawfunc/drawsh.cxx | 4 ++--
sc/source/ui/drawfunc/drawsh2.cxx | 14 +++++++-------
sc/source/ui/drawfunc/drtxtob.cxx | 22 +++++++++++-----------
sc/source/ui/drawfunc/fuconarc.cxx | 16 ++--------------
sc/source/ui/drawfunc/fuconcustomshape.cxx | 10 ++--------
sc/source/ui/drawfunc/fuconpol.cxx | 14 +-------------
sc/source/ui/drawfunc/fuconrec.cxx | 16 ++--------------
sc/source/ui/drawfunc/fuconuno.cxx | 16 ++--------------
sc/source/ui/drawfunc/fuins1.cxx | 8 ++++----
sc/source/ui/drawfunc/fuins2.cxx | 4 ++--
sc/source/ui/drawfunc/fupoor.cxx | 12 ++----------
sc/source/ui/drawfunc/fusel.cxx | 2 +-
12 files changed, 38 insertions(+), 100 deletions(-)
New commits:
commit 2fbcdd3e551710c8fcbe15d28b7b71f8d038d9ad
Author: Thomas Beck <thomas.b...@cib.de>
Date: Fri May 12 10:08:00 2017 +0200
tdf#39468 translate German comments
Translated comments in sc/source/ui/drawfunc/. There were still some
left that bin/find-german-comments did not find.
Removed unneccessary comments.
Change-Id: I61c1cadea259bb2a4b14721a25da85e9a9c0753e
Reviewed-on: https://gerrit.libreoffice.org/37530
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 24ccb51cd760..1befc0f56d29 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -120,7 +120,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
}
break;
- case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
+ case SID_TEXT_STANDARD: // delete hard text attributes
{
SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
pView->SetAttributes(aEmptyAttr, true);
@@ -152,7 +152,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
case SID_ATTR_SHADOW_XDISTANCE:
case SID_ATTR_SHADOW_YDISTANCE:
{
- // Wenn ToolBar vertikal :
+ // if toolbar is vertical :
if ( !rReq.GetArgs() )
{
switch ( nSlot )
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx
b/sc/source/ui/drawfunc/drawsh2.cxx
index 02215b8e1093..9921d0d3e2e9 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -77,7 +77,7 @@ ScDrawShell::~ScDrawShell()
mpSelectionChangeHandler->Disconnect();
}
-void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles
+void ScDrawShell::GetState( SfxItemSet& rSet ) // Conditions / Toggles
{
ScDrawView* pView = pViewData->GetScDrawView();
SdrDragMode eMode = pView->GetDragMode();
@@ -242,19 +242,19 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )
// disable functions
rSet.DisableItem( SID_TITLE_DESCRIPTION_OBJECT );
}
- if ( !nMarkCount ) // nichts selektiert
+ if ( !nMarkCount ) // nothing selected
{
- // Anordnung
+ // Arrangement
rSet.DisableItem( SID_FRAME_UP );
rSet.DisableItem( SID_FRAME_DOWN );
rSet.DisableItem( SID_FRAME_TO_TOP );
rSet.DisableItem( SID_FRAME_TO_BOTTOM );
- // Clipboard / loeschen
+ // Clipboard / delete
rSet.DisableItem( SID_DELETE );
rSet.DisableItem( SID_DELETE_CONTENTS );
rSet.DisableItem( SID_CUT );
rSet.DisableItem( SID_COPY );
- // sonstiges
+ // other
rSet.DisableItem( SID_ANCHOR_TOGGLE );
rSet.DisableItem( SID_ORIGINALSIZE );
rSet.DisableItem( SID_ATTR_TRANSFORM );
@@ -275,7 +275,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )
// disable functions
svx::FontworkBar::getState( pView, rSet );
}
-// Attribute fuer Drawing-Objekte
+// Attributes for Drawing-Objects
void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
{
@@ -342,7 +342,7 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet)
{
- // Dialoge fuer Draw-Attribute disablen, wenn noetig
+ // Disable dialogs for Draw-attributes if neccessary
ScDrawView* pDrView = pViewData->GetScDrawView();
SfxItemSet aViewSet = pDrView->GetAttrFromMarked(false);
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index ccd6bfe07a94..5ccb7823462e 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -538,11 +538,11 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
}
}
-// Attribute
+// Attributes
void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
{
- // Unterstreichung
+ // Underline
SdrView* pView = pViewData->GetScDrawView();
@@ -553,7 +553,7 @@ void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
SfxItemSet aViewAttr(pView->GetModel()->GetItemPool());
pView->GetAttributes(aViewAttr);
- // Unterstreichung
+ // Underline
FontLineStyle eOld = static_cast<const SvxUnderlineItem&>( aViewAttr.
Get(EE_CHAR_UNDERLINE)).GetLineStyle();
FontLineStyle eNew = eOld;
@@ -795,7 +795,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
{
switch ( nSlot )
{
- case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
+ case SID_TEXT_STANDARD: // delete hard text attributes
{
OutlinerView* pOutView = pView->IsTextEdit() ?
pView->GetTextEditOutlinerView() : nullptr;
@@ -813,7 +813,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
rReq.Done( aEmptyAttr );
pViewData->GetScDrawView()->InvalidateDrawTextAttrs();
- bDone = false; // bereits hier passiert
+ bDone = false; // already happend here
}
break;
@@ -835,7 +835,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
break;
case SID_CHAR_DLG_EFFECT:
- case SID_CHAR_DLG: // Dialog-Button
+ case SID_CHAR_DLG: // dialog button
case SID_ATTR_CHAR_FONT: // Controller not shown
case SID_ATTR_CHAR_FONTHEIGHT:
bDone = ExecuteCharDlg( aEditAttr, aNewAttr , nSlot);
@@ -974,7 +974,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet&
rDestSet )
SfxItemSet aAttrSet(pView->GetModel()->GetItemPool());
pView->GetAttributes(aAttrSet);
- // direkte Attribute
+ // direct attributes
rDestSet.Put( aAttrSet );
@@ -1001,7 +1001,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet&
rDestSet )
ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_WEIGHT, nScript
);
if ( rDestSet.GetItemState( EE_CHAR_ITALIC ) != SfxItemState::UNKNOWN )
ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_ITALIC, nScript
);
- // Ausrichtung
+ // Alignment
SvxAdjust eAdj = static_cast<const
SvxAdjustItem&>(aAttrSet.Get(EE_PARA_JUST)).GetAdjust();
switch( eAdj )
@@ -1078,7 +1078,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet&
rDestSet )
rDestSet.InvalidateItem(SID_ATTR_PARA_ULSPACE);
}
- // Zeilenabstand
+ // Line spacing
sal_uInt16 nLineSpace = static_cast<const SvxLineSpacingItem&>(aAttrSet.
Get( EE_PARA_SBL )).GetPropLineSpace();
@@ -1095,7 +1095,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet&
rDestSet )
break;
}
- // hoch-/tiefgestellt
+ // super-/subscript
SvxEscapement eEsc = (SvxEscapement) static_cast<const SvxEscapementItem&>(
aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
@@ -1104,7 +1104,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet&
rDestSet )
else if( eEsc == SvxEscapement::Subscript )
rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) );
- // Unterstreichung
+ // Underline
eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE );
if ( eState == SfxItemState::DONTCARE )
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx
b/sc/source/ui/drawfunc/fuconarc.cxx
index b6f3f66d6177..988cff764e82 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -26,24 +26,12 @@
#include <svx/svdocirc.hxx>
#include <svx/sxciaitm.hxx>
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
FuConstArc::FuConstArc( ScTabViewShell* pViewSh, vcl::Window* pWin,
ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq )
: FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq )
{
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
FuConstArc::~FuConstArc()
{
}
@@ -100,7 +88,7 @@ bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
/*************************************************************************
|*
-|* Function aktivieren
+|* Activate function
|*
\************************************************************************/
@@ -141,7 +129,7 @@ void FuConstArc::Activate()
/*************************************************************************
|*
-|* Function deaktivieren
+|* Deactivate functions
|*
\************************************************************************/
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx
b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 45c562a4048f..a69037136f92 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -48,12 +48,6 @@ FuConstCustomShape::FuConstCustomShape( ScTabViewShell*
pViewSh, vcl::Window* pW
}
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
FuConstCustomShape::~FuConstCustomShape()
{
}
@@ -122,7 +116,7 @@ bool FuConstCustomShape::MouseButtonUp(const MouseEvent&
rMEvt)
/*************************************************************************
|*
-|* Function aktivieren
+|* Activate function
|*
\************************************************************************/
@@ -143,7 +137,7 @@ void FuConstCustomShape::Activate()
/*************************************************************************
|*
-|* Function deaktivieren
+|* Deactivate function
|*
\************************************************************************/
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx
b/sc/source/ui/drawfunc/fuconpol.cxx
index 515fbeb90564..c7e2717e1f5b 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -27,24 +27,12 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
FuConstPolygon::FuConstPolygon(ScTabViewShell* pViewSh, vcl::Window* pWin,
ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq)
: FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq)
{
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
FuConstPolygon::~FuConstPolygon()
{
}
@@ -199,7 +187,7 @@ void FuConstPolygon::Activate()
/*************************************************************************
|*
-|* Function deaktivieren
+|* Deactivate function
|*
\************************************************************************/
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx
b/sc/source/ui/drawfunc/fuconrec.cxx
index 0e7c4d89388f..728c63c59df9 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -41,24 +41,12 @@
#include "scresid.hxx"
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
FuConstRectangle::FuConstRectangle(ScTabViewShell* pViewSh, vcl::Window* pWin,
ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq)
: FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq)
{
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
FuConstRectangle::~FuConstRectangle()
{
}
@@ -185,7 +173,7 @@ bool FuConstRectangle::MouseButtonUp(const MouseEvent&
rMEvt)
/*************************************************************************
|*
-|* Function aktivieren
+|* Activate function
|*
\************************************************************************/
@@ -378,7 +366,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr,
SdrObject* pObj, sal_uInt1
/*************************************************************************
|*
-|* Function deaktivieren
+|* Deactivate function
|*
\************************************************************************/
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx
b/sc/source/ui/drawfunc/fuconuno.cxx
index 416d24ad0609..0963da5ed74c 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -22,12 +22,6 @@
#include "sc.hrc"
#include "drawview.hxx"
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window*
pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq)
: FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq)
@@ -42,12 +36,6 @@ FuConstUnoControl::FuConstUnoControl(ScTabViewShell*
pViewSh, vcl::Window* pWin,
nIdentifier = pIdentifierItem->GetValue();
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
FuConstUnoControl::~FuConstUnoControl()
{
}
@@ -105,7 +93,7 @@ bool FuConstUnoControl::MouseButtonUp(const MouseEvent&
rMEvt)
/*************************************************************************
|*
-|* Function aktivieren
+|* Activate function
|*
\************************************************************************/
@@ -126,7 +114,7 @@ void FuConstUnoControl::Activate()
/*************************************************************************
|*
-|* Function deaktivieren
+|* Deactivate function
|*
\************************************************************************/
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 7b4302b67c93..7a7092536640 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -220,7 +220,7 @@ static void lcl_InsertMedia( const OUString& rMediaURL,
bool bApi,
/*************************************************************************
|*
-|* FuInsertGraphic::Konstruktor
+|* FuInsertGraphic::Constructor
|*
\************************************************************************/
@@ -293,7 +293,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
/*************************************************************************
|*
-|* FuInsertGraphic::Destruktor
+|* FuInsertGraphic::Destructor
|*
\************************************************************************/
@@ -303,7 +303,7 @@ FuInsertGraphic::~FuInsertGraphic()
/*************************************************************************
|*
-|* FuInsertMedia::Konstruktor
+|* FuInsertMedia::Constructor
|*
\************************************************************************/
@@ -359,7 +359,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
/*************************************************************************
|*
-|* FuInsertMedia::Destruktor
+|* FuInsertMedia::Destructor
|*
\************************************************************************/
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 25bac55420c2..3ac966fc708c 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -582,7 +582,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
vcl::Window* pWin, ScDrawV
pScDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nNewTab )
);
pViewSh->SetTabNo( nNewTab, true );
- pScDocSh->PostPaintExtras(); //! erst hinterher ???
+ pScDocSh->PostPaintExtras(); //! done afterwards ???
}
else
{
@@ -597,7 +597,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
vcl::Window* pWin, ScDrawV
lcl_ChartInit(xObj, &rData, aRangeString, bRangeIsPivotTable); //
set source range, auto-detect column/row headers
- // Objekt-Position
+ // object position
Point aStart;
if ( bDrawRect )
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index a1a0bfc58e00..915590a724b9 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -119,12 +119,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
}
}
-/*************************************************************************
-|*
-|* Timer-Handler fuer Fensterscrolling
-|*
-\************************************************************************/
-
+// Timer handler for window scrolling
IMPL_LINK_NOARG(FuPoor, ScrollHdl, Timer *, void)
{
Point aPosPixel = pWindow->GetPointerPosPixel();
@@ -134,7 +129,6 @@ IMPL_LINK_NOARG(FuPoor, ScrollHdl, Timer *, void)
MouseMove(MouseEvent(aPosPixel, 1, MouseEventModifiers::NONE,
GetMouseButtonCode()));
}
-// moved from inline to *.cxx
bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -143,7 +137,6 @@ bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
return false;
}
-// moved from inline to *.cxx
bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
{
// remember button state for creation of own MouseEvents
@@ -169,7 +162,6 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt)
{
if ( CommandEventId::StartDrag == rCEvt.GetCommand() )
{
- //!!! sollte Joe eigentlich machen:
// Only if a selection is in Outliner, then Command is allowed
// to return sal_True
@@ -213,7 +205,7 @@ IMPL_LINK_NOARG(FuPoor, DragHdl, void*, void)
}
}
-// Detektiv-Linie
+// Detective-line
bool FuPoor::IsDetectiveHit( const Point& rLogicPos )
{
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index b7f468a77aa4..54fc57cfc8b9 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -253,7 +253,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SfxInPlaceClient* pClient = pViewShell->GetIPClient();
bool bWasOleActive = ( pClient &&
pClient->IsObjectInPlaceActive() );
- // Markieren
+ // Selection
// do not allow multiselection with note caption
bool bCaptionClicked = IsNoteCaptionClicked( aMDPos );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
