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

remove unused SdrInsertFlags enum value

Browse Source 
Change-Id: Ic68f2dc4e3752859c943d9885b52b70f33896aea
Reviewed-on: https://gerrit.libreoffice.org/64172
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2018-11-26 10:59:57 +02:00
parent 21de55596c
commit 07c607b8a2
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/unusedenumconstants.readonly.results
View File

@ -492,8 +492,6 @@ include/svx/ruler.hxx:60
enum SvxRulerDragFlags OBJECT_LEFT_INDENT_ONLY enum SvxRulerDragFlags OBJECT_LEFT_INDENT_ONLY
include/svx/sdtakitm.hxx:31 include/svx/sdtakitm.hxx:31
enum SdrTextAniKind Blink enum SdrTextAniKind Blink
include/svx/svdedtv.hxx:65
enum SdrInsertFlags NOBROADCAST
include/svx/svdhdl.hxx:108 include/svx/svdhdl.hxx:108
enum BitmapMarkerKind RectPlus_7x7 enum BitmapMarkerKind RectPlus_7x7
include/svx/svdograf.hxx:52 include/svx/svdograf.hxx:52

3
include/svx/svdedtv.hxx
View File

@ -62,11 +62,10 @@ enum class SdrInsertFlags
ADDMARK = 0x0002, /* object will be added an existing selection */ ADDMARK = 0x0002, /* object will be added an existing selection */
SETDEFATTR = 0x0004, /* actual attributes (+StyleSheet) are assigned to the object */ SETDEFATTR = 0x0004, /* actual attributes (+StyleSheet) are assigned to the object */
SETDEFLAYER = 0x0008, /* actual layer is assigned to the object */ SETDEFLAYER = 0x0008, /* actual layer is assigned to the object */
NOBROADCAST = 0x0010, /* insert with NbcInsertObject() for SolidDragging */
}; };
namespace o3tl namespace o3tl
{ {
template<> struct typed_flags<SdrInsertFlags> : is_typed_flags<SdrInsertFlags, 0x1f> {}; template<> struct typed_flags<SdrInsertFlags> : is_typed_flags<SdrInsertFlags, 0x0f> {};
} }
class SVX_DLLPUBLIC SdrEditView : public SdrMarkView class SVX_DLLPUBLIC SdrEditView : public SdrMarkView

4
svx/source/svdraw/svdedtv.cxx
View File

@ -971,12 +971,8 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInser
pObj->SetMergedItemSet(maDefaultAttr); pObj->SetMergedItemSet(maDefaultAttr);
} }
if (!pObj->IsInserted()) { if (!pObj->IsInserted()) {
if (nOptions & SdrInsertFlags::NOBROADCAST) {
rPV.GetObjList()->NbcInsertObject(pObj, SAL_MAX_SIZE);
} else {
rPV.GetObjList()->InsertObject(pObj, SAL_MAX_SIZE); rPV.GetObjList()->InsertObject(pObj, SAL_MAX_SIZE);
} }
}
if( IsUndoEnabled() ) if( IsUndoEnabled() )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj)); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj));