strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS chart25 (1.13.24); FILE MERGED

Browse source 
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
This commit is contained in:
Rüdiger Timm 2008-06-06 08:09:04 +00:00
parent ecb113a8d0
commit 927677f476
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
chart2/source/controller/itemsetwrapper/ItemConverter.cxx
View file

@ -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);