svx/source/svdraw/svdpdf.cxx | 4 ++-- svx/source/svdraw/svdpdf.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 92b0a4d933d682bfce10fa5f04c7a966f20cde7a Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> AuthorDate: Fri May 1 17:30:22 2020 +0200 Commit: Tomaž Vajngerl <qui...@gmail.com> CommitDate: Sun May 3 11:10:23 2020 +0200 SdrPdfImport: rename ImportText to InsertTextObject There are two ImportText methods, so rename one to something else to avoid confusion. Change-Id: I1ccc491fca47b2d72ba1f7bd5a75d325819ec041 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93333 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index 296d2b53f31b..7e4a3e6a5345 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -879,10 +879,10 @@ void ImpSdrPdfImport::ImportText(FPDF_PAGEOBJECT pPageObject, FPDF_TEXTPAGE pTex mbFntDirty = true; } - ImportText(aRect.TopLeft(), aRect.GetSize(), sText); + InsertTextObject(aRect.TopLeft(), aRect.GetSize(), sText); } -void ImpSdrPdfImport::ImportText(const Point& rPos, const Size& rSize, const OUString& rStr) +void ImpSdrPdfImport::InsertTextObject(const Point& rPos, const Size& rSize, const OUString& rStr) { // calc text box size, add 5% to make it fit safely diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx index db5eabe3445d..d9d35fe0c80c 100644 --- a/svx/source/svdraw/svdpdf.hxx +++ b/svx/source/svdraw/svdpdf.hxx @@ -110,7 +110,7 @@ class ImpSdrPdfImport final void ImportImage(FPDF_PAGEOBJECT pPageObject, int nPageObjectIndex); void ImportPath(FPDF_PAGEOBJECT pPageObject, int nPageObjectIndex); void ImportText(FPDF_PAGEOBJECT pPageObject, FPDF_TEXTPAGE pTextPage, int nPageObjectIndex); - void ImportText(const Point& rPos, const Size& rSize, const OUString& rStr); + void InsertTextObject(const Point& rPos, const Size& rSize, const OUString& rStr); void SetupPageScale(const double dPageWidth, const double dPageHeight); void SetAttributes(SdrObject* pObj, bool bForceTextAttr = false); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits