summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-10-26 23:15:06 +0200
committerMichael Stahl <mstahl@redhat.com>2017-10-26 23:17:45 +0200
commit11d2f3d6e1b6c9baf43d8521293c53525108436d (patch)
treeffe35d5d47713a11c93c3bf11f588eeaf492fc16 /starmath
parent213f7c02d4f3ddbe2f52950575e2559c52d98ac2 (diff)
vcl: make MapMode constructor explicit
Insert constructor everywhere, except a couple places that apparently want to compare GetMapUnit(). Change-Id: I1910deb60562e5e949203435e827057f70a3f988
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/ElementsDockingWindow.cxx2
-rw-r--r--starmath/source/accessibility.cxx12
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--starmath/source/edit.cxx2
-rw-r--r--starmath/source/tmpdevice.cxx2
-rw-r--r--starmath/source/unomodel.cxx2
-rw-r--r--starmath/source/view.cxx2
7 files changed, 12 insertions, 12 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index d40e1606e2c6..9ddf2d21f5c6 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -529,7 +529,7 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin
pNode->SetSize(Fraction(10,8));
pNode->Arrange(*this, maFormat);
- Size aSizePixel = LogicToPixel(Size(pNode->GetWidth(), pNode->GetHeight()), MapUnit::Map100thMM);
+ Size aSizePixel = LogicToPixel(Size(pNode->GetWidth(), pNode->GetHeight()), MapMode(MapUnit::Map100thMM));
if (aSizePixel.Width() > maMaxElementDimensions.Width()) {
maMaxElementDimensions.Width() = aSizePixel.Width();
}
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index f2d0f1b8655d..c7e7ad737c60 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -825,7 +825,7 @@ tools::Rectangle SmViewForwarder::GetVisArea() const
MapMode aMapMode(pOutDev->GetMapMode());
aVisArea = OutputDevice::LogicToLogic( aVisArea,
pEditEngine->GetRefMapMode(),
- aMapMode.GetMapUnit() );
+ MapMode(aMapMode.GetMapUnit()));
aMapMode.SetOrigin(Point());
return pOutDev->LogicToPixel( aVisArea, aMapMode );
}
@@ -843,7 +843,7 @@ Point SmViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMod
{
MapMode aMapMode(pOutDev->GetMapMode());
Point aPoint( OutputDevice::LogicToLogic( rPoint, rMapMode,
- aMapMode.GetMapUnit() ) );
+ MapMode(aMapMode.GetMapUnit())) );
aMapMode.SetOrigin(Point());
return pOutDev->LogicToPixel( aPoint, aMapMode );
}
@@ -862,7 +862,7 @@ Point SmViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod
aMapMode.SetOrigin(Point());
Point aPoint( pOutDev->PixelToLogic( rPoint, aMapMode ) );
return OutputDevice::LogicToLogic( aPoint,
- aMapMode.GetMapUnit(),
+ MapMode(aMapMode.GetMapUnit()),
rMapMode );
}
@@ -1431,7 +1431,7 @@ tools::Rectangle SmEditViewForwarder::GetVisArea() const
MapMode aMapMode(pOutDev->GetMapMode());
aVisArea = OutputDevice::LogicToLogic( aVisArea,
pEditEngine->GetRefMapMode(),
- aMapMode.GetMapUnit() );
+ MapMode(aMapMode.GetMapUnit()));
aMapMode.SetOrigin(Point());
aRect = pOutDev->LogicToPixel( aVisArea, aMapMode );
}
@@ -1449,7 +1449,7 @@ Point SmEditViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMa
{
MapMode aMapMode(pOutDev->GetMapMode());
Point aPoint( OutputDevice::LogicToLogic( rPoint, rMapMode,
- aMapMode.GetMapUnit() ) );
+ MapMode(aMapMode.GetMapUnit())));
aMapMode.SetOrigin(Point());
return pOutDev->LogicToPixel( aPoint, aMapMode );
}
@@ -1468,7 +1468,7 @@ Point SmEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa
aMapMode.SetOrigin(Point());
Point aPoint( pOutDev->PixelToLogic( rPoint, aMapMode ) );
return OutputDevice::LogicToLogic( aPoint,
- aMapMode.GetMapUnit(),
+ MapMode(aMapMode.GetMapUnit()),
rMapMode );
}
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 1baf0339b113..ae8587e9d3ca 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -342,7 +342,7 @@ EditEngine& SmDocShell::GetEditEngine()
EEControlBits(~EEControlBits::PASTESPECIAL) );
mpEditEngine->SetWordDelimiters(" .=+-*/(){}[];\"");
- mpEditEngine->SetRefMapMode( MapUnit::MapPixel );
+ mpEditEngine->SetRefMapMode(MapMode(MapUnit::MapPixel));
mpEditEngine->SetPaperSize( Size( 800, 0 ) );
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index d044bd1b7959..84094839b961 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -80,7 +80,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
{
set_id("math_edit");
SetHelpId(HID_SMA_COMMAND_WIN_EDIT);
- SetMapMode(MapUnit::MapPixel);
+ SetMapMode(MapMode(MapUnit::MapPixel));
// Even RTL languages don't use RTL for math
EnableRTL( false );
diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx
index 1983a0059765..e47bc1b72ffb 100644
--- a/starmath/source/tmpdevice.cxx
+++ b/starmath/source/tmpdevice.cxx
@@ -38,7 +38,7 @@ SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm) :
if (bUseMap100th_mm && MapUnit::Map100thMM != rOutDev.GetMapMode().GetMapUnit())
{
SAL_WARN("starmath", "incorrect MapMode?");
- rOutDev.SetMapMode( MapUnit::Map100thMM ); //format for 100% always
+ rOutDev.SetMapMode(MapMode(MapUnit::Map100thMM)); // format for 100% always
}
}
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 114662deaf15..68527eb52e6b 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -982,7 +982,7 @@ void SAL_CALL SmModel::render(
if (!pOut)
throw RuntimeException();
- pOut->SetMapMode( MapUnit::Map100thMM );
+ pOut->SetMapMode(MapMode(MapUnit::Map100thMM));
uno::Reference< frame::XModel > xModel;
rSelection >>= xModel;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 1d433288bc6c..11c5b7148488 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -886,7 +886,7 @@ void SmViewShell::InnerResizePixel(const Point &rOfs, const Size &rSize, bool)
Size aObjSize = GetObjectShell()->GetVisArea().GetSize();
if ( aObjSize.Width() > 0 && aObjSize.Height() > 0 )
{
- Size aProvidedSize = GetWindow()->PixelToLogic( rSize, MapUnit::Map100thMM );
+ Size aProvidedSize = GetWindow()->PixelToLogic(rSize, MapMode(MapUnit::Map100thMM));
SfxViewShell::SetZoomFactor( Fraction( aProvidedSize.Width(), aObjSize.Width() ),
Fraction( aProvidedSize.Height(), aObjSize.Height() ) );
}