diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-09 16:06:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-17 11:02:00 +0100 |
| commit | 573322e26b0244b27f70cfbc8989b3040a34f3d6 (patch) | |
| tree | 1812788fd614d7c55b127ef360cab08b334b8244 /svx/source/svdraw/svdibrow.cxx | |
| parent | b93107f3d510f19faa2e62dc965aea9f1b46898d (diff) | |
Resolves: #i121538# Removed old Fontwork dialogs preset box...
and all dependencies
(cherry picked from commit bcfee75544246db6788715d98efd6d33c12f933d)
Conflicts:
sd/inc/pch/precompiled_sd.hxx
sd/source/core/typemap.cxx
sd/source/ui/view/drviews6.cxx
svx/Package_inc.mk
svx/inc/svx/dialogs.hrc
svx/inc/svx/fontwork.hxx
svx/inc/svx/svdstr.hrc
svx/inc/svx/svxcommands.h
svx/inc/svx/svxids.hrc
svx/inc/svx/unoshprp.hxx
svx/inc/svx/xdef.hxx
svx/inc/svx/xenum.hxx
svx/inc/svx/xtextit.hxx
svx/source/dialog/fontwork.cxx
svx/source/dialog/fontwork.hrc
svx/source/dialog/fontwork.src
svx/source/xoutdev/xattr.cxx
sw/inc/pch/precompiled_sw.hxx
Change-Id: I3718285d38444d3862ca382fe020a4e0a083a677
Diffstat (limited to 'svx/source/svdraw/svdibrow.cxx')
| -rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 75a3c79e38a7..bd465e57d635 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -734,7 +734,6 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI case XATTR_FORMTXTSHDWCOLOR : case XATTR_FORMTXTSHDWXVAL : case XATTR_FORMTXTSHDWYVAL : - case XATTR_FORMTXTSTDFORM : case XATTR_FORMTXTHIDEFORM : case XATTR_FORMTXTSHDWTRANSP: { rIndent=1; @@ -882,11 +881,10 @@ sal_uInt16 ImpSortWhich(sal_uInt16 nWhich) case XATTR_FILLBMP_STRETCH : nWhich=XATTR_FILLBMP_TILEOFFSETY ; break; // Fontwork - case XATTR_FORMTXTSHADOW : nWhich=XATTR_FORMTXTSTDFORM ; break; + case XATTR_FORMTXTSHADOW : nWhich=XATTR_FORMTXTSHDWXVAL ; break; case XATTR_FORMTXTSHDWCOLOR : nWhich=XATTR_FORMTXTHIDEFORM ; break; case XATTR_FORMTXTSHDWXVAL : nWhich=XATTR_FORMTXTSHADOW ; break; case XATTR_FORMTXTSHDWYVAL : nWhich=XATTR_FORMTXTSHDWCOLOR ; break; - case XATTR_FORMTXTSTDFORM : nWhich=XATTR_FORMTXTSHDWXVAL ; break; case XATTR_FORMTXTHIDEFORM : nWhich=XATTR_FORMTXTSHDWYVAL ; break; // Misc |