diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-12-20 09:51:59 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-12-21 09:04:41 +0100 |
commit | bc89e6f3a735401e67f23ab503492c275b2d6090 (patch) | |
tree | 48f72c649eec6974ee1be72850a422802b95d6dd /sd | |
parent | 639d9484d9591aefce724b1137abb651e2dc0bbd (diff) |
Templates Manager: removed the old dialogs and menu entries
Conflicts:
basctl/uiconfig/basicide/menubar/menubar.xml
extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
framework/uiconfig/startmodule/menubar/menubar.xml
sc/uiconfig/scalc/menubar/menubar.xml
sd/uiconfig/sdraw/menubar/menubar.xml
sd/uiconfig/simpress/menubar/menubar.xml
sfx2/inc/docvor.hxx
sfx2/inc/orgmgr.hxx
sfx2/source/doc/docvor.cxx
sfx2/source/view/orgmgr.cxx
sw/uiconfig/sglobal/menubar/menubar.xml
sw/uiconfig/sweb/menubar/menubar.xml
sw/uiconfig/swform/menubar/menubar.xml
sw/uiconfig/swreport/menubar/menubar.xml
sw/uiconfig/swriter/menubar/menubar.xml
sw/uiconfig/swxform/menubar/menubar.xml
Change-Id: I5aa9dd8c0bfb95c26bca14962f60041e892ea2ea
Diffstat (limited to 'sd')
-rw-r--r-- | sd/sdi/SlideSorterController.sdi | 5 | ||||
-rw-r--r-- | sd/sdi/outlnvsh.sdi | 5 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 3 | ||||
-rw-r--r-- | sd/uiconfig/sdraw/menubar/menubar.xml | 6 | ||||
-rw-r--r-- | sd/uiconfig/simpress/menubar/menubar.xml | 6 |
6 files changed, 0 insertions, 28 deletions
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi index 53ea834ed1f9..a71f43171ce1 100644 --- a/sd/sdi/SlideSorterController.sdi +++ b/sd/sdi/SlideSorterController.sdi @@ -200,11 +200,6 @@ interface SlideSorterView ExecMethod = ExecCtrl ; StateMethod = GetMenuState ; ] - SID_STYLE_CATALOG // ole : no, status : ? - [ - ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; - ] SID_SLIDE_TRANSITIONS_PANEL // ole : no, status : ? [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 82e5fb7a800f..b98cfdb42f86 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -250,11 +250,6 @@ interface OutlineView ExecMethod = FuTemporaryModify ; StateMethod = GetMenuState ; ] - SID_STYLE_CATALOG // ole : no, status : ? - [ - ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; - ] // Vorlagen // kein Menueeintrag SID_STYLE_FAMILY2 // ole : no, status : ? diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 493ebdcc50b0..d3e20cea55e9 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -527,9 +527,6 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) rSet.Put( SfxBoolItem( SID_NOTESMODE, sal_False ) ); rSet.Put( SfxBoolItem( SID_HANDOUTMODE, sal_False ) ); - // Vorlagenkatalog darf nicht aufgerufen werden - rSet.DisableItem(SID_STYLE_CATALOG); - if (pShell!=NULL && pShell->IsMainViewShell()) { rSet.DisableItem(SID_SPELL_DIALOG); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 5fbb6f343e7c..6469ef017270 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -780,9 +780,6 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { ViewShell::GetMenuState(rSet); - // Style catalog must not be called - rSet.DisableItem( SID_STYLE_CATALOG ); - rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False)); rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_True)); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 44cfa109f464..85ea0e028868 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -48,12 +48,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> <menu:menuitem menu:id=".uno:Signature"/> - <menu:menu menu:id=".uno:TemplateMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:Organizer"/> - <menu:menuitem menu:id=".uno:OpenTemplate"/> - </menu:menupopup> - </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:WebHtml"/> <menu:menuseparator/> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 6035cdd4922a..9fd07b1ea8b9 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -50,12 +50,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetDocumentProperties"/> <menu:menuitem menu:id=".uno:Signature"/> - <menu:menu menu:id=".uno:TemplateMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:Organizer"/> - <menu:menuitem menu:id=".uno:OpenTemplate"/> - </menu:menupopup> - </menu:menu> <menu:menuseparator/> <menu:menuitem menu:id=".uno:WebHtml"/> <menu:menuseparator/> |