diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 08:09:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 08:09:04 +0000 |
| commit | 927677f476420a5516a4f27c09e5577393cb841f (patch) | |
| tree | 4458577edc092943914a279dbdb585af41295356 /chart2/source/controller/itemsetwrapper | |
| parent | ecb113a8d09337508d3c786a074b0d424eb19222 (diff) | |
INTEGRATION: CWS chart25 (1.13.24); FILE MERGED
2008/04/24 12:46:39 iha 1.13.24.2: RESYNC: (1.13-1.14); FILE MERGED
2008/04/10 09:16:21 iha 1.13.24.1: #i26572# set an explicit text for the font preview
Diffstat (limited to 'chart2/source/controller/itemsetwrapper')
| -rw-r--r-- | chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 31c7452aaf53..6421429ef34c 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ItemConverter.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.15 $ * * This file is part of OpenOffice.org. * @@ -37,6 +37,7 @@ #include <svtools/itemiter.hxx> // header for class SfxWhichIter #include <svtools/whiter.hxx> +#include <svx/svxids.hrc> using namespace ::com::sun::star; @@ -259,7 +260,12 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItem (rDestSet.GetItemState(nWhich, TRUE, &pPoolItem) == SFX_ITEM_SET)) { if (rSourceSet.Get(nWhich) != rDestSet.Get(nWhich)) - rDestSet.InvalidateItem(nWhich); + { + if( SID_CHAR_DLG_PREVIEW_STRING != nWhich ) + { + rDestSet.InvalidateItem(nWhich); + } + } } else if( rSourceSet.GetItemState(nWhich, TRUE, &pPoolItem) == SFX_ITEM_DONTCARE ) rDestSet.InvalidateItem(nWhich); |