Skip to content

C
core
Kaydet (Commit) ecc52491 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat
Dosyalara gözat
Seçenekler

Revert "n#676858: added new menu entry for headers/footers edit mode" 

This reverts the following commits:
  + f3e275a2
  + 29a45a09 (partly)

Conflicts:

	officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
üst 3d294102
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 69 deletions
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
Dosyayı görüntüle @ ecc52491
......@@ -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 &amp; 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>
......
scripting/workben/bindings/writermenubar.xml
Dosyayı görüntüle @ ecc52491
......@@ -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..."/>
......
sw/inc/cmdid.h
Dosyayı görüntüle @ ecc52491
......@@ -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 */
......
sw/sdi/_textsh.sdi
Dosyayı görüntüle @ ecc52491
......@@ -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 ;
......
sw/sdi/swriter.sdi
Dosyayı görüntüle @ ecc52491
......@@ -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;
]
sw/source/ui/shells/textsh1.cxx
Dosyayı görüntüle @ ecc52491
......@@ -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:
......
sw/uiconfig/sglobal/menubar/menubar.xml
Dosyayı görüntüle @ ecc52491
......@@ -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"/>
......
sw/uiconfig/swform/menubar/menubar.xml
Dosyayı görüntüle @ ecc52491
......@@ -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"/>
......
sw/uiconfig/swreport/menubar/menubar.xml
Dosyayı görüntüle @ ecc52491
......@@ -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"/>
......
sw/uiconfig/swriter/menubar/menubar.xml
Dosyayı görüntüle @ ecc52491
......@@ -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"/>
......
sw/uiconfig/swxform/menubar/menubar.xml
Dosyayı görüntüle @ ecc52491
......@@ -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"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment