[Libreoffice-commits] core.git: sc/source
Thomas Arnhold
thomas at arnhold.org
Sat Feb 23 17:39:54 PST 2013
sc/source/ui/drawfunc/fuins1.cxx | 2 -
sc/source/ui/view/viewfun6.cxx | 11 +++------
sc/source/ui/view/viewfun7.cxx | 46 ++++++++++++++++-----------------------
sc/source/ui/view/viewutil.cxx | 14 +++--------
4 files changed, 29 insertions(+), 44 deletions(-)
New commits:
commit ff6a046a916ca91e39072700c4ddd591a6e2f2d4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Feb 21 02:36:00 2013 +0100
Translate German comments
"Grafik x" is "Graphics"
Change-Id: I935df68636c22dda3c21826a47b76c5dd52292c7
Reviewed-on: https://gerrit.libreoffice.org/2311
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index b0ac39e..a0cb995 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -135,7 +135,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
// Path is no longer used as name for the graphics object
ScDrawLayer* pLayer = (ScDrawLayer*) pView->GetModel();
- String aName = pLayer->GetNewGraphicName(); // "Grafik x"
+ String aName = pLayer->GetNewGraphicName(); // "Graphics"
pObj->SetName(aName);
// don't select if from (dispatch) API, to allow subsequent cell operations
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 2a5f693..eeb93a9 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -52,7 +52,6 @@ using ::std::vector;
#define D_TIMEFACTOR 86400.0
-//==================================================================
void ScViewFunc::DetectiveAddPred()
{
@@ -271,8 +270,6 @@ void ScViewFunc::InsertCurrentTime(short nCellFmt, const OUString& rUndoStr)
pUndoMgr->LeaveListAction();
}
-//---------------------------------------------------------------------------
-
void ScViewFunc::ShowNote( bool bShow )
{
if( bShow )
@@ -285,7 +282,7 @@ void ScViewFunc::ShowNote( bool bShow )
void ScViewFunc::EditNote()
{
- // zum Editieren einblenden und aktivieren
+ // for editing display and activate
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
@@ -321,11 +318,11 @@ void ScViewFunc::EditNote()
// activate object (as in FuSelection::TestComment)
GetViewData()->GetDispatcher().Execute( SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
- // jetzt den erzeugten FuText holen und in den EditModus setzen
+ // now get the created FuText and set into EditMode
FuPoor* pPoor = GetDrawFuncPtr();
- if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // hat keine RTTI
+ if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // has no RTTI
{
- ScrollToObject( pCaption ); // Objekt komplett sichtbar machen
+ ScrollToObject( pCaption ); // make object fully visible
static_cast< FuText* >( pPoor )->SetInEditMode( pCaption );
}
}
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 07e4f1f..45985e3 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -34,7 +34,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/embed/Aspects.hpp>
-#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw
+#include "document.hxx" // for MapMode init in PasteDraw
#include "viewfunc.hxx"
#include "tabvwsh.hxx"
#include "drawview.hxx"
@@ -50,13 +50,10 @@
extern Point aDragStartDiff;
-// STATIC DATA -----------------------------------------------------------
-
sal_Bool bPasteIsMove = false;
using namespace com::sun::star;
-//==================================================================
static void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize )
{
@@ -67,12 +64,12 @@ static void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize )
aPgSize.Width() = -aPgSize.Width();
long x = aPgSize.Width() - rPos.X() - rSize.Width();
long y = aPgSize.Height() - rPos.Y() - rSize.Height();
- // ggf. Ajustments (80/200) fuer Pixel-Rundungsfehler
+ // if necessary: adjustments (80/200) for pixel approx. errors
if( x < 0 )
rPos.X() += x + 80;
if( y < 0 )
rPos.Y() += y + 200;
- rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an
+ rPos.X() += rSize.Width() / 2; // postition at paste is center
rPos.Y() += rSize.Height() / 2;
}
@@ -82,8 +79,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
MakeDrawLayer();
Point aPos( rLogicPos );
- // MapMode am Outliner-RefDevice muss stimmen (wie in FuText::MakeOutliner)
- //! mit FuText::MakeOutliner zusammenfassen?
+ // MapMode at Outliner-RefDevice has to be right (as in FuText::MakeOutliner)
+ //! merge with FuText::MakeOutliner?
MapMode aOldMapMode;
OutputDevice* pRef = GetViewData()->GetDocument()->GetDrawLayer()->GetRefDevice();
if (pRef)
@@ -121,13 +118,13 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
sal_Bool bSameDoc = ( pDragEditView && pDragEditView->GetModel() == pScDrawView->GetModel() );
if (bSameDoc)
{
- // lokal kopieren - incl. Charts
+ // copy locally - incl. charts
Point aSourceStart = pDragEditView->GetAllMarkedRect().TopLeft();
long nDiffX = aPos.X() - aSourceStart.X();
long nDiffY = aPos.Y() - aSourceStart.Y();
- // innerhalb einer Page verschieben?
+ // move within a page?
if ( bPasteIsMove &&
pScDrawView->GetSdrPageView()->GetPage() ==
@@ -141,7 +138,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
SdrModel* pDrawModel = pDragEditView->GetModel();
SCTAB nTab = GetViewData()->GetTabNo();
SdrPage* pDestPage = pDrawModel->GetPage( static_cast< sal_uInt16 >( nTab ) );
- OSL_ENSURE(pDestPage,"nanu, Page?");
+ OSL_ENSURE(pDestPage,"who is this, Page?");
::std::vector< ::rtl::OUString > aExcludedChartNames;
if ( pDestPage )
@@ -193,7 +190,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
}
else
{
- bPasteIsMove = false; // kein internes Verschieben passiert
+ bPasteIsMove = false; // no internal move happend
SdrView aView(pModel); // #i71529# never create a base class of SdrView directly!
SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0));
@@ -201,8 +198,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
Size aSize = aView.GetAllMarkedRect().GetSize();
lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
- // Markierung nicht aendern, wenn Ole-Objekt aktiv
- // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!)
+ // don't change marking if OLE object is active
+ // (at Drop from OLE object it would be deactivated in the middle of ExecuteDrag!)
sal_uLong nOptions = 0;
SfxInPlaceClient* pClient = GetViewData()->GetViewShell()->GetIPClient();
@@ -331,7 +328,7 @@ sal_Bool ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embe
}
aSize = Size( aSz.Width, aSz.Height );
- aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // fuer SdrOle2Obj
+ aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // for SdrOle2Obj
if( aSize.Height() == 0 || aSize.Width() == 0 )
{
@@ -355,7 +352,7 @@ sal_Bool ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embe
SdrOle2Obj* pSdrObj = new SdrOle2Obj( aObjRef, aName, aRect );
SdrPageView* pPV = pDrView->GetSdrPageView();
- pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole
+ pDrView->InsertObjectSafe( pSdrObj, *pPV ); // don't mark if OLE
GetViewData()->GetViewShell()->SetDrawShell( sal_True );
return sal_True;
}
@@ -390,8 +387,7 @@ sal_Bool ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
if (aSourceMap.GetMapUnit() == MAP_PIXEL)
{
- // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt
-
+ // consider pixel correction, so bitmap fits to screen
Fraction aScaleX, aScaleY;
pScDrawView->CalcNormScale( aScaleX, aScaleY );
aDestMap.SetScaleX(aScaleX);
@@ -408,15 +404,13 @@ sal_Bool ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
Rectangle aRect(aPos, aSize);
SdrGrafObj* pGrafObj = new SdrGrafObj(rGraphic, aRect);
- // calling SetGraphicLink here doesn't work
-
- // Pfad wird nicht mehr als Name der Grafik gesetzt
+ // path was the name of the graphic in history
ScDrawLayer* pLayer = (ScDrawLayer*) pScDrawView->GetModel();
- String aName = pLayer->GetNewGraphicName(); // "Grafik x"
+ String aName = pLayer->GetNewGraphicName(); // "Graphics"
pGrafObj->SetName(aName);
- // nicht markieren wenn Ole
+ // don't mark if OLE
pScDrawView->InsertObjectSafe(pGrafObj, *pScDrawView->GetSdrPageView());
// SetGraphicLink has to be used after inserting the object,
@@ -436,13 +430,13 @@ sal_Bool ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& r
if ( pScDrawView && pPickObj )
{
/**********************************************************************
- * Objekt neu attributieren
+ * New attributes for object
**********************************************************************/
SdrPageView* pPV = pScDrawView->GetSdrPageView();
if (pPickObj->ISA(SdrGrafObj))
{
/******************************************************************
- * Das Graphik-Objekt bekommt eine neue Graphik
+ * Graphic object gets a new graphic
******************************************************************/
SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pPickObj->Clone();
pNewGrafObj->SetGraphic(rGraphic);
@@ -456,7 +450,7 @@ sal_Bool ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& r
else if (pPickObj->IsClosedObj() && !pPickObj->ISA(SdrOle2Obj))
{
/******************************************************************
- * Das Objekt wird mit der Graphik gefuellt
+ * Object gets filled with the graphic
******************************************************************/
//pScDrawView->BegUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
pScDrawView->AddUndo(new SdrUndoAttrObj(*pPickObj));
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 1fa6561..e740079 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "scitems.hxx"
#include <sfx2/bindings.hxx>
#include <sfx2/viewsh.hxx>
@@ -40,7 +39,6 @@
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
-
#include "viewutil.hxx"
#include "global.hxx"
#include "chgtrack.hxx"
@@ -49,9 +47,7 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-// STATIC DATA -----------------------------------------------------------
-//==================================================================
void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
sal_uInt16 nWhichId, sal_uInt16 nScript )
@@ -140,8 +136,8 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
const ScChangeViewSettings& rSettings,
ScDocument& rDocument )
{
- // abgelehnte werden durch eine invertierende akzeptierte Action dargestellt,
- // die Reihenfolge von ShowRejected/ShowAccepted ist deswegen wichtig
+ // discarded are displayed as inverted accepted action, because of this
+ // order of ShowRejected/ShowAccepted is important
if ( !rSettings.IsShowRejected() && rAction.IsRejecting() )
return false;
@@ -153,7 +149,7 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
{
if ( rSettings.IsEveryoneButMe() )
{
- // GetUser() am ChangeTrack ist der aktuelle Benutzer
+ // GetUser() at ChangeTrack is the current user
ScChangeTrack* pTrack = rDocument.GetChangeTrack();
if ( !pTrack || rAction.GetUser().equals(pTrack->GetUser()) )
return false;
@@ -186,7 +182,7 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
const DateTime& rFirst = rSettings.GetTheFirstDateTime();
const DateTime& rLast = rSettings.GetTheLastDateTime();
switch ( rSettings.GetTheDateMode() )
- { // korrespondiert mit ScHighlightChgDlg::OKBtnHdl
+ { // corresponds with ScHighlightChgDlg::OKBtnHdl
case SCDM_DATE_BEFORE:
if ( aDateTime > rFirst )
return false;
@@ -341,7 +337,6 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal
rSet.DisableItem( nSlotId );
}
-//==================================================================
sal_Bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
SfxViewFrame& rFrame,
@@ -393,7 +388,6 @@ void ScViewUtil::SetFullScreen( SfxViewShell& rViewShell, bool bSet )
}
}
-//------------------------------------------------------------------
ScUpdateRect::ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 )
{
More information about the Libreoffice-commits
mailing list