summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny_M <klasse@partyheld.de>2018-03-24 13:38:25 +0100
committerBartosz Kosiorek <gang65@poczta.onet.pl>2018-03-28 18:11:10 +0200
commitcc39342305af736e8b127af49df4af8998767ba0 (patch)
tree014dfebb1e8aaf6b90769e0a45cf7287c53a0a69
parent6a189b2ac72d5fb83199bdb09e41f7d088440cc9 (diff)
Translate German function names
Akt -> Current in ppt filter Change-Id: Id32efb885e5e1b04c7fd8f3ce0f21537b2e7576c Reviewed-on: https://gerrit.libreoffice.org/51800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
-rw-r--r--filter/source/msfilter/svdfppt.cxx10
-rw-r--r--include/filter/msfilter/svdfppt.hxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx6
3 files changed, 10 insertions, 10 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 19f5863a4036..cbd63e3eb6dc 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2417,7 +2417,7 @@ bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStream&
return bRetValue;
}
-sal_uInt32 SdrPowerPointImport::GetAktPageId()
+sal_uInt32 SdrPowerPointImport::GetCurrentPageId()
{
PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
if ( pList && nCurrentPageNum < pList->size() )
@@ -2425,7 +2425,7 @@ sal_uInt32 SdrPowerPointImport::GetAktPageId()
return 0;
}
-bool SdrPowerPointImport::SeekToAktPage( DffRecordHeader* pRecHd ) const
+bool SdrPowerPointImport::SeekToCurrentPage( DffRecordHeader* pRecHd ) const
{
bool bRet = false;
PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
@@ -2742,7 +2742,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
return;
DffRecordHeader aPageHd;
- if ( SeekToAktPage( &aPageHd ) )
+ if ( SeekToCurrentPage( &aPageHd ) )
{
rSlidePersist.xHeaderFooterEntry.reset(new HeaderFooterEntry(pMasterPersist));
ProcessData aProcessData( rSlidePersist, SdPageCapsule(pRet) );
@@ -3022,7 +3022,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
std::unique_ptr<SfxItemSet> pSet;
sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later
DffRecordHeader aPageHd;
- if ( SeekToAktPage( &aPageHd ) )
+ if ( SeekToCurrentPage( &aPageHd ) )
{ // and now search for the background attributes of the Page
sal_uLong nPageRecEnd = aPageHd.GetRecEndFilePos();
DffRecordHeader aPPDrawHd;
@@ -6554,7 +6554,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
}
if ( bStatus )
{
- sal_uInt32 nSlideId = rSdrPowerPointImport.GetAktPageId();
+ sal_uInt32 nSlideId = rSdrPowerPointImport.GetCurrentPageId();
if ( !nSlideId )
bStatus = false;
else
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index d06c1a4c4e42..0c25f15ad63e 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -578,7 +578,7 @@ protected:
protected:
using SdrEscherImport::ReadObjText;
- bool SeekToAktPage(DffRecordHeader* pRecHd) const;
+ bool SeekToCurrentPage(DffRecordHeader* pRecHd) const;
bool SeekToDocument(DffRecordHeader* pRecHd) const;
static bool SeekToContentOfProgTag(
sal_Int32 nVersion,
@@ -607,7 +607,7 @@ protected:
SdrPage* MakeBlancPage(bool bMaster) const;
bool ReadFontCollection();
PptSlidePersistList* GetPageList(PptPageKind ePageKind) const;
- sal_uInt32 GetAktPageId();
+ sal_uInt32 GetCurrentPageId();
sal_uInt32 GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const;
sal_uInt32 GetNotesPageId(sal_uInt16 nPageNum ) const;
static SdrOutliner* GetDrawOutliner( SdrTextObj const * pSdrText );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 6bf664f8a797..d93fa3dd8280 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -769,7 +769,7 @@ bool ImplSdPPTImport::Import()
ProcessData aProcessData( (*pList)[ nCurrentPageNum ], SdPageCapsule(pMPage) );
sal_uInt32 nFPosMerk = rStCtrl.Tell();
DffRecordHeader aPageHd;
- if ( SeekToAktPage( &aPageHd ) )
+ if ( SeekToCurrentPage( &aPageHd ) )
{
auto nEndRecPos = SanitizeEndPos(rStCtrl, aPageHd.GetRecEndFilePos());
while( ( rStCtrl.GetError() == ERRCODE_NONE ) && ( rStCtrl.Tell() < nEndRecPos ) )
@@ -932,7 +932,7 @@ bool ImplSdPPTImport::Import()
// CWS preseng01: pPage->SetPageKind( PageKind::Standard );
DffRecordHeader aPageHd;
- if ( SeekToAktPage( &aPageHd ) )
+ if ( SeekToCurrentPage( &aPageHd ) )
{
bool bNewAnimationsUsed = false;
@@ -1525,7 +1525,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
}
}
DffRecordHeader aPageRecHd;
- if ( SeekToAktPage( &aPageRecHd ) )
+ if ( SeekToCurrentPage( &aPageRecHd ) )
{
sal_uLong nPageRecEnd = SanitizeEndPos(rStCtrl, aPageRecHd.GetRecEndFilePos());