summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-07-19 17:13:56 +0200
committerMathias Bauer <mba@openoffice.org>2010-07-19 17:13:56 +0200
commit66be8992043f8728beb915ce13475ffd93d370fa (patch)
tree5c9bb22647483701f75d2f674c35bc0483d3129c /sd
parentde0d3255d183b96ecccb3b83fc25bc078ce846e9 (diff)
CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs
Diffstat (limited to 'sd')
-rwxr-xr-xsd/inc/app.hrc44
-rwxr-xr-x[-rw-r--r--]sd/inc/helpids.h69
-rwxr-xr-xsd/source/core/drawdoc4.cxx1
-rwxr-xr-xsd/source/core/sdpage.cxx2
-rwxr-xr-xsd/source/core/stlpool.cxx1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futempl.cxx2
-rwxr-xr-xsd/source/ui/toolpanel/controls/MasterPagesPanel.cxx1
-rwxr-xr-x[-rw-r--r--]sd/util/hidother.src26
8 files changed, 53 insertions, 93 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 65aec562f084..9a18f184363b 100755
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -32,6 +32,50 @@
#include <sfx2/sfx.hrc>
#endif
+// HelpIDs fuer Vorlagen
+#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70)
+#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71)
+#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72)
+#define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73)
+#define HID_POOLSHEET_TEXT (HID_SD_START + 74)
+#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75)
+#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76)
+#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77)
+#define HID_POOLSHEET_TITLE (HID_SD_START + 78)
+#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79)
+#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80)
+#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81)
+#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82)
+#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83)
+#define HID_POOLSHEET_MEASURE (HID_SD_START + 84)
+#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85)
+#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86)
+#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87)
+#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88)
+#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89)
+#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90)
+#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91)
+#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92)
+#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93)
+#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94)
+#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95)
+#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96)
+#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97)
+#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98)
+#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101)
+
+#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194)
+#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195)
+#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196)
+#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197)
+#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198)
+#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199)
+
+#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174)
+#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175)
+#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176)
+#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177)
+
#define SID_BACKGROUND (SID_SD_START)
#define SID_LASTVERSION (SID_SD_START+1)
#define SID_PAGESETUP (SID_SD_START+2)
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index d9e0f5561a6b..2dabcc43db45 100644..100755
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -24,68 +24,47 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
#include <sfx2/sfxcommands.h>
#include <svx/svxcommands.h>
#include "sdcommands.h"
-#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174)
-#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175)
-#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176)
-#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177)
-
#define HID_NOTESMODE "SD_HID_NOTESMODE"
#define HID_HANDOUTMODE "SD_HID_HANDOUTMODE"
#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL"
#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL"
#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL"
-
#define HID_SD_PRINT_OPTIONS "SD_HID_SD_PRINT_OPTIONS"
#define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP"
#define HID_SD_OPTIONS_VIEW "SD_HID_SD_OPTIONS_VIEW"
-
#define HID_SD_AUTOPILOT_PAGE1 "SD_HID_SD_AUTOPILOT_PAGE1"
#define HID_SD_AUTOPILOT_PAGE2 "SD_HID_SD_AUTOPILOT_PAGE2"
#define HID_SD_AUTOPILOT_PAGE3 "SD_HID_SD_AUTOPILOT_PAGE3"
#define HID_SD_AUTOPILOT_PAGE4 "SD_HID_SD_AUTOPILOT_PAGE4"
#define HID_SD_AUTOPILOT_PAGE5 "SD_HID_SD_AUTOPILOT_PAGE5"
#define HID_SD_AUTOPILOT_PAGE6 "SD_HID_SD_AUTOPILOT_PAGE6"
-
#define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED"
#define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG"
-
#define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE"
#define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE"
#define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER"
-
#define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW"
#define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE"
#define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE"
#define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES"
#define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT"
-
#define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT"
-
#define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT"
#define HID_SD_OPTIONS_CONTENTS "SD_HID_SD_OPTIONS_CONTENTS"
#define HID_SD_OPTIONS_MISC "SD_HID_SD_OPTIONS_MISC"
-
#define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW"
#define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL"
#define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB"
#define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR"
-
#define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS"
#define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS"
-
#define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE"
-
#define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX"
#define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB"
-
#define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN"
#define HID_SD_NAVIGATOR_TBI_FIRST "SD_HID_SD_NAVIGATOR_TBI_FIRST"
#define HID_SD_NAVIGATOR_TBI_PREV "SD_HID_SD_NAVIGATOR_TBI_PREV"
@@ -130,40 +109,6 @@
#define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION"
-// HelpIDs fuer Vorlagen
-#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70)
-#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71)
-#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72)
-#define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73)
-#define HID_POOLSHEET_TEXT (HID_SD_START + 74)
-#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75)
-#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76)
-#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77)
-#define HID_POOLSHEET_TITLE (HID_SD_START + 78)
-#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79)
-#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80)
-#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81)
-#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82)
-#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83)
-#define HID_POOLSHEET_MEASURE (HID_SD_START + 84)
-
-#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85)
-#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86)
-#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87)
-#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88)
-#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89)
-#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90)
-#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91)
-#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92)
-#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93)
-#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94)
-#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95)
-#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96)
-#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97)
-#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98)
-
-#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101)
-
#define HID_DLG_DEFINE_CUSTOMSHOW "SD_HID_DLG_DEFINE_CUSTOMSHOW"
#define HID_DLG_DEFINE_CUSTOMSHOW_CTL "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL"
@@ -205,9 +150,9 @@
#define HID_SD_PAGEOBJSTLB "SD_HID_SD_PAGEOBJSTLB"
-#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT"
-#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE"
-#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND"
+#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT"
+#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE"
+#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND"
#define HID_SD_DRAW_3D_TOOLBOX "SD_HID_SD_DRAW_3D_TOOLBOX"
#define HID_SD_DRAW_FONTWORK_TOOLBOX "SD_HID_SD_DRAW_FONTWORK_TOOLBOX"
@@ -284,13 +229,6 @@
#define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL"
#define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL"
-#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194)
-#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195)
-#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196)
-#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197)
-#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198)
-#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199)
-
#define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN"
#define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS"
@@ -313,4 +251,3 @@
#define HID_MN_SUB_PREVIEW_OUTPUT_QUALITY "SD_HID_MN_SUB_PREVIEW_OUTPUT_QUALITY"
#define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT"
#define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR"
-
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 89f74de30494..a58577458a67 100755
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -117,6 +117,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <svl/itemset.hxx>
+#include "app.hrc"
using ::rtl::OUString;
using namespace ::com::sun::star;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 76450cf76760..739966c9baf2 100755
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -66,7 +66,7 @@
#include "../ui/inc/DrawDocShell.hxx"
#include "Outliner.hxx"
-
+#include "app.hrc"
#include "misc.hxx"
#include "eetext.hxx"
#include "drawdoc.hxx"
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 138863cc313a..205e007d9e97 100755
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -76,6 +76,7 @@
#include "sdpage.hxx"
#include "helpids.h"
#include <svl/itemset.hxx>
+#include "app.hrc"
using ::rtl::OUString;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 43572c2af8a4..437d4bc246a6 100644..100755
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -54,7 +54,7 @@
#include <svx/xlndsit.hxx>
#include <svx/xlnstit.hxx>
#include <svx/xlnedit.hxx>
-
+#include "app.hrc"
#include "stlsheet.hxx"
#include "sdpage.hxx"
#include "stlpool.hxx"
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
index d87dfbd24f0e..d7c96252136c 100755
--- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
@@ -45,6 +45,7 @@
#include "sdresid.hxx"
#include "helpids.h"
#include <svtools/valueset.hxx>
+#include "app.hrc"
namespace sd { namespace toolpanel { namespace controls {
diff --git a/sd/util/hidother.src b/sd/util/hidother.src
index 1a15c421b419..bd378fb6d75f 100644..100755
--- a/sd/util/hidother.src
+++ b/sd/util/hidother.src
@@ -24,28 +24,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#include "../inc/helpids.h"
-#include "hidother.hrc"
-#include "../inc/app.hrc"
-
-hidspecial SID_NOTESMODE { HelpId = SID_NOTESMODE; };
-hidspecial SID_HANDOUTMODE { HelpId = SID_HANDOUTMODE; };
-
-hidspecial SD_IF_SDAPP { HelpId = SD_IF_SDAPP; };
-hidspecial SD_IF_SDDRAWDOCSHELL { HelpId = SD_IF_SDDRAWDOCSHELL; };
-hidspecial SD_IF_SDVIEWSHELL { HelpId = SD_IF_SDVIEWSHELL; };
-hidspecial SD_IF_SDDRAWVIEWSHELL { HelpId = SD_IF_SDDRAWVIEWSHELL; };
-hidspecial SD_IF_SDSLIDEVIEWSHELL { HelpId = SD_IF_SDSLIDEVIEWSHELL; };
-hidspecial SD_IF_SDOUTLINEVIEWSHELL { HelpId = SD_IF_SDOUTLINEVIEWSHELL; };
-hidspecial SD_IF_SDDRAWSTDOBJECTBAR { HelpId = SD_IF_SDDRAWSTDOBJECTBAR; };
-hidspecial SD_IF_SDDRAWTEXTOBJECTBAR { HelpId = SD_IF_SDDRAWTEXTOBJECTBAR; };
-hidspecial SD_IF_SDDRAWBEZIEROBJECTBAR { HelpId = SD_IF_SDDRAWBEZIEROBJECTBAR; };
-hidspecial SD_IF_SDDRAWGLUEPOINTSOBJECTBAR { HelpId = SD_IF_SDDRAWGLUEPOINTSOBJECTBAR; };
-hidspecial SD_IF_SDGRAPHICDOCSHELL { HelpId = SD_IF_SDGRAPHICDOCSHELL; };
-hidspecial SD_IF_SDGRAPHICVIEWSHELL { HelpId = SD_IF_SDGRAPHICVIEWSHELL; };
-hidspecial SD_IF_SDGRAPHICSTDOBJECTBAR { HelpId = SD_IF_SDGRAPHICSTDOBJECTBAR; };
-hidspecial SD_IF_SDDRAWGRAFOBJECTBAR { HelpId = SD_IF_SDDRAWGRAFOBJECTBAR; };
-hidspecial SD_IF_SDPRESVIEWSHELL { HelpId = SD_IF_SDPRESVIEWSHELL; };
hidspecial HID_SD_PRINT_OPTIONS { HelpId = HID_SD_PRINT_OPTIONS; };
hidspecial HID_SD_OPTIONS_SNAP { HelpId = HID_SD_OPTIONS_SNAP; };
@@ -130,8 +110,6 @@ hidspecial HID_SD_NAMEDIALOG_LINEEND { HelpId = HID_SD_NAMEDIALOG_LINEEND; };
hidspecial HID_SD_TABPAGE_HEADERFOOTER_SLIDE { HelpId = HID_SD_TABPAGE_HEADERFOOTER_SLIDE; };
hidspecial HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT { HelpId = HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT; };
-hidspecial SD_IF_SDDRAWMEDIAOBJECTBAR { HelpId = SD_IF_SDDRAWMEDIAOBJECTBAR; };
-
hidspecial HID_SD_TASK_PANE { HelpId = HID_SD_TASK_PANE; };
hidspecial HID_SD_SLIDE_DESIGNS { HelpId = HID_SD_SLIDE_DESIGNS; };
hidspecial HID_SD_CURRENT_MASTERS { HelpId = HID_SD_CURRENT_MASTERS; };
@@ -194,8 +172,6 @@ hidspecial HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX { HelpId = HID_S
hidspecial HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX; };
hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX; };
-hidspecial SID_SAVEGRAPHIC { HelpId = SID_SAVEGRAPHIC; };
-
hidspecial HID_SD_SLIDESHOW_DISPLAY { HelpId = HID_SD_SLIDESHOW_DISPLAY; };
hidspecial HID_SD_RULER_HORIZONTAL { HelpId = HID_SD_RULER_HORIZONTAL; };