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

8 files changed, 9 insertions, 38 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 58f0d0bf7afe..81f83b2a8297 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_INC_APP_HRC
 #define INCLUDED_SD_INC_APP_HRC
 
-#include <sfx2/sfx.hrc>
+#include <svl/solar.hrc>
 
 // Helper IDs for templates
 #define HID_STANDARD_STYLESHEET_NAME        (HID_SD_START + 70)
diff --git a/sd/inc/errhdl.hrc b/sd/inc/errhdl.hrc
index 20fe07e02f34..bcaa2a0a5328 100644
--- a/sd/inc/errhdl.hrc
+++ b/sd/inc/errhdl.hrc
@@ -22,7 +22,6 @@
 
 #define NC_(Context, String) (Context "\004" u8##String)
 
-#include "glob.hrc"
 #include "sderror.hxx"
 
 #define ERR_CODE( class, err )  ErrCode(class | (sal_uInt32(err) - ERROR_SD_BASE))
diff --git a/sd/inc/family.hrc b/sd/inc/family.hrc
index 6e3d7114a8b4..b89c241af0a6 100644
--- a/sd/inc/family.hrc
+++ b/sd/inc/family.hrc
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_INC_FAMILY_HRC
 #define INCLUDED_SD_INC_FAMILY_HRC
 
-#include <sfx2/sfx.hrc>
 #include <svl/style.hxx>
 
 #define NC_(Context, String) (Context "\004" u8##String)
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
deleted file mode 100644
index 1ad0a198134d..000000000000
--- a/sd/inc/glob.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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_SD_INC_GLOB_HRC
-#define INCLUDED_SD_INC_GLOB_HRC
-
-#include <sfx2/sfx.hrc>
-
-#define RID_GLOB_START                          RID_APP_START+1000
-
-#define RID_CUSTOMANIMATION_START               RID_GLOB_START+120
-//      RID_CUSTOMANIMATION_END                 RID_GLOB_START+199
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index daedcf1634db..26bed2967ffd 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -16,6 +16,10 @@
  *   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_SD_INC_HELPIDS_H
+#define INCLUDED_SD_INC_HELPIDS_H
+
 #include <svx/svxcommands.h>
 #include "sdcommands.h"
 
@@ -76,4 +80,6 @@
 #define HID_MN_SUB_CONVERT                                      "SD_HID_MN_SUB_CONVERT"
 #define HID_MN_SUB_MIRROR                                       "SD_HID_MN_SUB_MIRROR"
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index f39b7d369332..9582ea377530 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -193,7 +193,7 @@ public:
     virtual VclPtr<AbstractSdStartPresDlg>     CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs,
                                                                      const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0;
     virtual VclPtr<VclAbstractDialog>          CreateRemoteDialog( vcl::Window* pWindow ) = 0;
-    virtual VclPtr<SfxAbstractTabDialog>       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, sal_uInt16 nDlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
+    virtual VclPtr<SfxAbstractTabDialog>       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
     virtual VclPtr<AbstractSdPresLayoutDlg>    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) = 0;
     virtual VclPtr<SfxAbstractTabDialog>       CreateSdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0;
     virtual VclPtr<SfxAbstractDialog>          CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0;
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 791c03121d2e..dc1131a43f40 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_INC_SDATTR_HRC
 #define INCLUDED_SD_INC_SDATTR_HRC
 
-#include <sfx2/sfx.hrc>
+#include <svl/solar.hrc>
 
 // Layer attributes
 #define ATTR_LAYER_START        SID_SD_START + 1234
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index efa78ac6957e..adbcd403646a 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -23,7 +23,6 @@
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include <sfx2/sfx.hrc>
 
 #include "sdattr.hrc"
 #include "glob.hxx"