[Libreoffice-commits] core.git: compilerplugins/clang include/svx svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 29 06:19:31 UTC 2018
compilerplugins/clang/unusedenumconstants.readonly.results | 2 --
include/svx/svdedtv.hxx | 3 +--
svx/source/svdraw/svdedtv.cxx | 6 +-----
3 files changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 07c607b8a20cfa3c0022204db201fe2739f7b8cc
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 26 10:59:57 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Nov 29 07:19:03 2018 +0100
remove unused SdrInsertFlags enum value
Change-Id: Ic68f2dc4e3752859c943d9885b52b70f33896aea
Reviewed-on: https://gerrit.libreoffice.org/64172
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index bbb57be316e4..a54619908b6d 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -492,8 +492,6 @@ include/svx/ruler.hxx:60
enum SvxRulerDragFlags OBJECT_LEFT_INDENT_ONLY
include/svx/sdtakitm.hxx:31
enum SdrTextAniKind Blink
-include/svx/svdedtv.hxx:65
- enum SdrInsertFlags NOBROADCAST
include/svx/svdhdl.hxx:108
enum BitmapMarkerKind RectPlus_7x7
include/svx/svdograf.hxx:52
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 6fc2e1aab75f..af60deaac0f6 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -62,11 +62,10 @@ enum class SdrInsertFlags
ADDMARK = 0x0002, /* object will be added an existing selection */
SETDEFATTR = 0x0004, /* actual attributes (+StyleSheet) are assigned to the object */
SETDEFLAYER = 0x0008, /* actual layer is assigned to the object */
- NOBROADCAST = 0x0010, /* insert with NbcInsertObject() for SolidDragging */
};
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
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 2197c3fbc42e..a3b20b853068 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -971,11 +971,7 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInser
pObj->SetMergedItemSet(maDefaultAttr);
}
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() )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
More information about the Libreoffice-commits
mailing list