[Libreoffice-commits] core.git: 2 commits - sc/source sw/source
Lior Kaplan
kaplanlior at gmail.com
Tue Mar 26 08:58:07 PDT 2013
sc/source/ui/view/tabvwsha.cxx | 28 +++++++++++++++-------------
sw/source/ui/wrtsh/move.cxx | 7 +++----
sw/source/ui/wrtsh/select.cxx | 2 +-
3 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit 447a924c115a86e96e91b24d744af70f97efde72
Author: Lior Kaplan <kaplanlior at gmail.com>
Date: Tue Mar 26 17:54:09 2013 +0200
Translate German comments to English
Change-Id: Iaedc226f0dfad234bc67100e2845e09cc2976687
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 979591a..5d8e622 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -102,7 +102,7 @@ sal_Bool ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
aStr += '0';
else
{
- // Anzahl im Standardformat, die anderen nach Cursorposition
+ // Number in the standard format, the other on the cursor position
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nNumFmt = 0;
if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 )
@@ -137,7 +137,7 @@ sal_Bool ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
-// Funktionen, die je nach Selektion disabled sind
+// Functions that are disabled, depending on the selection
// Default:
// SID_DELETE,
// SID_DELETE_CONTENTS,
@@ -223,8 +223,10 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
case SID_SEARCH_OPTIONS:
{
- sal_uInt16 nOptions = 0xffff; // alles erlaubt
- // wenn ReadOnly, kein Ersetzen:
+ // Anything goes
+ sal_uInt16 nOptions = 0xffff;
+
+ // No replacement if ReadOnly
if (GetViewData()->GetDocShell()->IsReadOnly())
nOptions &= ~( SEARCH_OPTIONS_REPLACE | SEARCH_OPTIONS_REPLACE_ALL );
rSet.Put( SfxUInt16Item( nWhich, nOptions ) );
@@ -243,7 +245,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
break;
case SID_CURRENTTAB:
- // Tabelle fuer Basic ist 1-basiert
+ // Table for Basic is 1-based
rSet.Put( SfxUInt16Item( nWhich, static_cast<sal_uInt16>(GetViewData()->GetTabNo()) + 1 ) );
break;
@@ -272,7 +274,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
case FID_RESET_PRINTZOOM:
{
- // disablen, wenn schon Default eingestellt
+ // disable if already set to default
String aStyleName = pDoc->GetPageStyle( nTab );
ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
@@ -441,13 +443,13 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
break;
case SID_FORMATPAGE:
- //! bei geschuetzten Tabellen ???
+ // in protected tables
if ( pDocShell && ( pDocShell->IsReadOnly() || pDocShell->IsDocShared() ) )
rSet.DisableItem( nWhich );
break;
case SID_PRINTPREVIEW:
- // Toggle-Slot braucht einen State
+ // Toggle slot needs a State
rSet.Put( SfxBoolItem( nWhich, false ) );
break;
@@ -480,7 +482,7 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, sal_uInt16 nTabPage
pOldAttrs->GetItemSet() );
- // Umrandungs-Items holen und in den Set packen:
+ // Get border items and put them in the set:
GetSelectionFrame( aLineOuter, aLineInner );
//Fix border incorrect for RTL fdo#62399
if( pDoc->IsLayoutRTL( GetViewData()->GetTabNo() ) )
@@ -502,7 +504,7 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, sal_uInt16 nTabPage
pOldSet->Put( aLineInner );
- // NumberFormat Value aus Value und Language erzeugen und eintueten
+ // Generate NumberFormat Value from Value and Language and box it.
pOldSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT,
pOldAttrs->GetNumberFormat( pDoc->GetFormatTable() ) ) );
@@ -708,9 +710,9 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust )
void ScTabViewShell::ExecuteSave( SfxRequest& rReq )
{
- // nur SID_SAVEDOC / SID_SAVEASDOC
+ // only SID_SAVEDOC / SID_SAVEASDOC
- // Eingabe auf jeden Fall abschliessen, auch wenn eine Formel bearbeitet wird
+ // Finish entering in any case, even if a formula is being processed
SC_MOD()->InputEnterHandler();
if ( GetViewData()->GetDocShell()->IsDocShared() )
@@ -718,7 +720,7 @@ void ScTabViewShell::ExecuteSave( SfxRequest& rReq )
GetViewData()->GetDocShell()->SetDocumentModified();
}
- // ansonsten normal weiter
+ // otherwise as normal
GetViewData()->GetDocShell()->ExecuteSlot( rReq );
}
commit 7a1b354b9bd215f3c144504326893a72d70aae0b
Author: Lior Kaplan <kaplanlior at gmail.com>
Date: Tue Mar 26 17:36:45 2013 +0200
Remove German comments as an English translation was already done
Follow up for aebfd023c116047ab467f7abebd84e4c9acd5bbf and
922d80ad11a78fb5abe05ba69f1a47e1bb76bd3c
Change-Id: I8fcebd106e5f81479e0622ceb195c39a51fdbb51
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx
index 7d50ffe..6b998f3 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/ui/wrtsh/move.cxx
@@ -560,12 +560,11 @@ sal_Bool SwWrtShell::PageCrsr(SwTwips lOffset, sal_Bool bSelect)
// Because only ViewShell::EndAction() is called at the end,
// no updating of the display of the cursor position takes place.
// The CrsrShell-Actionparentheses cannot be used, because it
- // always leads to displaying the cursor, thus also, da sie immer zu einer Anzeige des Cursors fuehrt, also auch,
- // if after the scroll scrolled in a region without a wenn nach dem Blaettern in einen Bereich ohne gueltige Position
- // valid postition. geblaettert wurde.
+ // always leads to displaying the cursor, thus also,
+ // if after the scroll scrolled in a region without a valid postition.
// ViewShell::StartAction();
PageMove eDir = lOffset > 0? MV_PAGE_DOWN: MV_PAGE_UP;
- // Change of direction and stack present Richtungswechsel und Stack vorhanden
+ // Change of direction and stack present
if( eDir != ePageMove && ePageMove != MV_NO && PopCrsr( sal_True, bSelect ))
return sal_True;
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index 5b9fb5c..370b449 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -842,7 +842,7 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut)
{
// On multiple selection no intelligent drag and drop
// there are multiple cursors, since a second was placed
- // already at the target postion. an die Zielposition gesetzt wurde
+ // already at the target postion.
if( IsAddMode() || !(nSelection & nsSelectionType::SEL_TXT) )
return sal_False;
More information about the Libreoffice-commits
mailing list