diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-07 16:51:11 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-07 16:51:11 +0100 |
| commit | 3b8718198bc75a7c0db5998cfc70047b4c340d7d (patch) | |
| tree | 11d50453c80e3e05f3c1943a1979f78707b247f2 | |
| parent | 2851cc7baf8defb165e100f303b02e895a4e7fdf (diff) | |
| parent | ecee0eb4d573ea55afd91e60513e06fabd48293d (diff) | |
CWS-TOOLING: integrate CWS os150ooo/DEV300_m102
| -rwxr-xr-x[-rw-r--r--] | sc/source/core/data/documen9.cxx | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | sc/source/core/tool/autoform.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index f164fe2c6..b80328183 100644..100755 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -704,7 +704,7 @@ void ScDocument::UpdateFontCharSet() pItem = (SvxFontItem*)pPool->GetItem2(ATTR_FONT, i); if ( pItem && ( pItem->GetCharSet() == eSrcSet || ( bUpdateOld && pItem->GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) - pItem->GetCharSet() = eSysSet; + pItem->SetCharSet(eSysSet); } if ( pDrawLayer ) @@ -716,7 +716,7 @@ void ScDocument::UpdateFontCharSet() pItem = (SvxFontItem*)rDrawPool.GetItem2(EE_CHAR_FONTINFO, i); if ( pItem && ( pItem->GetCharSet() == eSrcSet || ( bUpdateOld && pItem->GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) - pItem->GetCharSet() = eSysSet; + pItem->SetCharSet( eSysSet ); } } } diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index e56e7bc2b..ba021086f 100644..100755 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -387,7 +387,7 @@ sal_Bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVe CharSet eSysSet = gsl_getSystemTextEncoding(); CharSet eSrcSet = rStream.GetStreamCharSet(); if( eSrcSet != eSysSet && aFont.GetCharSet() == eSrcSet ) - aFont.GetCharSet() = eSysSet; + aFont.SetCharSet(eSysSet); aStacked.SetValue( aOrientation.IsStacked() ); aRotateAngle.SetValue( aOrientation.GetRotation( aRotateAngle.GetValue() ) ); |