diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 12:50:12 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 12:50:12 +0200 |
| commit | 81ca9771b760858e9db7e4bd595fab4a15113089 (patch) | |
| tree | 255ea3adfd9a18c2151a7779545c5296ca1b9a8e /dbaccess/source/ui | |
| parent | Merge branch 'master' into feature/gnumake4 (diff) | |
| download | core-81ca9771b760858e9db7e4bd595fab4a15113089.tar.gz core-81ca9771b760858e9db7e4bd595fab4a15113089.zip | |
gnumake4: postmerge fixes in dbaccess reportdesign
Diffstat (limited to 'dbaccess/source/ui')
| -rw-r--r-- | dbaccess/source/ui/dlg/AutoControls.src | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/ConnectionHelper.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/admincontrols.src | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index e43e2a13a7fb..a286cdf33516 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" -#endif String STR_DBASE_PATH_OR_FILE { diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index efb8a38dcfd2..64e00fe4e7ca 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -69,6 +69,7 @@ #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <sfx2/docfilt.hxx> +#include <AutoControlsDef.hrc> #ifdef _ADO_DATALINK_BROWSE_ #include <vcl/sysdata.hxx> diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src index 8ce3bb4030dc..8f5bf2c0210d 100644 --- a/dbaccess/source/ui/dlg/admincontrols.src +++ b/dbaccess/source/ui/dlg/admincontrols.src @@ -24,7 +24,7 @@ * ************************************************************************/ -#include "AutoControls.hrc" +#include "AutoControlsDef.hrc" #include "dbu_dlg.hrc" #include "admincontrols.hrc" |