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

10 files changed, 0 insertions, 134 deletions

diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 6a91b6cc8e20..a22074963513 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -27,7 +27,6 @@
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <comphelper/types.hxx>
 #include "TPrivilegesResultSet.hxx"
-#include "resource/conn_shared_res.hrc"
 #include "strings.hxx"
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index 36a3518fb396..acffce89b759 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -19,7 +19,6 @@
 
 #include "java/math/BigDecimal.hxx"
 #include "java/tools.hxx"
-#include "resource/conn_shared_res.hrc"
 using namespace connectivity;
 
 //************ Class: java.lang.Boolean
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 0f9ba8fb8f9e..ecd265d3f5dd 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -36,7 +36,6 @@
 #include <connectivity/dbexception.hxx>
 #include "java/util/Property.hxx"
 #include "java/LocalRef.hxx"
-#include "resource/conn_shared_res.hrc"
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <jvmaccess/classpath.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 74513dd5ed76..c05372db4942 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -26,7 +26,6 @@
 #include "java/tools.hxx"
 #include <connectivity/dbexception.hxx>
 #include <jvmfwk/framework.hxx>
-#include "resource/conn_shared_res.hrc"
 #include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index fed0c3d7be15..6a66929c8fea 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/FetchDirection.hpp>
 
-#include "resource/conn_shared_res.hrc"
 #include "strings.hxx"
 
 #include <algorithm>
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 3b819d94cb65..d90f94cf61e8 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -25,7 +25,6 @@
 #include "java/sql/SQLException.hxx"
 #include <osl/thread.h>
 #include "java/LocalRef.hxx"
-#include "resource/conn_shared_res.hrc"
 #include "strings.hxx"
 
 #include <comphelper/logging.hxx>
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 6763c985283c..b64a9fade6c7 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -30,7 +30,6 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/conn_shared_res.hrc"
 #include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include "java/LocalRef.hxx"
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
deleted file mode 100644
index 9008b45bb495..000000000000
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ /dev/null
@@ -1,65 +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 CONNECTIVITY_SHARED_RES_HRC
-#define CONNECTIVITY_SHARED_RES_HRC
-
-// = normal resource ids, per driver
-
-// Mozilla driver resource ids
-#define STR_MOZAB_BASE                  1000
-//  either mozab or mork is actually used
-#define STR_MORK_BASE                   1000
-
-// common resource ids
-#define STR_COMMON_BASE                 1200
-
-// Spreadsheet driver resource ids
-#define STR_CALC_BASE                   1300
-
-// DBase driver resource ids
-#define STR_DBASE_BASE                  1400
-
-// ADO driver resource ids
-#define STR_ADO_BASE                    1450
-
-// EVOAB2 driver resource ids
-#define STR_EVOAB2_BASE                 1500
-
-// FILE driver resource ids
-#define STR_FILE_BASE                   1550
-
-// KAB driver resource ids
-#define STR_KAB_BASE                    1600
-
-// MACAB driver resource ids
-#define STR_MACAB_BASE                  1650
-
-// hsqldb driver resource ids
-#define STR_HSQLDB_BASE                 1750
-
-// = resource ids for log messages
-#define STR_LOG_MESSAGE_BASE            10000
-
-// log messages for the jdbc driver
-#define STR_JDBC_LOG_MESSAGE_BASE       STR_LOG_MESSAGE_BASE + 500
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
deleted file mode 100644
index 06b2a81b3f3b..000000000000
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ /dev/null
@@ -1,27 +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 CONNECTIVITY_RESOURCE_JDBC_LOG_HRC
-#define CONNECTIVITY_RESOURCE_JDBC_LOG_HRC
-
-#include "resource/conn_shared_res.hrc"
-
-#endif // CONNECTIVITY_RESOURCE_JDBC_LOG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
deleted file mode 100644
index 019e99449b9d..000000000000
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ /dev/null
@@ -1,35 +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 CONNECTIVITY_RESOURCE_KAB_HRC
-#define CONNECTIVITY_RESOURCE_KAB_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the kab driver's resource strings
-
-#define STR_NO_KDE_INST                 ( STR_KAB_BASE +    0 )
-#define STR_KDE_VERSION_TOO_OLD         ( STR_KAB_BASE +    1 )
-#define STR_KDE_VERSION_TOO_NEW         ( STR_KAB_BASE +    2 )
-#define STR_KDE_VERSION_TOO_NEW_WORK_AROUND ( STR_KAB_BASE +    3 )
-
-#endif // CONNECTIVITY_RESOURCE_KAB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */