diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:19 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:19 +0100 |
| commit | 219458b0d7a0c785efaaebf2107260d67580db59 (patch) | |
| tree | 51afdf8c6f51dfc565734828cee1fda2b72c5f49 /sd/source/ui/presenter | |
| parent | c2acb5440848c8350258ec46642301e5f952e6cc (diff) | |
| parent | a91221b5419122591164a61771da082843e89664 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
slideshow/source/engine/debug.cxx
slideshow/source/engine/transitions/randomwipe.cxx
Diffstat (limited to 'sd/source/ui/presenter')
| -rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index d8126597b4a2..4562a477c40d 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -499,7 +499,7 @@ void PresenterTextView::Implementation::SetFontDescriptor ( mpEditEngineItemPool->SetPoolDefaultItem( aFontHeight); SvxFontItem aSvxFontItem (EE_CHAR_FONTINFO); - aSvxFontItem.GetFamilyName() = rFontDescriptor.Name; + aSvxFontItem.SetFamilyName( rFontDescriptor.Name ); mpEditEngineItemPool->SetPoolDefaultItem(aSvxFontItem); mnTotalHeight = -1; |