dbaccess/Library_dbu.mk | 2 --
dbaccess/source/ui/dlg/AutoControls.src | 2 +-
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPage.src | 1 -
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 1 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 2 +-
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 1 -
dbaccess/source/ui/dlg/dbadmin.src | 1 -
dbaccess/source/ui/dlg/dbadmin2.src | 1 -
dbaccess/source/ui/dlg/dbadminsetup.src | 2 +-
dbaccess/source/ui/dlg/detailpages.cxx | 1 -
dbaccess/source/ui/dlg/tablespage.cxx | 1 -
13 files changed, 3 insertions(+), 14 deletions(-)
New commits:
commit 3679956b238eab3c453f12c43fb328965e7eeae7
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Aug 15 13:11:13 2014 +0200
dbaccess: fix build after AutoControls_tmpl.hrc removal
Change-Id: I8e7e926aae646225234cf9e41fdf048735f40eb0
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index d01342b..fa551c5 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -280,6 +280,4 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
))
endif
-$(call gb_Library_get_headers_target,dbu) : $(call
gb_SrsTemplateTarget_get_include_dir,dbaccess)/AutoControls.hrc
-
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/source/ui/dlg/AutoControls.src
b/dbaccess/source/ui/dlg/AutoControls.src
index 486a910..7e56864 100644
--- a/dbaccess/source/ui/dlg/AutoControls.src
+++ b/dbaccess/source/ui/dlg/AutoControls.src
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "AutoControls.hrc"
+#include "dbu_dlg.hrc"
String STR_DBASE_PATH_OR_FILE
{
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index ce5803a..5c4dc6a 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -19,7 +19,6 @@
#include "dsnItem.hxx"
#include "ConnectionHelper.hxx"
-#include "AutoControls.hrc"
#include "dbu_dlg.hrc"
#include "dbu_misc.hrc"
#include <svl/itemset.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 1f925b7..c76327c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -68,7 +68,6 @@
#include "adodatalinks.hxx"
#endif //_ADO_DATALINK_BROWSE_
-#include "AutoControls.hrc"
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src
b/dbaccess/source/ui/dlg/ConnectionPage.src
index d48505a..77078c5 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -19,7 +19,6 @@
#include "dbaccess_helpid.hrc"
#include "dbu_dlg.hrc"
-#include "AutoControls.hrc"
String STR_CONNECTION_TEST
{
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index e2263cc..e362b45 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -18,7 +18,6 @@
*/
#include "ConnectionPageSetup.hxx"
-#include "AutoControls.hrc"
#include "dbu_dlg.hrc"
#include <svl/itemset.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 12af7c0..d025ab7 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -21,8 +21,8 @@
#include "DBSetupConnectionPages.hxx"
#include "sqlmessage.hxx"
+#include "dbu_dlg.hrc"
#include "dbu_resource.hrc"
-#include "AutoControls.hrc"
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index f977c35..b399bf6 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -24,7 +24,6 @@
#include "sqlmessage.hxx"
#include "dbu_dlg.hrc"
#include "dbu_resource.hrc"
-#include "AutoControls.hrc"
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
diff --git a/dbaccess/source/ui/dlg/dbadmin.src
b/dbaccess/source/ui/dlg/dbadmin.src
index 65f2069..9762e72 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -18,7 +18,6 @@
*/
#include "dbaccess_helpid.hrc"
-#include "AutoControls.hrc"
#include "dbu_dlg.hrc"
#include "browserids.hxx"
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src
b/dbaccess/source/ui/dlg/dbadmin2.src
index 3548147..13b96d4 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -21,7 +21,6 @@
#include "dbu_dlg.hrc"
#include "browserids.hxx"
#include "toolbox.hrc"
-#include "AutoControls.hrc"
String STR_ENTER_CONNECTION_PASSWORD
{
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src
b/dbaccess/source/ui/dlg/dbadminsetup.src
index 802fc1f..d798978 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "AutoControls.hrc"
+#include "dbu_dlg.hrc"
String STR_DBWIZARDTITLE
{
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx
b/dbaccess/source/ui/dlg/detailpages.cxx
index e0de94a..a0257d5 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -45,7 +45,6 @@
#include "DriverSettings.hxx"
#include "dbadmin.hxx"
#include <comphelper/types.hxx>
-#include "AutoControls.hrc"
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx
b/dbaccess/source/ui/dlg/tablespage.cxx
index 07cad95..a45578c 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -51,7 +51,6 @@
#include <tools/diagnose_ex.h>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include "AutoControls.hrc"
namespace dbaui
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
