Kaydet (Commit) 182a74d9 authored tarafından Caolán McNamara's avatar Caolán McNamara

de-hrc various things

e.g.  helpid[s].hrc -> helpids.h
and insert include guards where missing

move "ordinary" defines into .hxx files

remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead

Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
üst 00657aef
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_HRC
#define INCLUDED_AVMEDIA_INC_HELPIDS_HRC
#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_H
#define INCLUDED_AVMEDIA_INC_HELPIDS_H
#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
......
......@@ -28,7 +28,7 @@
#include <vcl/lstbox.hxx>
#include "bitmaps.hlst"
#include "strings.hrc"
#include "helpids.hrc"
#include "helpids.h"
#include "mediamisc.hxx"
using ::rtl::OUString;
......
......@@ -22,7 +22,7 @@
#include "mediamisc.hxx"
#include <avmedia/mediawindow.hxx>
#include <avmedia/mediaplayer.hxx>
#include "helpids.hrc"
#include "helpids.h"
#include <tools/time.hxx>
#include <svtools/miscopt.hxx>
#include <vcl/svapp.hxx>
......
......@@ -22,7 +22,7 @@
#include <avmedia/mediaitem.hxx>
#include "mediamisc.hxx"
#include "strings.hrc"
#include "helpids.hrc"
#include "helpids.h"
#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
......
......@@ -25,7 +25,7 @@
#include "mediamisc.hxx"
#include "strings.hrc"
#include "bitmaps.hlst"
#include "helpids.hrc"
#include "helpids.h"
#include <algorithm>
#include <cmath>
......
......@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_BASCTL_INC_HELPID_HRC
#define INCLUDED_BASCTL_INC_HELPID_HRC
#ifndef INCLUDED_BASCTL_INC_HELPIDS_H
#define INCLUDED_BASCTL_INC_HELPIDS_H
#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT"
......
......@@ -18,6 +18,6 @@
*/
#include <svx/svxids.hrc>
#include <editeng/memberids.hrc>
#include <editeng/memberids.h>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -44,7 +44,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell)
void basctl_DocShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterStatusBar(SID_BASICIDE_STATUSBAR);
GetStaticInterface()->RegisterStatusBar(StatusBarId::BasicIdeStatusBar);
}
DocShell::DocShell()
......
......@@ -25,7 +25,7 @@
#include "docsignature.hxx"
#include "officecfg/Office/BasicIDE.hxx"
#include "helpid.hrc"
#include "helpids.h"
#include <strings.hrc>
#include <basic/basmgr.hxx>
......
......@@ -21,7 +21,7 @@
#include <cassert>
#include "helpid.hrc"
#include "helpids.h"
#include <strings.hrc>
#include "bitmaps.hlst"
......
......@@ -18,7 +18,7 @@
*/
#include "strings.hrc"
#include "helpid.hrc"
#include "helpids.h"
#include "accessibledialogwindow.hxx"
#include "baside3.hxx"
......
......@@ -19,7 +19,7 @@
#include <memory>
#include "strings.hrc"
#include "helpid.hrc"
#include "helpids.h"
#include "baside2.hxx"
#include "baside3.hxx"
......
......@@ -18,7 +18,7 @@
*/
#include "strings.hrc"
#include "helpid.hrc"
#include "helpids.h"
#include "baside2.hxx"
#include "baside3.hxx"
......
......@@ -20,7 +20,7 @@
#include "strings.hrc"
#include "objdlg.hxx"
#include "helpid.hrc"
#include "helpids.h"
#include <svl/itemset.hxx>
#include <vcl/taskpanelist.hxx>
......
......@@ -24,7 +24,7 @@
#include "localizationmgr.hxx"
#include "managelang.hxx"
#include "helpid.hrc"
#include "helpids.h"
#include "strings.hrc"
#include <com/sun/star/i18n/Boundary.hpp>
......
......@@ -19,7 +19,7 @@
#include "ChartTypeDialogController.hxx"
#include "ResId.hxx"
#include "HelpIds.hrc"
#include "helpids.h"
#include "strings.hrc"
#include "bitmaps.hlst"
#include "macros.hxx"
......
......@@ -32,7 +32,7 @@
#include "servicenames_charttypes.hxx"
#include "ResId.hxx"
#include "bitmaps.hlst"
#include "HelpIds.hrc"
#include "helpids.h"
#include <vcl/fixed.hxx>
#include <vcl/image.hxx>
......
......@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC
//for strings see Strings.hrc
//for Bitmaps see bitmaps.hlst
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H
//TabPage Ids:
#define TP_LEGEND_POS 900
......
......@@ -19,7 +19,7 @@
#include "dlg_ChartType.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "strings.hrc"
#include "tp_ChartType.hxx"
#include "macros.hxx"
......
......@@ -21,7 +21,7 @@
#include "ResId.hxx"
#include "macros.hxx"
#include "strings.hrc"
#include "HelpIds.hrc"
#include "helpids.h"
#include "tp_ChartType.hxx"
#include "tp_RangeChooser.hxx"
......
......@@ -23,7 +23,7 @@
#include "ChartTypeTemplateProvider.hxx"
#include "DiagramHelper.hxx"
#include "DialogModel.hxx"
#include "HelpIds.hrc"
#include "helpids.h"
#include "tp_RangeChooser.hxx"
#include "tp_DataSource.hxx"
......
......@@ -21,7 +21,7 @@
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
#include "HelpIds.hrc"
#include "helpids.h"
#include "ObjectNameProvider.hxx"
#include <svl/eitem.hxx>
......
......@@ -19,7 +19,7 @@
#include <svl/zforlist.hxx>
#include "dlg_ObjectProperties.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "strings.hrc"
#include "tp_AxisLabel.hxx"
#include "tp_DataLabel.hxx"
......
......@@ -20,7 +20,7 @@
#include "dlg_ShapeFont.hxx"
#include "ViewElementListProvider.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include <svl/intitem.hxx>
#include <sfx2/objsh.hxx>
......
......@@ -19,7 +19,7 @@
#include "dlg_ShapeParagraph.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include <svl/cjkoptions.hxx>
#include <svl/intitem.hxx>
......
......@@ -19,7 +19,7 @@
#include "dlg_View3D.hxx"
#include "strings.hrc"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "ResId.hxx"
#include "tp_3D_SceneGeometry.hxx"
#include "tp_3D_SceneAppearance.hxx"
......
......@@ -23,7 +23,7 @@
#include "RangeSelectionHelper.hxx"
#include "TabPageNotifiable.hxx"
#include "macros.hxx"
#include "HelpIds.hrc"
#include "helpids.h"
#include <rtl/math.hxx>
#include <vcl/dialog.hxx>
......
......@@ -20,7 +20,7 @@
#include "tp_AxisLabel.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
......
......@@ -20,7 +20,7 @@
#include "tp_AxisPositions.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "strings.hrc"
#include "chartview/ChartSfxItemIds.hxx"
#include "AxisHelper.hxx"
......
......@@ -19,7 +19,7 @@
#include "tp_DataLabel.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "ResId.hxx"
namespace chart
......
......@@ -19,7 +19,7 @@
#include "tp_ErrorBars.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "TabPageNotifiable.hxx"
#include <vcl/settings.hxx>
......
......@@ -19,7 +19,7 @@
#include "tp_LegendPosition.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "res_LegendPosition.hxx"
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
......
......@@ -18,7 +18,7 @@
*/
#include "tp_PointGeometry.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "res_BarGeometry.hxx"
#include "ResId.hxx"
......
......@@ -20,9 +20,9 @@
#include "tp_TitleRotation.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include "chartview/ChartSfxItemIds.hxx"
#include "HelpIds.hrc"
#include "helpids.h"
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
......
......@@ -19,7 +19,7 @@
#include "tp_Trendline.hxx"
#include "ResId.hxx"
#include "ResourceIds.hrc"
#include "TabPageIds.h"
#include <vcl/settings.hxx>
namespace chart
......
......@@ -22,7 +22,7 @@
#include "res_Titles.hxx"
#include "res_LegendPosition.hxx"
#include "ResId.hxx"
#include "HelpIds.hrc"
#include "helpids.h"
#include "macros.hxx"
#include "ChartModelHelper.hxx"
#include "AxisHelper.hxx"
......
......@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef CHART_SHAPECONTROLLER_HRC
#define CHART_SHAPECONTROLLER_HRC
#ifndef CHART_SHAPECONTROLLER_H
#define CHART_SHAPECONTROLLER_H
//Command Ids:
#define COMMAND_ID_FORMAT_LINE 1
......
......@@ -16,8 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef CHART_HELPIDS_HRC
#define CHART_HELPIDS_HRC
#ifndef CHART_HELPIDS_H
#define CHART_HELPIDS_H
#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT"
#define HID_SCH_ERROR_BARS_FROM_DATA "CHART2_SCH_ERROR_BARS_FROM_DATA"
......
......@@ -22,7 +22,7 @@
#include "macros.hxx"
#include "ItemPropertyMap.hxx"
#include "RelativeSizeHelper.hxx"
#include <editeng/memberids.hrc>
#include <editeng/memberids.h>
#include <editeng/eeitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/fontitem.hxx>
......
......@@ -23,7 +23,7 @@
#include "ItemPropertyMap.hxx"
#include "PropertyHelper.hxx"
#include "CommonConverters.hxx"
#include <editeng/memberids.hrc>
#include <editeng/memberids.h>