summaryrefslogtreecommitdiff
path: root/svx/source/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/dialog')
-rw-r--r--svx/source/dialog/fontwork.cxx24
-rw-r--r--svx/source/dialog/hdft.cxx24
-rw-r--r--svx/source/dialog/optgrid.cxx8
-rw-r--r--svx/source/dialog/rulritem.cxx20
-rwxr-xr-xsvx/source/dialog/srchdlg.cxx14
5 files changed, 45 insertions, 45 deletions
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index df0d257faf03..ade3e1c2deb3 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -421,7 +421,7 @@ void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem)
// Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !m_pMtrFldDistance->HasChildPathFocus() )
{
- SetMetricValue(*m_pMtrFldDistance, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
+ SetMetricValue(*m_pMtrFldDistance, pItem->GetValue(), MAP_100TH_MM);
}
}
@@ -432,7 +432,7 @@ void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem)
// Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !m_pMtrFldTextStart->HasChildPathFocus() )
{
- SetMetricValue(*m_pMtrFldTextStart, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
+ SetMetricValue(*m_pMtrFldTextStart, pItem->GetValue(), MAP_100TH_MM);
}
}
@@ -513,8 +513,8 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
if ( bRestoreValues )
{
- SetMetricValue(*m_pMtrFldShadowX, nSaveShadowX, SFX_MAPUNIT_100TH_MM);
- SetMetricValue(*m_pMtrFldShadowY, nSaveShadowY, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue(*m_pMtrFldShadowX, nSaveShadowX, MAP_100TH_MM);
+ SetMetricValue(*m_pMtrFldShadowY, nSaveShadowY, MAP_100TH_MM);
XFormTextShadowXValItem aXItem( nSaveShadowX );
XFormTextShadowYValItem aYItem( nSaveShadowY );
@@ -604,7 +604,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
}
else
{
- SetMetricValue(*m_pMtrFldShadowX, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
+ SetMetricValue(*m_pMtrFldShadowX, pItem->GetValue(), MAP_100TH_MM);
}
}
}
@@ -626,7 +626,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem)
}
else
{
- SetMetricValue(*m_pMtrFldShadowY, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
+ SetMetricValue(*m_pMtrFldShadowY, pItem->GetValue(), MAP_100TH_MM);
}
}
}
@@ -712,8 +712,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void)
if (nLastShadowTbxId == nShadowNormalId)
{
- nSaveShadowX = GetCoreValue(*m_pMtrFldShadowX, SFX_MAPUNIT_100TH_MM);
- nSaveShadowY = GetCoreValue(*m_pMtrFldShadowY, SFX_MAPUNIT_100TH_MM);
+ nSaveShadowX = GetCoreValue(*m_pMtrFldShadowX, MAP_100TH_MM);
+ nSaveShadowY = GetCoreValue(*m_pMtrFldShadowY, MAP_100TH_MM);
}
else if (nLastShadowTbxId == nShadowSlantId)
{
@@ -759,9 +759,9 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void)
m_pMtrFldShadowY->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
}
- long nValue = GetCoreValue(*m_pMtrFldDistance, SFX_MAPUNIT_100TH_MM);
+ long nValue = GetCoreValue(*m_pMtrFldDistance, MAP_100TH_MM);
XFormTextDistanceItem aDistItem( nValue );
- nValue = GetCoreValue(*m_pMtrFldTextStart, SFX_MAPUNIT_100TH_MM);
+ nValue = GetCoreValue(*m_pMtrFldTextStart, MAP_100TH_MM);
XFormTextStartItem aStartItem( nValue );
sal_Int32 nValueX(0L);
@@ -773,8 +773,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void)
// methos regarding to the kind of value accessed.
if (nLastShadowTbxId == nShadowNormalId)
{
- nValueX = GetCoreValue(*m_pMtrFldShadowX, SFX_MAPUNIT_100TH_MM);
- nValueY = GetCoreValue(*m_pMtrFldShadowY, SFX_MAPUNIT_100TH_MM);
+ nValueX = GetCoreValue(*m_pMtrFldShadowX, MAP_100TH_MM);
+ nValueY = GetCoreValue(*m_pMtrFldShadowY, MAP_100TH_MM);
}
else if (nLastShadowTbxId == nShadowSlantId)
{
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 57e1cc71ffcc..318ae321b22e 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -261,7 +261,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet )
const SfxItemSet& rOldSet = GetItemSet();
SfxItemPool* pPool = rOldSet.GetPool();
DBG_ASSERT(pPool,"no pool :-(");
- SfxMapUnit eUnit = pPool->GetMetric(nWSize);
+ MapUnit eUnit = pPool->GetMetric(nWSize);
SfxItemSet aSet(*pPool,aWhichTab);
if(mbEnableDrawingLayerFillStyles)
@@ -367,7 +367,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet )
SfxItemPool* pPool = GetItemSet().GetPool();
DBG_ASSERT( pPool, "Where is the pool" );
- SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_PAGE_SIZE ) );
+ MapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_PAGE_SIZE ) );
//hide "same content on first page when this is calc
bool bIsCalc = false;
@@ -439,8 +439,8 @@ void SvxHFPage::Reset( const SfxItemSet* rSet )
{
// defaults for distance and height
long nDefaultDist = bIsCalc ? DEF_DIST_CALC : DEF_DIST_WRITER;
- SetMetricValue( *m_pDistEdit, nDefaultDist, SFX_MAPUNIT_100TH_MM );
- SetMetricValue( *m_pHeightEdit, 500, SFX_MAPUNIT_100TH_MM );
+ SetMetricValue( *m_pDistEdit, nDefaultDist, MAP_100TH_MM );
+ SetMetricValue( *m_pHeightEdit, 500, MAP_100TH_MM );
}
if ( !pSetItem )
@@ -747,18 +747,18 @@ void SvxHFPage::UpdateExample()
if ( nId == SID_ATTR_PAGE_HEADERSET )
{
m_pBspWin->SetHeader( m_pTurnOnBox->IsChecked() );
- m_pBspWin->SetHdHeight( GetCoreValue( *m_pHeightEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetHdDist( GetCoreValue( *m_pDistEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetHdLeft( GetCoreValue( *m_pLMEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetHdRight( GetCoreValue( *m_pRMEdit, SFX_MAPUNIT_TWIP ) );
+ m_pBspWin->SetHdHeight( GetCoreValue( *m_pHeightEdit, MAP_TWIP ) );
+ m_pBspWin->SetHdDist( GetCoreValue( *m_pDistEdit, MAP_TWIP ) );
+ m_pBspWin->SetHdLeft( GetCoreValue( *m_pLMEdit, MAP_TWIP ) );
+ m_pBspWin->SetHdRight( GetCoreValue( *m_pRMEdit, MAP_TWIP ) );
}
else
{
m_pBspWin->SetFooter( m_pTurnOnBox->IsChecked() );
- m_pBspWin->SetFtHeight( GetCoreValue( *m_pHeightEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetFtDist( GetCoreValue( *m_pDistEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetFtLeft( GetCoreValue( *m_pLMEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetFtRight( GetCoreValue( *m_pRMEdit, SFX_MAPUNIT_TWIP ) );
+ m_pBspWin->SetFtHeight( GetCoreValue( *m_pHeightEdit, MAP_TWIP ) );
+ m_pBspWin->SetFtDist( GetCoreValue( *m_pDistEdit, MAP_TWIP ) );
+ m_pBspWin->SetFtLeft( GetCoreValue( *m_pLMEdit, MAP_TWIP ) );
+ m_pBspWin->SetFtRight( GetCoreValue( *m_pRMEdit, MAP_TWIP ) );
}
m_pBspWin->Invalidate();
}
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 36111159cd17..36efa3272519 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -105,8 +105,8 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const
bool SvxGridItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -216,7 +216,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet )
aGridItem.bSynchronize = pCbxSynchronize->IsChecked();
aGridItem.bGridVisible = pCbxGridVisible->IsChecked();
- SfxMapUnit eUnit =
+ MapUnit eUnit =
rCoreSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) );
long nX =GetCoreValue( *pMtrFldDrawX, eUnit );
long nY = GetCoreValue( *pMtrFldDrawY, eUnit );
@@ -244,7 +244,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet )
pCbxSynchronize->Check( pGridAttr->bSynchronize );
pCbxGridVisible->Check( pGridAttr->bGridVisible );
- SfxMapUnit eUnit =
+ MapUnit eUnit =
rSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) );
SetMetricValue( *pMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
SetMetricValue( *pMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 33077bb5c241..45952e225cb3 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -117,8 +117,8 @@ bool SvxLongLRSpaceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberI
bool SvxLongLRSpaceItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& /*rText*/,
const IntlWrapper* /*pWrapper*/) const
{
@@ -243,8 +243,8 @@ bool SvxLongULSpaceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberI
bool SvxLongULSpaceItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& /*rText*/,
const IntlWrapper* /*pWrapper*/ ) const
{
@@ -364,8 +364,8 @@ bool SvxPagePosSizeItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberI
bool SvxPagePosSizeItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& /*rText*/,
const IntlWrapper* /*pWrapper*/ ) const
{
@@ -455,8 +455,8 @@ SvxColumnItem::~SvxColumnItem()
bool SvxColumnItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& /*rText*/,
const IntlWrapper* /*pWrapper*/ ) const
{
@@ -695,8 +695,8 @@ bool SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const
bool SvxObjectItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& /*rText*/,
const IntlWrapper* /*pWrapper*/ ) const
{
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d63c90f318a3..ea1f9a1631e9 100755
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2148,21 +2148,21 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
return rStr;
// Metric query
- SfxMapUnit eMapUnit = SFX_MAPUNIT_CM;
+ MapUnit eMapUnit = MAP_CM;
FieldUnit eFieldUnit = pSh->GetModule()->GetFieldUnit();
switch ( eFieldUnit )
{
- case FUNIT_MM: eMapUnit = SFX_MAPUNIT_MM; break;
+ case FUNIT_MM: eMapUnit = MAP_MM; break;
case FUNIT_CM:
case FUNIT_M:
- case FUNIT_KM: eMapUnit = SFX_MAPUNIT_CM; break;
- case FUNIT_TWIP: eMapUnit = SFX_MAPUNIT_TWIP; break;
+ case FUNIT_KM: eMapUnit = MAP_CM; break;
+ case FUNIT_TWIP: eMapUnit = MAP_TWIP; break;
case FUNIT_POINT:
- case FUNIT_PICA: eMapUnit = SFX_MAPUNIT_POINT; break;
+ case FUNIT_PICA: eMapUnit = MAP_POINT; break;
case FUNIT_INCH:
case FUNIT_FOOT:
- case FUNIT_MILE: eMapUnit = SFX_MAPUNIT_INCH; break;
- case FUNIT_100TH_MM: eMapUnit = SFX_MAPUNIT_100TH_MM; break;
+ case FUNIT_MILE: eMapUnit = MAP_INCH; break;
+ case FUNIT_100TH_MM: eMapUnit = MAP_100TH_MM; break;
default: ;//prevent warning
}
generated by cgit (git 2.34.1) at 2025-01-15 09:41:57 +0000