summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-03-31 11:58:23 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-07 09:18:06 +0200
commitf8f30f6bc2cc3b84f26818164d15b94922ae9553 (patch)
tree51c2bdfb4de6cbd9bec700476020449c85dd9be0
parent8f6b3d6421efb8cc0a22aafa5cbf0312006749cc (diff)
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
-rw-r--r--sd/source/ui/inc/ViewShell.hxx2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/view/viewshel.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx2
-rw-r--r--sw/source/uibase/inc/edtwin.hxx2
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx4
6 files changed, 8 insertions, 8 deletions
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)
{
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index f0831acce215..9b0eecb2abc2 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6229,7 +6229,7 @@ void SwEditWin::SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool
rShell.getShellCrsr(/*bBlock=*/false)->Exchange();
}
-void SwEditWin::SetGraphicLogicPosition(bool bStart, const Point& rPosition)
+void SwEditWin::SetGraphicTwipPosition(bool bStart, const Point& rPosition)
{
if (bStart)
{
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index b9d00f9eaf5f..5a4cf7aa7198 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -305,7 +305,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 SetGraphicTwipPosition(bool bStart, const Point& rPosition);
};
#endif
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 15b9a96a1091..f34f83b75181 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3234,10 +3234,10 @@ void SwXTextDocument::setGraphicSelection(int nType, int nX, int nY)
switch (nType)
{
case LOK_SETGRAPHICSELECTION_START:
- rEditWin.SetGraphicLogicPosition(/*bStart=*/true, Point(nX, nY));
+ rEditWin.SetGraphicTwipPosition(/*bStart=*/true, Point(nX, nY));
break;
case LOK_SETGRAPHICSELECTION_END:
- rEditWin.SetGraphicLogicPosition(/*bStart=*/false, Point(nX, nY));
+ rEditWin.SetGraphicTwipPosition(/*bStart=*/false, Point(nX, nY));
break;
default:
assert(false);