diff options
Diffstat (limited to 'sw/source/core/unocore')
| -rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoobj.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoport.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unosett.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 84122febaf3f..9479f9be96c1 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1250,7 +1250,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORTYPE == pEntry->nMemberId) { bool bSetAttr = true; - sal_Int32 eNewAnchor = SWUnoHelper::GetEnumAsInt32( aValue ); + text::TextContentAnchorType eNewAnchor = (text::TextContentAnchorType)SWUnoHelper::GetEnumAsInt32( aValue ); //if old anchor was in_cntnt the related text attribute has to be removed const SwFormatAnchor& rOldAnchor = pFormat->GetAnchor(); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 730d329a05dc..c02cdd730816 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -1879,7 +1879,7 @@ SwUnoCursorHelper::GetPropertyStates( eCaller) { //this values marks the element as unknown property - pStates[i] = beans::PropertyState_MAKE_FIXED_SIZE; + pStates[i] = beans::PropertyState::PropertyState_MAKE_FIXED_SIZE; continue; } else diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 98ed94f2d72d..916150b1b73e 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -607,7 +607,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: try { aResult.Name = pProp[i]; - if(pPropertyStates[i] == beans::PropertyState_MAKE_FIXED_SIZE) // property unknown? + if(pPropertyStates[i] == beans::PropertyState::PropertyState_MAKE_FIXED_SIZE) // property unknown? { if( bDirectValuesOnly ) continue; diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index ef24606f4bb0..7ec4232deff3 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -2459,10 +2459,10 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& if (! ( aValue >>= nTmp ) ) throw IllegalArgumentException(); else - nSepLineVertAlign = nTmp; + nSepLineVertAlign = (style::VerticalAlignment)nTmp; } else - nSepLineVertAlign = static_cast< sal_Int8 >(eAlign); + nSepLineVertAlign = eAlign; } break; case WID_TXTCOL_LINE_IS_ON: diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 67b5610bb092..60c8d64d11c8 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -3702,7 +3702,7 @@ SwAutoStylesEnumImpl::SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAut // special case for ruby auto styles: if ( IStyleAccess::AUTO_STYLE_RUBY == eFam ) { - std::set< std::pair< sal_uInt16, sal_uInt16 > > aRubyMap; + std::set< std::pair< sal_uInt16, text::RubyAdjust > > aRubyMap; SwAttrPool& rAttrPool = pDoc->GetAttrPool(); sal_uInt32 nCount = rAttrPool.GetItemCount2( RES_TXTATR_CJK_RUBY ); @@ -3711,7 +3711,7 @@ SwAutoStylesEnumImpl::SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAut const SwFormatRuby* pItem = static_cast<const SwFormatRuby*>(rAttrPool.GetItem2( RES_TXTATR_CJK_RUBY, nI )); if ( pItem && pItem->GetTextRuby() ) { - std::pair< sal_uInt16, sal_uInt16 > aPair( pItem->GetPosition(), pItem->GetAdjustment() ); + std::pair< sal_uInt16, text::RubyAdjust > aPair( pItem->GetPosition(), pItem->GetAdjustment() ); if ( aRubyMap.find( aPair ) == aRubyMap.end() ) { aRubyMap.insert( aPair ); |