summaryrefslogtreecommitdiff
path: root/svtools/source/graphic
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r--svtools/source/graphic/descriptor.cxx4
-rw-r--r--svtools/source/graphic/grfmgr.cxx20
-rw-r--r--svtools/source/graphic/provider.cxx12
3 files changed, 18 insertions, 18 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 1cec88463da3..4f73e4fab05c 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -379,9 +379,9 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
if( mpGraphic )
{
- if( mpGraphic->GetPrefMapMode().GetMapUnit() != MAP_PIXEL )
+ if( mpGraphic->GetPrefMapMode().GetMapUnit() != MapUnit::MapPixel )
{
- const Size aSizeLog( OutputDevice::LogicToLogic( mpGraphic->GetPrefSize(), mpGraphic->GetPrefMapMode(), MAP_100TH_MM ) );
+ const Size aSizeLog( OutputDevice::LogicToLogic( mpGraphic->GetPrefSize(), mpGraphic->GetPrefMapMode(), MapUnit::Map100thMM ) );
aAWTSize = awt::Size( aSizeLog.Width(), aSizeLog.Height() );
}
}
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 3392814cc4d9..214f37814fb0 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -290,7 +290,7 @@ bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
tools::Polygon aClipPoly( Rectangle( rPt, rSz ) );
const sal_uInt16 nRot10 = pAttr->GetRotation() % 3600;
const Point aOldOrigin( rPt );
- const MapMode aMap100( MAP_100TH_MM );
+ const MapMode aMap100( MapUnit::Map100thMM );
Size aSize100;
long nTotalWidth, nTotalHeight;
@@ -304,7 +304,7 @@ bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
rClipPolyPoly = aClipPoly;
- if( maGraphic.GetPrefMapMode() == MAP_PIXEL )
+ if( maGraphic.GetPrefMapMode() == MapUnit::MapPixel )
aSize100 = Application::GetDefaultDevice()->PixelToLogic( maGraphic.GetPrefSize(), aMap100 );
else
{
@@ -723,7 +723,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo
// #104115# Convert the crop margins to graphic object mapmode
const MapMode aMapGraph( aTransGraphic.GetPrefMapMode() );
- const MapMode aMap100( MAP_100TH_MM );
+ const MapMode aMap100( MapUnit::Map100thMM );
Size aCropLeftTop;
Size aCropRightBottom;
@@ -732,9 +732,9 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo
{
GDIMetaFile aMtf( aTransGraphic.GetGDIMetaFile() );
- if( aMapGraph == MAP_PIXEL )
+ if( aMapGraph == MapUnit::MapPixel )
{
- // crops are in 1/100th mm -> to aMapGraph -> to MAP_PIXEL
+ // crops are in 1/100th mm -> to aMapGraph -> to MapUnit::MapPixel
aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
aMap100);
@@ -805,9 +805,9 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo
// convert crops to pixel
if(rAttr.IsCropped())
{
- if( aMapGraph == MAP_PIXEL )
+ if( aMapGraph == MapUnit::MapPixel )
{
- // crops are in 1/100th mm -> to MAP_PIXEL
+ // crops are in 1/100th mm -> to MapUnit::MapPixel
aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
aMap100);
@@ -817,7 +817,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo
}
else
{
- // crops are in GraphicObject units -> to MAP_PIXEL
+ // crops are in GraphicObject units -> to MapUnit::MapPixel
aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
aMapGraph);
@@ -1153,12 +1153,12 @@ basegfx::B2DVector GraphicObject::calculateCropScaling(
double fRightCrop,
double fBottomCrop) const
{
- const MapMode aMapMode100thmm(MAP_100TH_MM);
+ const MapMode aMapMode100thmm(MapUnit::Map100thMM);
Size aBitmapSize(GetPrefSize());
double fFactorX(1.0);
double fFactorY(1.0);
- if(MAP_PIXEL == GetPrefMapMode().GetMapUnit())
+ if(MapUnit::MapPixel == GetPrefMapMode().GetMapUnit())
{
aBitmapSize = Application::GetDefaultDevice()->PixelToLogic(aBitmapSize, aMapMode100thmm);
}
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index fdfcbc50ae9a..1f559d6c5e28 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -501,13 +501,13 @@ void ImplCalculateCropRect( ::Graphic& rGraphic, const text::GraphicCrop& rGraph
if ( rGraphicCropLogic.Left || rGraphicCropLogic.Top || rGraphicCropLogic.Right || rGraphicCropLogic.Bottom )
{
Size aSize100thMM( 0, 0 );
- if( rGraphic.GetPrefMapMode().GetMapUnit() != MAP_PIXEL )
+ if( rGraphic.GetPrefMapMode().GetMapUnit() != MapUnit::MapPixel )
{
- aSize100thMM = OutputDevice::LogicToLogic( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode(), MAP_100TH_MM );
+ aSize100thMM = OutputDevice::LogicToLogic( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode(), MapUnit::Map100thMM );
}
else
{
- aSize100thMM = Application::GetDefaultDevice()->PixelToLogic( rGraphic.GetPrefSize(), MAP_100TH_MM );
+ aSize100thMM = Application::GetDefaultDevice()->PixelToLogic( rGraphic.GetPrefSize(), MapUnit::Map100thMM );
}
if ( aSize100thMM.Width() && aSize100thMM.Height() )
{
@@ -627,10 +627,10 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
{
ScopedVclPtrInstance< VirtualDevice > aDummyVDev;
GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() );
- Size aMtfSize( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_100TH_MM ) );
+ Size aMtfSize( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MapUnit::Map100thMM ) );
if ( aMtfSize.Width() && aMtfSize.Height() )
{
- MapMode aNewMapMode( MAP_100TH_MM );
+ MapMode aNewMapMode( MapUnit::Map100thMM );
aNewMapMode.SetScaleX( static_cast< double >( aLogicalSize.Width ) / static_cast< double >( aMtfSize.Width() ) );
aNewMapMode.SetScaleY( static_cast< double >( aLogicalSize.Height ) / static_cast< double >( aMtfSize.Height() ) );
aDummyVDev->EnableOutput( false );
@@ -680,7 +680,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
}
::Graphic aGraphic( aBmpEx );
const Size aSize100thmm( aDummyVDev->LogicToPixel( aSize ) );
- Size aSize100thmm2( aDummyVDev->PixelToLogic( aSize100thmm, MAP_100TH_MM ) );
+ Size aSize100thmm2( aDummyVDev->PixelToLogic( aSize100thmm, MapUnit::Map100thMM ) );
ImplApplyBitmapResolution( aGraphic, nImageResolution,
aGraphic.GetSizePixel(), awt::Size( aSize100thmm2.Width(), aSize100thmm2.Height() ) );
generated by cgit (git 2.34.1) at 2024-07-25 11:29:49 +0000