[Libreoffice-commits] core.git: 6 commits - sd/source
Urs Fässler
urs at bitzgi.ch
Fri Mar 1 04:11:53 PST 2013
sd/source/core/sdpage2.cxx | 68 ++++++++++++-------------
sd/source/core/stlpool.cxx | 79 ++++++++++++++----------------
sd/source/filter/eppt/eppt.cxx | 50 +++++++++---------
sd/source/filter/eppt/eppt.hxx | 16 +++---
sd/source/filter/eppt/epptso.cxx | 43 +++++++---------
sd/source/filter/eppt/escherex.cxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 6 +-
sd/source/filter/eppt/pptx-stylesheet.cxx | 4 -
sd/source/filter/eppt/pptx-text.cxx | 24 ++++-----
sd/source/filter/eppt/text.hxx | 12 ++--
10 files changed, 150 insertions(+), 154 deletions(-)
New commits:
commit 8eb64e21a826ddde37356d0cb22dbff408efd2c9
Author: Urs Fässler <urs at bitzgi.ch>
Date: Fri Mar 1 11:01:10 2013 +0100
translation of German comments in file sd/source/filter/eppt/pptx-text.cxx
Change-Id: Ibf2ef88a200699bea456b916fd5e59392d1f19e1
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index ff5532c..b344101 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -460,7 +460,7 @@ sal_uInt32 PortionObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPositi
}
// -----------------------------------------------------------------------
-// Rueckgabe: 0 = kein TextField
+// Return: 0 = no TextField
// bit28->31 text field type :
// 1 = Date
// 2 = Time
@@ -501,7 +501,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com
{
sal_Bool bBool = sal_False;
aAny >>= bBool;
- if ( !bBool ) // Fixed DateFields gibt es in PPT nicht
+ if ( !bBool ) // Fixed DateFields does not exist in PPT
{
if ( GetPropertyValue( aAny, xFieldPropSet, rtl::OUString( "Format" ) ), sal_True )
{
@@ -893,17 +893,17 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
if ( !aFontDesc.Name.isEmpty() )
{
- nParaFlags |= 0x90; // wir geben den Font und den Charset vor
+ nParaFlags |= 0x90; // we define the font and charset
}
}
- case SVX_NUM_CHARS_UPPER_LETTER : // zaehlt von a-z, aa - az, ba - bz, ...
+ case SVX_NUM_CHARS_UPPER_LETTER : // count from a-z, aa - az, ba - bz, ...
case SVX_NUM_CHARS_LOWER_LETTER :
case SVX_NUM_ROMAN_UPPER :
case SVX_NUM_ROMAN_LOWER :
case SVX_NUM_ARABIC :
- case SVX_NUM_PAGEDESC : // Numerierung aus der Seitenvorlage
+ case SVX_NUM_PAGEDESC : // numbering from the page template
case SVX_NUM_BITMAP :
- case SVX_NUM_CHARS_UPPER_LETTER_N : // zaehlt von a-z, aa-zz, aaa-zzz
+ case SVX_NUM_CHARS_UPPER_LETTER_N : // count from a-z, aa-zz, aaa-zzz
case SVX_NUM_CHARS_LOWER_LETTER_N :
{
if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
@@ -1145,17 +1145,17 @@ void ParagraphObj::ImplConstruct( const ParagraphObj& rParagraphObj )
nBulletFlags = rParagraphObj.nBulletFlags;
sPrefix = rParagraphObj.sPrefix;
sSuffix = rParagraphObj.sSuffix;
- sGraphicUrl = rParagraphObj.sGraphicUrl; // String auf eine Graphic
+ sGraphicUrl = rParagraphObj.sGraphicUrl; // String to a graphic
aBuGraSize = rParagraphObj.aBuGraSize;
- nNumberingType = rParagraphObj.nNumberingType; // in wirlichkeit ist dies ein SvxEnum
+ nNumberingType = rParagraphObj.nNumberingType; // this is actually a SvxEnum
nHorzAdjust = rParagraphObj.nHorzAdjust;
nBulletColor = rParagraphObj.nBulletColor;
nBulletOfs = rParagraphObj.nBulletOfs;
- nStartWith = rParagraphObj.nStartWith; // Start der nummerierung
+ nStartWith = rParagraphObj.nStartWith; // start of numbering
nTextOfs = rParagraphObj.nTextOfs;
- nBulletRealSize = rParagraphObj.nBulletRealSize; // GroessenVerhaeltnis in Proz
- nDepth = rParagraphObj.nDepth; // aktuelle tiefe
- cBulletId = rParagraphObj.cBulletId; // wenn Numbering Type == CharSpecial
+ nBulletRealSize = rParagraphObj.nBulletRealSize; // scale in percent
+ nDepth = rParagraphObj.nDepth; // actual depth
+ cBulletId = rParagraphObj.cBulletId; // if Numbering Type == CharSpecial
aFontDesc = rParagraphObj.aFontDesc;
bExtendedBulletsUsed = rParagraphObj.bExtendedBulletsUsed;
commit dc2b5d791805b7826d5108178e7250ee41ad1156
Author: Urs Fässler <urs at bitzgi.ch>
Date: Fri Mar 1 11:00:45 2013 +0100
small translation of German comments in some files in sd/source/filter/eppt/
Change-Id: If1bfcef7acd3a71ac4c36666d5386f88def62591
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index b1b7132..fa1347b 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -241,7 +241,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
OpenContainer( ESCHER_SpContainer );
AddAtom( 16, ESCHER_Spgr, 1 );
PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() );
- *mpOutStrm << (sal_Int32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ *mpOutStrm << (sal_Int32)aRect.Left() // bounding box for the grouped shapes to which they are attached
<< (sal_Int32)aRect.Top()
<< (sal_Int32)aRect.Right()
<< (sal_Int32)aRect.Bottom();
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index de815dc..eebf32b 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -424,7 +424,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
return sal_False;
SetCurrentStyleSheet( nPageNum );
- if ( !ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) ) // Backgroundshape laden
+ if ( !ImplGetPropertyValue( mXPagePropSet, rtl::OUString( "Background" ) ) ) // load background shape
return sal_False;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
if ( !( mAny >>= aXBackgroundPropSet ) )
@@ -501,7 +501,7 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType )
{
if ( ImplGetPropertyValue( aXPropertySet, rtl::OUString( "Number" ) ) )
nRetValue |= *(sal_Int16*)mAny.getValue();
- if ( nRetValue & 0xffff ) // ueberlauf vermeiden
+ if ( nRetValue & 0xffff ) // avoid overflow
nRetValue--;
}
}
@@ -756,7 +756,7 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
rtl::OStringBuffer aTypeBuffer(rtl::OUStringToOString(
mXShape->getShapeType(), RTL_TEXTENCODING_UTF8));
- // "com.sun.star." entfernen
+ // remove "com.sun.star."
aTypeBuffer.remove(0, RTL_CONSTASCII_LENGTH("com.sun.star."));
sal_Int32 nPos = aTypeBuffer.toString().indexOf("Shape");
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 83b53d6..a4697fb 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -122,8 +122,8 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo
else
{
rSt << rLev.mnAsianOrComplexFont
- << (sal_uInt16)0xffff // unbekannt
- << (sal_uInt16)0xffff // unbekannt
+ << (sal_uInt16)0xffff // unknown
+ << (sal_uInt16)0xffff // unknown
<< rLev.mnFontHeight
<< nFontColor
<< rLev.mnEscapement;
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 48e0980..06bc4e0 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -43,17 +43,17 @@ struct SOParagraph
sal_Int16 nBulletFlags;
String sPrefix;
String sSuffix;
- String sGraphicUrl; // String auf eine Graphic
+ String sGraphicUrl; // String to a graphic
Size aBuGraSize;
- sal_uInt32 nNumberingType; // in wirlichkeit ist dies ein SvxEnum
+ sal_uInt32 nNumberingType; // this is actually a SvxEnum
sal_uInt32 nHorzAdjust;
sal_uInt32 nBulletColor;
sal_Int32 nBulletOfs;
- sal_Int16 nStartWith; // Start der nummerierung
+ sal_Int16 nStartWith; // start of numbering
sal_Int16 nTextOfs;
- sal_Int16 nBulletRealSize; // GroessenVerhaeltnis in Proz
- sal_Int16 nDepth; // aktuelle tiefe
- sal_Unicode cBulletId; // wenn Numbering Type == CharSpecial
+ sal_Int16 nBulletRealSize; // scale in percent
+ sal_Int16 nDepth; // actual depth
+ sal_Unicode cBulletId; // if Numbering Type == CharSpecial
::com::sun::star::awt::FontDescriptor aFontDesc;
sal_Bool bExtendedBulletsUsed;
commit 6bb44ef034e9b15c8805ed2af404c27d434ecfa2
Author: Urs Fässler <urs at bitzgi.ch>
Date: Fri Mar 1 10:59:29 2013 +0100
translation of German comments in file sd/source/filter/eppt/epptso.cxx
Change-Id: Iacd49459f7976f9ff6676c79532fd44c3e11056d
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 21c664f..ff20478 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -480,10 +480,10 @@ sal_Bool PPTWriter::ImplCloseDocument()
mpExEmbed->Seek( STREAM_SEEK_TO_END );
sal_uInt32 nExEmbedSize = mpExEmbed->Tell();
- // nEnviroment : Gesamtgroesse des Environment Containers
- sal_uInt32 nEnvironment = maFontCollection.GetCount() * 76 // 68 bytes pro Fontenityatom und je 8 Bytes fuer die Header
- + 8 // 1 FontCollection Container
- + 20 // SrKinsoku Container
+ // nEnviroment : whole size of the environment container
+ sal_uInt32 nEnvironment = maFontCollection.GetCount() * 76 // 68 bytes per Fontenityatom and 8 Bytes per header
+ + 8 // 1 FontCollection container
+ + 20 // SrKinsoku container
+ 18 // 1 TxSiStyleAtom
+ aTxMasterStyleAtomStrm.Tell() // 1 TxMasterStyleAtom;
+ mpStyleSheet->SizeOfTxCFStyleAtom();
@@ -498,7 +498,7 @@ sal_Bool PPTWriter::ImplCloseDocument()
nBytesToInsert += ImplMasterSlideListContainer( NULL );
nBytesToInsert += ImplDocumentListContainer( NULL );
- // nBytes im Stream einfuegen, und abhaengige Container anpassen
+ // insert nBytes into stream and adjust depending container
mpPptEscherEx->InsertAtCurrentPos( nBytesToInsert, false );
// CREATE HYPERLINK CONTAINER
@@ -1085,9 +1085,8 @@ void PPTWriter::ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt )
if ( ( mnAngle >= ( 45 << 16 ) && mnAngle < ( 135 << 16 ) ) ||
( mnAngle >= ( 225 << 16 ) && mnAngle < ( 315 << 16 ) ) )
{
- // In diesen beiden Bereichen steht in PPT gemeinerweise die
- // BoundingBox bereits senkrecht. Daher muss diese VOR
- // DER ROTATION flachgelegt werden.
+ // Maddeningly, in those two areas of PPT is the BoundingBox already
+ // vertical. Therefore, we need to put down it BEFORE THE ROTATION.
::com::sun::star::awt::Point
aTopLeft( (sal_Int32)( maRect.Left() + fWidthHalf - fHeightHalf ), (sal_Int32)( maRect.Top() + fHeightHalf - fWidthHalf ) );
Size aNewSize( maRect.GetHeight(), maRect.GetWidth() );
@@ -1180,7 +1179,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
case 2 :
{
rOut << (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) << (sal_uInt32)8
- << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset auf TxtField;
+ << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset to TxtField;
<< (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) // Type
<< (sal_uInt8)0 << (sal_uInt16)0; // PadBytes
}
@@ -1275,7 +1274,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
aTextObj.WriteTextSpecInfo( &rOut );
- // Star Office Default TabSizes schreiben ( wenn noetig )
+ // write Star Office Default TabSizes (if necessary)
if ( aTextObj.ParagraphCount() )
{
pPara = aTextObj.GetParagraph(0);
@@ -2051,7 +2050,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
{
if ( *pIter == aBookmark )
{
- // Bookmark ist ein link zu einer Dokumentseite
+ // Bookmark is a link to a document page
nAction = 4;
nHyperLinkType = 7;
@@ -2236,10 +2235,10 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
nIndices = nInstance = nLastPer = nShapeCount = nEffectCount = 0;
- sal_Bool bIsTitlePossible = sal_True; // bei mehr als einem title geht powerpoint in die knie
+ sal_Bool bIsTitlePossible = sal_True; // powerpoint is not able to handle more than one title
- sal_uInt32 nOutlinerCount = 0; // die gliederungsobjekte muessen dem layout entsprechen,
- sal_uInt32 nPrevTextStyle = 0; // es darf nicht mehr als zwei geben
+ sal_uInt32 nOutlinerCount = 0; // the outline objects have to conform to the layout,
+ sal_uInt32 nPrevTextStyle = 0; // there are no more than two allowed
nOlePictureId = 0;
@@ -2770,7 +2769,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
- // ein GraphicObject kann auch ein ClickMe Element sein
+ // a GraphicObject can also be a ClickMe element
if ( mbEmptyPresObj && ( ePageType == NORMAL ) )
{
nPlaceHolderAtom = rLayout.nUsedObjectPlaceHolder;
@@ -2789,7 +2788,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( mXText.is() )
mnTextSize = mXText->getString().getLength();
- if ( mnTextSize ) // graphic object oder Flachenfuellung
+ if ( mnTextSize ) // graphic object or area fill
{
/* SJ #i34951#: because M. documents are not allowing GraphicObjects containing text, we
have to create a simpe Rectangle with fill bitmap instead (while not allowing BitmapMode_Repeat).
@@ -2869,7 +2868,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
aPropertyOptions.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
- *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // oben, links, rechts, unten ????
+ *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // top, left, right, bottom ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
*mpStrm << (sal_uInt32)0 // PlacementID
@@ -2884,9 +2883,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
const sal_Unicode* pString = aUString.getStr();
for ( sal_uInt32 i = 0; i < mnTextSize; i++ )
{
- nChar = pString[ i ]; // 0xa -> 0xb weicher Zeilenumbruch
+ nChar = pString[ i ]; // 0xa -> 0xb soft newline
if ( nChar == 0xa )
- nChar++; // 0xd -> 0xd harter Zeilenumbruch
+ nChar++; // 0xd -> 0xd hard newline
*mpStrm << nChar;
}
mpPptEscherEx->AddAtom( 6, EPP_BaseTextPropAtom );
@@ -2961,7 +2960,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt2 );
aPropOpt2.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
- *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // oben, links, rechts, unten ????
+ *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // top, left, right, bottom ????
mpPptEscherEx->OpenContainer( ESCHER_ClientData );
mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom );
*mpStrm << (sal_uInt32)1 // PlacementID
@@ -3502,7 +3501,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mpPptEscherEx->LeaveGroup();
}
}
- ClearGroupTable(); // gruppierungen wegschreiben, sofern noch irgendwelche offen sind, was eigendlich nicht sein sollte
+ ClearGroupTable(); // storing groups if any are still open, which should not be the case
nGroups = GetGroupsClosed();
for ( sal_uInt32 i = 0; i < nGroups; i++, mpPptEscherEx->LeaveGroup() ) ;
mnPagesWritten++;
@@ -3569,7 +3568,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
- *mpStrm << (sal_Int32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
+ *mpStrm << (sal_Int32)maRect.Left() // Bounding box for the grouped shapes to which they are attached
<< (sal_Int32)maRect.Top()
<< (sal_Int32)maRect.Right()
<< (sal_Int32)maRect.Bottom();
commit 0f4b18d18eb04322886ffbe1b4118f3fa276531e
Author: Urs Fässler <urs at bitzgi.ch>
Date: Fri Mar 1 10:58:56 2013 +0100
translation of German comments in files sd/source/filter/eppt/eppt.*
Change-Id: Ied95b179972106402fde3f9d82f6c4844571fa3a
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 5d8959a..d98cdda 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -90,7 +90,7 @@ void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::Property
if ( !mrStg.Is() )
return;
- // MasterPages + Slides und Notizen + NotesMasterPage
+ // master pages + slides and notes + notes master page
mnDrawings = mnMasterPages + ( mnPages << 1 ) + 1;
if ( mXStatusIndicator.is() )
@@ -169,9 +169,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx->OpenContainer( EPP_Slide );
mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
*mpStrm << rLayout.nLayout;
- mpStrm->Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs ( 8Stueck )
- *mpStrm << (sal_uInt32)(nMasterNum | 0x80000000)// master ID ( ist gleich 0x80000000 bei einer masterpage )
- << (sal_uInt32)nPageNum + 0x100 // notes ID ( ist gleich null wenn keine notizen vorhanden )
+ mpStrm->Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs (8 parts)
+ *mpStrm << (sal_uInt32)(nMasterNum | 0x80000000)// master ID (equals 0x80000000 on a master page)
+ << (sal_uInt32)nPageNum + 0x100 // notes ID (equals null if no notes are present)
<< nMode
<< (sal_uInt16)0; // padword
@@ -185,12 +185,12 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
{
switch ( *(sal_Int32*)aAny.getValue() )
{
- case 1 : // automatisch
+ case 1 : // automatic
mnDiaMode++;
- case 2 : // halbautomatisch
+ case 2 : // semi-automatic
mnDiaMode++;
default :
- case 0 : // manuell
+ case 0 : // manual
break;
}
}
@@ -226,7 +226,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
sal_uInt8 nDirection = 0;
sal_uInt8 nTransitionType = 0;
sal_uInt16 nBuildFlags = 1; // advange by mouseclick
- sal_Int32 nSlideTime = 0; // muss noch !!!
+ sal_Int32 nSlideTime = 0; // still has to !!!
sal_uInt8 nSpeed = 1;
if ( GetPropertyValue( aAny, mXPagePropSet, rtl::OUString( "Speed" ) ) )
@@ -277,7 +277,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpPptEscherEx->OpenContainer( EPP_PPDrawing );
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum ); // the shapes of the pages are created in the PPT document
mpPptEscherEx->LeaveGroup();
if ( bHasBackground )
@@ -358,8 +358,8 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
*mpStrm << (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide
<< (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID
- << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage )
- << (sal_uInt32)0 // notes ID ( ist gleich null wenn keine notizen vorhanden )
+ << (sal_uInt32)0 // master ID (equals null at a master page)
+ << (sal_uInt32)0 // notes ID (equals null if no notes are present)
<< (sal_uInt16)0 // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
<< (sal_uInt16)0; // padword
@@ -418,7 +418,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True ); // the shapes of the pages are created in the PPT document
mpPptEscherEx->LeaveGroup();
ImplWriteBackground( aXBackgroundPropSet );
@@ -720,7 +720,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
mpPptEscherEx->CloseContainer();
- mpPptEscherEx->OpenContainer( EPP_SlideListWithText ); // Animation info fuer die Slides
+ mpPptEscherEx->OpenContainer( EPP_SlideListWithText ); // animation information for the slides
for ( i = 0; i < mnPages; i++ )
{
@@ -732,7 +732,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
<< (sal_Int32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example
<< (sal_uInt32)0; // reserved, usualy 0
- if ( !GetPageByIndex( i, NORMAL ) ) // sehr aufregend: noch einmal ueber alle seiten
+ if ( !GetPageByIndex( i, NORMAL ) ) // very exciting: once again through all pages
return sal_False;
SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
@@ -746,7 +746,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
}
mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText
- mpPptEscherEx->OpenContainer( EPP_SlideListWithText, 2 ); // Animation info fuer die notes
+ mpPptEscherEx->OpenContainer( EPP_SlideListWithText, 2 ); // animation information for the notes
for( i = 0; i < mnPages; i++ )
{
mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom );
@@ -820,7 +820,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
nFlags |= 1;
}
- if ( ImplGetPropertyValue( rtl::OUString( "IsEndless" ) ) ) // muesste eigendlich heissen IsNotEndless !=)"�()&
+ if ( ImplGetPropertyValue( rtl::OUString( "IsEndless" ) ) ) // the correct name would be IsNotEndless: WTF?
{
sal_Bool bBool = sal_False;
mAny >>= bBool;
@@ -867,7 +867,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
{
mpPptEscherEx->OpenContainer( EPP_NamedShows );
sal_uInt32 nCustomShowIndex = 0;
- for( i = 0; i < nCount; i++ ) // Anzahl der Custom Shows
+ for( i = 0; i < nCount; i++ ) // number of custom shows
{
if ( !pUString[ i ].isEmpty() )
{
@@ -889,7 +889,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
mpPptEscherEx->BeginAtom();
sal_Int32 nSlideCount = aXIC->getCount();
- for ( sal_Int32 j = 0; j < nSlideCount; j++ ) // Anzahl der Slides
+ for ( sal_Int32 j = 0; j < nSlideCount; j++ ) // number of slides
{
mAny = aXIC->getByIndex( j );
if ( mAny.getValue() )
@@ -1165,7 +1165,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
mpPptEscherEx->EnterGroup(0,0);
- ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_False ); // Die Shapes der Seite werden im PPT Dok. erzeugt
+ ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_False ); // the shapes of the pages are created in the PPT document
mpPptEscherEx->LeaveGroup();
mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -1362,12 +1362,12 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
sal_uInt32 i, nPos, nOfs, nPersistOfs = mpStrm->Tell();
sal_uInt32 nPersistEntrys = 0;
- *mpStrm << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0; // Record Header und ersten Eintrag ueberspringen
+ *mpStrm << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0; // skip record header and first entry
// Document pesist schreiben
nPersistEntrys++;
*mpStrm << (sal_uInt32)0;
- // MasterPages persists schreiben
+ // write MasterPages persists
for ( i = 0; i < mnMasterPages; i++ )
{
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_MainMaster | i );
@@ -1377,14 +1377,14 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
mpPptEscherEx->InsertAtPersistOffset( EPP_MAINMASTER_PERSIST_KEY | i, ++nPersistEntrys );
}
}
- // MainNotesMaster persist schreiben
+ // write MainNotesMaster persist
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_MainNotes );
if ( nOfs )
{
*mpStrm << nOfs;
mpPptEscherEx->InsertAtPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, ++nPersistEntrys );
}
- // Slide persists schreiben -> es gilt hier auch den EPP_SlidePersistAtome mit einem gueltigen wert zu beschreiben
+ // write slide persists -> we have to write a valid value into EPP_SlidePersistAtome too
for ( i = 0; i < mnPages; i++ )
{
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Slide | i );
@@ -1394,7 +1394,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
mpPptEscherEx->InsertAtPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, ++nPersistEntrys );
}
}
- // Notes persists schreiben
+ // write Notes persists
for ( i = 0; i < mnPages; i++ )
{
nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Notes | i );
@@ -1445,7 +1445,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
}
nPos = mpStrm->Tell();
mpStrm->Seek( nPersistOfs );
- mpPptEscherEx->AddAtom( ( nPersistEntrys + 1 ) << 2, EPP_PersistPtrIncrementalBlock ); // Record Header eintragen
+ mpPptEscherEx->AddAtom( ( nPersistEntrys + 1 ) << 2, EPP_PersistPtrIncrementalBlock ); // insert Record Header
*mpStrm << (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 );
mpStrm->Seek( nPos );
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 1513763..2765660 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -171,10 +171,10 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
std::vector<rtl::OUString> maSlideNameList;
rtl::OUString maBaseURI;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef des globalen Text
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > mXText; // TextRef of the global text
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > mXCursor;
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mXCursorText; // TextRef des Teilstuecks des Cursors
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXCursorPropSet; // die Properties des Teilstueckes
+ ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mXCursorText; // TextRef of part of the cursor
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXCursorPropSet; // properties of the part
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > mXTextField;
sal_uInt32 mnTextStyle;
@@ -193,13 +193,13 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
sal_uInt32 mnExEmbed;
SvMemoryStream* mpExEmbed;
- sal_uInt32 mnDrawings; // anzahl Slides + masterpages + notes + handout
+ sal_uInt32 mnDrawings; // number of Slides + masterpages + notes + handout
sal_uInt32 mnPagesWritten;
sal_uInt32 mnUniqueSlideIdentifier;
sal_uInt32 mnTxId; // Identifier determined by the HOST (PP) ????
- sal_uInt32 mnDiaMode; // 0 -> manuell
- // 1 -> halbautomatisch
- // 2 -> automatisch
+ sal_uInt32 mnDiaMode; // 0 -> manual
+ // 1 -> semi-automatic
+ // 2 -> automatic
sal_uInt32 mnShapeMasterTitle;
sal_uInt32 mnShapeMasterBody;
@@ -270,7 +270,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
void ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
EscherPropertyContainer& aPropOpt );
- sal_Bool ImplCloseDocument(); // die font-, hyper-, Soundliste wird geschrieben ..
+ sal_Bool ImplCloseDocument(); // we write the font, hyper and sound list
virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterID, sal_uInt16 nMode,
sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
commit 1369b2547d7b96b9d371bd8427facc6ed0081450
Author: Urs Fässler <urs at bitzgi.ch>
Date: Fri Mar 1 10:55:30 2013 +0100
translation of German comments in file sd/source/core/stlpool.cxx
Change-Id: Ie5274ef6c5bba0caa8ba8057f751db3301618f32
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 2cbe841..8fb287f 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -45,7 +45,7 @@
#include <svx/svdattr.hxx>
#include "eetext.hxx"
-#include <svx/xtable.hxx> // fuer RGB_Color
+#include <svx/xtable.hxx> // for RGB_Color
#include <editeng/bulletitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/adjustitem.hxx>
@@ -131,8 +131,8 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const String& rLayoutName)
/*************************************************************************
|*
-|* eine Liste der Gliederungstextvorlagen fuer ein Praesentationlayout
-|* erstellen, der Aufrufer muss die Liste wieder loeschen
+|* Create a list of outline text templates for a presentation layout.
+|* The caller has to delete the list.
|*
\************************************************************************/
@@ -156,7 +156,7 @@ void SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName, std::v
/*************************************************************************
|*
-|* StyleSheets mit Defaultweren fuer das genannte Praesentationslayout erzeugen
+|* Create style sheets with default values for the named presentation layout
|*
\************************************************************************/
@@ -177,7 +177,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
mpDoc->getDefaultFonts( aLatinFont, aCJKFont, aCTLFont );
- // Font fuer Titel und Gliederung
+ // Font for title and outline
SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
@@ -190,7 +190,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
Font aBulletFont( GetBulletFont() );
/**************************************************************************
- * Gliederungsebenen
+ * outline levels
**************************************************************************/
String aName(SdResId(STR_LAYOUT_OUTLINE));
String aHelpFile;
@@ -216,7 +216,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
pSheet->SetParent( String() );
- // Attributierung fuer Level 1, die anderen Ebenen "erben"
+ // attributing for level 1, the others levels inherit
if (nLevel == 1)
{
SfxItemSet& rSet = pSheet->GetItemSet();
@@ -324,7 +324,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
}
/**************************************************************************
- * Titel
+ * Title
**************************************************************************/
aName = String(SdResId(STR_LAYOUT_TITLE));
aName.Insert(aPrefix, 0);
@@ -369,7 +369,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
}
/**************************************************************************
- * Untertitel
+ * Subtitle
**************************************************************************/
aName = String(SdResId(STR_LAYOUT_SUBTITLE));
aName.Insert(aPrefix, 0);
@@ -417,7 +417,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
}
/**************************************************************************
- * Notizen
+ * Notes
**************************************************************************/
aName = String(SdResId(STR_LAYOUT_NOTES));
aName.Insert(aPrefix, 0);
@@ -461,7 +461,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
}
/**************************************************************************
- * Hintergrundobjekte
+ * Background objects
**************************************************************************/
aName = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
aName.Insert(aPrefix, 0);
@@ -476,7 +476,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet();
rBackgroundObjectsSet.Put(SdrShadowItem(sal_False));
rBackgroundObjectsSet.Put(SdrShadowColorItem(Color(COL_GRAY)));
- rBackgroundObjectsSet.Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
+ rBackgroundObjectsSet.Put(SdrShadowXDistItem(200)); // 3 mm shadow distance
rBackgroundObjectsSet.Put(SdrShadowYDistItem(200));
// #i16874# enable kerning by default but only for new documents
rBackgroundObjectsSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
@@ -484,7 +484,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
}
/**************************************************************************
- * Hintergrund
+ * Background
**************************************************************************/
aName = String(SdResId(STR_LAYOUT_BACKGROUND));
aName.Insert(aPrefix, 0);
@@ -508,10 +508,9 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
/*************************************************************************
|*
-|* Graphik-StyleSheets aus dem Quellpool in diesen Pool kopieren
+|* Copy graphic style sheets from source pool into this pool
|*
-|* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find
-|* nicht const ist)
+|* (rSourcePool can not be const since SfxStyleSheetPoolBase::Find isn't const)
|*
\************************************************************************/
@@ -644,14 +643,12 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
/*************************************************************************
|*
-|* StyleSheets des genannten Praesentationslayouts aus dem Quellpool in diesen
-|* Pool kopieren. Kopiert werden nur solche StyleSheets, die in diesem Pool
-|* noch nicht vorhanden sind.
-|* pCreatedSheets wird - wenn ungleich NULL - mit Zeigern auf die erzeugten
-|* StyleSheets gefuellt.
+|* Copy style sheets of the named presentation layout from the source pool into
+|* this pool. Copies only the style sheets which aren't yet in this pool.
+|* If not NULL, pCreatedSheets is filled with pointers to the created style
+|* sheets.
|*
-|* (rSourcePool kann nicht const sein, weil SfxStyleSheetPoolBase::Find
-|* nicht const ist)
+|* (rSourcePool can not be const since SfxStyleSheetPoolBase::Find isn't const)
|*
\************************************************************************/
@@ -672,7 +669,7 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
DBG_ASSERT(pSourceSheet, "CopyLayoutSheets: Quellvorlage nicht gefunden");
if (pSourceSheet)
{
- // falls einer mit Methusalem-Doks. ankommt
+ // In the case one comes with Methusalem-Docs.
SfxStyleSheetBase& rNewSheet = Make(*it, SD_STYLE_FAMILY_MASTERPAGE);
rNewSheet.SetHelpId( sEmpty, pSourceSheet->GetHelpId( sEmpty ) );
rNewSheet.GetItemSet().Put(pSourceSheet->GetItemSet());
@@ -681,7 +678,7 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
}
}
- // Sonderbehandlung fuer Gliederungsvorlagen: Parentbeziehungen aufbauen
+ // Special treatment for outline templates: create parent relation
std::vector<SfxStyleSheetBase*> aOutlineSheets;
CreateOutlineSheetList(rLayoutName,aOutlineSheets);
@@ -710,8 +707,8 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
/*************************************************************************
|*
-|* Liste mit den Namen der Praesentationsvorlagen eines Layouts erzeugen.
-|* Die Liste und die enthaltenen Strings gehoeren dem Caller!
+|* Create list with names of the presentation templates of a layout.
+|* The list and the containing strings are owned by the caller!
|*
\************************************************************************/
@@ -756,8 +753,8 @@ void SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName, std::ve
/*************************************************************************
|*
-|* Liste mit Zeigern auf Praesentationsvorlagen eines Layouts erzeugen.
-|* Die Liste gehoert dem Caller!
+|* Create a list with pointer to presentation templates of a layout.
+|* The list is owned by the caller!
|*
\************************************************************************/
@@ -780,7 +777,7 @@ void SdStyleSheetPool::CreateLayoutSheetList(const String& rLayoutName, SdStyleS
/*************************************************************************
|*
-|* ggfs. PseudoStyleSheets erzeugen
+|* Create pseudo style sheets if necessary
|*
\************************************************************************/
@@ -866,7 +863,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
/*************************************************************************
|*
-|* Standard-Styles den richtigen Namen in der Programm-Sprache geben
+|* Set the correct name in the program language to the standard styles
|*
\************************************************************************/
@@ -930,7 +927,7 @@ void SdStyleSheetPool::UpdateStdNames()
case HID_SD_CELL_STYLE_LAST_COLUMN: nNameId = STR_POOLSHEET_LAST_COLUMN; break;
default:
- // 0 oder falsche (alte) HelpId
+ // 0 or wrong (old) HelpId
bHelpKnown = sal_False;
}
if( bHelpKnown )
@@ -951,12 +948,12 @@ void SdStyleSheetPool::UpdateStdNames()
if ( !pSheetFound )
{
- // Sheet existiert noch nicht: Altes Sheet wird umbenannt
- pStyle->SetName( aNewName ); // setzt auch Parents um
+ // Sheet does not yet exist: rename old sheet
+ pStyle->SetName( aNewName ); // transform also parents
}
else
{
- // Sheet existiert schon: Altes Sheet muss entfernt werden
+ // Sheet does exist: old sheet has to be removed
aEraseList.push_back( pStyle );
}
}
@@ -964,12 +961,12 @@ void SdStyleSheetPool::UpdateStdNames()
}
}
- // Styles, welche nicht umbenannt werden konnten, muessen entfernt werden
+ // styles that could not be renamed, must be removed
for ( size_t i = 0, n = aEraseList.size(); i < n; ++i )
Remove( aEraseList[ i ] );
}
// --------------------------------------------------------------------
-// Neues SvxNumBulletItem fuer das jeweilige StyleSheet setzen
+// Set new SvxNumBulletItem for the respective style sheet
// --------------------------------------------------------------------
void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
@@ -983,7 +980,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
{
case HID_STANDARD_STYLESHEET_NAME :
{
- // Standard-Vorlage
+ // Standard template
SvxNumberFormat aNumberFormat(SVX_NUM_CHAR_SPECIAL);
aNumberFormat.SetBulletFont(&rBulletFont);
aNumberFormat.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34
@@ -1012,7 +1009,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
/* title gets same bullet as subtitle and not that page symbol anymore */
case HID_PSEUDOSHEET_SUBTITLE :
{
- // Untertitel-Vorlage
+ // Subtitle template
SvxNumRule* pDefaultRule = ((SvxNumBulletItem*) rSet.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET))->GetNumRule();
DBG_ASSERT( pDefaultRule, "Wo ist mein Default? [CL]" );
@@ -1041,7 +1038,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
case HID_PSEUDOSHEET_OUTLINE + 1 :
{
- // Gliederungs-Vorlage
+ // Outline template
SvxNumberFormat aNumberFormat(SVX_NUM_CHAR_SPECIAL);
aNumberFormat.SetBulletColor(Color(COL_AUTO));
aNumberFormat.SetStart(1);
@@ -1109,7 +1106,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
/*************************************************************************
|*
-|* Standard Bullet-Font erzeugen (ohne Groesse)
+|* Create standard bullet font (without size)
|*
\************************************************************************/
commit 83b8e4c0defb0dba94dbee402ed4420882b6fc61
Author: Urs Fässler <urs at bitzgi.ch>
Date: Fri Mar 1 10:54:57 2013 +0100
translation of German comments in file sd/source/core/sdpage2.cxx
Change-Id: I310ca52319b553ab153dfce53b145f8785a4c62a
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index b4e5c40..8fbad2f 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -55,21 +55,22 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString&
/*************************************************************************
|*
-|* SetPresentationLayout, setzt: Layoutnamen, Masterpage-Verkn�pfung und
-|* Vorlagen fuer Praesentationsobjekte
+|* Sets: names of layout, master page links and templates for presentation
+|* objects
|*
-|* Vorraussetzungen: - Die Seite muss bereits das richtige Model kennen!
-|* - Die entsprechende Masterpage muss bereits im Model sein.
-|* - Die entsprechenden StyleSheets muessen bereits im
-|* im StyleSheetPool sein.
+|* Preconditions: - The page has to know the correct model!
+|* - The corresponding master page has to be in the model.
+|* - The corresponding style sheets have to be in the style sheet
+|* pool.
|*
-|* bReplaceStyleSheets = sal_True : Benannte StyleSheets werden ausgetauscht
-|* sal_False: Alle StyleSheets werden neu zugewiesen
+|* bReplaceStyleSheets = sal_True : Named style sheets are replaced
+|* sal_False: All style sheets are reassigned
|*
-|* bSetMasterPage = sal_True : MasterPage suchen und zuweisen
+|* bSetMasterPage = sal_True : search and assign master page
|*
-|* bReverseOrder = sal_False: MasterPages von vorn nach hinten suchen
-|* sal_True : MasterPages von hinten nach vorn suchen (fuer Undo-Action)
+|* bReverseOrder = sal_False: search master page from head to tail
+|* sal_True : search master page from tail to head
+|* (for undo operations)
|*
\************************************************************************/
@@ -79,7 +80,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
sal_Bool bReverseOrder)
{
/*********************************************************************
- |* Layoutname der Seite
+ |* Name of the layout of the page
\********************************************************************/
OUString aOldLayoutName(maLayoutName); // merken
OUStringBuffer aBuf(rLayoutName);
@@ -87,7 +88,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
maLayoutName = aBuf.makeStringAndClear();
/*********************************************************************
- |* ggf. Masterpage suchen und setzen
+ |* search and replace master page if necessary
\********************************************************************/
if (bSetMasterPage && !IsMasterPage())
{
@@ -132,11 +133,11 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
}
/*********************************************************************
- |* Vorlagen fuer Praesentationsobjekte
+ |* templates for presentation objects
\********************************************************************/
- // Listen mit:
- // - Vorlagenzeigern fuer Gliederungstextobjekt (alte und neue Vorlagen)
- // -Replacedaten fuer OutlinerParaObject
+ // list with:
+ // - pointer to templates for outline text object (old and new templates)
+ // - replace-data for OutlinerParaObject
std::vector<SfxStyleSheetBase*> aOutlineStyles;
std::vector<SfxStyleSheetBase*> aOldOutlineStyles;
boost::ptr_vector<StyleReplaceData> aReplList;
@@ -177,7 +178,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
if (bReplaceStyleSheets && pSheet)
{
- // Replace anstatt Set
+ // Replace instead Set
StyleReplaceData* pReplData = new StyleReplaceData;
pReplData->nNewFamily = pSheet->GetFamily();
pReplData->nFamily = pSheet->GetFamily();
@@ -234,9 +235,9 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
else if (pObj->GetObjInventor() == SdrInventor &&
pObj->GetObjIdentifier() == OBJ_TITLETEXT)
{
- // PresObjKind nicht ueber GetPresObjKind() holen, da dort nur
- // die PresObjListe beruecksichtigt wird. Es sollen aber alle
- // "Titelobjekte" hier beruecksichtigt werden (Paste aus Clipboard usw.)
+ // We do net get PresObjKind via GetPresObjKind() since there are
+ // only PresObjListe considered. But we want to consider all "Title
+ // objects" here (paste from clipboard etc.)
SfxStyleSheet* pSheet = GetStyleSheetForPresObj(PRESOBJ_TITLE);
if (pSheet)
@@ -255,8 +256,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
/*************************************************************************
|*
-|* das Gliederungstextobjekt bei den Vorlagen fuer die Gliederungsebenen
-|* abmelden
+|* disconnect outline text object from templates for outline levels
|*
\************************************************************************/
@@ -286,7 +286,7 @@ void SdPage::EndListenOutlineText()
/*************************************************************************
|*
-|* Neues Model setzen
+|* Set new model
|*
\************************************************************************/
@@ -294,7 +294,7 @@ void SdPage::SetModel(SdrModel* pNewModel)
{
DisconnectLink();
- // Model umsetzen
+ // assign model
FmFormPage::SetModel(pNewModel);
ConnectLink();
@@ -302,7 +302,7 @@ void SdPage::SetModel(SdrModel* pNewModel)
/*************************************************************************
|*
-|* Ist die Seite read-only?
+|* Is this page read-only?
|*
\************************************************************************/
@@ -313,7 +313,7 @@ bool SdPage::IsReadOnly() const
/*************************************************************************
|*
-|* Beim sfx2::LinkManager anmelden
+|* Connect to sfx2::LinkManager
|*
\************************************************************************/
@@ -326,14 +326,14 @@ void SdPage::ConnectLink()
( (SdDrawDocument*) pModel)->IsNewOrLoadCompleted())
{
/**********************************************************************
- * Anmelden
- * Nur Standardseiten duerfen gelinkt sein
+ * Connect
+ * Only standard pages are allowed to be linked
**********************************************************************/
::sd::DrawDocShell* pDocSh = ((SdDrawDocument*) pModel)->GetDocSh();
if (!pDocSh || !pDocSh->GetMedium()->GetOrigURL().equals(maFileName))
{
- // Keine Links auf Dokument-eigene Seiten!
+ // No links to document owned pages!
mpPageLink = new SdPageLink(this, maFileName, maBookmarkName);
String aFilterName(SdResId(STR_IMPRESS));
pLinkManager->InsertFileLink(*mpPageLink, OBJECT_CLIENT_FILE,
@@ -346,7 +346,7 @@ void SdPage::ConnectLink()
/*************************************************************************
|*
-|* Beim sfx2::LinkManager abmelden
+|* Disconnect from sfx2::LinkManager
|*
\************************************************************************/
@@ -357,8 +357,8 @@ void SdPage::DisconnectLink()
if (pLinkManager && mpPageLink)
{
/**********************************************************************
- * Abmelden
- * (Bei Remove wird *pGraphicLink implizit deleted)
+ * Disconnect
+ * (remove deletes *pGraphicLink implicit)
**********************************************************************/
pLinkManager->Remove(mpPageLink);
mpPageLink=NULL;
@@ -410,7 +410,7 @@ SdPage::SdPage(const SdPage& rSrcPage)
// header footer
setHeaderFooterSettings( rSrcPage.getHeaderFooterSettings() );
- mpPageLink = NULL; // Wird beim Einfuegen ueber ConnectLink() gesetzt
+ mpPageLink = NULL; // is set when inserting via ConnectLink()
}
More information about the Libreoffice-commits
mailing list