[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - sd/source

[Tomaž Vajngerl (via logerrit)]

 sd/source/ui/view/Outliner.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit fcd4982b60a1a54de66f1ca47f20670f2623e4e1
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri May 29 08:36:34 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Fri May 29 08:36:34 2020 +0200

    sd: use b2DRectangleFromRectangle from canvastools.hxx
    
    Change-Id: I8604b80f887a2c3a1143b8a9bc70f429576512f1

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e6dfcb27bc0a..89f87baa98bf 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -26,6 +26,7 @@
 #include <svl/srchitem.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/editstat.hxx>
+#include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/dispatch.hxx>
@@ -694,15 +695,6 @@ bool SdOutliner::SearchAndReplaceAll()
 
 namespace
 {
-basegfx::B2DRange b2DRectangleFromRectangle( const ::tools::Rectangle& rRect )
-{
-    if (rRect.IsWidthEmpty() && rRect.IsHeightEmpty())
-        return basegfx::B2DRange(basegfx::B2DTuple(rRect.Left(), rRect.Top()));
-    return basegfx::B2DRectangle(rRect.Left(),
-                                 rRect.Top(),
-                                 rRect.IsWidthEmpty() ? rRect.Left() : rRect.Right(),
-                                 rRect.IsHeightEmpty() ? rRect.Top() : rRect.Bottom());
-}
 
 basegfx::B2DRectangle getPDFSelection(std::unique_ptr<VectorGraphicSearch> & rVectorGraphicSearch,
                                        SdrObject* pObject)
@@ -715,7 +707,7 @@ basegfx::B2DRectangle getPDFSelection(std::unique_ptr<VectorGraphicSearch> & rVe
 
     basegfx::B2DSize aPdfPageSizeHMM = rVectorGraphicSearch->pageSize();
 
-    basegfx::B2DRectangle aObjectB2DRectHMM(b2DRectangleFromRectangle(pObject->GetLogicRect()));
+    basegfx::B2DRectangle aObjectB2DRectHMM(vcl::unotools::b2DRectangleFromRectangle(pObject->GetLogicRect()));
 
     // Setup coordinate conversion matrix to convert the inner PDF
     // coordinates to the page relative coordinates