mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#91932 enable CaseMap property in impress/draw

Browse Source 
I don't see why this was explicitly disabled, works fine
out of the box for me, import/export already hooked up
in odf

Change-Id: I5e6bdbc6a4f3cbcd97330c7d9fb33589489afee2
This commit is contained in:
Caolán McNamara
2015-06-08 12:21:01 +01:00
parent b9dd51782c
commit ff178cca33
12 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cui/source/inc/chardlg.hxx
View File

@@ -32,16 +32,6 @@
class SvxFontListItem;
class FontList;
#define DISABLE_CASEMAP ((sal_uInt16)0x0001)
#define DISABLE_WORDLINE ((sal_uInt16)0x0002)
#define DISABLE_BLINK ((sal_uInt16)0x0004)
#define DISABLE_UNDERLINE_COLOR ((sal_uInt16)0x0008)
#define DISABLE_LANGUAGE ((sal_uInt16)0x0010)
#define DISABLE_HIDE_LANGUAGE ((sal_uInt16)0x0020)
// class SvxCharBasePage -------------------------------------------------
class SvxCharBasePage : public SfxTabPage

6
sd/sdi/drtxtob.sdi
View File

@@ -92,6 +92,12 @@ shell TextObjectBar
StateMethod = GetAttrState;
]
SID_ATTR_CHAR_CASEMAP // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
]
SID_ATTR_PARA_ADJUST_LEFT // ole : ?, status : ?
[
ExecMethod = Execute;

1
sd/source/core/typemap.cxx
View File

@@ -21,6 +21,7 @@
#include <editeng/outliner.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/cmapitem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/colritem.hxx>

1
sd/source/ui/dlg/dlgchar.cxx
View File

@@ -60,7 +60,6 @@ void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
else if (nId == mnCharEffects)
{
aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
rPage.PageCreated(aSet);
}
}

1
sd/source/ui/dlg/prltempl.cxx
View File

@@ -281,7 +281,6 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
else if (nId == mnEffects)
{
aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
rPage.PageCreated(aSet);
}
}

1
sd/source/ui/dlg/tabtempl.cxx
View File

@@ -152,7 +152,6 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
else if (nId == m_nFontEffectId)
{
aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
rPage.PageCreated(aSet);
}
else if (nId == m_nTextId)

1
sd/source/ui/func/fuchar.cxx
View File

@@ -106,6 +106,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
SID_ATTR_CHAR_FONTHEIGHT,
SID_ATTR_CHAR_COLOR,
SID_ATTR_CHAR_KERNING,
SID_ATTR_CHAR_CASEMAP,
SID_SET_SUPER_SCRIPT,
SID_SET_SUB_SCRIPT,
0 };

7
sd/source/ui/func/futext.cxx
View File

@@ -85,12 +85,13 @@ static sal_uInt16 SidArray[] = {
SID_ATTR_CHAR_FONT, // 10007
SID_ATTR_CHAR_POSTURE, // 10008
SID_ATTR_CHAR_WEIGHT, // 10009
SID_ATTR_CHAR_SHADOWED, //10010
SID_ATTR_CHAR_STRIKEOUT, //10013
SID_ATTR_CHAR_SHADOWED, // 10010
SID_ATTR_CHAR_STRIKEOUT, // 10013
SID_ATTR_CHAR_UNDERLINE, // 10014
SID_ATTR_CHAR_FONTHEIGHT, // 10015
SID_ATTR_CHAR_COLOR, // 10017
SID_ATTR_CHAR_KERNING, //10018
SID_ATTR_CHAR_KERNING, // 10018
SID_ATTR_CHAR_CASEMAP, // 10019
SID_ATTR_PARA_ADJUST_LEFT, // 10028
SID_ATTR_PARA_ADJUST_RIGHT, // 10029
SID_ATTR_PARA_ADJUST_CENTER, // 10030

3
sd/source/ui/view/drtxtob.cxx
View File

@@ -171,8 +171,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
case SID_ATTR_CHAR_FONTHEIGHT:
case SID_ATTR_CHAR_WEIGHT:
case SID_ATTR_CHAR_POSTURE:
case SID_ATTR_CHAR_SHADOWED:
case SID_ATTR_CHAR_SHADOWED:
case SID_ATTR_CHAR_STRIKEOUT:
case SID_ATTR_CHAR_CASEMAP:
{
sal_uInt16 stretchX = 100;
sal_uInt16 stretchY = 100;

11
sd/source/ui/view/drviews2.cxx
View File

@@ -87,6 +87,7 @@
#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
#include <editeng/cmapitem.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/kernitem.hxx>
#include <editeng/wghtitem.hxx>
@@ -3032,6 +3033,16 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
}
}
break;
case SID_ATTR_CHAR_CASEMAP:
if( rReq.GetArgs() )
{
SFX_REQUEST_ARG( rReq, pItem, SvxCaseMapItem, SID_ATTR_CHAR_CASEMAP , false );
if (pItem)
{
aNewAttr.Put(*pItem);
}
}
break;
case SID_SET_SUB_SCRIPT:
{
SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT );

1
sd/source/ui/view/drviewsf.cxx
View File

@@ -409,6 +409,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
case SID_ATTR_CHAR_WEIGHT:
case SID_ATTR_CHAR_COLOR:
case SID_ATTR_CHAR_KERNING:
case SID_ATTR_CHAR_CASEMAP:
case SID_SET_SUB_SCRIPT:
case SID_SET_SUPER_SCRIPT:
{

8
sw/source/ui/chrdlg/chardlg.cxx
View File

@@ -112,13 +112,7 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
else if (nId == m_nCharExtId)
{
if(m_nDialogMode == DLG_CHAR_DRAW || m_nDialogMode == DLG_CHAR_ANN)
aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
else
{
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER|SVX_ENABLE_FLASH));
}
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER|SVX_ENABLE_FLASH));
rPage.PageCreated(aSet);
}
else if (nId == m_nCharPosId)