diff options
author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-09-12 16:46:16 +0200 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-09-12 18:09:50 +0200 |
commit | ecc5249190af915d98856939281afcd648eaac2b (patch) | |
tree | 2d0a89a0a2890b20ca4fc68a9ca6168b1af6bd9f | |
parent | Header/Footer: added a timer to show the separator (diff) | |
download | core-ecc5249190af915d98856939281afcd648eaac2b.tar.gz core-ecc5249190af915d98856939281afcd648eaac2b.zip |
Revert "n#676858: added new menu entry for headers/footers edit mode"
This reverts the following commits:
+ f3e275a2123c6356951a294051d0be230c178851
+ 29a45a09ba8a21022e105f3d500a027f93a4fca0 (partly)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 8 | ||||
-rwxr-xr-x | scripting/workben/bindings/writermenubar.xml | 1 | ||||
-rw-r--r-- | sw/inc/cmdid.h | 1 | ||||
-rw-r--r-- | sw/sdi/_textsh.sdi | 6 | ||||
-rw-r--r-- | sw/sdi/swriter.sdi | 27 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 21 | ||||
-rwxr-xr-x | sw/uiconfig/sglobal/menubar/menubar.xml | 1 | ||||
-rwxr-xr-x | sw/uiconfig/swform/menubar/menubar.xml | 1 | ||||
-rwxr-xr-x | sw/uiconfig/swreport/menubar/menubar.xml | 1 | ||||
-rwxr-xr-x | sw/uiconfig/swriter/menubar/menubar.xml | 1 | ||||
-rwxr-xr-x | sw/uiconfig/swxform/menubar/menubar.xml | 1 |
11 files changed, 0 insertions, 69 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 43962943adf8..9153d94aff26 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -301,14 +301,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:EditHeaderAndFooter" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Headers & Footers</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> <node oor:name=".uno:InsertCaptionDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Caption...</value> diff --git a/scripting/workben/bindings/writermenubar.xml b/scripting/workben/bindings/writermenubar.xml index 4d452801be95..d2d6d880b7b9 100755 --- a/scripting/workben/bindings/writermenubar.xml +++ b/scripting/workben/bindings/writermenubar.xml @@ -81,7 +81,6 @@ <menu:menuitem menu:id="slot:20620" menu:helpid="20620" menu:label="AutoTe~xt..."/> <menu:menuseparator/> <menu:menuitem menu:id="slot:20309" menu:helpid="20309" menu:label="Exc~hange Database..."/> - <menu:menuitem menu:id="slot:20195" menu:helpid="20195" menu:label="Headers/Footers"/> <menu:menuitem menu:id="slot:20104" menu:helpid="20104" menu:label="F~ields..."/> <menu:menuitem menu:id="slot:20162" menu:helpid="20162" menu:label="Footnote~..."/> <menu:menuitem menu:id="slot:20123" menu:helpid="20123" menu:label="Index Entr~y..."/> diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index ae2a6ebccebc..466e07da285f 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -216,7 +216,6 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_SELECT_INDEX (FN_EDIT + 85) /**/ #define FN_UP (FN_EDIT + 86) /**/ -#define FN_EDIT_HEADER_FOOTER (FN_EDIT + 95) /* Toggle headers/footers edition*/ #define FN_SELECT_PARA (FN_EDIT + 97) /* select paragraph*/ #define FN_SELECT_CONTENT (FN_EDIT + 99) /* Navigator - Content Type */ diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index a175daea03d7..c0f1126ec5cf 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -373,12 +373,6 @@ interface BaseText StateMethod = GetState; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - FN_EDIT_HEADER_FOOTER - [ - ExecMethod = Execute ; - StateMethod = GetState; - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] FN_TABLE_UNSET_READ_ONLY // status(final|play) [ ExecMethod = Execute ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 4d5df44e3d92..36c45e495cc4 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -10417,30 +10417,3 @@ SfxVoidItem NavigateForward FN_NAVIGATION_FORWARD ToolBoxConfig = TRUE, GroupId = GID_NAVIGATION; ] - -//-------------------------------------------------------------------------- -SfxVoidItem EditHeaderAndFooter FN_EDIT_HEADER_FOOTER -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = TRUE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_EDIT; -] - diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 493485b56cd1..739eaa6d2073 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -819,9 +819,6 @@ void SwTextShell::Execute(SfxRequest &rReq) } } break; - case FN_EDIT_HEADER_FOOTER: - rWrtSh.ToggleHeaderFooterEdit(); - break; case SID_ATTR_BRUSH_CHAR : case SID_ATTR_CHAR_SCALEWIDTH : case SID_ATTR_CHAR_ROTATED : @@ -1568,24 +1565,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } } break; - case FN_EDIT_HEADER_FOOTER: - { - SfxBoolItem aBool( nWhich, rSh.IsHeaderFooterEdit() ); - rSet.Put( aBool ); - - bool bHasHeaderFooter = false; - for ( sal_uInt16 i = 0; !bHasHeaderFooter && i < rSh.GetPageDescCnt(); i++ ) - { - const SwPageDesc& rPageDesc = rSh.GetPageDesc( i ); - bHasHeaderFooter = rPageDesc.GetMaster().GetHeader().IsActive() || - rPageDesc.GetMaster().GetFooter().IsActive() || - rPageDesc.GetLeft().GetHeader().IsActive() || - rPageDesc.GetLeft().GetFooter().IsActive(); - } - if ( !bHasHeaderFooter ) - rSet.DisableItem( nWhich ); - } - break; case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index fc479ea8bdcc..e643158b2506 100755 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -90,7 +90,6 @@ <menu:menuitem menu:id=".uno:EditGlossary"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ChangeDatabaseField"/> - <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/> <menu:menuitem menu:id=".uno:FieldDialog"/> <menu:menuitem menu:id=".uno:EditFootnote"/> <menu:menuitem menu:id=".uno:IndexEntryDialog"/> diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index c9972e93b208..7e5f14f5d58c 100755 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -90,7 +90,6 @@ <menu:menuitem menu:id=".uno:EditGlossary"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ChangeDatabaseField"/> - <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/> <menu:menuitem menu:id=".uno:FieldDialog"/> <menu:menuitem menu:id=".uno:EditFootnote"/> <menu:menuitem menu:id=".uno:IndexEntryDialog"/> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index c9972e93b208..7e5f14f5d58c 100755 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -90,7 +90,6 @@ <menu:menuitem menu:id=".uno:EditGlossary"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ChangeDatabaseField"/> - <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/> <menu:menuitem menu:id=".uno:FieldDialog"/> <menu:menuitem menu:id=".uno:EditFootnote"/> <menu:menuitem menu:id=".uno:IndexEntryDialog"/> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index bb562a5920e5..02107d0088a2 100755 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -93,7 +93,6 @@ <menu:menuitem menu:id=".uno:EditGlossary"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ChangeDatabaseField"/> - <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/> <menu:menuitem menu:id=".uno:FieldDialog"/> <menu:menuitem menu:id=".uno:EditFootnote"/> <menu:menuitem menu:id=".uno:IndexEntryDialog"/> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 2e6cca6ebf6e..ff139ef3654d 100755 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -91,7 +91,6 @@ <menu:menuitem menu:id=".uno:EditGlossary"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ChangeDatabaseField"/> - <menu:menuitem menu:id=".uno:EditHeaderAndFooter"/> <menu:menuitem menu:id=".uno:FieldDialog"/> <menu:menuitem menu:id=".uno:EditFootnote"/> <menu:menuitem menu:id=".uno:IndexEntryDialog"/> |