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/help_hid.lst | |
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/help_hid.lst')
-rw-r--r-- | helpcontent2/helpers/help_hid.lst | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst index db2145a5da..6946d753db 100644 --- a/helpcontent2/helpers/help_hid.lst +++ b/helpcontent2/helpers/help_hid.lst @@ -5084,7 +5084,6 @@ SID_DRAW_XPOLYGON_NOFILL,10396,.uno:Polygon_Diagonal_Unfilled SID_DSBROWSER_EXPLORER,10764,.uno:DSBrowserExplorer SID_DUPLICATE_PAGE,27342,.uno:DuplicatePage SID_EDITDOC,6312,.uno:EditDoc -SID_EDITMACRO,5802,.uno:ToolsMacroEdit SID_EDIT_FRAMESET,5646,.uno:EditFrameSet SID_EDIT_HYPERLINK,27382,.uno:EditHyperlink SID_EDIT_OUTLINER,27044,.uno:EditOutline @@ -5414,7 +5413,6 @@ SID_INSERTPAGE,27014,.uno:InsertPage SID_INSERTPAGE_LAYOUT_MENU,27438, SID_INSERTPAGE_QUICK,27352,.uno:InsertPageQuick SID_INSERTTEXT,30360, -SID_INSERT_APPLET,5673,.uno:InsertApplet SID_INSERT_AVMEDIA,6696,.uno:InsertAVMedia SID_INSERT_AXIS,30518, SID_INSERT_CHART_LEGEND,30516, @@ -5693,7 +5691,6 @@ SID_PIVOT_GET,26665,.uno:DataPilotTables SID_PIVOT_KILL,26315,.uno:DeletePivotTable SID_PIVOT_RECALC,26314,.uno:RecalcPivotTable SID_PIVOT_TABLE,26337,.uno:DataPilotExec -SID_PLAYMACRO,5801,.uno:PlayMacro SID_PLUGINS_ACTIVE,6314,.uno:PlugInsActive SID_POLYGON_MORPHING,27319,.uno:Morphing SID_POLY_FORMEN,5682,.uno:PolyFormen @@ -5907,7 +5904,6 @@ SID_SPLIT_PARENT_VERTICAL,5650,.uno:SplitParentVertical SID_SPLIT_VERTICAL,5648,.uno:SplitVertical SID_STANDARD_FONTS,26064,.uno:StandardFonts SID_STARTAPP,27052,.uno:StartApplication -SID_STARTSW,5821,.uno:RunStarWriter SID_STATUSBARTEXT,5642,.uno:StatusBar SID_STATUS_DOCPOS,26114,.uno:StatusDocPos SID_STATUS_LAYOUT,27087,.uno:LayoutStatus |