Kaydet (Commit) 08416ff7 authored tarafından Urs Fässler's avatar Urs Fässler

translated last missed german comments in sd/

Change-Id: I48102b5e4d41ba786e9f9476b480715d5756ab87
üst 3e33adc4
...@@ -144,7 +144,7 @@ SdStyleSheet::SdStyleSheet( const SdStyleSheet & r ) ...@@ -144,7 +144,7 @@ SdStyleSheet::SdStyleSheet( const SdStyleSheet & r )
SdStyleSheet::~SdStyleSheet() SdStyleSheet::~SdStyleSheet()
{ {
delete pSet; delete pSet;
pSet = NULL; // damit nachfolgende Destruktoren eine Chance haben pSet = NULL; // that following destructors also get a change
} }
void SdStyleSheet::SetApiName( const OUString& rApiName ) void SdStyleSheet::SetApiName( const OUString& rApiName )
...@@ -165,31 +165,19 @@ void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion) ...@@ -165,31 +165,19 @@ void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion)
{ {
SfxStyleSheetBase::Load(rIn, nVersion); SfxStyleSheetBase::Load(rIn, nVersion);
// Die Default-Maske war frueher 0xAFFE. /* previously, the default mask was 0xAFFE. The needed flags were masked
// Aus dieser Default-Maske wurden die benoetigten Flags ausmaskiert. from this mask. Now the flag SFXSTYLEBIT_READONLY was introduced and with
// Nun wurde das Flag SFXSTYLEBIT_READONLY eingefuehrt, was dazu this, all style sheets are read only. Since no style sheet should be read
// das alle StyleSheets read-only waren. only in Draw, we reset the flag here. */
// Da im Draw kein StyleSheet read-only sein soll, wird an dieser Stelle
// das Flag zurueckgesetzt.
nMask &= ~SFXSTYLEBIT_READONLY; nMask &= ~SFXSTYLEBIT_READONLY;
} }
/*************************************************************************
|*
|* Store
|*
\************************************************************************/
void SdStyleSheet::Store(SvStream& rOut) void SdStyleSheet::Store(SvStream& rOut)
{ {
SfxStyleSheetBase::Store(rOut); SfxStyleSheetBase::Store(rOut);
} }
/*************************************************************************
|*
|* Parent setzen
|*
\************************************************************************/
bool SdStyleSheet::SetParent(const String& rParentName) bool SdStyleSheet::SetParent(const String& rParentName)
{ {
...@@ -197,7 +185,7 @@ bool SdStyleSheet::SetParent(const String& rParentName) ...@@ -197,7 +185,7 @@ bool SdStyleSheet::SetParent(const String& rParentName)
if (SfxStyleSheet::SetParent(rParentName)) if (SfxStyleSheet::SetParent(rParentName))
{ {
// PseudoStyleSheets haben keine eigenen ItemSets // PseudoStyleSheets do not have their own ItemSets
if (nFamily != SD_STYLE_FAMILY_PSEUDO) if (nFamily != SD_STYLE_FAMILY_PSEUDO)
{ {
if( rParentName.Len() ) if( rParentName.Len() )
...@@ -226,17 +214,14 @@ bool SdStyleSheet::SetParent(const String& rParentName) ...@@ -226,17 +214,14 @@ bool SdStyleSheet::SetParent(const String& rParentName)
return bResult; return bResult;
} }
/************************************************************************* /**
|* * create if necessary and return ItemSets
|* ItemSet ggfs. erzeugen und herausreichen */
|*
\************************************************************************/
SfxItemSet& SdStyleSheet::GetItemSet() SfxItemSet& SdStyleSheet::GetItemSet()
{ {
if (nFamily == SD_STYLE_FAMILY_GRAPHICS || nFamily == SD_STYLE_FAMILY_MASTERPAGE) if (nFamily == SD_STYLE_FAMILY_GRAPHICS || nFamily == SD_STYLE_FAMILY_MASTERPAGE)
{ {
// ggfs. das ItemSet 'on demand' anlegen // we create the ItemSet 'on demand' if necessary
if (!pSet) if (!pSet)
{ {
sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST,
...@@ -288,8 +273,8 @@ SfxItemSet& SdStyleSheet::GetItemSet() ...@@ -288,8 +273,8 @@ SfxItemSet& SdStyleSheet::GetItemSet()
return *pSet; return *pSet;
} }
// dies ist eine Stellvertretervorlage fuer die interne Vorlage des // this is a dummy template for the internal template of the
// aktuellen Praesentationslayouts: dessen ItemSet returnieren // current presentation layout; return the ItemSet of that template
else else
{ {
...@@ -329,13 +314,10 @@ SfxItemSet& SdStyleSheet::GetItemSet() ...@@ -329,13 +314,10 @@ SfxItemSet& SdStyleSheet::GetItemSet()
} }
} }
/************************************************************************* /**
|* * A template is used when it is referenced by inserted object or by a used
|* IsUsed(), eine Vorlage gilt als benutzt, wenn sie von eingefuegten Objekten * template.
|* oder von benutzten Vorlagen referenziert wird */
|*
\************************************************************************/
bool SdStyleSheet::IsUsed() const bool SdStyleSheet::IsUsed() const
{ {
bool bResult = false; bool bResult = false;
...@@ -378,12 +360,9 @@ bool SdStyleSheet::IsUsed() const ...@@ -378,12 +360,9 @@ bool SdStyleSheet::IsUsed() const
return bResult; return bResult;
} }
/************************************************************************* /**
|* * Determine the style sheet for which this dummy is for.
|* das StyleSheet ermitteln, fuer das dieses StyleSheet steht */
|*
\************************************************************************/
SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
{ {
OUString aRealStyle; OUString aRealStyle;
...@@ -421,8 +400,8 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const ...@@ -421,8 +400,8 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
} }
else else
{ {
// Noch keine Seite vorhanden /* no page available yet. This can happen when actualising the
// Dieses kann beim Aktualisieren vonDokumentvorlagen vorkommen document templates. */
SfxStyleSheetIterator aIter(pPool, SD_STYLE_FAMILY_MASTERPAGE); SfxStyleSheetIterator aIter(pPool, SD_STYLE_FAMILY_MASTERPAGE);
SfxStyleSheetBase* pSheet = aIter.First(); SfxStyleSheetBase* pSheet = aIter.First();
if( pSheet ) if( pSheet )
...@@ -435,8 +414,8 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const ...@@ -435,8 +414,8 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
} }
} }
// jetzt vom Namen (landessprachlich angepasst) auf den internen /* now map from the name (specified for country language) to the internal
// Namen (unabhaengig von der Landessprache) mappen name (independent of the country language) */
String aInternalName; String aInternalName;
if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE))) if (aName == String(SdResId(STR_PSEUDOSHEET_TITLE)))
...@@ -487,18 +466,15 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const ...@@ -487,18 +466,15 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
return pRealStyle; return pRealStyle;
} }
/************************************************************************* /**
|* * Determine pseudo style sheet which stands for this style sheet.
|* das PseudoStyleSheet ermitteln, durch das dieses StyleSheet vertreten wird */
|*
\************************************************************************/
SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
{ {
SdStyleSheet* pPseudoStyle = NULL; SdStyleSheet* pPseudoStyle = NULL;
OUString aSep( SD_LT_SEPARATOR ); OUString aSep( SD_LT_SEPARATOR );
OUString aStyleName(aName); OUString aStyleName(aName);
// ohne Layoutnamen und Separator // without layout name and seperator
if( aStyleName.indexOf(aSep) >=0 ) if( aStyleName.indexOf(aSep) >=0 )
{ {
...@@ -544,20 +520,13 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const ...@@ -544,20 +520,13 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
} }
/*************************************************************************
|*
|* Notify
|*
\************************************************************************/
void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{ {
// erstmal die Basisklassenfunktionalitaet // first, base class functionality
SfxStyleSheet::Notify(rBC, rHint); SfxStyleSheet::Notify(rBC, rHint);
// wenn der Stellvertreter ein Notify bezueglich geaenderter Attribute /* if the dummy gets a notify about a changed attribute, he takes care that
// bekommt, sorgt er dafuer, dass das eigentlich gemeinte StyleSheet the actual ment style sheet sends broadcasts. */
// broadcastet
SfxSimpleHint* pSimple = PTR_CAST(SfxSimpleHint, &rHint); SfxSimpleHint* pSimple = PTR_CAST(SfxSimpleHint, &rHint);
sal_uLong nId = pSimple == NULL ? 0 : pSimple->GetId(); sal_uLong nId = pSimple == NULL ? 0 : pSimple->GetId();
if (nId == SFX_HINT_DATACHANGED && nFamily == SD_STYLE_FAMILY_PSEUDO) if (nId == SFX_HINT_DATACHANGED && nFamily == SD_STYLE_FAMILY_PSEUDO)
...@@ -568,20 +537,18 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) ...@@ -568,20 +537,18 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
} }
} }
/************************************************************************* /**
|* AdjustToFontHeight passt die Bulletbreite und den linken Texteinzug * Adjust the bullet width and the left text indent of the provided ItemSets to
|* des uebergebenen ItemSets dessen Fonthoehe an. Die neuen Werte werden so * their font height. The new values are calculated that the ratio to the font
|* berechnet, dass das Verhaeltnis zur Fonthoehe so ist wie im StyleSheet. * height is as in the style sheet.
|* *
|* bOnlyMissingItems legt fest, ob lediglich nicht gesetzte Items ergaenzt * @param bOnlyMissingItems If sal_True, only not set items are completed. With
|* (sal_True) oder explizit gesetzte Items ueberschreiben werden sollen (sal_False) * sal_False, are items are overwritten.
|* */
\************************************************************************/
void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems) void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems)
{ {
// Bulletbreite und Texteinzug an neue Fonthoehe /* If not explicit set, ddjust bullet width and text indent to new font
// anpassen, wenn sie nicht explizit gesetzt wurden height. */
SfxStyleFamily eFamily = nFamily; SfxStyleFamily eFamily = nFamily;
OUString aStyleName(aName); OUString aStyleName(aName);
if (eFamily == SD_STYLE_FAMILY_PSEUDO) if (eFamily == SD_STYLE_FAMILY_PSEUDO)
......
...@@ -1350,7 +1350,7 @@ void PPTWriter::ImplWriteOLE( ) ...@@ -1350,7 +1350,7 @@ void PPTWriter::ImplWriteOLE( )
} }
// --------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------
// PersistantTable und UserEditAtom schreiben // write PersistantTable and UserEditAtom
sal_Bool PPTWriter::ImplWriteAtomEnding() sal_Bool PPTWriter::ImplWriteAtomEnding()
{ {
...@@ -1364,7 +1364,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() ...@@ -1364,7 +1364,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
sal_uInt32 nPersistEntrys = 0; sal_uInt32 nPersistEntrys = 0;
*mpStrm << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0; // skip record header and first entry *mpStrm << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0; // skip record header and first entry
// Document pesist schreiben // write document persist
nPersistEntrys++; nPersistEntrys++;
*mpStrm << (sal_uInt32)0; *mpStrm << (sal_uInt32)0;
// write MasterPages persists // write MasterPages persists
...@@ -1449,7 +1449,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() ...@@ -1449,7 +1449,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
*mpStrm << (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 ); *mpStrm << (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 );
mpStrm->Seek( nPos ); mpStrm->Seek( nPos );
*mpCurUserStrm << (sal_uInt32)nPos; // offset to current edit setzen *mpCurUserStrm << (sal_uInt32)nPos; // set offset to current edit
mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom ); mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom );
*mpStrm << (sal_Int32)0x100 // last slide ID *mpStrm << (sal_Int32)0x100 // last slide ID
<< (sal_uInt32)0x03000dbc // minor and major app version that did the save << (sal_uInt32)0x03000dbc // minor and major app version that did the save
......
...@@ -1038,8 +1038,9 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) ...@@ -1038,8 +1038,9 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
} }
} }
// ---------------------------------------------------------------------------------------- /**
// laedt und konvertiert text aus shape, ergebnis ist mnTextSize gespeichert; * Loads and converts text from shape, value is stored in mnTextSize.
*/
sal_Bool PPTWriter::ImplGetText() sal_Bool PPTWriter::ImplGetText()
{ {
mnTextSize = 0; mnTextSize = 0;
...@@ -1079,7 +1080,7 @@ void PPTWriter::ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ) ...@@ -1079,7 +1080,7 @@ void PPTWriter::ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt )
maRect.Move( (sal_Int32)( -( fWidthHalf - fXDiff ) ), (sal_Int32)( - ( fHeightHalf + fYDiff ) ) ); maRect.Move( (sal_Int32)( -( fWidthHalf - fXDiff ) ), (sal_Int32)( - ( fHeightHalf + fYDiff ) ) );
mnAngle *= 655; mnAngle *= 655;
mnAngle += 0x8000; mnAngle += 0x8000;
mnAngle &=~0xffff; // nAngle auf volle Gradzahl runden mnAngle &=~0xffff; // round nAngle to full grads
rPropOpt.AddOpt( ESCHER_Prop_Rotation, mnAngle ); rPropOpt.AddOpt( ESCHER_Prop_Rotation, mnAngle );
if ( ( mnAngle >= ( 45 << 16 ) && mnAngle < ( 135 << 16 ) ) || if ( ( mnAngle >= ( 45 << 16 ) && mnAngle < ( 135 << 16 ) ) ||
...@@ -3478,7 +3479,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ...@@ -3478,7 +3479,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
mnAngle *= 655; mnAngle *= 655;
mnAngle += 0x8000; mnAngle += 0x8000;
mnAngle &=~0xffff; // nAngle auf volle Gradzahl runden mnAngle &=~0xffff; // round nAngle to full grad
aPropOpt.AddOpt( ESCHER_Prop_Rotation, mnAngle ); aPropOpt.AddOpt( ESCHER_Prop_Rotation, mnAngle );
mpPptEscherEx->SetGroupSnapRect( nGroupLevel, maRect ); mpPptEscherEx->SetGroupSnapRect( nGroupLevel, maRect );
mpPptEscherEx->SetGroupLogicRect( nGroupLevel, maRect ); mpPptEscherEx->SetGroupLogicRect( nGroupLevel, maRect );
......
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