diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-31 10:30:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-01 06:48:13 +0000 |
commit | fa135fd0e05fc4ba784b4349d65f2e5ed26c0f55 (patch) | |
tree | dfe79dd3f61f872b9e6b788444631285774e17ac /sd | |
parent | 79aaa464134970b15f6858f98cb9f8e37aced23c (diff) |
remove unused SID constants and associated code
found with a python script that looks like:
process = subprocess.Popen(
"git ls-files *.hrc | xargs grep -hE '#define +SID_' | cut -d ' ' -f 2 | sort -u",
shell=True, stdout=subprocess.PIPE)
for line in iter(process.stdout.readline, b''):
line = line.strip()
if line.startswith("//"): continue
if line.startswith("sfx"): continue
if len(line) < 10: continue
i = subprocess.check_output("git grep -nP \"#define +" + line + " \"",
shell=True)
if i.count("#define") < 2: continue
print line + "
" + i
Change-Id: I40eac2569c2b5b129d9459cb723a9d6f26d09264
Reviewed-on: https://gerrit.libreoffice.org/25715
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/app.hrc | 6 | ||||
-rw-r--r-- | sd/source/ui/func/fuconbez.cxx | 13 | ||||
-rw-r--r-- | sd/source/ui/func/fuoltext.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/func/fupage.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/fuconbez.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 37 | ||||
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsj.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 1 |
9 files changed, 1 insertions, 65 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index e9b5755e2aaa..70d730a61dcc 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -80,8 +80,6 @@ #define SID_PRESENTATION_END (SID_SD_START+18) // FREE #define SID_POSITION (SID_SD_START+22) -#define SID_MIRROR (SID_SD_START+23) -#define SID_CONVERT (SID_SD_START+24) // FREE #define SID_COMBINE (SID_SD_START+26) #define SID_NAME_GROUP (SID_SD_START+27) @@ -127,7 +125,6 @@ // In svxids.hrc: SID_BEZIER_CONVERT (SID_SD_START+65) // In svxids.hrc: SID_BEZIER_EDGE (SID_SD_START+66) // In svxids.hrc: SID_BEZIER_SYMMTR (SID_SD_START+67) -#define SID_PRESENTATION_TEMPLATES (SID_SD_START+68) #define SID_NOTES_MODE (SID_SD_START+69) #define SID_HANDOUT_MASTER_MODE (SID_SD_START+70) #define SID_LINEEND_POLYGON (SID_SD_START+71) @@ -290,7 +287,6 @@ // In svxids.hrc: SID_BEZIERTO (SID_SD_START+252) #define SID_PAGESIZE (SID_SD_START+253) #define SID_PAGEMARGIN (SID_SD_START+254) -#define SID_ZOOMING (SID_SD_START+255) #define SID_SELECTAT (SID_SD_START+256) #define SID_COLORVIEW (SID_SD_START+257) // FREE @@ -401,7 +397,6 @@ #define SID_OUTPUT_QUALITY_BLACKWHITE (SID_SD_START+368) #define SID_PREVIEW_QUALITY_COLOR (SID_SD_START+369) // FREE -#define SID_VECTORIZE (SID_SD_START+372) #define SID_INSERT_FLD_PAGES (SID_SD_START+373) // FREE #define SID_CONVERT_TO_BITMAP (SID_SD_START+378) @@ -464,7 +459,6 @@ // Add companion for the SID_HIDE_SLIDE (that is defined in svx) #define SID_SHOW_SLIDE (SID_SD_START+441) -#define SID_ADD_MOTION_PATH (SID_SD_START+442) #define SID_TABLE_TOOLBOX (SID_SD_START+443) // FREE #define SID_ZOOM_MODE (SID_SD_START+447) diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index c0d8113bda33..bc0cc72a32e1 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -70,19 +70,6 @@ rtl::Reference<FuPoor> FuConstructBezierPolygon::Create( ViewShell* pViewSh, ::s return xFunc; } -void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq ) -{ - FuConstruct::DoExecute( rReq ); - - const SfxItemSet* pArgs = rReq.GetArgs(); - if( pArgs ) - { - const SfxPoolItem* pPoolItem = nullptr; - if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, true, &pPoolItem ) ) - maTargets = static_cast<const SfxUnoAnyItem*>( pPoolItem )->GetValue(); - } -} - bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) { bool bReturn = FuConstruct::MouseButtonDown(rMEvt); diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 5a753bb25895..271909ea8144 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -72,7 +72,6 @@ static sal_uInt16 SidArray[] = { SID_SET_SUPER_SCRIPT, SID_SET_SUB_SCRIPT, SID_HYPERLINK_GETLINK, - SID_PRESENTATION_TEMPLATES, SID_STATUS_PAGE, SID_STATUS_LAYOUT, SID_EXPAND_PAGE, diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 530da42b8db4..d9c8ad9faebe 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -215,7 +215,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) SfxItemSet aNewAttr(mpDoc->GetPool(), mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE), - SID_ATTR_PAGE, SID_ATTR_PAGE_BSP, + SID_ATTR_PAGE, SID_ATTR_PAGE_SHARED, SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_SHADOW, SID_ATTR_BORDER_SHADOW, XATTR_FILL_FIRST, XATTR_FILL_LAST, diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 0684f7d6daf1..55958d06d767 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -33,7 +33,6 @@ class FuConstructBezierPolygon public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); - virtual void DoExecute( SfxRequest& rReq ) override; // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt) override; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 8704f87cd6ae..b78b8ce9c1a0 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -538,36 +538,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) rReq.Done (); break; } - case SID_ZOOMING : // no menu entry, but generated from zoom dialog - { - const SfxItemSet* pArgs = rReq.GetArgs(); - - if (pArgs) - if (pArgs->Count () == 1) - { - const SfxUInt32Item* pScale = rReq.GetArg<SfxUInt32Item>(ID_VAL_ZOOM); - if (CHECK_RANGE (10, pScale->GetValue (), 1000)) - { - SetZoom (pScale->GetValue ()); - - SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_ATTR_ZOOM ); - rBindings.Invalidate( SID_ZOOM_IN ); - rBindings.Invalidate( SID_ZOOM_OUT ); - rBindings.Invalidate( SID_ATTR_ZOOMSLIDER ); - } -#if HAVE_FEATURE_SCRIPTING - else StarBASIC::FatalError (ERRCODE_BASIC_BAD_PROP_VALUE); -#endif - rReq.Ignore (); - break; - } -#if HAVE_FEATURE_SCRIPTING - StarBASIC::FatalError (ERRCODE_BASIC_WRONG_ARGS); -#endif - rReq.Ignore (); - break; - } case SID_ATTR_ZOOM: { @@ -1385,13 +1355,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; - case SID_VECTORIZE: - { - SetCurrentFunction( FuVectorize::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); - Cancel(); - } - break; - case SID_INSERTLAYER: { if ( mpDrawView->IsTextEdit() ) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 3f679b9e734a..c75417cbb9bf 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -539,10 +539,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if ( !mpDrawView->IsMorphingAllowed() ) rSet.DisableItem( SID_POLYGON_MORPHING ); - // disable vectorizing if necessary - if ( !mpDrawView->IsVectorizeAllowed() ) - rSet.DisableItem( SID_VECTORIZE ); - if( !mpDrawView->IsReverseOrderPossible() ) { rSet.DisableItem( SID_REVERSE_ORDER ); diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 0909cbbdbb6a..febb543daeb6 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -457,7 +457,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_FRAME_TO_BOTTOM ); rSet.DisableItem( SID_BEFORE_OBJ ); rSet.DisableItem( SID_BEHIND_OBJ ); - rSet.DisableItem( SID_CONVERT ); rSet.DisableItem( SID_POSITION ); rSet.DisableItem( SID_SIZE_OPTIMAL ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index c875ce3de6d0..23922b525621 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -842,7 +842,6 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (aTest.isEmpty()) { bUnique = false; - rSet.DisableItem(SID_PRESENTATION_TEMPLATES); } if (!bUnique) |