svx/source/inc/svdpdf.hxx | 2 +-
svx/source/svdraw/svdpdf.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1dd9431056b8e16e6c2c916baa251121c36e0b7e
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 1 17:30:22 2020 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Jun 8 13:45:35 2020 +0200
SdrPdfImport: rename ImportText to InsertTextObject
There are two ImportText methods, so rename one to something
else to avoid confusion.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93333
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 92b0a4d933d682bfce10fa5f04c7a966f20cde7a)
Change-Id: I1ccc491fca47b2d72ba1f7bd5a75d325819ec041
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95785
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/svx/source/inc/svdpdf.hxx b/svx/source/inc/svdpdf.hxx
index 60894542fb8f..cc3ec7f27bfa 100644
--- a/svx/source/inc/svdpdf.hxx
+++ b/svx/source/inc/svdpdf.hxx
@@ -114,7 +114,7 @@ class SVXCORE_DLLPUBLIC 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);
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 4d973c433711..b380d478d806 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -872,10 +872,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
