[Libreoffice-commits] core.git: avmedia/source chart2/source cui/source dbaccess/source editeng/source forms/source include/avmedia include/editeng include/sfx2 include/svl include/svtools include/svx reportdesign/source sc/inc sc/source sd/source sfx2/source svl/source svtools/source svx/inc svx/source sw/inc sw/source
Caolán McNamara
caolanm at redhat.com
Fri Aug 19 11:25:46 UTC 2016
avmedia/source/framework/mediaitem.cxx | 11 -
chart2/source/controller/sidebar/ChartLinePanel.cxx | 2
chart2/source/view/main/ChartItemPool.cxx | 4
chart2/source/view/main/ChartItemPool.hxx | 2
chart2/source/view/main/DrawModelWrapper.cxx | 2
cui/source/inc/connect.hxx | 2
cui/source/inc/cuitabarea.hxx | 8
cui/source/inc/cuitabline.hxx | 4
cui/source/inc/measure.hxx | 2
cui/source/inc/numpages.hxx | 12 -
cui/source/inc/textanim.hxx | 2
cui/source/inc/transfrm.hxx | 6
cui/source/tabpages/border.cxx | 8
cui/source/tabpages/chardlg.cxx | 20 -
cui/source/tabpages/labdlg.cxx | 6
cui/source/tabpages/measure.cxx | 2
cui/source/tabpages/page.cxx | 68 +++---
cui/source/tabpages/paragrph.cxx | 16 -
cui/source/tabpages/textattr.cxx | 4
dbaccess/source/ui/misc/UITools.cxx | 2
editeng/source/editeng/editdbg.cxx | 8
editeng/source/editeng/editobj.cxx | 2
editeng/source/editeng/editview.cxx | 4
editeng/source/editeng/impedit4.cxx | 2
editeng/source/items/borderline.cxx | 8
editeng/source/items/bulitem.cxx | 4
editeng/source/items/charhiddenitem.cxx | 4
editeng/source/items/frmitems.cxx | 60 ++---
editeng/source/items/itemtype.cxx | 66 +++---
editeng/source/items/justifyitem.cxx | 12 -
editeng/source/items/optitems.cxx | 8
editeng/source/items/paraitem.cxx | 42 +--
editeng/source/items/textitem.cxx | 176 ++++++++--------
editeng/source/items/writingmodeitem.cxx | 4
editeng/source/items/xmlcnitm.cxx | 4
editeng/source/uno/unoipset.cxx | 26 +-
forms/source/richtext/richtextengine.cxx | 2
forms/source/richtext/rtattributehandler.cxx | 8
include/avmedia/mediaitem.hxx | 4
include/editeng/adjustitem.hxx | 6
include/editeng/autokernitem.hxx | 6
include/editeng/blinkitem.hxx | 6
include/editeng/borderline.hxx | 2
include/editeng/boxitem.hxx | 8
include/editeng/brushitem.hxx | 6
include/editeng/bulletitem.hxx | 4
include/editeng/charhiddenitem.hxx | 6
include/editeng/charreliefitem.hxx | 8
include/editeng/charrotateitem.hxx | 4
include/editeng/charscaleitem.hxx | 8
include/editeng/charsetcoloritem.hxx | 6
include/editeng/cmapitem.hxx | 4
include/editeng/colritem.hxx | 2
include/editeng/contouritem.hxx | 6
include/editeng/crossedoutitem.hxx | 6
include/editeng/emphasismarkitem.hxx | 4
include/editeng/escapementitem.hxx | 4
include/editeng/fhgtitem.hxx | 16 -
include/editeng/flstitem.hxx | 6
include/editeng/fontitem.hxx | 2
include/editeng/forbiddenruleitem.hxx | 8
include/editeng/formatbreakitem.hxx | 6
include/editeng/frmdiritem.hxx | 8
include/editeng/fwdtitem.hxx | 6
include/editeng/hngpnctitem.hxx | 8
include/editeng/hyphenzoneitem.hxx | 6
include/editeng/itemtype.hxx | 4
include/editeng/justifyitem.hxx | 18 -
include/editeng/keepitem.hxx | 6
include/editeng/kernitem.hxx | 6
include/editeng/langitem.hxx | 8
include/editeng/lcolitem.hxx | 8
include/editeng/lineitem.hxx | 6
include/editeng/lrspitem.hxx | 6
include/editeng/lspcitem.hxx | 6
include/editeng/nhypitem.hxx | 6
include/editeng/nlbkitem.hxx | 6
include/editeng/opaqitem.hxx | 6
include/editeng/optitems.hxx | 12 -
include/editeng/orphitem.hxx | 6
include/editeng/paravertalignitem.hxx | 8
include/editeng/pbinitem.hxx | 6
include/editeng/pgrditem.hxx | 6
include/editeng/pmdlitem.hxx | 6
include/editeng/postitem.hxx | 6
include/editeng/prntitem.hxx | 6
include/editeng/protitem.hxx | 6
include/editeng/prszitem.hxx | 6
include/editeng/scriptspaceitem.hxx | 8
include/editeng/shaditem.hxx | 6
include/editeng/shdditem.hxx | 6
include/editeng/sizeitem.hxx | 6
include/editeng/spltitem.hxx | 6
include/editeng/tstpitem.hxx | 6
include/editeng/twolinesitem.hxx | 8
include/editeng/udlnitem.hxx | 6
include/editeng/ulspitem.hxx | 6
include/editeng/unoipset.hxx | 4
include/editeng/wghtitem.hxx | 6
include/editeng/widwitem.hxx | 6
include/editeng/writingmodeitem.hxx | 8
include/editeng/wrlmitem.hxx | 6
include/editeng/xmlcnitm.hxx | 4
include/sfx2/ctrlitem.hxx | 2
include/sfx2/evntconf.hxx | 8
include/sfx2/unoctitm.hxx | 2
include/svl/cenumitm.hxx | 8
include/svl/cintitem.hxx | 24 +-
include/svl/ctypeitm.hxx | 8
include/svl/custritm.hxx | 7
include/svl/eitem.hxx | 2
include/svl/flagitem.hxx | 8
include/svl/int64item.hxx | 2
include/svl/intitem.hxx | 2
include/svl/itempool.hxx | 10
include/svl/macitem.hxx | 8
include/svl/poolitem.hxx | 29 --
include/svl/ptitem.hxx | 8
include/svl/rectitem.hxx | 8
include/svl/rngitem.hxx | 16 -
include/svl/slstitm.hxx | 8
include/svl/srchitem.hxx | 6
include/svl/style.hxx | 2
include/svl/szitem.hxx | 8
include/svl/visitem.hxx | 7
include/svtools/unitconv.hxx | 14 -
include/svx/algitem.hxx | 12 -
include/svx/chrtitem.hxx | 6
include/svx/drawitem.hxx | 42 +--
include/svx/float3d.hxx | 2
include/svx/grfcrop.hxx | 8
include/svx/itemwin.hxx | 4
include/svx/nbdtmg.hxx | 6
include/svx/numinf.hxx | 6
include/svx/optgrid.hxx | 6
include/svx/pageitem.hxx | 12 -
include/svx/postattr.hxx | 18 -
include/svx/rotmodit.hxx | 6
include/svx/rulritem.hxx | 32 +-
include/svx/sdangitm.hxx | 10
include/svx/sdasaitm.hxx | 4
include/svx/sdasitm.hxx | 4
include/svx/sdgmoitm.hxx | 7
include/svx/sdmetitm.hxx | 6
include/svx/sdooitm.hxx | 2
include/svx/sdprcitm.hxx | 4
include/svx/sdtaaitm.hxx | 2
include/svx/sdtaditm.hxx | 2
include/svx/sdtaitm.hxx | 4
include/svx/sdtakitm.hxx | 2
include/svx/sdtayitm.hxx | 2
include/svx/sdtfchim.hxx | 4
include/svx/sdtfsitm.hxx | 2
include/svx/sdynitm.hxx | 2
include/svx/sidebar/LinePropertyPanelBase.hxx | 4
include/svx/sidebar/LineWidthPopup.hxx | 4
include/svx/svdobj.hxx | 4
include/svx/svdpool.hxx | 7
include/svx/sxcecitm.hxx | 2
include/svx/sxctitm.hxx | 2
include/svx/sxekitm.hxx | 2
include/svx/sxfiitm.hxx | 2
include/svx/sxmtpitm.hxx | 4
include/svx/sxmuitm.hxx | 2
include/svx/sxsiitm.hxx | 2
include/svx/xbtmpit.hxx | 6
include/svx/xfillit0.hxx | 6
include/svx/xflbckit.hxx | 6
include/svx/xflbmpit.hxx | 6
include/svx/xflbmsli.hxx | 6
include/svx/xflbmsxy.hxx | 12 -
include/svx/xflbmtit.hxx | 6
include/svx/xflboxy.hxx | 12 -
include/svx/xflbstit.hxx | 6
include/svx/xflbtoxy.hxx | 12 -
include/svx/xflclit.hxx | 6
include/svx/xflftrit.hxx | 6
include/svx/xflgrit.hxx | 6
include/svx/xflhtit.hxx | 6
include/svx/xfltrit.hxx | 6
include/svx/xgrscit.hxx | 6
include/svx/xlineit0.hxx | 6
include/svx/xlinjoit.hxx | 4
include/svx/xlncapit.hxx | 4
include/svx/xlnclit.hxx | 6
include/svx/xlndsit.hxx | 6
include/svx/xlnedcit.hxx | 6
include/svx/xlnedit.hxx | 6
include/svx/xlnedwit.hxx | 4
include/svx/xlnstcit.hxx | 6
include/svx/xlnstit.hxx | 6
include/svx/xlnstwit.hxx | 6
include/svx/xlntrit.hxx | 6
include/svx/xlnwtit.hxx | 6
include/svx/xsflclit.hxx | 4
reportdesign/source/ui/misc/UITools.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 4
sc/inc/attrib.hxx | 37 +--
sc/inc/docpool.hxx | 11 -
sc/source/core/data/attrib.cxx | 18 -
sc/source/core/data/docpool.cxx | 12 -
sc/source/core/data/drwlayer.cxx | 2
sc/source/core/data/poolhelp.cxx | 4
sc/source/ui/app/msgpool.cxx | 6
sc/source/ui/inc/msgpool.hxx | 2
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 4
sc/source/ui/unoobj/textuno.cxx | 2
sc/source/ui/view/notemark.cxx | 2
sd/source/core/drawdoc.cxx | 2
sd/source/ui/app/sdmod2.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 28 +-
sd/source/ui/dlg/dlgsnap.cxx | 10
sd/source/ui/dlg/tpoption.cxx | 4
sd/source/ui/inc/tpoption.hxx | 2
sd/source/ui/sidebar/SlideBackground.hxx | 2
sd/source/ui/view/sdview3.cxx | 2
sfx2/source/appl/appuno.cxx | 8
sfx2/source/config/evntconf.cxx | 8
sfx2/source/control/ctrlitem.cxx | 4
sfx2/source/control/dispatch.cxx | 2
sfx2/source/control/unoctitm.cxx | 10
sfx2/source/dialog/mgetempl.cxx | 10
svl/source/inc/poolio.hxx | 4
svl/source/items/cenumitm.cxx | 6
svl/source/items/cintitem.cxx | 25 +-
svl/source/items/ctypeitm.cxx | 4
svl/source/items/custritm.cxx | 4
svl/source/items/flagitem.cxx | 4
svl/source/items/int64item.cxx | 2
svl/source/items/intitem.cxx | 2
svl/source/items/itempool.cxx | 8
svl/source/items/macitem.cxx | 4
svl/source/items/poolitem.cxx | 8
svl/source/items/ptitem.cxx | 4
svl/source/items/rectitem.cxx | 4
svl/source/items/rngitem.cxx | 14 -
svl/source/items/sitem.cxx | 6
svl/source/items/slstitm.cxx | 4
svl/source/items/srchitem.cxx | 4
svl/source/items/style.cxx | 2
svl/source/items/szitem.cxx | 4
svl/source/items/visitem.cxx | 6
svtools/source/misc/unitconv.cxx | 106 ++++-----
svx/inc/sxcikitm.hxx | 2
svx/inc/sxmkitm.hxx | 2
svx/source/dialog/fontwork.cxx | 24 +-
svx/source/dialog/hdft.cxx | 24 +-
svx/source/dialog/optgrid.cxx | 8
svx/source/dialog/rulritem.cxx | 20 -
svx/source/dialog/srchdlg.cxx | 14 -
svx/source/engine3d/float3d.cxx | 2
svx/source/gallery2/galmisc.cxx | 2
svx/source/items/algitem.cxx | 8
svx/source/items/chrtitem.cxx | 4
svx/source/items/customshapeitem.cxx | 4
svx/source/items/drawitem.cxx | 28 +-
svx/source/items/grfitem.cxx | 10
svx/source/items/numinf.cxx | 4
svx/source/items/pageitem.cxx | 8
svx/source/items/postattr.cxx | 16 -
svx/source/items/rotmodit.cxx | 2
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 4
svx/source/sidebar/line/LineWidthPopup.cxx | 4
svx/source/sidebar/nbdtmg.cxx | 8
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 6
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 24 +-
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 4
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 4
svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 4
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 2
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 6
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 2
svx/source/svdraw/svdattr.cxx | 62 ++---
svx/source/svdraw/svdibrow.cxx | 2
svx/source/svdraw/svdmodel.cxx | 6
svx/source/svdraw/svdoashp.cxx | 12 -
svx/source/svdraw/svdobj.cxx | 16 -
svx/source/svdraw/svdocapt.cxx | 6
svx/source/svdraw/svdomeas.cxx | 12 -
svx/source/svdraw/svdopath.cxx | 12 -
svx/source/svdraw/svdotext.cxx | 12 -
svx/source/tbxctrls/grafctrl.cxx | 4
svx/source/tbxctrls/itemwin.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 2
svx/source/unodraw/unopool.cxx | 16 -
svx/source/unodraw/unoshape.cxx | 24 +-
svx/source/xoutdev/xattr.cxx | 65 ++---
svx/source/xoutdev/xattr2.cxx | 64 ++---
svx/source/xoutdev/xattrbmp.cxx | 4
sw/inc/docstyle.hxx | 2
sw/inc/fchrfmt.hxx | 8
sw/inc/fmtanchr.hxx | 8
sw/inc/fmtautofmt.hxx | 8
sw/inc/fmtclds.hxx | 8
sw/inc/fmtcnct.hxx | 8
sw/inc/fmteiro.hxx | 8
sw/inc/fmtfollowtextflow.hxx | 8
sw/inc/fmtfsize.hxx | 8
sw/inc/fmtftntx.hxx | 8
sw/inc/fmthdft.hxx | 16 -
sw/inc/fmtinfmt.hxx | 8
sw/inc/fmtline.hxx | 8
sw/inc/fmtlsplt.hxx | 8
sw/inc/fmtornt.hxx | 12 -
sw/inc/fmtpdsc.hxx | 8
sw/inc/fmtrowsplt.hxx | 8
sw/inc/fmtruby.hxx | 8
sw/inc/fmtsrnd.hxx | 8
sw/inc/fmturl.hxx | 8
sw/inc/format.hxx | 2
sw/inc/grfatr.hxx | 72 +++---
sw/inc/hfspacingitem.hxx | 8
sw/inc/paratr.hxx | 32 +-
sw/inc/swatrset.hxx | 2
sw/inc/tgrditem.hxx | 8
sw/source/core/crsr/crstrvl.cxx | 2
sw/source/core/doc/fmtcol.cxx | 2
sw/source/core/layout/atrfrm.cxx | 4
sw/source/core/unocore/unoframe.cxx | 8
sw/source/core/unocore/unoparagraph.cxx | 4
sw/source/core/unocore/unostyle.cxx | 16 -
sw/source/ui/config/optpage.cxx | 34 +--
sw/source/uibase/app/docstyle.cxx | 2
sw/source/uibase/inc/uiitems.hxx | 8
sw/source/uibase/sidebar/PageFormatPanel.hxx | 2
sw/source/uibase/sidebar/PageMarginControl.cxx | 2
sw/source/uibase/sidebar/PageMarginControl.hxx | 4
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 2
sw/source/uibase/utlui/attrdesc.cxx | 136 ++++++------
sw/source/uibase/utlui/uiitems.cxx | 6
331 files changed, 1581 insertions(+), 1615 deletions(-)
New commits:
commit 396138a6bc7192abe0837b419283860d3331f607
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 19 09:31:35 2016 +0100
Resolves: coverity#705366 Mixing enum types
and
coverity#705367 Mixing enum types
coverity#705371 Mixing enum types
coverity#982694 Mixing enum types
coverity#1027717 Mixing enum types
coverity#1371228 Mixing enum types
coverity#1371242 Mixing enum types
coverity#1371280 Mixing enum types
coverity#1371310 Mixing enum types
MapUnit and SfxMapUnit share the same values and
are freely cast from one to the other.
Now that
commit d30a4298bdb5ba53cd1fe659f2b742f218a2e527
Date: Thu Aug 11 15:02:19 2016 +0200
loplugin:unusedenumconstants in package..svtools
removed the SfxMapUnit entries that were directly unused, they
don't match anymore and casting from one to the other is dangerous.
Why there was two of these anyway escapes me, get rid of SfxMapUnit
and just use MapUnit universally
Change-Id: I4db5dcd04b59be2f85b62b728f96c90afe00c57e
Reviewed-on: https://gerrit.libreoffice.org/28234
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index ed413f2..5a6a92c 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -125,24 +125,21 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
&& m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom;
}
-
SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
{
return new MediaItem( *this );
}
-
bool MediaItem::GetPresentation( SfxItemPresentation,
- SfxMapUnit,
- SfxMapUnit,
- OUString& rText,
- const IntlWrapper * ) const
+ MapUnit,
+ MapUnit,
+ OUString& rText,
+ const IntlWrapper * ) const
{
rText.clear();
return false;
}
-
bool MediaItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
{
uno::Sequence< uno::Any > aSeq( 10 );
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 6ed4862..8cc18b9 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -174,7 +174,7 @@ void ChartLinePanel::Initialize()
SvxColorToolBoxControl* pToolBoxColor = getColorToolBoxControl(mpTBColor.get());
pToolBoxColor->setColorSelectFunction(maLineColorWrapper);
- setMapUnit(SFX_MAPUNIT_100TH_MM);
+ setMapUnit(MAP_100TH_MM);
updateData();
}
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 6e089e0..c1a9abf 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -208,9 +208,9 @@ SfxItemPool* ChartItemPool::Clone() const
return new ChartItemPool(*this);
}
-SfxMapUnit ChartItemPool::GetMetric(sal_uInt16 /* nWhich */) const
+MapUnit ChartItemPool::GetMetric(sal_uInt16 /* nWhich */) const
{
- return SFX_MAPUNIT_100TH_MM;
+ return MAP_100TH_MM;
}
SfxItemPool* ChartItemPool::CreateChartItemPool()
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index 7b0d28c..5740fcd 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -38,7 +38,7 @@ protected:
public:
virtual SfxItemPool* Clone() const override;
- SfxMapUnit GetMetric( sal_uInt16 nWhich ) const override;
+ MapUnit GetMetric( sal_uInt16 nWhich ) const override;
/// creates a pure chart item pool
static SfxItemPool* CreateChartItemPool();
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index d628860..4dda034 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -63,7 +63,7 @@ DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>
SetDefaultFontHeight(423); // 12pt
SfxItemPool* pMasterPool = &GetItemPool();
- pMasterPool->SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
+ pMasterPool->SetDefaultMetric(MAP_100TH_MM);
pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, true) );
pMasterPool->SetPoolDefaultItem(makeSvx3DPercentDiagonalItem (5));
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 1b481f9..afb0624 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -53,7 +53,7 @@ private:
const SfxItemSet& rOutAttrs;
SfxItemSet aAttrSet;
const SdrView* pView;
- SfxMapUnit eUnit;
+ MapUnit eUnit;
void FillTypeLB();
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 590cd6e..1c2afd7 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -249,7 +249,7 @@ private:
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
- SfxMapUnit m_ePoolUnit;
+ MapUnit m_ePoolUnit;
DECL_LINK_TYPED(SelectDialogTypeHdl_Impl, ListBox&, void);
DECL_LINK_TYPED( ModifyColorHdl_Impl, ListBox&, void );
@@ -328,7 +328,7 @@ private:
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
- SfxMapUnit m_ePoolUnit;
+ MapUnit m_ePoolUnit;
DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void );
DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void );
@@ -481,7 +481,7 @@ private:
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
- SfxMapUnit m_ePoolUnit;
+ MapUnit m_ePoolUnit;
DECL_LINK_TYPED( ChangeHatchHdl, ValueSet*, void );
void ChangeHatchHdl_Impl();
@@ -574,7 +574,7 @@ private:
XFillAttrSetItem m_aXFillAttr;
SfxItemSet& m_rXFSet;
const SdrView* mpView;
- SfxMapUnit mePoolUnit;
+ MapUnit mePoolUnit;
Size rBitmapSize;
Size rFilledSize;
Size rZoomedSize;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index f2398ad..639e511 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -164,7 +164,7 @@ private:
sal_Int32* m_pPosDashLb;
sal_Int32* m_pPosLineEndLb;
- SfxMapUnit m_ePoolUnit;
+ MapUnit m_ePoolUnit;
sal_Int32 m_nActLineWidth;
@@ -280,7 +280,7 @@ private:
sal_uInt16 nDlgType;
sal_Int32* pPosDashLb;
- SfxMapUnit ePoolUnit;
+ MapUnit ePoolUnit;
FieldUnit eFUnit;
void FillDash_Impl();
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 90dbfa8..184ad5c 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -54,7 +54,7 @@ private:
const SfxItemSet& rOutAttrs;
SfxItemSet aAttrSet;
const SdrView* pView;
- SfxMapUnit eUnit;
+ MapUnit eUnit;
bool bPositionModified;
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 5344aaf..42bcf296 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -213,7 +213,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
SvxNumRule* pSaveNum;
sal_uInt16 nActNumLvl;
sal_uInt16 nNumItemId;
- SfxMapUnit eCoreUnit;
+ MapUnit eCoreUnit;
bool bModified : 1;
bool bPreset : 1;
@@ -303,10 +303,10 @@ class SvxNumOptionsTabPage : public SfxTabPage
std::vector<OUString> aGrfNames;
vcl::Font aActBulletFont;
- sal_uInt8 nBullet;
- sal_uInt16 nActNumLvl;
- sal_uInt16 nNumItemId;
- SfxMapUnit eCoreUnit;
+ sal_uInt8 nBullet;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
+ MapUnit eCoreUnit;
void InitControls();
/** To switch between the numbering type
@@ -402,7 +402,7 @@ class SvxNumPositionTabPage : public SfxTabPage
sal_uInt16 nActNumLvl;
sal_uInt16 nNumItemId;
- SfxMapUnit eCoreUnit;
+ MapUnit eCoreUnit;
bool bModified : 1;
bool bPreset : 1;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index c76c39d..688bd2a 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -63,7 +63,7 @@ private:
const SfxItemSet& rOutAttrs;
SdrTextAniKind eAniKind;
FieldUnit eFUnit;
- SfxMapUnit eUnit;
+ MapUnit eUnit;
DECL_LINK_TYPED( SelectEffectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index b2e5157..2857e45 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -116,7 +116,7 @@ private:
basegfx::B2DRange maWorkRange;
basegfx::B2DPoint maAnchor;
- SfxMapUnit mePoolUnit;
+ MapUnit mePoolUnit;
FieldUnit meDlgUnit;
TriState mnProtectSizeState;
bool mbPageDisabled;
@@ -197,7 +197,7 @@ private:
basegfx::B2DRange maRange;
basegfx::B2DPoint maAnchor;
- SfxMapUnit ePoolUnit;
+ MapUnit ePoolUnit;
FieldUnit eDlgUnit;
public:
@@ -250,7 +250,7 @@ private:
// #i75273#
basegfx::B2DRange maRange;
- SfxMapUnit ePoolUnit;
+ MapUnit ePoolUnit;
FieldUnit eDlgUnit;
public:
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index c07f7dd..e28f03f 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -261,7 +261,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
}
bIsDontCare = !pBoxInfo->IsValid( SvxBoxInfoItemValidFlags::DISABLE );
}
- if(!mbUseMarginItem && eFUnit == FUNIT_MM && SFX_MAPUNIT_TWIP == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) ))
+ if(!mbUseMarginItem && eFUnit == FUNIT_MM && MAP_TWIP == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) ))
{
//#i91548# changing the number of decimal digits changes the minimum values, too
lcl_SetDecimalDigitsTo1(*m_pLeftMF);
@@ -433,8 +433,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
const SvxBoxItem* pBoxItem;
const SvxBoxInfoItem* pBoxInfoItem;
- sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER);
- SfxMapUnit eCoreUnit;
+ sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER);
+ MapUnit eCoreUnit;
pBoxItem = static_cast<const SvxBoxItem*>(GetItem( *rSet, SID_ATTR_BORDER_OUTER ));
@@ -663,7 +663,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich );
const SvxBoxItem* pOldBoxItem = static_cast<const SvxBoxItem*>(GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_OUTER ));
- SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich );
+ MapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich );
// outer border:
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 99563d6..2ec8336 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -777,12 +777,12 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
if ( pSizeBox->IsRelativeMode() )
{
- SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
+ MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get( nWhich ));
- if( rItem.GetProp() != 100 || SFX_MAPUNIT_RELATIVE != rItem.GetPropUnit() )
+ if( rItem.GetProp() != 100 || MAP_RELATIVE != rItem.GetPropUnit() )
{
- bool bPtRel = SFX_MAPUNIT_POINT == rItem.GetPropUnit();
+ bool bPtRel = MAP_POINT == rItem.GetPropUnit();
pSizeBox->SetPtRelative( bPtRel );
pSizeBox->SetValue( bPtRel ? ((short)rItem.GetProp()) * 10 : rItem.GetProp() );
}
@@ -794,7 +794,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
}
else if ( eState >= SfxItemState::DEFAULT )
{
- SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
+ MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
const SvxFontHeightItem& rItem = static_cast<const SvxFontHeightItem&>(rSet.Get( nWhich ));
pSizeBox->SetValue( (long)CalcToPoint( rItem.GetHeight(), eUnit, 10 ) );
}
@@ -1079,9 +1079,9 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
}
if ( bChanged || !pOldHeight ||
- bRel != ( SFX_MAPUNIT_RELATIVE != pOldHeight->GetPropUnit() || 100 != pOldHeight->GetProp() ) )
+ bRel != ( MAP_RELATIVE != pOldHeight->GetPropUnit() || 100 != pOldHeight->GetProp() ) )
{
- SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
+ MapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
if ( pSizeBox->IsRelative() )
{
DBG_ASSERT( GetItemSet().GetParent(), "No parent set" );
@@ -1090,7 +1090,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
SvxFontHeightItem aHeight( 240, 100, nWhich );
if ( pSizeBox->IsPtRelative() )
- aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)( nSize / 10 ), SFX_MAPUNIT_POINT, eUnit );
+ aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)( nSize / 10 ), MAP_POINT, eUnit );
else
aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)nSize );
rSet.Put( aHeight );
@@ -1269,7 +1269,7 @@ namespace
const SvxFontHeightItem& rHeightItem =
static_cast<const SvxFontHeightItem&>(_pPage->GetItemSet().GetParent()->Get( _nHeightWhich ));
- SfxMapUnit eUnit = _pPage->GetItemSet().GetPool()->GetMetric( _nHeightWhich );
+ MapUnit eUnit = _pPage->GetItemSet().GetPool()->GetMetric( _nHeightWhich );
short nCurHeight =
static_cast< short >( CalcToPoint( rHeightItem.GetHeight(), eUnit, 1 ) * 10 );
@@ -3003,7 +3003,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
if ( rSet->GetItemState( nWhich ) >= SfxItemState::DEFAULT )
{
const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>(rSet->Get( nWhich ));
- SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
+ MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
MapUnit eOrgUnit = (MapUnit)eUnit;
MapUnit ePntUnit( MAP_POINT );
long nBig = static_cast<long>(m_pKerningMF->Normalize( static_cast<long>(rItem.GetValue()) ));
@@ -3176,7 +3176,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_CHAR_KERNING );
pOld = GetOldItem( *rSet, SID_ATTR_CHAR_KERNING );
short nKerning = 0;
- SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
+ MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
long nTmp = static_cast<long>(m_pKerningMF->GetValue());
long nVal = LogicToLogic( nTmp, MAP_POINT, (MapUnit)eUnit );
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 1b18c5b..2c01f53 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -170,7 +170,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs)
SfxItemPool* pPool = _rOutAttrs->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
- SfxMapUnit eUnit;
+ MapUnit eUnit;
nCaptionType = (SdrCaptionType) (m_pCT_CAPTTYPE->GetSelectItemId()-1);
@@ -260,8 +260,8 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
- sal_uInt16 nWhich;
- SfxMapUnit eUnit;
+ sal_uInt16 nWhich;
+ MapUnit eUnit;
nWhich = GetWhich( SDRATTR_CAPTIONESCABS );
eUnit = pPool->GetMetric( nWhich );
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 4cfe577..714a362 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -86,7 +86,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs
rOutAttrs ( rInAttrs ),
aAttrSet ( *rInAttrs.GetPool() ),
pView( nullptr ),
- eUnit( SFX_MAPUNIT_100TH_MM ),
+ eUnit( MAP_100TH_MM ),
bPositionModified ( false )
{
get(m_pMtrFldLineDist, "MTR_LINE_DIST");
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 2fdee55..61d5da6 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -116,9 +116,9 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo
}
-long ConvertLong_Impl( const long nIn, SfxMapUnit eUnit )
+long ConvertLong_Impl( const long nIn, MapUnit eUnit )
{
- return OutputDevice::LogicToLogic( nIn, (MapUnit)eUnit, MAP_TWIP );
+ return OutputDevice::LogicToLogic( nIn, eUnit, MAP_TWIP );
}
bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
@@ -435,7 +435,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
{
SfxItemPool* pPool = rSet->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
- SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) );
+ MapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) );
// adjust margins (right/left)
const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_LRSPACE );
@@ -549,8 +549,8 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
Swap( aPaperSize );
// write values into the edits
- SetMetricValue( *m_pPaperHeightEdit, aPaperSize.Height(), SFX_MAPUNIT_100TH_MM );
- SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), SFX_MAPUNIT_100TH_MM );
+ SetMetricValue( *m_pPaperHeightEdit, aPaperSize.Height(), MAP_100TH_MM );
+ SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), MAP_100TH_MM );
m_pPaperSizeBox->Clear();
m_pPaperSizeBox->FillPaperSizeEntries( ( ePaperStart == PAPER_A3 ) ? PaperSizeStd : PaperSizeDraw );
@@ -675,7 +675,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
SfxItemPool* pPool = rOldSet.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE );
- SfxMapUnit eUnit = pPool->GetMetric( nWhich );
+ MapUnit eUnit = pPool->GetMetric( nWhich );
const SfxPoolItem* pOld = nullptr;
// copy old left and right margins
@@ -964,8 +964,8 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void )
if ( aSize.Width() < m_pPaperWidthEdit->GetMin( FUNIT_100TH_MM ) )
m_pPaperWidthEdit->SetMin(
m_pPaperWidthEdit->Normalize( aSize.Width() ), FUNIT_100TH_MM );
- SetMetricValue( *m_pPaperHeightEdit, aSize.Height(), SFX_MAPUNIT_100TH_MM );
- SetMetricValue( *m_pPaperWidthEdit, aSize.Width(), SFX_MAPUNIT_100TH_MM );
+ SetMetricValue( *m_pPaperHeightEdit, aSize.Height(), MAP_100TH_MM );
+ SetMetricValue( *m_pPaperWidthEdit, aSize.Width(), MAP_100TH_MM );
CalcMargin_Impl();
@@ -984,28 +984,28 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void )
if ( bScreen || m_pRightMarginEdit->GetValue() == 0 )
{
- SetMetricValue( *m_pRightMarginEdit, nTmp, SFX_MAPUNIT_CM );
+ SetMetricValue( *m_pRightMarginEdit, nTmp, MAP_CM );
if ( !bScreen &&
m_pRightMarginEdit->GetFirst() > m_pRightMarginEdit->GetValue() )
m_pRightMarginEdit->SetValue( m_pRightMarginEdit->GetFirst() );
}
if ( bScreen || m_pLeftMarginEdit->GetValue() == 0 )
{
- SetMetricValue( *m_pLeftMarginEdit, nTmp, SFX_MAPUNIT_CM );
+ SetMetricValue( *m_pLeftMarginEdit, nTmp, MAP_CM );
if ( !bScreen &&
m_pLeftMarginEdit->GetFirst() > m_pLeftMarginEdit->GetValue() )
m_pLeftMarginEdit->SetValue( m_pLeftMarginEdit->GetFirst() );
}
if ( bScreen || m_pBottomMarginEdit->GetValue() == 0 )
{
- SetMetricValue( *m_pBottomMarginEdit, nTmp, SFX_MAPUNIT_CM );
+ SetMetricValue( *m_pBottomMarginEdit, nTmp, MAP_CM );
if ( !bScreen &&
m_pBottomMarginEdit->GetFirst() > m_pBottomMarginEdit->GetValue() )
m_pBottomMarginEdit->SetValue( m_pBottomMarginEdit->GetFirst() );
}
if ( bScreen || m_pTopMarginEdit->GetValue() == 0 )
{
- SetMetricValue( *m_pTopMarginEdit, nTmp, SFX_MAPUNIT_CM );
+ SetMetricValue( *m_pTopMarginEdit, nTmp, MAP_CM );
if ( !bScreen &&
m_pTopMarginEdit->GetFirst() > m_pTopMarginEdit->GetValue() )
m_pTopMarginEdit->SetValue( m_pTopMarginEdit->GetFirst() );
@@ -1019,7 +1019,7 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void )
IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void)
{
sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE );
- SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich );
+ MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich );
Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ),
GetCoreValue( *m_pPaperHeightEdit, eUnit ) );
Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, (MapUnit)eUnit, true );
@@ -1038,12 +1038,12 @@ IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void )
{
bLandscape = m_pLandscapeBtn->IsChecked();
- const long lWidth = GetCoreValue( *m_pPaperWidthEdit, SFX_MAPUNIT_100TH_MM );
- const long lHeight = GetCoreValue( *m_pPaperHeightEdit, SFX_MAPUNIT_100TH_MM );
+ const long lWidth = GetCoreValue( *m_pPaperWidthEdit, MAP_100TH_MM );
+ const long lHeight = GetCoreValue( *m_pPaperHeightEdit, MAP_100TH_MM );
// swap width and height
- SetMetricValue( *m_pPaperWidthEdit, lHeight, SFX_MAPUNIT_100TH_MM );
- SetMetricValue( *m_pPaperHeightEdit, lWidth, SFX_MAPUNIT_100TH_MM );
+ SetMetricValue( *m_pPaperWidthEdit, lHeight, MAP_100TH_MM );
+ SetMetricValue( *m_pPaperHeightEdit, lWidth, MAP_100TH_MM );
// recalculate margins if necessary
CalcMargin_Impl();
@@ -1133,16 +1133,16 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void)
void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
{
// Size
- Size aSize( GetCoreValue( *m_pPaperWidthEdit, SFX_MAPUNIT_TWIP ),
- GetCoreValue( *m_pPaperHeightEdit, SFX_MAPUNIT_TWIP ) );
+ Size aSize( GetCoreValue( *m_pPaperWidthEdit, MAP_TWIP ),
+ GetCoreValue( *m_pPaperHeightEdit, MAP_TWIP ) );
m_pBspWin->SetSize( aSize );
// Margins
- m_pBspWin->SetTop( GetCoreValue( *m_pTopMarginEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetBottom( GetCoreValue( *m_pBottomMarginEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetLeft( GetCoreValue( *m_pLeftMarginEdit, SFX_MAPUNIT_TWIP ) );
- m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, SFX_MAPUNIT_TWIP ) );
+ m_pBspWin->SetTop( GetCoreValue( *m_pTopMarginEdit, MAP_TWIP ) );
+ m_pBspWin->SetBottom( GetCoreValue( *m_pBottomMarginEdit, MAP_TWIP ) );
+ m_pBspWin->SetLeft( GetCoreValue( *m_pLeftMarginEdit, MAP_TWIP ) );
+ m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, MAP_TWIP ) );
// Layout
m_pBspWin->SetUsage( PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) );
@@ -1456,7 +1456,7 @@ DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
// put portray/landscape if applicable
sal_uInt16 nWh = GetWhich( SID_ATTR_PAGE_SIZE );
- SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWh );
+ MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWh );
Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ),
GetCoreValue( *m_pPaperHeightEdit, eUnit ) );
@@ -1540,14 +1540,14 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void)
void SvxPageDescPage::CalcMargin_Impl()
{
// current values for page margins
- long nBT = GetCoreValue( *m_pTopMarginEdit, SFX_MAPUNIT_TWIP );
- long nBB = GetCoreValue( *m_pBottomMarginEdit, SFX_MAPUNIT_TWIP );
+ long nBT = GetCoreValue( *m_pTopMarginEdit, MAP_TWIP );
+ long nBB = GetCoreValue( *m_pBottomMarginEdit, MAP_TWIP );
- long nBL = GetCoreValue( *m_pLeftMarginEdit, SFX_MAPUNIT_TWIP );
- long nBR = GetCoreValue( *m_pRightMarginEdit, SFX_MAPUNIT_TWIP );
+ long nBL = GetCoreValue( *m_pLeftMarginEdit, MAP_TWIP );
+ long nBR = GetCoreValue( *m_pRightMarginEdit, MAP_TWIP );
- long nH = GetCoreValue( *m_pPaperHeightEdit, SFX_MAPUNIT_TWIP );
- long nW = GetCoreValue( *m_pPaperWidthEdit, SFX_MAPUNIT_TWIP );
+ long nH = GetCoreValue( *m_pPaperHeightEdit, MAP_TWIP );
+ long nW = GetCoreValue( *m_pPaperWidthEdit, MAP_TWIP );
long nWidth = nBL + nBR + MINBODY;
long nHeight = nBT + nBB + MINBODY;
@@ -1560,9 +1560,9 @@ void SvxPageDescPage::CalcMargin_Impl()
nTmp -= nWidth - nW;
if ( nBL <= nBR )
- SetMetricValue( *m_pRightMarginEdit, nTmp, SFX_MAPUNIT_TWIP );
+ SetMetricValue( *m_pRightMarginEdit, nTmp, MAP_TWIP );
else
- SetMetricValue( *m_pLeftMarginEdit, nTmp, SFX_MAPUNIT_TWIP );
+ SetMetricValue( *m_pLeftMarginEdit, nTmp, MAP_TWIP );
}
if ( nHeight > nH )
@@ -1571,9 +1571,9 @@ void SvxPageDescPage::CalcMargin_Impl()
nTmp -= nHeight - nH;
if ( nBT <= nBB )
- SetMetricValue( *m_pBottomMarginEdit, nTmp, SFX_MAPUNIT_TWIP );
+ SetMetricValue( *m_pBottomMarginEdit, nTmp, MAP_TWIP );
else
- SetMetricValue( *m_pTopMarginEdit, nTmp, SFX_MAPUNIT_TWIP );
+ SetMetricValue( *m_pTopMarginEdit, nTmp, MAP_TWIP );
}
}
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 7bc8403..b48e793 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -220,7 +220,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
m_pLineDistAtMetricBox->IsValueModified() ) )
{
nWhich = GetWhich( SID_ATTR_PARA_LINESPACE );
- SfxMapUnit eUnit = pPool->GetMetric( nWhich );
+ MapUnit eUnit = pPool->GetMetric( nWhich );
SvxLineSpacingItem aSpacing(
static_cast<const SvxLineSpacingItem&>(GetItemSet().Get( nWhich )) );
@@ -265,7 +265,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
|| m_pContextualCB->IsValueChangedFromSaved())
{
nWhich = GetWhich( SID_ATTR_ULSPACE );
- SfxMapUnit eUnit = pPool->GetMetric( nWhich );
+ MapUnit eUnit = pPool->GetMetric( nWhich );
pOld = GetOldItem( *rOutSet, SID_ATTR_ULSPACE );
SvxULSpaceItem aMargin( nWhich );
@@ -312,7 +312,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
m_pAutoCB->IsValueChangedFromSaved() )
{
nWhich = GetWhich( SID_ATTR_LRSPACE );
- SfxMapUnit eUnit = pPool->GetMetric( nWhich );
+ MapUnit eUnit = pPool->GetMetric( nWhich );
SvxLRSpaceItem aMargin( nWhich );
pOld = GetOldItem( *rOutSet, SID_ATTR_LRSPACE );
@@ -441,7 +441,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- SfxMapUnit eUnit = pPool->GetMetric( _nWhich );
+ MapUnit eUnit = pPool->GetMetric( _nWhich );
if ( bRelativeMode )
{
@@ -511,7 +511,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- SfxMapUnit eUnit = pPool->GetMetric( _nWhich );
+ MapUnit eUnit = pPool->GetMetric( _nWhich );
const SvxULSpaceItem& rOldItem =
static_cast<const SvxULSpaceItem&>(rSet->Get( _nWhich ));
@@ -714,7 +714,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
const SvxLineSpacingItem &rAttr
)
{
- SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( rAttr.Which() );
+ MapUnit eUnit = GetItemSet().GetPool()->GetMetric( rAttr.Which() );
switch( rAttr.GetLineSpaceRule() )
{
@@ -837,7 +837,7 @@ IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void
// if the value has been changed at SetMin,
// it is time for the default
if ( m_pLineDistAtMetricBox->GetValue() != nTemp )
- SetMetricValue( *m_pLineDistAtMetricBox, FIX_DIST_DEF, SFX_MAPUNIT_TWIP ); // fix is only in Writer
+ SetMetricValue( *m_pLineDistAtMetricBox, FIX_DIST_DEF, MAP_TWIP ); // fix is only in Writer
m_pLineDistAtPercentBox->Hide();
m_pLineDistAtMetricBox->Show();
m_pLineDistAtMetricBox->Enable();
@@ -908,7 +908,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl()
case LLINESPACE_DURCH:
case LLINESPACE_FIX:
m_pExampleWin->SetLineSpace( (SvxPrevLineSpace)nPos,
- (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, SFX_MAPUNIT_TWIP ) );
+ (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, MAP_TWIP ) );
break;
}
m_pExampleWin->Invalidate();
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index d7d8008..49eca66 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -135,7 +135,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
{
SfxItemPool* pPool = rAttrs->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
- SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
+ MapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_TEXT_LEFTDIST );
@@ -342,7 +342,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
{
SfxItemPool* pPool = rAttrs->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
- SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
+ MapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
sal_Int32 nValue;
TriState eState;
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 8027c7a..430e703 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -821,7 +821,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent,
};
SfxItemPool* pPool = new SfxItemPool(OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults);
- pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why
+ pPool->SetDefaultMetric( MAP_TWIP ); // ripped, don't understand why
pPool->FreezeIdRanges(); // the same
std::unique_ptr<SfxItemSet> pFormatDescriptor(new SfxItemSet(*pPool, aAttrMap));
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 1572f04..134abc8 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -206,8 +206,8 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
aDebStr.append("Groesse=");
aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxFontHeightItem&>(rItem).GetHeight()));
Size aSz( 0, static_cast<const SvxFontHeightItem&>(rItem).GetHeight() );
- SfxMapUnit eUnit = rPool.GetMetric( rItem.Which() );
- MapMode aItemMapMode( (MapUnit) eUnit );
+ MapUnit eUnit = rPool.GetMetric( rItem.Which() );
+ MapMode aItemMapMode(eUnit);
MapMode aPntMap( MAP_POINT );
aSz = OutputDevice::LogicToLogic( aSz, aItemMapMode, aPntMap );
aDebStr.append(" Points=");
@@ -276,8 +276,8 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
aDebStr.append("Kerning=");
aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxKerningItem&>(rItem).GetValue()));
Size aSz( 0, (short)static_cast<const SvxKerningItem&>(rItem).GetValue() );
- SfxMapUnit eUnit = rPool.GetMetric( rItem.Which() );
- MapMode aItemMapMode( (MapUnit) eUnit );
+ MapUnit eUnit = rPool.GetMetric( rItem.Which() );
+ MapMode aItemMapMode(eUnit);
MapMode aPntMap( MAP_POINT );
aSz = OutputDevice::LogicToLogic( aSz, aItemMapMode, aPntMap );
aDebStr.append(" Points=");
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 0f4a018..6637a34 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1449,7 +1449,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
// therefore evaluate only from 401
nMetric = nTmpMetric;
if ( bOwnerOfPool && pPool && ( nMetric != 0xFFFF ) )
- pPool->SetDefaultMetric( (SfxMapUnit)nMetric );
+ pPool->SetDefaultMetric( (MapUnit)nMetric );
}
}
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 49aeaf2..1bc28d3 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1205,8 +1205,8 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo
{
SvxFontHeightItem aFontHeightItem( static_cast<const SvxFontHeightItem&>(rSet.Get( *pWhich )) );
long nHeight = aFontHeightItem.GetHeight();
- const SfxMapUnit eUnit = rSet.GetPool()->GetMetric( *pWhich );
- nHeight = OutputDevice::LogicToLogic( nHeight * 10, (MapUnit)eUnit, MAP_POINT );
+ const MapUnit eUnit = rSet.GetPool()->GetMetric( *pWhich );
+ nHeight = OutputDevice::LogicToLogic(nHeight * 10, eUnit, MAP_POINT);
FontMetric aFontMetric = pFontList->Get( pFontItem->GetFamilyName(), pFontItem->GetStyleName() );
const sal_IntPtr* pAry = pFontList->GetSizeAry( aFontMetric );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 17eed1c..1b97adc 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1027,7 +1027,7 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool
{
EditTextObject* pTxtObj = new EditTextObject(pPool);
pTxtObj->SetVertical( IsVertical() );
- SfxMapUnit eMapUnit = aEditDoc.GetItemPool().GetMetric( DEF_METRIC );
+ MapUnit eMapUnit = aEditDoc.GetItemPool().GetMetric( DEF_METRIC );
pTxtObj->mpImpl->SetMetric( (sal_uInt16) eMapUnit );
if ( pTxtObj->mpImpl->IsOwnerOfPool() )
pTxtObj->mpImpl->GetPool()->SetDefaultMetric( eMapUnit );
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 9abc38f..1ae6914 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -633,10 +633,10 @@ void SvxBorderLine::SetWidth( long nWidth )
m_nWidth = nWidth;
}
-OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
- SfxMapUnit eDestUnit,
- const IntlWrapper* pIntl,
- bool bMetricStr) const
+OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit,
+ MapUnit eDestUnit,
+ const IntlWrapper* pIntl,
+ bool bMetricStr) const
{
static const sal_uInt16 aStyleIds[] =
{
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 36c7b35..e2a68da 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -340,8 +340,8 @@ OUString SvxBulletItem::GetFullText() const
bool SvxBulletItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 70a3a17..b8ad6cd 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -37,8 +37,8 @@ SfxPoolItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const
bool SvxCharHiddenItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText,
const IntlWrapper * /*pIntl*/
) const
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index ed2d033..eda2aed 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -184,8 +184,8 @@ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const
bool SvxPaperBinItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -322,8 +322,8 @@ SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const
bool SvxSizeItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText, const IntlWrapper *pIntl
) const
{
@@ -596,8 +596,8 @@ SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const
bool SvxLRSpaceItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText, const IntlWrapper* pIntl
) const
{
@@ -973,8 +973,8 @@ SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const
bool SvxULSpaceItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText,
const IntlWrapper *pIntl
) const
@@ -1123,8 +1123,8 @@ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const
bool SvxPrintItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -1161,8 +1161,8 @@ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const
bool SvxOpaqueItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -1231,8 +1231,8 @@ SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const
bool SvxProtectItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -1457,8 +1457,8 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const
bool SvxShadowItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText, const IntlWrapper *pIntl
) const
{
@@ -2058,8 +2058,8 @@ SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const
bool SvxBoxItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText, const IntlWrapper *pIntl
) const
{
@@ -2557,8 +2557,8 @@ SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const
bool SvxBoxInfoItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -2893,8 +2893,8 @@ bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const
bool SvxFormatBreakItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -3023,8 +3023,8 @@ SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
bool SvxFormatKeepItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -3153,8 +3153,8 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
bool SvxLineItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText, const IntlWrapper *pIntl
) const
{
@@ -3667,8 +3667,8 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
bool SvxBrushItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -4131,8 +4131,8 @@ sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const
bool SvxFrameDirectionItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *) const
{
rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index dff82ee..ee17491 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -26,7 +26,7 @@
#include <rtl/ustrbuf.hxx>
-OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl )
+OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper* pIntl )
{
bool bNeg = false;
sal_Int32 nRet = 0;
@@ -39,45 +39,45 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co
switch ( eDestUnit )
{
- case SFX_MAPUNIT_100TH_MM:
- case SFX_MAPUNIT_10TH_MM:
- case SFX_MAPUNIT_MM:
- case SFX_MAPUNIT_CM:
+ case MAP_100TH_MM:
+ case MAP_10TH_MM:
+ case MAP_MM:
+ case MAP_CM:
{
nRet = (long)OutputDevice::LogicToLogic(
- nVal, (MapUnit)eSrcUnit, (MapUnit)SFX_MAPUNIT_100TH_MM );
+ nVal, (MapUnit)eSrcUnit, (MapUnit)MAP_100TH_MM );
switch ( eDestUnit )
{
- case SFX_MAPUNIT_100TH_MM: nRet *= 1000; break;
- case SFX_MAPUNIT_10TH_MM: nRet *= 100; break;
- case SFX_MAPUNIT_MM: nRet *= 10; break;
+ case MAP_100TH_MM: nRet *= 1000; break;
+ case MAP_10TH_MM: nRet *= 100; break;
+ case MAP_MM: nRet *= 10; break;
default: ;//prevent warning
}
break;
}
- case SFX_MAPUNIT_1000TH_INCH:
- case SFX_MAPUNIT_100TH_INCH:
- case SFX_MAPUNIT_10TH_INCH:
- case SFX_MAPUNIT_INCH:
+ case MAP_1000TH_INCH:
+ case MAP_100TH_INCH:
+ case MAP_10TH_INCH:
+ case MAP_INCH:
{
nRet = OutputDevice::LogicToLogic(
- nVal, (MapUnit)eSrcUnit, (MapUnit)SFX_MAPUNIT_1000TH_INCH );
+ nVal, (MapUnit)eSrcUnit, (MapUnit)MAP_1000TH_INCH );
switch ( eDestUnit )
{
- case SFX_MAPUNIT_1000TH_INCH: nRet *= 1000; break;
- case SFX_MAPUNIT_100TH_INCH: nRet *= 100; break;
- case SFX_MAPUNIT_10TH_INCH: nRet *= 10; break;
+ case MAP_1000TH_INCH: nRet *= 1000; break;
+ case MAP_100TH_INCH: nRet *= 100; break;
+ case MAP_10TH_INCH: nRet *= 10; break;
default: ;//prevent warning
}
break;
}
- case SFX_MAPUNIT_POINT:
- case SFX_MAPUNIT_TWIP:
- case SFX_MAPUNIT_PIXEL:
+ case MAP_POINT:
+ case MAP_TWIP:
+ case MAP_PIXEL:
return OUString::number( (long)OutputDevice::LogicToLogic(
nVal, (MapUnit)eSrcUnit, (MapUnit)eDestUnit ));
@@ -86,7 +86,7 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co
return OUString();
}
- if ( SFX_MAPUNIT_CM == eDestUnit || SFX_MAPUNIT_INCH == eDestUnit )
+ if ( MAP_CM == eDestUnit || MAP_INCH == eDestUnit )
{
sal_Int32 nMod = nRet % 10;
@@ -168,38 +168,38 @@ OUString GetColorString( const Color& rCol )
}
-sal_uInt16 GetMetricId( SfxMapUnit eUnit )
+sal_uInt16 GetMetricId( MapUnit eUnit )
{
sal_uInt16 nId = RID_SVXITEMS_METRIC_MM;
switch ( eUnit )
{
- case SFX_MAPUNIT_100TH_MM:
- case SFX_MAPUNIT_10TH_MM:
- case SFX_MAPUNIT_MM:
+ case MAP_100TH_MM:
+ case MAP_10TH_MM:
+ case MAP_MM:
nId = RID_SVXITEMS_METRIC_MM;
break;
- case SFX_MAPUNIT_CM:
+ case MAP_CM:
nId = RID_SVXITEMS_METRIC_CM;
break;
- case SFX_MAPUNIT_1000TH_INCH:
- case SFX_MAPUNIT_100TH_INCH:
- case SFX_MAPUNIT_10TH_INCH:
- case SFX_MAPUNIT_INCH:
+ case MAP_1000TH_INCH:
+ case MAP_100TH_INCH:
+ case MAP_10TH_INCH:
+ case MAP_INCH:
nId = RID_SVXITEMS_METRIC_INCH;
break;
- case SFX_MAPUNIT_POINT:
+ case MAP_POINT:
nId = RID_SVXITEMS_METRIC_POINT;
break;
- case SFX_MAPUNIT_TWIP:
+ case MAP_TWIP:
nId = RID_SVXITEMS_METRIC_TWIP;
break;
- case SFX_MAPUNIT_PIXEL:
+ case MAP_PIXEL:
nId = RID_SVXITEMS_METRIC_PIXEL;
break;
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index 48f961a..7979a7b 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -52,8 +52,8 @@ SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
bool SvxHorJustifyItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *) const
{
rText = GetValueText( GetValue() );
@@ -199,8 +199,8 @@ SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
bool SvxVerJustifyItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText,
const IntlWrapper * ) const
{
@@ -330,8 +330,8 @@ SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify,
bool SvxJustifyMethodItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText,
const IntlWrapper * ) const
{
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 9feba60..8d89d23 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -53,8 +53,8 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) :
bool SfxSpellCheckItem::GetPresentation
(
SfxItemPresentation ,
- SfxMapUnit ,
- SfxMapUnit ,
+ MapUnit ,
+ MapUnit ,
OUString& ,
const IntlWrapper*
) const
@@ -113,8 +113,8 @@ SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const
bool SfxHyphenRegionItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit ,
- SfxMapUnit ,
+ MapUnit ,
+ MapUnit ,
OUString& rText,
const IntlWrapper*
) const
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 0f5decd..3ce42df 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -230,8 +230,8 @@ SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const
bool SvxLineSpacingItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -415,8 +415,8 @@ SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const
bool SvxAdjustItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -530,8 +530,8 @@ SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
bool SvxWidowsItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -591,8 +591,8 @@ SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
bool SvxOrphansItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -703,8 +703,8 @@ SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const
bool SvxHyphenZoneItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -1028,8 +1028,8 @@ SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const
bool SvxTabStopItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText, const IntlWrapper *pIntl
) const
{
@@ -1186,8 +1186,8 @@ SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
bool SvxFormatSplitItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -1246,8 +1246,8 @@ bool SvxPageModelItem::operator==( const SfxPoolItem& rAttr ) const
bool SvxPageModelItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *
) const
{
@@ -1302,7 +1302,7 @@ sal_uInt16 SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const
bool SvxScriptSpaceItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* /*pIntl*/ ) const
{
rText = EE_RESSTR( !GetValue()
@@ -1342,7 +1342,7 @@ sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const
bool SvxHangingPunctuationItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* /*pIntl*/ ) const
{
rText = EE_RESSTR( !GetValue()
@@ -1382,7 +1382,7 @@ sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const
bool SvxForbiddenRuleItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* /*pIntl*/ ) const
{
rText = EE_RESSTR( !GetValue()
@@ -1426,7 +1426,7 @@ sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const
bool SvxParaVertAlignItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* ) const
{
sal_uInt16 nTmp;
@@ -1498,7 +1498,7 @@ sal_uInt16 SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const
bool SvxParaGridItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* /*pIntl*/ ) const
{
rText = GetValue() ?
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index e76b527..64efe96 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -186,8 +186,8 @@ bool SvxFontListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
bool SvxFontListItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -422,8 +422,8 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxFontItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -487,8 +487,8 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxPostureItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -638,8 +638,8 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxWeightItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -733,7 +733,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion )
// When exporting to the old versions the relative information is lost
// when there is no percentage
sal_uInt16 _nProp = GetProp();
- if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
+ if( MAP_RELATIVE != GetPropUnit() )
_nProp = 100;
rStrm.WriteUInt16( _nProp );
}
@@ -744,7 +744,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion )
SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
sal_uInt16 nVersion ) const
{
- sal_uInt16 nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
+ sal_uInt16 nsize, nprop = 0, nPropUnit = MAP_RELATIVE;
rStrm.ReadUInt16( nsize );
@@ -761,7 +761,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
rStrm.ReadUInt16( nPropUnit );
SvxFontHeightItem* pItem = new SvxFontHeightItem( nsize, 100, Which() );
- pItem->SetProp( nprop, (SfxMapUnit)nPropUnit );
+ pItem->SetProp( nprop, (MapUnit)nPropUnit );
return pItem;
}
@@ -801,22 +801,22 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
aFontHeight.Height = fRoundPoints;
}
- aFontHeight.Prop = (sal_Int16)(SFX_MAPUNIT_RELATIVE == ePropUnit ? nProp : 100);
+ aFontHeight.Prop = (sal_Int16)(MAP_RELATIVE == ePropUnit ? nProp : 100);
float fRet = (float)(short)nProp;
switch( ePropUnit )
{
- case SFX_MAPUNIT_RELATIVE:
+ case MAP_RELATIVE:
fRet = 0.;
break;
- case SFX_MAPUNIT_100TH_MM:
+ case MAP_100TH_MM:
fRet = convertMm100ToTwip(fRet);
fRet /= 20.;
break;
- case SFX_MAPUNIT_POINT:
+ case MAP_POINT:
break;
- case SFX_MAPUNIT_TWIP:
+ case MAP_TWIP:
fRet /= 20.;
break;
default: ;//prevent warning
@@ -843,24 +843,24 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
break;
case MID_FONTHEIGHT_PROP:
- rVal <<= (sal_Int16)(SFX_MAPUNIT_RELATIVE == ePropUnit ? nProp : 100);
+ rVal <<= (sal_Int16)(MAP_RELATIVE == ePropUnit ? nProp : 100);
break;
case MID_FONTHEIGHT_DIFF:
{
float fRet = (float)(short)nProp;
switch( ePropUnit )
{
- case SFX_MAPUNIT_RELATIVE:
+ case MAP_RELATIVE:
fRet = 0.;
break;
- case SFX_MAPUNIT_100TH_MM:
+ case MAP_100TH_MM:
fRet = convertMm100ToTwip(fRet);
fRet /= 20.;
break;
- case SFX_MAPUNIT_POINT:
+ case MAP_POINT:
break;
- case SFX_MAPUNIT_TWIP:
+ case MAP_TWIP:
fRet /= 20.;
break;
default: ;//prevent warning
@@ -879,17 +879,17 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
// overloads), and indeed known to occasionally produce nRet values that would
// be negative, so just guard against negative results here and throw the hands
// up in despair:
-static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, bool bCoreInTwip)
+static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, MapUnit eProp, bool bCoreInTwip)
{
sal_uInt32 nRet = nHeight;
short nDiff = 0;
switch( eProp )
{
- case SFX_MAPUNIT_RELATIVE:
+ case MAP_RELATIVE:
nRet *= 100;
nRet /= nProp;
break;
- case SFX_MAPUNIT_POINT:
+ case MAP_POINT:
{
short nTemp = (short)nProp;
nDiff = nTemp * 20;
@@ -897,11 +897,11 @@ static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, S
nDiff = (short)convertTwipToMm100((long)(nDiff));
}
break;
- case SFX_MAPUNIT_100TH_MM:
+ case MAP_100TH_MM:
//then the core is surely also in 1/100 mm
nDiff = (short)nProp;
break;
- case SFX_MAPUNIT_TWIP:
+ case MAP_TWIP:
// Here surely TWIP
nDiff = ((short)nProp);
break;
@@ -926,7 +926,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
if ( rVal >>= aFontHeight )
{
// Height
- ePropUnit = SFX_MAPUNIT_RELATIVE;
+ ePropUnit = MAP_RELATIVE;
nProp = 100;
double fPoint = aFontHeight.Height;
if( fPoint < 0. || fPoint > 10000. )
@@ -944,7 +944,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
break;
case MID_FONTHEIGHT:
{
- ePropUnit = SFX_MAPUNIT_RELATIVE;
+ ePropUnit = MAP_RELATIVE;
nProp = 100;
double fPoint = 0;
if(!(rVal >>= fPoint))
@@ -973,7 +973,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
nHeight *= nNew;
nHeight /= 100;
nProp = nNew;
- ePropUnit = SFX_MAPUNIT_RELATIVE;
+ ePropUnit = MAP_RELATIVE;
}
break;
case MID_FONTHEIGHT_DIFF:
@@ -990,7 +990,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
sal_Int16 nCoreDiffValue = (sal_Int16)(fValue * 20.);
nHeight += bConvert ? nCoreDiffValue : convertTwipToMm100(nCoreDiffValue);
nProp = (sal_uInt16)((sal_Int16)fValue);
- ePropUnit = SFX_MAPUNIT_POINT;
+ ePropUnit = MAP_POINT;
}
break;
}
@@ -1001,12 +1001,12 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
bool SvxFontHeightItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit eCoreUnit,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit eCoreUnit,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *pIntl
) const
{
- if( SFX_MAPUNIT_RELATIVE != ePropUnit )
+ if( MAP_RELATIVE != ePropUnit )
{
rText = OUString::number( (short)nProp ) +
" " + EE_RESSTR( GetMetricId( ePropUnit ) );
@@ -1016,8 +1016,8 @@ bool SvxFontHeightItem::GetPresentation
else if( 100 == nProp )
{
rText = GetMetricText( (long)nHeight,
- eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ eCoreUnit, MAP_POINT, pIntl ) +
+ " " + EE_RESSTR(GetMetricId(MAP_POINT));
}
else
rText = OUString::number( nProp ) + "%";
@@ -1045,11 +1045,11 @@ bool SvxFontHeightItem::HasMetrics() const
}
void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp,
- SfxMapUnit eUnit )
+ MapUnit eUnit )
{
DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
- if( SFX_MAPUNIT_RELATIVE != eUnit )
+ if( MAP_RELATIVE != eUnit )
nHeight = nNewHeight + ::ItemToControl( (short)nNewProp, eUnit,
FUNIT_TWIP );
else if( 100 != nNewProp )
@@ -1062,11 +1062,11 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewP
}
void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
- SfxMapUnit eMetric, SfxMapUnit eCoreMetric )
+ MapUnit eMetric, MapUnit eCoreMetric )
{
DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
- if( SFX_MAPUNIT_RELATIVE != eMetric )
+ if( MAP_RELATIVE != eMetric )
nHeight = nNewHeight +
::ControlToItem( ::ItemToControl((short)nNewProp, eMetric,
FUNIT_TWIP ), FUNIT_TWIP,
@@ -1186,16 +1186,16 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
bool SvxFontWidthItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit eCoreUnit,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit eCoreUnit,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *pIntl
) const
{
if ( 100 == nProp )
{
rText = GetMetricText( (long)nWidth,
- eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ eCoreUnit, MAP_POINT, pIntl ) +
+ " " + EE_RESSTR(GetMetricId(MAP_POINT));
}
else
rText = OUString::number( nProp ) + "%";
@@ -1260,8 +1260,8 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxTextLineItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1463,8 +1463,8 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxCrossedOutItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1545,8 +1545,8 @@ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxShadowedItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1590,8 +1590,8 @@ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxAutoKernItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1636,8 +1636,8 @@ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxWordLineModeItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1681,8 +1681,8 @@ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxContourItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1726,8 +1726,8 @@ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxPropSizeItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1910,8 +1910,8 @@ SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const
bool SvxColorItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -1972,8 +1972,8 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxCharSetColorItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -2025,16 +2025,16 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxKerningItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit eCoreUnit,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper *pIntl
) const
{
switch ( ePres )
{
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ rText = GetMetricText( (long)GetValue(), eCoreUnit, MAP_POINT, pIntl ) +
+ " " + EE_RESSTR(GetMetricId(MAP_POINT));
return true;
case SFX_ITEM_PRESENTATION_COMPLETE:
{
@@ -2049,8 +2049,8 @@ bool SvxKerningItem::GetPresentation
if ( nId )
rText += EE_RESSTR(nId);
rText = rText +
- GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl ) +
- " " + EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+ GetMetricText( (long)GetValue(), eCoreUnit, MAP_POINT, pIntl ) +
+ " " + EE_RESSTR(GetMetricId(MAP_POINT));
return true;
}
default: ; //prevent warning
@@ -2116,8 +2116,8 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxCaseMapItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -2245,8 +2245,8 @@ sal_uInt16 SvxEscapementItem::GetValueCount() const
bool SvxEscapementItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -2389,8 +2389,8 @@ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxLanguageItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -2472,8 +2472,8 @@ SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxNoLinebreakItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -2513,8 +2513,8 @@ SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const
bool SvxNoHyphenItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -2551,8 +2551,8 @@ SvxLineColorItem::~SvxLineColorItem()
bool SvxLineColorItem::GetPresentation
(
SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText,
const IntlWrapper * pIntlWrapper
) const
@@ -2594,8 +2594,8 @@ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const
bool SvxBlinkItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
@@ -2641,8 +2641,8 @@ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const
bool SvxEmphasisMarkItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText,
const IntlWrapper * /*pIntl*/
) const
@@ -2830,7 +2830,7 @@ bool SvxTwoLinesItem::PutValue( const css::uno::Any& rVal,
}
bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* /*pIntl*/ ) const
{
if( !GetValue() )
@@ -2910,7 +2910,7 @@ sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const
bool SvxCharRotateItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* ) const
{
if( !GetValue() )
@@ -3049,7 +3049,7 @@ sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const
bool SvxCharScaleWidthItem::GetPresentation(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
OUString &rText, const IntlWrapper* ) const
{
if( !GetValue() )
@@ -3135,8 +3135,8 @@ sal_uInt16 SvxCharReliefItem::GetValueCount() const
bool SvxCharReliefItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
+ MapUnit /*eCoreUnit*/,
+ MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 86c260a..50e4b35 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -66,8 +66,8 @@ sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const
}
bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreMetric*/,
- SfxMapUnit /*ePresMetric*/,
+ MapUnit /*eCoreMetric*/,
+ MapUnit /*ePresMetric*/,
OUString &rText,
const IntlWrapper * ) const
{
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 07883f6..c1e397f 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -56,8 +56,8 @@ bool SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const
bool SvXMLAttrContainerItem::GetPresentation(
SfxItemPresentation /*ePresentation*/,
- SfxMapUnit /*eCoreMetric*/,
- SfxMapUnit /*ePresentationMetric*/,
+ MapUnit /*eCoreMetric*/,
+ MapUnit /*ePresentationMetric*/,
OUString & /*rText*/,
const IntlWrapper * /*pIntlWrapper*/ ) const
{
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 02c5d9d..31f7e48 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -103,9 +103,9 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
if( nullptr == pItem && pPool )
pItem = &(pPool->GetDefaultItem( pMap->nWID ));
- const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
+ const MapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : MAP_100TH_MM;
sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
- if( eMapUnit == SFX_MAPUNIT_100TH_MM )
+ if( eMapUnit == MAP_100TH_MM )
nMemberId &= (~CONVERT_TWIPS);
if(pItem)
@@ -113,7 +113,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
pItem->QueryValue( aVal, nMemberId );
if( pMap->nMemberId & SFX_METRIC_ITEM )
{
- if( eMapUnit != SFX_MAPUNIT_100TH_MM )
+ if( eMapUnit != MAP_100TH_MM )
{
if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aVal ) )
SvxUnoConvertToMM( eMapUnit, aVal );
@@ -164,10 +164,10 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
{
uno::Any aValue( rVal );
- const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
+ const MapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : MAP_100TH_MM;
// check for needed metric translation
- if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != SFX_MAPUNIT_100TH_MM )
+ if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != MAP_100TH_MM )
{
if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aValue ) )
SvxUnoConvertFromMM( eMapUnit, aValue );
@@ -176,7 +176,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
SfxPoolItem *pNewItem = pItem->Clone();
sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
- if( eMapUnit == SFX_MAPUNIT_100TH_MM )
+ if( eMapUnit == MAP_100TH_MM )
nMemberId &= (~CONVERT_TWIPS);
if( pNewItem->PutValue( aValue, nMemberId ) )
@@ -198,9 +198,9 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
return *pUsrAny;
// No UsrAny detected yet, generate Default entry and return this
- const SfxMapUnit eMapUnit = mrItemPool.GetMetric((sal_uInt16)pMap->nWID);
+ const MapUnit eMapUnit = mrItemPool.GetMetric((sal_uInt16)pMap->nWID);
sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
- if( eMapUnit == SFX_MAPUNIT_100TH_MM )
+ if( eMapUnit == MAP_100TH_MM )
nMemberId &= (~CONVERT_TWIPS);
uno::Any aVal;
SfxItemSet aSet( mrItemPool, pMap->nWID, pMap->nWID);
@@ -226,7 +226,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
if( pMap->nMemberId & SFX_METRIC_ITEM )
{
// check for needed metric translation
- if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
+ if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != MAP_100TH_MM)
{
SvxUnoConvertToMM( eMapUnit, aVal );
}
@@ -277,12 +277,12 @@ uno::Reference< beans::XPropertySetInfo > const & SvxItemPropertySet::getProper
#endif
/** converts the given any with a metric to 100th/mm if needed */
-void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) throw()
+void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, uno::Any & rMetric ) throw()
{
// map the metric of the itempool to 100th mm
switch(eSourceMapUnit)
{
- case SFX_MAPUNIT_TWIP :
+ case MAP_TWIP :
{
switch( rMetric.getValueTypeClass() )
{
@@ -315,11 +315,11 @@ void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) th
/** converts the given any with a metric from 100th/mm to the given metric if needed */
-void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, uno::Any & rMetric ) throw()
+void SvxUnoConvertFromMM( const MapUnit eDestinationMapUnit, uno::Any & rMetric ) throw()
{
switch(eDestinationMapUnit)
{
- case SFX_MAPUNIT_TWIP :
+ case MAP_TWIP :
{
switch( rMetric.getValueTypeClass() )
{
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 98f88fd..0e94313 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -55,7 +55,7 @@ namespace frm
pReturn->SetStatusEventHdl( LINK( pReturn, RichTextEngine, EditEngineStatusChanged ) );
- pPool->SetDefaultMetric( (SfxMapUnit)( aDeviceMapMode.GetMapUnit() ) );
+ pPool->SetDefaultMetric(aDeviceMapMode.GetMapUnit());
// defaults
vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index ededc66..1e99987 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -326,7 +326,7 @@ namespace frm
{
// by definition, the item should have the unit twip
sal_uLong nHeight = pFontHeightItem->GetHeight();
- if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP )
+ if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != MAP_TWIP )
{
nHeight = OutputDevice::LogicToLogic(
Size( 0, nHeight ),
@@ -352,13 +352,13 @@ namespace frm
if ( pFontHeightItem )
{
// correct measurement units
- SfxMapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit;
+ MapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit;
sal_uLong nHeight = pFontHeightItem->GetHeight();
- if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP )
+ if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != MAP_TWIP )
{
nHeight = OutputDevice::LogicToLogic(
Size( 0, nHeight ),
- MapMode( (MapUnit)( SFX_MAPUNIT_TWIP ) ),
+ MapMode( (MapUnit)( MAP_TWIP ) ),
MapMode( (MapUnit)( _rNewAttribs.GetPool()->GetMetric( getWhich() ) ) )
).Height();
}
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index 3235e36..1144885 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -73,8 +73,8 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreUnit,
- SfxMapUnit ePresUnit,
+ MapUnit eCoreUnit,
+ MapUnit ePresUnit,
OUString& rText,
const IntlWrapper *pIntl = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index b55e52a..2af8a54 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -59,9 +59,9 @@ public:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual sal_uInt16 GetValueCount() const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
virtual sal_uInt16 GetEnumValue() const override;
diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx
index 26231e7..5704b35 100644
--- a/include/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
@@ -45,9 +45,9 @@ public:
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
{
diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx
index 2df566f..4cdd649 100644
--- a/include/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
@@ -44,9 +44,9 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
SetValue(rBlink.GetValue());
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index d72cdab..bd8cb5a 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -127,7 +127,7 @@ namespace editeng {
bool operator==( const SvxBorderLine &rCmp ) const;
- OUString GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit,
+ OUString GetValueString( MapUnit eSrcUnit, MapUnit eDestUnit,
const IntlWrapper* pIntl,
bool bMetricStr = false ) const;
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index cb23578..83c42e2 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -76,8 +76,8 @@ public:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -189,8 +189,8 @@ public:
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 2b94ce1..82fdd0c 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -78,9 +78,9 @@ public:
public:
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 9116222..8eaee6b 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -96,8 +96,8 @@ public:
virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
static void StoreFont( SvStream&, const vcl::Font& );
diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx
index 728c0fa..2cdc197 100644
--- a/include/editeng/charhiddenitem.hxx
+++ b/include/editeng/charhiddenitem.hxx
@@ -38,9 +38,9 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) {
SetValue(rHidden.GetValue());
diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index 1136788..b644d31 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -50,10 +50,10 @@ public:
void SetValue(FontRelief f) { SfxEnumItem::SetValue((sal_uInt16)f); }
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText,
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index eaea318..2ab87f2 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -49,8 +49,8 @@ public:
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
OUString &rText,
const IntlWrapper * = nullptr ) const override;
diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx
index 1cbaf68..32761e4 100644
--- a/include/editeng/charscaleitem.hxx
+++ b/include/editeng/charscaleitem.hxx
@@ -46,10 +46,10 @@ public:
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText,
- const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText,
+ const IntlWrapper * = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index f949c13..b0208a9 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -42,9 +42,9 @@ public:
// "pure virtual Methods" from SfxPoolItem
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index 3d80874..3b32064 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -42,8 +42,8 @@ public:
// "pure virtual Methods" from SfxPoolItem + SfxEnumItem
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
OUString &rText, const IntlWrapper * = nullptr ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index c91429e..33f9dec 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -50,7 +50,7 @@ public:
virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const override;
virtual bool GetPresentation(SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
+ MapUnit eCoreMetric, MapUnit ePresMetric,
OUString &rText, const IntlWrapper* pIntlWrapper = nullptr) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index 6ea0d5c..13f4083 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list