diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-12 11:24:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-13 07:47:24 +0100 |
| commit | 078ee7560d4c7ac3883c0a625023ad22ec8dc326 (patch) | |
| tree | d638c9c98dff401eab4dded6aa89cbad972e0958 /svx/source/svdraw/svdmodel.cxx | |
| parent | cf4cf3ed0d9f57981b3fd15d64ef1c53bc16c0f1 (diff) | |
sal_uIntPtr->sal_Int32 in SdrModel
Change-Id: I7cf53514641c52f3ebb503251e25df90bd6db8c7
Reviewed-on: https://gerrit.libreoffice.org/46310
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdmodel.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 95532a7b6b34..1290930214a8 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -185,9 +185,9 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // using static SdrEngineDefaults only if default SvxFontHeight item is not available const SfxPoolItem* pPoolItem = pItemPool->GetPoolDefaultItem( EE_CHAR_FONTHEIGHT ); if ( pPoolItem ) - nDefTextHgt = static_cast<const SvxFontHeightItem*>(pPoolItem)->GetHeight(); + mnDefTextHgt = static_cast<const SvxFontHeightItem*>(pPoolItem)->GetHeight(); else - nDefTextHgt = SdrEngineDefaults::GetFontHeight(); + mnDefTextHgt = SdrEngineDefaults::GetFontHeight(); pItemPool->SetPoolDefaultItem( makeSdrTextWordWrapItem( false ) ); @@ -689,10 +689,10 @@ SdrPage* SdrModel::AllocPage(bool bMasterPage) void SdrModel::SetTextDefaults() const { - SetTextDefaults( pItemPool, nDefTextHgt ); + SetTextDefaults( pItemPool, mnDefTextHgt ); } -void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ) +void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 nDefTextHgt ) { // set application-language specific dynamic pool language defaults SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ; @@ -889,10 +889,10 @@ void SdrModel::RefDeviceChanged() ImpReformatAllTextObjects(); } -void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal) +void SdrModel::SetDefaultFontHeight(sal_Int32 nVal) { - if (nVal!=nDefTextHgt) { - nDefTextHgt=nVal; + if (nVal!=mnDefTextHgt) { + mnDefTextHgt=nVal; Broadcast(SdrHint(SdrHintKind::DefaultFontHeightChange)); ImpReformatAllTextObjects(); } |