From f8f30f6bc2cc3b84f26818164d15b94922ae9553 Mon Sep 17 00:00:00 2001 From: Miklos Vajna <vmiklos@collabora.co.uk> Date: Tue, 31 Mar 2015 11:58:23 +0200 Subject: Change the Logic in SetGraphicLogicPosition() Seeing that SetGraphicLogicPosition works in twips in sw but in mm100 in sd, change the Logic in then name to the actual unit. Change-Id: I825f735eac8c626efcb11d85532ea30e85416acd --- sd/source/ui/inc/ViewShell.hxx | 2 +- sd/source/ui/unoidl/unomodel.cxx | 4 ++-- sd/source/ui/view/viewshel.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 89bd8e6dce1d..93bb0f9485e2 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -450,7 +450,7 @@ public: /// Allows adjusting the point or mark of the selection to a document coordinate. void SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool bClearMark); /// Allows starting or ending a graphic move or resize action. - void SetGraphicLogicPosition(bool bStart, const Point& rPosition); + void SetGraphicMm100Position(bool bStart, const Point& rPosition); class Implementation; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index dd908974db9a..9cb8df9acd93 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2440,10 +2440,10 @@ void SdXImpressDocument::setGraphicSelection(int nType, int nX, int nY) switch (nType) { case LOK_SETGRAPHICSELECTION_START: - pViewShell->SetGraphicLogicPosition(/*bStart=*/true, aPoint); + pViewShell->SetGraphicMm100Position(/*bStart=*/true, aPoint); break; case LOK_SETGRAPHICSELECTION_END: - pViewShell->SetGraphicLogicPosition(/*bStart=*/false, aPoint); + pViewShell->SetGraphicMm100Position(/*bStart=*/false, aPoint); break; default: assert(false); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 2ce29b972481..2f5ebf1c485d 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -548,7 +548,7 @@ void ViewShell::SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool } } -void ViewShell::SetGraphicLogicPosition(bool bStart, const Point& rPosition) +void ViewShell::SetGraphicMm100Position(bool bStart, const Point& rPosition) { if (bStart) { -- cgit