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

5 files changed, 0 insertions, 38 deletions

diff --git a/sw/source/uibase/wrtsh/wrtsh.hrc b/sw/source/uibase/wrtsh/wrtsh.hrc
deleted file mode 100644
index 05cdf6c20034..000000000000
--- a/sw/source/uibase/wrtsh/wrtsh.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_SW_SOURCE_UIBASE_WRTSH_WRTSH_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_WRTSH_WRTSH_HRC
-
-#include "rcid.hrc"
-
-#define WRTSH_ACT_END RC_WRTSH_BEGIN
-
-#if WRTSH_ACT_END > RC_WRTSH_END
-#error Resource-Id Ueberlauf
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 9be63a7ca364..d3575cbc1547 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -81,7 +81,6 @@
 #include <swdtflvr.hxx>
 #include <doc.hxx>
 #include <IDocumentSettingAccess.hxx>
-#include <wrtsh.hrc>
 #include <SwStyleNameMapper.hxx>
 #include <sfx2/request.hxx>
 #include <paratr.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 1ff5866f5dd2..f4ed6cc0afa0 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -54,9 +54,7 @@
 #include <navipi.hxx>
 #include <txtinet.hxx>
 #include <cmdid.h>
-#include <wrtsh.hrc>
 #include "swabstdlg.hxx"
-#include "fldui.hrc"
 #include <SwRewriter.hxx>
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx
index a169c246f710..db7de18d251b 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -33,7 +33,6 @@
 #include "view.hxx"
 #include "IMark.hxx"
 #include "doc.hxx"
-#include "wrtsh.hrc"
 
 #include <unomid.h>
 
diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx
index dec13a188e5c..27c7f0e34ed6 100644
--- a/sw/source/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/uibase/wrtsh/wrtundo.cxx
@@ -25,8 +25,6 @@
 #include <swdtflvr.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/strings.hrc>
-#include <wrtsh.hrc>
-#include <sfx2/sfx.hrc>
 
 // Undo ends all modes. If a selection is emerged by the Undo,
 // this must be considered for further action.