diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-21 23:32:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-22 20:55:54 +0200 |
| commit | 728e42a9dae8305f6f92628d6d9ba616baaf0426 (patch) | |
| tree | 4ff27bec324e0ccea95c195ec399599098b4716e /svx | |
| parent | 66e32324f6441818612f088cfa5c8082c8ceea32 (diff) | |
drop unused SvxScriptTypeItem
apparently there was never a user for this item since initial commit
in the year 2000. SvxScriptSetItem gets the ScriptType by parameter
see GetItemOfScript and PutItemForScriptType.
remove SID_ATTR_CHAR_SCRIPTTYPE and don't put the item in any set.
keep the gap in the ID range because it's not part of any range
and there are already other gaps.
Change-Id: Iee24f13b329593af2dc5548d8b6bc2282c2dc5b3
Reviewed-on: https://gerrit.libreoffice.org/41423
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 5 | ||||
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 5734295acb47..ab28ff0c69c0 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -33,7 +33,6 @@ #include <editeng/editeng.hxx> #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> -#include <editeng/scripttypeitem.hxx> #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> #include <svx/svdotext.hxx> @@ -2027,14 +2026,10 @@ bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) c // add object attributes rTargetSet.Put( mxTextEditObj->GetMergedItemSet() ); - if( mxTextEditObj->GetOutlinerParaObject() ) - rTargetSet.Put( SvxScriptTypeItem( mxTextEditObj->GetOutlinerParaObject()->GetTextObject().GetScriptType() ) ); - if(pTextEditOutlinerView) { // FALSE= regard InvalidItems as "holes," not as Default rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), false); - rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ) ); } if(GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get()) diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 98ef5bd8ffaf..8e6a59ce34ff 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -38,7 +38,6 @@ #include <sfx2/request.hxx> -#include <editeng/scripttypeitem.hxx> #include <svx/svdotable.hxx> #include <svx/sdr/overlay/overlayobjectcell.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> @@ -2519,15 +2518,11 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt if( mpView->IsTextEdit() ) { - if( mxTableObj->GetOutlinerParaObject() ) - rTargetSet.Put( SvxScriptTypeItem( mxTableObj->GetOutlinerParaObject()->GetTextObject().GetScriptType() ) ); - OutlinerView* pTextEditOutlinerView = mpView->GetTextEditOutlinerView(); if(pTextEditOutlinerView) { // FALSE= consider InvalidItems not as the default, but as "holes" rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), false); - rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ) ); } } |