summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/dlg')
-rw-r--r--sd/source/ui/dlg/PaneDockingWindow.cxx2
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx6
-rw-r--r--sd/source/ui/dlg/animobjs.cxx10
-rw-r--r--sd/source/ui/dlg/copydlg.cxx28
-rw-r--r--sd/source/ui/dlg/dlgsnap.cxx8
-rw-r--r--sd/source/ui/dlg/docprev.cxx2
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx2
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx2
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx2
9 files changed, 31 insertions, 31 deletions
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx
index a76a2fe4afc5..2dbe88d41039 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -43,7 +43,7 @@ PaneDockingWindow::PaneDockingWindow(
: TitledDockingWindow(_pBindings, pChildWindow, pParent)
{
SetTitle(rsTitle);
- SetSizePixel(LogicToPixel(Size(80,200), MAP_APPFONT));
+ SetSizePixel(LogicToPixel(Size(80,200), MapUnit::MapAppFont));
}
PaneDockingWindow::~PaneDockingWindow()
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index e20fdec12faa..b1c466f8bc5e 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -119,7 +119,7 @@ VCL_BUILDER_DECL_FACTORY(ClientBox)
Size ClientBox::GetOptimalSize() const
{
- return LogicToPixel(Size(200, 140), MAP_APPFONT);
+ return LogicToPixel(Size(200, 140), MapUnit::MapAppFont);
}
ClientBox::~ClientBox()
@@ -167,7 +167,7 @@ void ClientBox::CalcActiveHeight( const long nPos )
aSize.Width() -= ICON_OFFSET;
aSize = LogicToPixel( Size( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ),
- MapMode( MAP_APPFONT ) );
+ MapMode( MapUnit::MapAppFont ) );
aTextHeight += aSize.Height();
if ( aTextHeight < m_nStdHeight )
@@ -356,7 +356,7 @@ void ClientBox::RecalcAll()
Size aPBSize = LogicToPixel(
Size( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ),
- MapMode( MAP_APPFONT ) );
+ MapMode( MapUnit::MapAppFont ) );
m_aPinBox->SetSizePixel( aPBSize );
m_aDeauthoriseButton->SetSizePixel( m_aDeauthoriseButton->GetOptimalSize() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index e7f2a837b49d..b40f032492c8 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -59,7 +59,7 @@ SdDisplay::SdDisplay(vcl::Window* pWin)
: Control(pWin, 0)
, aScale(1, 1)
{
- SetMapMode( MAP_PIXEL );
+ SetMapMode( MapUnit::MapPixel );
const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings();
SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) );
}
@@ -105,7 +105,7 @@ void SdDisplay::SetScale( const Fraction& rFrac )
Size SdDisplay::GetOptimalSize() const
{
- return LogicToPixel(Size(147, 87), MAP_APPFONT);
+ return LogicToPixel(Size(147, 87), MapUnit::MapAppFont);
}
void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt )
@@ -534,7 +534,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
Size aObjSize( aObjRect.GetSize() );
Point aOrigin( Point( -aObjRect.Left(), -aObjRect.Top() ) );
MapMode aMap( pVD->GetMapMode() );
- aMap.SetMapUnit( MAP_100TH_MM );
+ aMap.SetMapUnit( MapUnit::Map100thMM );
aMap.SetOrigin( aOrigin );
pVD->SetMapMode( aMap );
pVD->SetOutputSize( aObjSize );
@@ -896,7 +896,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
DBG_ASSERT( pOutWin, "Window does not exist!" );
// find window center
- const MapMode aMap100( MAP_100TH_MM );
+ const MapMode aMap100( MapUnit::Map100thMM );
Size aMaxSizeLog;
Size aMaxSizePix;
Size aTemp( pOutWin->GetOutputSizePixel() );
@@ -913,7 +913,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
Size aTmpSizeLog;
const Size aTmpSizePix( rBmpEx.GetSizePixel() );
- if ( aGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL )
+ if ( aGraphic.GetPrefMapMode().GetMapUnit() == MapUnit::MapPixel )
aTmpSizeLog = pDefDev->PixelToLogic( aGraphic.GetPrefSize(), aMap100 );
else
aTmpSizeLog = OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), aMap100 );
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index e4ed8df8241d..f68e06c38293 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -118,12 +118,12 @@ void CopyDlg::Reset()
long nMoveX = 500L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) )
nMoveX = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
- SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, MAP_100TH_MM);
+ SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, MapUnit::Map100thMM);
long nMoveY = 500L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, true, &pPoolItem ) )
nMoveY = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
- SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, MAP_100TH_MM);
+ SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, MapUnit::Map100thMM);
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, true, &pPoolItem ) )
m_pMtrFldAngle->SetValue( static_cast<const SfxInt32Item*>( pPoolItem )->GetValue() );
@@ -133,12 +133,12 @@ void CopyDlg::Reset()
long nWidth = 0L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) )
nWidth = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
- SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, MAP_100TH_MM);
+ SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, MapUnit::Map100thMM);
long nHeight = 0L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, true, &pPoolItem ) )
nHeight = static_cast<const SfxInt32Item*>( pPoolItem )->GetValue();
- SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, MAP_100TH_MM);
+ SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, MapUnit::Map100thMM);
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) )
{
@@ -189,10 +189,10 @@ void CopyDlg::Reset()
*/
void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
{
- long nMoveX = Fraction( GetCoreValue( *m_pMtrFldMoveX, MAP_100TH_MM) ) * maUIScale;
- long nMoveY = Fraction( GetCoreValue( *m_pMtrFldMoveY, MAP_100TH_MM) ) * maUIScale;
- long nHeight = Fraction( GetCoreValue( *m_pMtrFldHeight, MAP_100TH_MM) ) * maUIScale;
- long nWidth = Fraction( GetCoreValue( *m_pMtrFldWidth, MAP_100TH_MM) ) * maUIScale;
+ long nMoveX = Fraction( GetCoreValue( *m_pMtrFldMoveX, MapUnit::Map100thMM) ) * maUIScale;
+ long nMoveY = Fraction( GetCoreValue( *m_pMtrFldMoveY, MapUnit::Map100thMM) ) * maUIScale;
+ long nHeight = Fraction( GetCoreValue( *m_pMtrFldHeight, MapUnit::Map100thMM) ) * maUIScale;
+ long nWidth = Fraction( GetCoreValue( *m_pMtrFldWidth, MapUnit::Map100thMM) ) * maUIScale;
rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (sal_uInt16) m_pNumFldCopies->GetValue() ) );
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) );
@@ -239,9 +239,9 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData, Button*, void)
Rectangle aRect = mpView->GetAllMarkedRect();
SetMetricValue( *m_pMtrFldMoveX, Fraction( aRect.GetWidth() ) /
- maUIScale, MAP_100TH_MM);
+ maUIScale, MapUnit::Map100thMM);
SetMetricValue( *m_pMtrFldMoveY, Fraction( aRect.GetHeight() ) /
- maUIScale, MAP_100TH_MM);
+ maUIScale, MapUnit::Map100thMM);
// sets color attribute
const SfxPoolItem* pPoolItem = nullptr;
@@ -260,13 +260,13 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault, Button*, void)
m_pNumFldCopies->SetValue( 1L );
long nValue = 500L;
- SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, MAP_100TH_MM);
- SetMetricValue( *m_pMtrFldMoveY, Fraction(nValue) / maUIScale, MAP_100TH_MM);
+ SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
+ SetMetricValue( *m_pMtrFldMoveY, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
nValue = 0L;
m_pMtrFldAngle->SetValue( nValue );
- SetMetricValue( *m_pMtrFldWidth, Fraction(nValue) / maUIScale, MAP_100TH_MM);
- SetMetricValue( *m_pMtrFldHeight, Fraction(nValue) / maUIScale, MAP_100TH_MM);
+ SetMetricValue( *m_pMtrFldWidth, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
+ SetMetricValue( *m_pMtrFldHeight, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
// set color attribute
const SfxPoolItem* pPoolItem = nullptr;
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index aa0d30375cde..1b9a51655c5a 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -105,8 +105,8 @@ SdSnapLineDlg::SdSnapLineDlg(
nYValue = static_cast<const SfxInt32Item&>( rInAttrs.Get(ATTR_SNAPLINE_Y)).GetValue();
nXValue = Fraction(nXValue) / aUIScale;
nYValue = Fraction(nYValue) / aUIScale;
- SetMetricValue( *m_pMtrFldX, nXValue, MAP_100TH_MM);
- SetMetricValue( *m_pMtrFldY, nYValue, MAP_100TH_MM);
+ SetMetricValue( *m_pMtrFldX, nXValue, MapUnit::Map100thMM);
+ SetMetricValue( *m_pMtrFldY, nYValue, MapUnit::Map100thMM);
m_pRbPoint->Check();
}
@@ -152,8 +152,8 @@ void SdSnapLineDlg::GetAttr(SfxItemSet& rOutAttrs)
else if ( m_pRbVert->IsChecked() ) eKind = SK_VERTICAL;
else eKind = SK_POINT;
- nXValue = Fraction( GetCoreValue( *m_pMtrFldX, MAP_100TH_MM) ) * aUIScale;
- nYValue = Fraction( GetCoreValue( *m_pMtrFldY, MAP_100TH_MM) ) * aUIScale;
+ nXValue = Fraction( GetCoreValue( *m_pMtrFldX, MapUnit::Map100thMM) ) * aUIScale;
+ nYValue = Fraction( GetCoreValue( *m_pMtrFldY, MapUnit::Map100thMM) ) * aUIScale;
rOutAttrs.Put(SfxAllEnumItem(ATTR_SNAPLINE_KIND, (sal_uInt16)eKind));
rOutAttrs.Put(SfxUInt32Item(ATTR_SNAPLINE_X, nXValue));
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index e141119de251..3158d48f47b5 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -89,7 +89,7 @@ void SdDocPreviewWin::dispose()
Size SdDocPreviewWin::GetOptimalSize() const
{
- return LogicToPixel(Size(122, 96), MAP_APPFONT);
+ return LogicToPixel(Size(122, 96), MapUnit::MapAppFont);
}
void SdDocPreviewWin::Resize()
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index e021b59a16e7..f369a613986d 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -703,7 +703,7 @@ PresLayoutPreview::~PresLayoutPreview()
Size PresLayoutPreview::GetOptimalSize() const
{
- return LogicToPixel(Size(80, 80), MAP_APPFONT);
+ return LogicToPixel(Size(80, 80), MapUnit::MapAppFont);
}
void PresLayoutPreview::init( SdPage *pMaster )
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index a39c9fdc9fd9..8b9fba0396ad 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -40,7 +40,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
, maStrNone(SD_RESSTR(STR_NULL))
{
get(m_pVS, "select");
- Size aPref(LogicToPixel(Size(144 , 141), MAP_APPFONT));
+ Size aPref(LogicToPixel(Size(144 , 141), MapUnit::MapAppFont));
m_pVS->set_width_request(aPref.Width());
m_pVS->set_height_request(aPref.Height());
get(m_pCbxMasterPage, "masterpage");
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 685658ae26db..54818e24a3be 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -45,7 +45,7 @@ SdVectorizeDlg::SdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::D
get(m_pBmpWin, "source");
get(m_pMtfWin, "vectorized");
- Size aSize(LogicToPixel(Size(92, 100), MAP_APPFONT));
+ Size aSize(LogicToPixel(Size(92, 100), MapUnit::MapAppFont));
m_pBmpWin->set_width_request(aSize.Width());
m_pMtfWin->set_width_request(aSize.Width());
m_pBmpWin->set_height_request(aSize.Height());