diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
commit | bc131c1ceaca2a227d4827f765e83faa0754a3f1 (patch) | |
tree | d275c8e57d62430153ca6ef21966f5033fd99cd9 /helpcontent2/helpers/longnames_commands.csv | |
parent | d55766ce22ef3ed771938e5ad60f6b776bab38ad (diff) | |
parent | 13e0998c215eb9419fce0ca6a4fc0d69a18356d5 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk
Diffstat (limited to 'helpcontent2/helpers/longnames_commands.csv')
-rw-r--r-- | helpcontent2/helpers/longnames_commands.csv | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/helpcontent2/helpers/longnames_commands.csv b/helpcontent2/helpers/longnames_commands.csv index ee2fa4615a..3ba7bfd355 100644 --- a/helpcontent2/helpers/longnames_commands.csv +++ b/helpcontent2/helpers/longnames_commands.csv @@ -993,7 +993,6 @@ SID_DRAW_XPOLYGON_NOFILL,.uno:Polygon_Diagonal_Unfilled SID_DSBROWSER_EXPLORER,.uno:DSBrowserExplorer SID_DUPLICATE_PAGE,.uno:DuplicatePage SID_EDITDOC,.uno:EditDoc -SID_EDITMACRO,.uno:ToolsMacroEdit SID_EDIT_FRAMESET,.uno:EditFrameSet SID_EDIT_HYPERLINK,.uno:EditHyperlink SID_EDIT_OUTLINER,.uno:EditOutline @@ -1271,7 +1270,6 @@ SID_INSERTFILE,.uno:ImportFromFile SID_INSERTLAYER,.uno:InsertLayer SID_INSERTPAGE,.uno:InsertPage SID_INSERTPAGE_QUICK,.uno:InsertPageQuick -SID_INSERT_APPLET,.uno:InsertApplet SID_INSERT_AVMEDIA,.uno:InsertAVMedia SID_INSERT_CHECKBOX,.uno:Checkbox SID_INSERT_COMBOBOX,.uno:Combobox @@ -1520,7 +1518,6 @@ SID_PIVOT_KILL,.uno:DeletePivotTable SID_PIVOT_RECALC,.uno:RecalcPivotTable SID_PIVOT_TABLE,.uno:DataPilotExec SID_PIXELMODE,.uno:PixelMode -SID_PLAYMACRO,.uno:PlayMacro SID_PLUGINS_ACTIVE,.uno:PlugInsActive SID_POLYGON_MORPHING,.uno:Morphing SID_POLY_FORMEN,.uno:PolyFormen @@ -1692,7 +1689,6 @@ SID_SPLIT_PARENT_VERTICAL,.uno:SplitParentVertical SID_SPLIT_VERTICAL,.uno:SplitVertical SID_STANDARD_FONTS,.uno:StandardFonts SID_STARTAPP,.uno:StartApplication -SID_STARTSW,.uno:RunStarWriter SID_STATUSBARTEXT,.uno:StatusBar SID_STATUS_DOCPOS,.uno:StatusDocPos SID_STATUS_LAYOUT,.uno:LayoutStatus |