sc/source/ui/view/auditsh.cxx | 2 +-
sc/source/ui/view/cellsh.cxx | 8 +++-----
sc/source/ui/view/cellsh3.cxx | 11 +++++------
3 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 1721236b5b3fad5660495d638f7cdf6abfcb7a47
Author: Albert Thuswaldner <albert.thuswald...@gmail.com>
Date: Sun Jul 19 12:05:59 2015 +0200
tdf#39468 clean-up/translated german comments in auditsh.cxx and cellsh*.cxx
Change-Id: I6fdc60164dc3144b23dfe08ca8ce9b40a07081b2
Reviewed-on: https://gerrit.libreoffice.org/17191
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index d341175..4194841 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -125,7 +125,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
void ScAuditingShell::GetState( SfxItemSet& rSet )
{
- rSet.Put( SfxBoolItem( nFunction, true ) ); // aktive Funktion
markieren
+ rSet.Put( SfxBoolItem( nFunction, true ) ); // mark active
functions
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 202c4b8..7d334bd2 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -279,9 +279,9 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
}
}
-// functionen, disabled depending on cursor position
-// Default:
-// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION
+// functions, disabled depending on cursor position
+// Default:
+// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION
void ScCellShell::GetCellState( SfxItemSet& rSet )
{
@@ -925,7 +925,6 @@ void ScCellShell::GetState(SfxItemSet &rSet)
case FID_COL_WIDTH:
{
- //GetViewData()->GetCurX();
SfxUInt16Item aWidthItem( FID_COL_WIDTH,
pDoc->GetColWidth( nPosX , nTab) );
rSet.Put( aWidthItem );
if ( pDocSh->IsReadOnly())
@@ -937,7 +936,6 @@ void ScCellShell::GetState(SfxItemSet &rSet)
case FID_ROW_HEIGHT:
{
- //GetViewData()->GetCurY();
SfxUInt16Item aHeightItem( FID_ROW_HEIGHT,
pDoc->GetRowHeight( nPosY , nTab) );
rSet.Put( aHeightItem );
//XXX disable if not conclusive
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index b1b5d7f..0f96121 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -75,7 +75,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
// (on closing the dialog StopEditShell is called)
case SID_OPENDLG_FUNCTION:
// inplace leads to trouble with EditShell ...
- //! cannot always be switched werden ????
+ //! cannot always be switched ????
if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace())
pTabViewShell->SetDontSwitch(true); // do not
switch off EditShell
// no break
@@ -257,7 +257,6 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
SfxStringItem aItem( SID_ENTER_STRING, aString );
- // SfxBindings& rBindings =
pTabViewShell->GetViewFrame()->GetBindings();
const SfxPoolItem* aArgs[2];
aArgs[0] = &aItem;
aArgs[1] = NULL;
@@ -449,7 +448,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
// first test, if the prefix is recognised as valid,
// else avoid only doubles
bool bPrefix = ScDocument::ValidTabName( aBaseName );
- OSL_ENSURE(bPrefix, "ungueltiger Tabellenname");
+ OSL_ENSURE(bPrefix, "invalid sheet name");
while ( pDoc->IsScenario(nTab+i) )
i++;
@@ -748,7 +747,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
if ( pReqArgs &&
pReqArgs->GetItemState(nSlot, true, &pItem) ==
SfxItemState::SET )
{
- OSL_ENSURE(pItem && pItem->ISA(SfxBoolItem), "falsches
Item");
+ OSL_ENSURE(pItem && pItem->ISA(SfxBoolItem), "wrong
item");
bMoveContents = static_cast<const
SfxBoolItem*>(pItem)->GetValue();
}
@@ -871,7 +870,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
break;
case FID_INPUTLINE_STATUS:
- OSL_FAIL("Execute von InputLine-Status");
+ OSL_FAIL("Execute from InputLine status");
break;
case SID_STATUS_DOCPOS:
@@ -886,7 +885,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
break;
default:
- OSL_FAIL("Unbekannter Slot bei ScCellShell::Execute");
+ OSL_FAIL("ScCellShell::Execute: unknown slot");
break;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
