[Libreoffice-commits] core.git: sc/source
Albert Thuswaldner
albert.thuswaldner at gmail.com
Mon Sep 7 15:12:47 PDT 2015
sc/source/ui/view/tabvwsha.cxx | 13 ++++++-------
sc/source/ui/view/tabvwshb.cxx | 26 +++++++++++++-------------
2 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit 9df5942d439febfc6adacddfc23ba304dfaaafba
Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
Date: Sun Sep 6 13:30:36 2015 +0200
tdf#39468 translated german comments in tabvwsha.cxx and tabvwshb.cxx
Change-Id: I78c0f32498ae559604f78706db85141bbebf89ad
Reviewed-on: https://gerrit.libreoffice.org/18359
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index fe2dbad..e8e7ca5 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -118,7 +118,7 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode )
sal_uInt32 nNumFmt = 0;
if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 && eFunc != SUBTOTAL_FUNC_SELECTION_COUNT)
{
- // Zahlformat aus Attributen oder Formel
+ // number format from attributes or formula
pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt );
}
@@ -653,11 +653,10 @@ void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bSt
pDoc->GetInputString( nPosX, nPosY, nTab, aString );
if (eType == CELLTYPE_STRING)
{
- // Bei Bedarf ein ' vorneweg, damit der String nicht ungewollt
- // als Zahl interpretiert wird, und um dem Benutzer zu zeigen,
- // dass es ein String ist (#35060#).
- //! Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen
-
+ // Put a ' in front if necessary, so that the string is not
+ // unintentionally interpreted as a number, and to show the
+ // user that it is a string (#35060#).
+ //! also for numberformat "Text"? -> then remove when editing
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nNumFmt;
pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt );
@@ -682,7 +681,7 @@ void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bSt
}
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile
+ rBindings.Invalidate( SID_STATUS_SUM ); // always together with the input row
rBindings.Invalidate( SID_ATTR_SIZE );
rBindings.Invalidate( SID_TABLE_CELL );
}
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index f861b7b..3dc426e 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -69,12 +69,12 @@ using namespace com::sun::star;
void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
{
- // wird aus dem Paint gerufen
+ // is called from paint
uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef();
vcl::Window* pWin = GetActiveWin();
- // wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale
+ // when already connected do not execute SetObjArea/SetSizeScale again
SfxInPlaceClient* pClient = FindIPClient( xObj, pWin );
if ( !pClient )
@@ -87,11 +87,11 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() );
Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() );
- aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj
+ aScaleWidth.ReduceInaccurate(10); // compatible with SdrOle2Obj
aScaleHeight.ReduceInaccurate(10);
pClient->SetSizeScale(aScaleWidth,aScaleHeight);
- // sichtbarer Ausschnitt wird nur inplace veraendert!
+ // visible section is only changed inplace!
// the object area must be set after the scaling since it triggers the resizing
aRect.SetSize( aOleSize );
pClient->SetObjArea( aRect );
@@ -102,7 +102,7 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
{
- // Gueltigkeits-Hinweisfenster nicht ueber dem Objekt stehenlassen
+ // Do not leave the hint message box on top of the object
RemoveHintWindow();
uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef();
@@ -154,12 +154,12 @@ bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() );
Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() );
- aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj
+ aScaleWidth.ReduceInaccurate(10); // compatible with SdrOle2Obj
aScaleHeight.ReduceInaccurate(10);
pClient->SetSizeScale(aScaleWidth,aScaleHeight);
}
- // sichtbarer Ausschnitt wird nur inplace veraendert!
+ // visible section is only changed inplace!
// the object area must be set after the scaling since it triggers the resizing
aRect.SetSize( aOleSize );
pClient->SetObjArea( aRect );
@@ -168,7 +168,7 @@ bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
nErr = pClient->DoVerb( nVerb );
bErrorShown = true;
- // SfxViewShell::DoVerb zeigt seine Fehlermeldungen selber an
+ // SfxViewShell::DoVerb shows its error messages
// attach listener to selection changes in chart that affect cell
// ranges, so those can be highlighted
@@ -208,7 +208,7 @@ bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
{
GetSdrView()->AdjustMarkHdl();
}
- //! SetDocumentName sollte schon im Sfx passieren ???
+ //! SetDocumentName should already happen in Sfx ???
//TODO/LATER: how "SetDocumentName"?
//xIPObj->SetDocumentName( GetViewData().GetDocShell()->GetTitle() );
@@ -219,7 +219,7 @@ ErrCode ScTabViewShell::DoVerb(long nVerb)
{
SdrView* pView = GetSdrView();
if (!pView)
- return ERRCODE_SO_NOTIMPL; // soll nicht sein
+ return ERRCODE_SO_NOTIMPL; // should not be
SdrOle2Obj* pOle2Obj = NULL;
ErrCode nErr = ERRCODE_NONE;
@@ -238,7 +238,7 @@ ErrCode ScTabViewShell::DoVerb(long nVerb)
}
else
{
- OSL_FAIL("kein Objekt fuer Verb gefunden");
+ OSL_FAIL("no object for Verb found");
}
return nErr;
@@ -265,7 +265,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
UpdateInputHandler();
}
- // Rahmen fuer Chart einfuegen wird abgebrochen:
+ // inertion of border for Chart is cancelled:
FuPoor* pPoor = GetDrawFuncPtr();
if ( pPoor && pPoor->GetSlotID() == SID_DRAW_CHART )
GetViewData().GetDispatcher().Execute(SID_DRAW_CHART, SfxCallMode::SLOT | SfxCallMode::RECORD);
@@ -325,7 +325,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
case SID_OBJECTRESIZE:
{
- // Der Server moechte die Clientgrosse verandern
+ // the server would like to change the client size
SfxInPlaceClient* pClient = GetIPClient();
More information about the Libreoffice-commits
mailing list