summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@collabora.com>2014-02-04 18:24:03 +0530
committerAndras Timar <andras.timar@collabora.com>2014-03-17 10:42:40 +0000
commitd58adfde297a840a65103a87bf09fb64f70803e1 (patch)
tree6398482d40d338d10036daf3fea2be90460afa0d /svx/source/tbxctrls
parent43dae523edd6aede5009d72be73e3627726903f9 (diff)
cp#1000025: Import casemaps from pptx.
(Ported from: 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec and 9dbcb79782d6a5b80c21a0c093537d18425b826f) Change-Id: I211491e06273aedf5c8ddbd0ca3fc35f3d168aaa Reviewed-on: https://gerrit.libreoffice.org/7848 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svx/source/tbxctrls')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6d6befa2ff1f..b8f3a85067da 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -73,6 +73,8 @@
#include <editeng/shdditem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/cmapitem.hxx>
#include "svx/drawitem.hxx"
#include <svx/tbcontrl.hxx>
#include "svx/dlgutil.hxx"
@@ -630,6 +632,10 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
if ( pItem )
aFont.SetStrikeout( static_cast< const SvxCrossedOutItem* >( pItem )->GetStrikeout() );
+ pItem = aItemSet.GetItem( SID_ATTR_CHAR_CASEMAP );
+ if ( pItem )
+ ((SvxFont &)aFont).SetCaseMap( static_cast< const SvxCaseMapItem* >( pItem )->GetCaseMap() );
+
pItem = aItemSet.GetItem( SID_ATTR_CHAR_EMPHASISMARK );
if ( pItem )
aFont.SetEmphasisMark( static_cast< const SvxEmphasisMarkItem* >( pItem )->GetEmphasisMark() );