filter/source/msfilter/svdfppt.cxx | 5 -----
include/filter/msfilter/svdfppt.hxx | 5 ++---
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 6d5e2ca07fb0c8686c9e09645933ca0f2f58ab71
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 25 12:35:36 2018 +0000
drop GetPageSize no-op function
which used to have some commented out stuff which considered changing
the size, but was all removed ages ago
Change-Id: Iff62a71e9b7d31acb16016b5e72d168327111ce7
Reviewed-on: https://gerrit.libreoffice.org/48583
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index b560fa6f7f71..3779ea408e3f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -248,11 +248,6 @@ SvStream& ReadPptExOleObjAtom( SvStream& rIn,
PptExOleObjAtom& rAtom )
return rIn;
}
-const Size& PptDocumentAtom::GetPageSize(const Size& rSiz)
-{
- return rSiz;
-}
-
SvStream& ReadPptDocumentAtom(SvStream& rIn, PptDocumentAtom& rAtom)
{
// Actual format:
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index 689236766fb9..a4b058b581fa 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -195,9 +195,8 @@ struct MSFILTER_DLLPUBLIC PptDocumentAtom
public:
- static const Size& GetPageSize( const Size& rSiz );
- Size GetSlidesPageSize() const { return GetPageSize(
aSlidesPageSize ); }
- Size GetNotesPageSize() const { return GetPageSize( aNotesPageSize
); }
+ Size GetSlidesPageSize() const { return aSlidesPageSize; }
+ Size GetNotesPageSize() const { return aNotesPageSize; }
friend SvStream& ReadPptDocumentAtom( SvStream& rIn, PptDocumentAtom&
rAtom );
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
