diff options
Diffstat (limited to 'sd/source/filter/ppt/pptin.cxx')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 3e1e6c454a1a..88c469243d76 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -605,7 +605,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } } @@ -618,7 +618,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } @@ -663,14 +663,13 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, nTitleInstance, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, nTitleInstance, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } // outlinerstylesheet sal_uInt16 nLevel; PPTParagraphObj* pParagraphs[ 9 ]; - PPTParagraphObj* pPreviousPara = nullptr; for ( nLevel = 0; nLevel < 9; nLevel++ ) { @@ -685,9 +684,8 @@ bool ImplSdPPTImport::Import() SfxItemSet& rItemSet = pOutlineSheet->GetItemSet(); PPTPortionObj aPortion( *pPPTStyleSheet, nOutlinerInstance, nLevel ); pParagraphs[ nLevel ]->AppendPortion( aPortion ); - pParagraphs[ nLevel ]->ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, pPreviousPara ); + pParagraphs[ nLevel ]->ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); - pPreviousPara = pParagraphs[ nLevel ]; } else pParagraphs[ nLevel ] = nullptr; @@ -702,7 +700,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::Subtitle, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::Subtitle, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } } @@ -715,7 +713,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::Notes, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::Notes, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } } |