Skip to content

C
core
Kaydet (Commit) 5be6008e authored tarafından Philipp Weissenbacher's avatar Philipp Weissenbacher Kaydeden (comit) Stefan Knorr (astron)
Dosyalara gözat
Seçenekler

Translate German comments

üst b181c48f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 89 deletions
sw/source/core/doc/ftnidx.cxx
Dosyayı görüntüle @ 5be6008e
......@@ -204,8 +204,7 @@ void SwFtnIdxs::UpdateAllFtn()
if( !Count() )
return;
// besorge erstmal das Nodes-Array ueber den StartIndex der
// ersten Fussnote
// Get the NodesArray via the StartIndex of the first Footnote
SwDoc* pDoc = (SwDoc*) (*this)[ 0 ]->GetTxtNode().GetDoc();
SwTxtFtn* pTxtFtn;
const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
......@@ -215,26 +214,25 @@ void SwFtnIdxs::UpdateAllFtn()
SwRootFrm* pTmpRoot = pDoc->GetCurrentLayout();//swmod 080305
std::set<SwRootFrm*> aAllLayouts = pDoc->GetAllLayouts();
//Fuer normale Fussnoten werden Chapter- und Dokumentweise Nummerierung
//getrennt behandelt. Fuer Endnoten gibt es nur die Dokumentweise
//Nummerierung.
// For normal Footnotes per-chapter and per-document numbering are treated separately.
// For Endnotes we only have document-wise numbering.
if( FTNNUM_CHAPTER == rFtnInfo.eNum )
{
const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
sal_uInt16 nNo = 1, // Nummer fuer die Fussnoten
nFtnIdx = 0; // Index in das FtnIdx-Array
sal_uInt16 nNo = 1, // Number for the Footnotes
nFtnIdx = 0; // Index into theFtnIdx array
for( sal_uInt16 n = 0; n < rOutlNds.Count(); ++n )
{
if ( rOutlNds[ n ]->GetTxtNode()->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
{
sal_uLong nCapStt = rOutlNds[ n ]->GetIndex(); // Start eines neuen Kapitels
sal_uLong nCapStt = rOutlNds[ n ]->GetIndex(); // Start of a new chapter
for( ; nFtnIdx < Count(); ++nFtnIdx )
{
pTxtFtn = (*this)[ nFtnIdx ];
if( pTxtFtn->GetTxtNode().GetIndex() >= nCapStt )
break;
// Endnoten nur Dokumentweise
// Endnotes are per-document only
const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
if( !rFtn.IsEndNote() && !rFtn.GetNumStr().Len() &&
!SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( *pTxtFtn ))
......@@ -242,14 +240,14 @@ void SwFtnIdxs::UpdateAllFtn()
&rFtn.GetNumStr() );
}
if( nFtnIdx >= Count() )
break; // ok alles geupdatet
break; // ok, everything is updated
nNo = 1;
}
}
for( nNo = 1; nFtnIdx < Count(); ++nFtnIdx )
{
//Endnoten nur Dokumentweise
// Endnotes are per-document
pTxtFtn = (*this)[ nFtnIdx ];
const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
if( !rFtn.IsEndNote() && !rFtn.GetNumStr().Len() &&
......@@ -260,8 +258,7 @@ void SwFtnIdxs::UpdateAllFtn()
}
// sal_Bool, damit hier auch bei Chapter-Einstellung die Endnoten
// durchlaufen.
// We use sal_Bool here, so that we also iterate through the Endnotes with a chapter setting.
const sal_Bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum;
sal_uInt16 nFtnNo = 0, nEndNo = 0;
for( sal_uInt16 nPos = 0; nPos < Count(); ++nPos )
......
sw/source/core/doc/gctable.cxx
Dosyayı görüntüle @ 5be6008e
......@@ -101,7 +101,7 @@ sal_Bool lcl_GCBorder_GetLastBox_B( const SwTableBox*& rpBox, void* pPara )
return sal_True;
}
// suche das "Ende" der vorgegebene BorderLine. Returnt wird die "Layout"Pos!
// Find the "end" of the passed BorderLine. Returns the "Layout"Pos!
sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB,
const SvxBorderLine& rBrdLn, sal_uInt16& rStt, sal_Bool bTop )
{
......@@ -173,8 +173,7 @@ sal_Bool lcl_GC_Line_Border( const SwTableLine*& rpLine, void* pPara )
{
_SwGCLineBorder* pGCPara = (_SwGCLineBorder*)pPara;
// zuerst die rechte Kante mit der linken Kante der naechsten Box
// innerhalb dieser Line
// First the right edge with the left edge of the succeeding Box within this Line
{
_SwGCBorder_BoxBrd aBPara;
const SvxBorderLine* pBrd;
......@@ -215,7 +214,7 @@ sal_Bool lcl_GC_Line_Border( const SwTableLine*& rpLine, void* pPara )
}
}
// und jetzt die eigene untere Kante mit der nachfolgenden oberen Kante
// And now the own bottom edge with the succeeding top edge
if( !pGCPara->IsLastLine() )
{
SwCollectTblLineBoxes aBottom( sal_False );
......@@ -226,7 +225,7 @@ sal_Bool lcl_GC_Line_Border( const SwTableLine*& rpLine, void* pPara )
const SwTableLine* pNextLine = (*pGCPara->pLines)[ pGCPara->nLinePos+1 ];
::lcl_Line_CollectBox( pNextLine, &aTop );
// dann entferne mal alle "doppelten" gleichen Lines
// remove all "duplicated" Lines that are the same
sal_uInt16 nBtmPos, nTopPos,
nSttBtm = 0, nSttTop = 0,
nEndBtm = aBottom.Count(), nEndTop = aTop.Count();
......@@ -245,7 +244,7 @@ sal_Bool lcl_GC_Line_Border( const SwTableLine*& rpLine, void* pPara )
if( pTopLine && pBtmLine && *pTopLine == *pBtmLine )
{
// dann kann einer entfernt werden, aber welche?
// We can remove one, but which one?
sal_uInt16 nSavSttBtm = nSttBtm, nSavSttTop = nSttTop;
sal_uInt16 nBtmEndPos = ::lcl_FindEndPosOfBorder( aBottom,
*pTopLine, nSttBtm, sal_False );
......@@ -257,7 +256,7 @@ sal_Bool lcl_GC_Line_Border( const SwTableLine*& rpLine, void* pPara )
if( nTopEndPos <= nBtmEndPos )
{
// dann die TopBorder bis zur BottomEndPos loeschen
// Delete the TopBorders until BottomEndPos
nSttTop = nSavSttTop;
if( nTopPos <= nBtmEndPos )
lcl_GCBorder_DelBorder( aTop, --nSttTop, sal_True,
......@@ -268,7 +267,7 @@ sal_Bool lcl_GC_Line_Border( const SwTableLine*& rpLine, void* pPara )
}
else
{
// sonst die BottomBorder bis zur TopEndPos loeschen
// Else delete the BottomBorders until TopEndPos
nSttBtm = nSavSttBtm;
if( nBtmPos <= nTopEndPos )
lcl_GCBorder_DelBorder( aBottom, --nSttBtm, sal_False,
......@@ -343,7 +342,7 @@ sal_Bool lcl_MergeGCBox( const SwTableBox*& rpTblBox, void* pPara )
sal_uInt16 n, nLen = rpBox->GetTabLines().Count();
if( nLen )
{
// ACHTUNG: die Anzahl der Lines kann sich aendern!
// ATTENTION: The Line count can change!
_GCLinePara aPara( rpBox->GetTabLines(), (_GCLinePara*)pPara );
for( n = 0; n < rpBox->GetTabLines().Count() &&
lcl_MergeGCLine( *(rpBox->GetTabLines().GetData() + n), &aPara );
......@@ -352,8 +351,8 @@ sal_Bool lcl_MergeGCBox( const SwTableBox*& rpTblBox, void* pPara )
if( 1 == rpBox->GetTabLines().Count() )
{
// Box mit einer Line, dann verschiebe alle Boxen der Line
// hinter diese Box in der Parent-Line und loesche diese Box
// Box with a Line, then move all the Line's Boxes after this Box
// into the parent Line and delete this Box
SwTableLine* pInsLine = rpBox->GetUpper();
SwTableLine* pCpyLine = rpBox->GetTabLines()[0];
sal_uInt16 nInsPos = pInsLine->GetTabBoxes().C40_GETPOS( SwTableBox, rpBox );
......@@ -362,10 +361,10 @@ sal_Bool lcl_MergeGCBox( const SwTableBox*& rpTblBox, void* pPara )
pInsLine->GetTabBoxes().Insert( &pCpyLine->GetTabBoxes(), nInsPos+1 );
pCpyLine->GetTabBoxes().Remove( 0, n );
// loesche alte die Box mit der Line
// Delete the old Box with the Line
pInsLine->GetTabBoxes().DeleteAndDestroy( nInsPos );
return sal_False; // neu aufsetzen
return sal_False; // set up anew
}
}
return sal_True;
......@@ -380,31 +379,30 @@ sal_Bool lcl_MergeGCLine( const SwTableLine*& rpLine, void* pPara )
_GCLinePara* pGCPara = (_GCLinePara*)pPara;
while( 1 == nLen )
{
// es gibt eine Box mit Lines
// We have a Box with Lines
SwTableBox* pBox = pLn->GetTabBoxes()[0];
if( !pBox->GetTabLines().Count() )
break;
SwTableLine* pLine = pBox->GetTabLines()[0];
// pLine wird zu der aktuellen, also der rpLine,
// die restlichen werden ins LinesArray hinter der akt.
// verschoben.
// Das LinesArray ist im pPara!
// pLine turns into the current Line (that is rpLine), the rest is moved
// into the LinesArray past the current one.
// The LinesArray is in pPara!
nLen = pBox->GetTabLines().Count();
SwTableLines& rLns = *pGCPara->pLns;
const SwTableLine* pTmp = pLn;
sal_uInt16 nInsPos = rLns.GetPos( pTmp );
OSL_ENSURE( USHRT_MAX != nInsPos, "Line nicht gefunden!" );
OSL_ENSURE( USHRT_MAX != nInsPos, "Could not find Line!" );
SwTableBox* pUpper = pLn->GetUpper();
rLns.Remove( nInsPos, 1 ); // die Line dem aus Array loeschen
rLns.Remove( nInsPos, 1 ); // remove the Line from the array
rLns.Insert( &pBox->GetTabLines(), nInsPos );
// JP 31.03.99: Bug 60000 - die Attribute der zu loeschenden
// Line an die "eingefuegten" uebertragen
// JP 31.03.99: Bug 60000
// Pass the attributes of the to-be-deleted Lines to the "inserted" one
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pLn->GetFrmFmt()->GetItemState(
RES_BACKGROUND, sal_True, &pItem ))
......@@ -416,19 +414,19 @@ sal_Bool lcl_MergeGCLine( const SwTableLine*& rpLine, void* pPara )
pGCPara->pShareFmts->SetAttr( *rBoxLns[ nLns ], *pItem );
}
pBox->GetTabLines().Remove( 0, nLen ); // Lines aus Array loeschen
pBox->GetTabLines().Remove( 0, nLen ); // Remove Lines from the array
delete pLn;
// Abhaengigkeit neu setzen
// Set the dependency anew
while( nLen-- )
rLns[ nInsPos++ ]->SetUpper( pUpper );
pLn = pLine; // und neu setzen
pLn = pLine; // and set up anew
nLen = pLn->GetTabBoxes().Count();
}
// ACHTUNG: die Anzahl der Boxen kann sich aendern!
// ATTENTION: The number of boxes can change!
for( nLen = 0; nLen < pLn->GetTabBoxes().Count(); ++nLen )
if( !lcl_MergeGCBox( *(pLn->GetTabBoxes().GetData() + nLen ), pPara ))
--nLen;
......@@ -436,10 +434,10 @@ sal_Bool lcl_MergeGCLine( const SwTableLine*& rpLine, void* pPara )
return sal_True;
}
// Struktur ein wenig aufraeumen
// Clean structure a bit
void SwTable::GCLines()
{
// ACHTUNG: die Anzahl der Lines kann sich aendern!
// ATTENTION: The Line count can change!
_GCLinePara aPara( GetTabLines() );
SwShareBoxFmts aShareFmts;
aPara.pShareFmts = &aShareFmts;
......
sw/source/core/doc/notxtfrm.cxx
Dosyayı görüntüle @ 5be6008e
This diff is collapsed.
sw/source/core/doc/swserv.cxx
Dosyayı görüntüle @ 5be6008e
......@@ -76,7 +76,7 @@ sal_Bool SwServerObject::GetData( uno::Any & rData,
case BOOKMARK_SERVER:
if( CNTNT_TYPE.pBkmk->IsExpanded() )
{
// Bereich aufspannen
// Span area
pPam = new SwPaM( CNTNT_TYPE.pBkmk->GetMarkPos(),
CNTNT_TYPE.pBkmk->GetOtherMarkPos() );
}
......@@ -99,7 +99,7 @@ sal_Bool SwServerObject::GetData( uno::Any & rData,
if( pPam )
{
// Stream anlegen
// Create stream
SvMemoryStream aMemStm( 65535, 65535 );
SwWriter aWrt( aMemStm, *pPam, sal_False );
if( !IsError( aWrt.Write( xWrt )) )
......@@ -128,7 +128,7 @@ sal_Bool SwServerObject::SetData( const String & ,
void SwServerObject::SendDataChanged( const SwPosition& rPos )
{
// ist an unseren Aenderungen jemand interessiert ?
// Is someone interested in our changes?
if( HasDataLinks() )
{
int bCall = sal_False;
......@@ -155,7 +155,7 @@ void SwServerObject::SendDataChanged( const SwPosition& rPos )
if( bCall )
{
// Recursionen erkennen und flaggen
// Recognize recursions and flag them
IsLinkInServer( 0 );
SvLinkSource::NotifyDataChanged();
}
......@@ -165,7 +165,7 @@ void SwServerObject::SendDataChanged( const SwPosition& rPos )
void SwServerObject::SendDataChanged( const SwPaM& rRange )
{
// ist an unseren Aenderungen jemand interessiert ?
// Is someone interested in our changes?
if( HasDataLinks() )
{
int bCall = sal_False;
......@@ -187,14 +187,14 @@ void SwServerObject::SendDataChanged( const SwPaM& rRange )
}
if( pNd )
{
// liegt der Start-Bereich im Node Bereich ?
// Is the start area within the node area?
bCall = pStt->nNode.GetIndex() < pNd->EndOfSectionIndex() &&
pEnd->nNode.GetIndex() >= pNd->GetIndex();
}
if( bCall )
{
// Recursionen erkennen und flaggen
// Recognize recursions and flag them
IsLinkInServer( 0 );
SvLinkSource::NotifyDataChanged();
}
......@@ -243,10 +243,10 @@ sal_Bool SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
if( nSttNd && nEndNd )
{
// LinkManager besorgen:
// Get LinkManager
const ::sfx2::SvBaseLinks& rLnks = pNds->GetDoc()->GetLinkManager().GetLinks();
// um Rekursionen zu Verhindern: ServerType umsetzen!
// To avoid recursions: convert ServerType!
SwServerObject::ServerModes eSave = eType;
if( !pChkLnk )
((SwServerObject*)this)->eType = NONE_SERVER;
......@@ -322,8 +322,7 @@ SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos, sal_uInt16 nTy
SwDataChanged::~SwDataChanged()
{
// JP 09.04.96: nur wenn das Layout vorhanden ist ( also waehrend der
// Eingabe)
// JP 09.04.96: Only if the Layout is available (thus during input)
if( pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
{
const ::sfx2::SvLinkSources& rServers = pDoc->GetLinkManager().GetServers();
......@@ -331,7 +330,7 @@ SwDataChanged::~SwDataChanged()
for( sal_uInt16 nCnt = rServers.Count(); nCnt; )
{
::sfx2::SvLinkSourceRef refObj( rServers[ --nCnt ] );
// noch jemand am Object interessiert ?
// Any one else interested in the Object?
if( refObj->HasDataLinks() && refObj->ISA( SwServerObject ))
{
SwServerObject& rObj = *(SwServerObject*)&refObj;
......@@ -341,11 +340,11 @@ SwDataChanged::~SwDataChanged()
rObj.SendDataChanged( *pPam );
}
// sollte jetzt gar keine Verbindung mehr bestehen
// We shouldn't have a connection anymore
if( !refObj->HasDataLinks() )
{
// dann raus aus der Liste (Object bleibt aber bestehen!)
// falls es noch da ist !!
// Then remove from the list
// Object is not destroyed, if it still is there!
if( nCnt < rServers.Count() && &refObj == rServers[ nCnt ] )
pDoc->GetLinkManager().RemoveServer( nCnt, 1 );
}
......
sw/source/core/doc/tblafmt.cxx
Dosyayı görüntüle @ 5be6008e
......@@ -41,7 +41,7 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#define READ_OLDVERS // erstmal noch alte Versionen lesen
#define READ_OLDVERS // read the old version for a start
#include <swtypes.hxx>
#include <doc.hxx>
#include <poolfmt.hxx>
......@@ -51,13 +51,13 @@
using ::editeng::SvxBorderLine;
// bis SO5PF
// until SO5PF
const sal_uInt16 AUTOFORMAT_ID_X = 9501;
const sal_uInt16 AUTOFORMAT_ID_358 = 9601;
const sal_uInt16 AUTOFORMAT_DATA_ID_X = 9502;
// ab SO5
//! in nachfolgenden Versionen muss der Betrag dieser IDs groesser sein
// from SO5
//! In follow-up versions these IDs' values need to increase
const sal_uInt16 AUTOFORMAT_ID_504 = 9801;
const sal_uInt16 AUTOFORMAT_DATA_ID_504 = 9802;
......@@ -96,11 +96,11 @@ SwBoxAutoFmt* SwTableAutoFmt::pDfltBoxAutoFmt = 0;
#define sAutoTblFmtName "autotbl.fmt"
// SwTable Auto-Format-Tabelle
// SwTable AutoFormat Table
SV_IMPL_PTRARR( _SwTableAutoFmtTbl, SwTableAutoFmt* )
// Struct mit Versionsnummern der Items
// Struct with version numbers of the Items
struct SwAfVersions
{
......@@ -405,7 +405,7 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s
rStream >> eSys >> eLge;
eSysLanguage = (LanguageType) eSys;
eNumFmtLanguage = (LanguageType) eLge;
if ( eSysLanguage == LANGUAGE_SYSTEM ) // von alten Versionen (Calc)
if ( eSysLanguage == LANGUAGE_SYSTEM ) // from old versions (Calc)
eSysLanguage = static_cast<LanguageType>(::GetAppLanguage());
}
......@@ -481,7 +481,7 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const
aOrientation.Store( rStream, aOrientation.GetVersion(SOFFICE_FILEFORMAT_40) );
aMargin.Store( rStream, aMargin.GetVersion(SOFFICE_FILEFORMAT_40) );
aLinebreak.Store( rStream, aLinebreak.GetVersion(SOFFICE_FILEFORMAT_40) );
// Calc Rotation ab SO5
// Calc Rotation from SO5
aRotateAngle.Store( rStream, aRotateAngle.GetVersion(SOFFICE_FILEFORMAT_40) );
aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) );
......@@ -556,9 +556,9 @@ SwTableAutoFmt& SwTableAutoFmt::operator=( const SwTableAutoFmt& rNew )
delete aBoxAutoFmt[ n ];
SwBoxAutoFmt* pFmt = rNew.aBoxAutoFmt[ n ];
if( pFmt ) // ist gesetzt -> kopieren
if( pFmt ) // if is set -> copy
aBoxAutoFmt[ n ] = new SwBoxAutoFmt( *pFmt );
else // sonst default
else // else default
aBoxAutoFmt[ n ] = 0;
}
......@@ -586,26 +586,26 @@ SwTableAutoFmt::~SwTableAutoFmt()
void SwTableAutoFmt::SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos )
{
OSL_ENSURE( nPos < 16, "falscher Bereich" );
OSL_ENSURE( nPos < 16, "wrong area" );
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
if( pFmt ) // ist gesetzt -> kopieren
if( pFmt ) // if is set -> copy
*aBoxAutoFmt[ nPos ] = rNew;
else // sonst neu setzen
else // else set anew
aBoxAutoFmt[ nPos ] = new SwBoxAutoFmt( rNew );
}
const SwBoxAutoFmt& SwTableAutoFmt::GetBoxFmt( sal_uInt8 nPos ) const
{
OSL_ENSURE( nPos < 16, "falscher Bereich" );
OSL_ENSURE( nPos < 16, "wrong area" );
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
if( pFmt ) // ist gesetzt -> kopieren
if( pFmt ) // if is set -> copy
return *pFmt;
else // sonst den default returnen
else // else return the default
{
// falls noch nicht vorhanden:
// If it doesn't exist yet:
if( !pDfltBoxAutoFmt )
pDfltBoxAutoFmt = new SwBoxAutoFmt;
return *pDfltBoxAutoFmt;
......@@ -619,10 +619,10 @@ SwBoxAutoFmt& SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
UpdateFlags eFlags,
SvNumberFormatter* pNFmtr )
{
OSL_ENSURE( nPos < 16, "falscher Bereich" );
OSL_ENSURE( nPos < 16, "wrong area" );
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
if( !pFmt ) // ist gesetzt -> kopieren
if( !pFmt ) // if is set -> copy
{
pFmt = new SwBoxAutoFmt;
aBoxAutoFmt[ nPos ] = pFmt;
......@@ -668,12 +668,12 @@ SwBoxAutoFmt& SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
static_cast<LanguageType>(::GetAppLanguage()));
else
{
// defaulten
// default
pFmt->SetValueFormat( aEmptyStr, LANGUAGE_SYSTEM,
static_cast<LanguageType>(::GetAppLanguage() ));
}
}
// den Rest koennen wir nicht, StarCalc spezifisch
// we cannot handle the rest, that's specific to StarCalc
return *pFmt;
}
......@@ -763,7 +763,7 @@ void SwTableAutoFmt::UpdateToSet( sal_uInt8 nPos, SfxItemSet& rSet,
}
}
// den Rest koennen wir nicht, StarCalc spezifisch
// we cannot handle the rest, that's specific to StarCalc
}
......@@ -876,9 +876,9 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream ) const
for( int i = 0; bRet && i < 16; ++i )
{
SwBoxAutoFmt* pFmt = aBoxAutoFmt[ i ];
if( !pFmt ) // nicht gesetzt -> default schreiben
if( !pFmt ) // if not set -> write default
{
// falls noch nicht vorhanden:
// If it doesn't exist yet:
if( !pDfltBoxAutoFmt )
pDfltBoxAutoFmt = new SwBoxAutoFmt;
pFmt = pDfltBoxAutoFmt;
......@@ -907,13 +907,13 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
for( i = 0; i < 4; ++i )
pNew->SetBoxFmt( aNew, i );
// 70% Grau
// 70% gray
aBrushItem.SetColor( RGB_COLORDATA( 0x4d, 0x4d, 0x4d ) );
aNew.SetBackground( aBrushItem );
for( i = 4; i <= 12; i += 4 )
pNew->SetBoxFmt( aNew, i );
// 20% Grau
// 20% gray
aBrushItem.SetColor( RGB_COLORDATA( 0xcc, 0xcc, 0xcc ) );
aNew.SetBackground( aBrushItem );
aColor.SetColor( COL_BLACK );
......@@ -978,7 +978,7 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream )
sal_Bool bRet = 0 == rStream.GetError();
if (bRet)
{
// Achtung hier muss ein allgemeiner Header gelesen werden
// Attention: We need to read a general Header here
sal_uInt16 nVal = 0;
rStream >> nVal;
bRet = 0 == rStream.GetError();
......@@ -998,7 +998,7 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream )
// rStream >> nFileVers;
if( rStream.Tell() != sal_uLong(nPos + nCnt) )
{
OSL_ENSURE( !this, "Der Header enthaelt mehr/neuere Daten" );
OSL_ENSURE( !this, "The Header contains more or newer Data" );
rStream.Seek( nPos + nCnt );
}
rStream.SetStreamCharSet( (CharSet)nChrSet );
......@@ -1008,7 +1008,7 @@ sal_Bool SwTableAutoFmtTbl::Load( SvStream& rStream )
if( nVal == AUTOFORMAT_ID_358 || nVal == AUTOFORMAT_ID_X ||
(AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) )
{
aVersions.Load( rStream, nVal ); // Item-Versionen
aVersions.Load( rStream, nVal ); // Item versions
SwTableAutoFmt* pNew;
sal_uInt16 nAnz = 0;
......@@ -1075,16 +1075,15 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const
{
rStream.SetVersion( SOFFICE_FILEFORMAT_40 );
// Achtung hier muss ein allgemeiner Header gespeichert werden
// Attention: We need to save a general Header here
sal_uInt16 nVal = AUTOFORMAT_ID;
rStream << nVal
<< (sal_uInt8)2 // Anzahl von Zeichen des Headers incl. diesem
<< (sal_uInt8)2 // Character count of the Header including this value
<< (sal_uInt8)GetStoreCharSet( ::osl_getThreadTextEncoding() );
bRet = 0 == rStream.GetError();
//-----------------------------------------------------------
// die VersionsNummer fuer alle Attribute schreiben
// Write this version number for all attributes
(*this)[ 0 ]->GetBoxFmt( 0 ).SaveVerionNo( rStream );
rStream << (sal_uInt16)(Count() - 1);
......
sw/source/core/doc/tblrwcl.cxx
Dosyayı görüntüle @ 5be6008e
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment