[Libreoffice-commits] .: editeng/source sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 24 05:37:09 PST 2012
editeng/source/rtf/rtfitem.cxx | 6 ++--
sc/source/core/data/attrib.cxx | 20 +++++++-------
sc/source/ui/view/preview.cxx | 55 ++++++++++++++++++++---------------------
3 files changed, 42 insertions(+), 39 deletions(-)
New commits:
commit fa6be97997f6142884accef5a88d6491bb1b3b76
Author: Peter Baumgarten <peter10691 at gmail.com>
Date: Sat Nov 24 11:30:28 2012 +0000
Translation of German comments
Change-Id: I729049b8fa9c26926423c6990a06377e6884e840
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index b1ff8ec..dde178b 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -220,7 +220,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
int bChkStkPos = !bNewGroup && !aAttrStack.empty();
- while( bWeiter && IsParserWorking() ) // as long as known Attribute are recognized
+ while( bWeiter && IsParserWorking() ) // as long as known
+Attribute are recognized
{
switch( nToken )
{
@@ -293,7 +294,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
else
{
nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue);
- // setze am akt. auf dem AttrStack stehenden Style die
+ /* setze am akt. auf dem AttrStack stehenden Style die
+ I sit on akt. which is on the immiediate sytle AttrStack */
// StyleNummer
SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
if( !pAkt )
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index d666229..310aa1d 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -65,7 +65,7 @@ TYPEINIT1(ScCondFormatItem, SfxPoolItem);
//------------------------------------------------------------------------
//
-// allgemeine Hilfsfunktionen
+// General Help Function
//
bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxBorderLine* pOther )
@@ -493,7 +493,7 @@ SfxItemPresentation ScRangeItem::GetPresentation
}
// -----------------------------------------------------------------------
-// ScTableListItem - Liste von Tabellen(-nummern)
+// ScTableListItem - List from Tables (-numbers)
// -----------------------------------------------------------------------
ScTableListItem::ScTableListItem( const ScTableListItem& rCpy )
@@ -618,7 +618,7 @@ SfxItemPresentation ScTableListItem::GetPresentation
// -----------------------------------------------------------------------
-// ScPageHFItem - Daten der Kopf-/Fusszeilen
+// ScPageHFItem - Dates from the Head and Foot lines
// -----------------------------------------------------------------------
ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP )
@@ -691,7 +691,7 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ )
if ( !pLeftArea || !pCenterArea || !pRightArea )
{
- // keine Texte auf NULL stehen lassen
+ // no Text with Null are left
ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), true );
if (!pLeftArea)
pLeftArea = aEngine.CreateTextObject();
@@ -745,7 +745,7 @@ SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const
static void lcl_SetSpace( String& rStr, const ESelection& rSel )
{
- // Text durch ein Leerzeichen ersetzen, damit Positionen stimmen:
+ // Text replaced by a space to ensure they are positions:
xub_StrLen nLen = rSel.nEndPos-rSel.nStartPos;
rStr.Erase( rSel.nStartPos, nLen-1 );
@@ -837,7 +837,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
}
}
- if ( nVer < 1 ) // alte Feldbefehle umsetzen
+ if ( nVer < 1 ) //old field command conversions
{
sal_uInt16 i;
const String& rDel = ScGlobal::GetRscString( STR_HFCMD_DELIMITER );
@@ -874,7 +874,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
}
}
else if ( nVer < 2 )
- { // nichts tun, SvxFileField nicht gegen SvxExtFileField austauschen
+ { // not to do, SvxFileField is not exchanged for SvxExtFileField
}
ScPageHFItem* pItem = new ScPageHFItem( Which() );
@@ -923,7 +923,7 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea )
}
//-----------------------------------------------------------------------
-// ScViewObjectModeItem - Darstellungsmodus von ViewObjekten
+// ScViewObjectModeItem - Display Mode of View Objects
//-----------------------------------------------------------------------
ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP )
@@ -979,7 +979,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation
break;
default:
- ePres = SFX_ITEM_PRESENTATION_NAMELESS;//das geht immer!
+ ePres = SFX_ITEM_PRESENTATION_NAMELESS;//this always goes!
break;
}
/* !!! fall-through !!! */
@@ -1035,7 +1035,7 @@ SfxPoolItem* ScViewObjectModeItem::Create(
{
if ( nVersion == 0 )
{
- // alte Version mit AllEnumItem -> mit Mode "Show" erzeugen
+ // Old Version with AllEnuItem -> produce with Mode "Show"
return new ScViewObjectModeItem( Which() );
}
else
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 2b9c870..b8400d4 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -55,7 +55,7 @@
#include "scmod.hxx"
#include "markdata.hxx"
#include "globstr.hrc"
-#include "sc.hrc" // fuer ShellInvalidate
+#include "sc.hrc" // for ShellInvalidate
#include "AccessibleDocumentPagePreview.hxx"
#include <vcl/lineinfo.hxx>
#include <svx/algitem.hxx>
@@ -149,10 +149,10 @@ ScPreview::~ScPreview()
delete pLocationData;
}
-void ScPreview::UpdateDrawView() // nTab muss richtig sein
+void ScPreview::UpdateDrawView() // nTab must be right
{
ScDocument* pDoc = pDocShell->GetDocument();
- ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0
+ ScDrawLayer* pModel = pDoc->GetDrawLayer(); // is not 0
// #114135#
if ( pModel )
@@ -165,11 +165,12 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein
pDrawView = NULL;
}
- if ( !pDrawView ) // neu anlegen?
+ if ( !pDrawView ) // New Drawing?
{
pDrawView = new FmFormView( pModel, this );
- // die DrawView uebernimmt den Design-Modus vom Model
- // (Einstellung "Im Entwurfsmodus oeffnen"), darum hier zuruecksetzen
+
+ // The DrawView takes over the Design-Mode from the Model
+ // (Settings "In opening Draftmode"), therefore to restore here
pDrawView->SetDesignMode( true );
pDrawView->SetPrintPreview( true );
pDrawView->ShowSdrPage(pPage);
@@ -177,7 +178,7 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein
}
else if ( pDrawView )
{
- delete pDrawView; // fuer diese Tabelle nicht gebraucht
+ delete pDrawView; // for this Chart is not needed
pDrawView = NULL;
}
}
@@ -191,9 +192,9 @@ void ScPreview::TestLastPage()
{
nPageNo = nTotalPages - 1;
nTab = static_cast<SCTAB>(nPages.size()) -1;
- while (nTab > 0 && !nPages[nTab]) // letzte nicht leere Tabelle
+ while (nTab > 0 && !nPages[nTab]) // not the last empty Table
--nTab;
- OSL_ENSURE(0 < static_cast<SCTAB>(nPages.size()),"alle Tabellen leer?");
+ OSL_ENSURE(0 < static_cast<SCTAB>(nPages.size()),"are all tables empty?");
nTabPage = nPages[nTab] - 1;
nTabStart = 0;
for (sal_uInt16 i=0; i<nTab; i++)
@@ -202,7 +203,7 @@ void ScPreview::TestLastPage()
ScDocument* pDoc = pDocShell->GetDocument();
nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages );
}
- else // leeres Dokument
+ else // empty Document
{
nTab = 0;
nPageNo = nTabPage = nTabStart = nDisplayStart = 0;
@@ -266,7 +267,7 @@ void ScPreview::CalcPages()
long nThisTab = aPrintFunc.GetTotalPages();
nPages[i] = nThisTab;
nTotalPages += nThisTab;
- nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage
+ nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // to keep or from template
if (nPageNo>=nThisStart && nPageNo<nTotalPages)
{
@@ -294,10 +295,10 @@ void ScPreview::CalcPages()
}
-void ScPreview::RecalcPages() // nur nPageNo geaendert
+void ScPreview::RecalcPages() // only nPageNo is changed
{
if (!bValid)
- return; // dann wird CalcPages aufgerufen
+ return; // then CalcPages is called
SCTAB nOldTab = nTab;
@@ -328,7 +329,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert
nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages );
}
- TestLastPage(); // testen, ob hinter letzter Seite
+ TestLastPage(); // to test, if after last page
if ( nTab != nOldTab )
bStateValid = false;
@@ -343,7 +344,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
{
CalcPages();
RecalcPages();
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // Spreedsheet eventually changes
}
Fraction aPreviewZoom( nZoom, 100 );
@@ -399,7 +400,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
pPrintFunc->SetDrawView( pDrawView );
- // MultiSelection fuer die eine Seite muss etwas umstaendlich erzeugt werden...
+ // MultiSelection for the one Page must produce something inconvenient
Range aPageRange( nPageNo+1, nPageNo+1 );
MultiSelection aPage( aPageRange );
aPage.SetTotalRange( Range(0,RANGE_MAX) );
@@ -452,7 +453,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
}
}
- if (nPrinted) // wenn nichts, alles grau zeichnen
+ if (nPrinted) // if not, draw everything grey
{
aLocalPageSize = pPrintFunc->GetPageSize();
aLocalPageSize.Width() = (long) (aLocalPageSize.Width() * HMM_PER_TWIPS );
@@ -526,7 +527,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
if (bBottom)
{
if (bRight)
- DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Ecke nicht doppelt
+ DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Corner not duplicated
else
DrawRect(Rectangle(0,nPageEndY, aWinEnd.X(),aWinEnd.Y()));
}
@@ -665,7 +666,7 @@ String ScPreview::GetPosString()
if (!bValid)
{
CalcPages();
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // The table eventually changes
}
String aString( ScGlobal::GetRscString( STR_PAGE ) );
@@ -715,7 +716,7 @@ void ScPreview::SetPageNo( long nPage )
{
nPageNo = nPage;
RecalcPages();
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // The table eventually changes
InvalidateLocationData( SC_HINT_DATACHANGED );
Invalidate();
}
@@ -733,12 +734,12 @@ long ScPreview::GetFirstPage(SCTAB nTabP)
CalcPages();
if (nTabP >= static_cast<SCTAB>(nPages.size()) )
OSL_FAIL("nPages out ouf bounds, FIX IT");
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // The table eventually changes
for (SCTAB i=0; i<nTabP; i++)
nPage += nPages[i];
- // bei leerer Tabelle vorhergehende Seite
+ // An empty Table on the previous Page
if ( nPages[nTabP]==0 && nPage > 0 )
--nPage;
@@ -857,13 +858,13 @@ void ScPreview::SetYOffset( long nY )
void ScPreview::DoInvalidate()
{
- // Wenn das ganze aus dem GetState der Shell gerufen wird,
- // muss das Invalidate hinterher asynchron kommen...
-
- if (bInGetState)
+ // If the whole GetState of the shell is called
+ // The Invalidate must come behind asynchronously
+
+ if (bInGetState)
Application::PostUserEvent( STATIC_LINK( this, ScPreview, InvalidateHdl ) );
else
- StaticInvalidate(); // sofort
+ StaticInvalidate(); // Immediately
}
void ScPreview::StaticInvalidate()
More information about the Libreoffice-commits
mailing list