diff options
| author | Niklas Nebel <nn@openoffice.org> | 2011-03-15 10:39:12 +0100 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2011-03-15 10:39:12 +0100 |
| commit | ad6f39dd32a8159a6551251305c7cba4b9f341fb (patch) | |
| tree | 7138cbef9b85f01f777b93ade8bd95b5db944c8e /sc | |
| parent | ffd2c7b2b15f46b00fc802a49a27a971a9dee2d4 (diff) | |
| parent | 61b8bd9f42f48609a14cab31f58d5122285e67f6 (diff) | |
calc66: merge with DEV300_m102
Diffstat (limited to 'sc')
| -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 88532522ce7d..8921feceb4ef 100644..100755 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -708,7 +708,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 ) @@ -720,7 +720,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 85447b6a8730..c1e261e3ba0a 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() ) ); |