diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-06 21:09:13 +0100 |
| commit | 23dd856d3c70a63dd47ae2a09a75833267296432 (patch) | |
| tree | 3ed426d983d5a46cc48dc1ee873ac5627b867f05 /reportdesign/source | |
| parent | 5106b38a9cc64677b3fa4a0aea7450560775e78e (diff) | |
| parent | 7e5b321535977ccddc6703c0ad4e5d25af797654 (diff) | |
Merge branch 'feature/gbuild_extensions'
Conflicts:
extensions/source/ole/servreg.cxx
extensions/source/plugin/util/makefile.mk
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
tail_build/prj/build.lst
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/DateTime.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/PageNumber.cxx | 2 |
5 files changed, 1 insertions, 14 deletions
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 9fd7e79bc671..6078904eab5b 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -44,9 +44,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> /** === end UNO includes === **/ -#include <svx/globlmn.hrc> -#include <svx/svxids.hrc> - #include <toolkit/helper/vclunohelper.hxx> #include <vcl/msgbox.hxx> diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 563d24f356ef..e197c661e4ac 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -34,8 +34,6 @@ #include "ModuleHelper.hxx" #include "helpids.hrc" #include <vcl/msgbox.hxx> -#include <svx/globlmn.hrc> -#include <svx/svxids.hrc> #include <connectivity/dbconversion.hxx> #include <unotools/syslocale.hxx> #include "UITools.hxx" diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 80d41f9207b0..75ad612b7b35 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -29,6 +29,7 @@ #include "GroupsSorting.hrc" #include <connectivity/dbtools.hxx> #include <svtools/editbrowsebox.hxx> +#include <svtools/imgdef.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/report/GroupOn.hpp> @@ -40,11 +41,6 @@ #include "rptui_slotid.hrc" #include "ModuleHelper.hxx" #include "helpids.hrc" - -#include <svx/globlmn.hrc> -#include <svx/svxids.hrc> -#include <svtools/imgdef.hxx> - #include "GroupExchange.hxx" #include "UITools.hxx" #include "UndoActions.hxx" diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index b5ecd583e0f0..78ddf3530dfa 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -40,8 +40,6 @@ #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/report/XImageControl.hpp> #include <com/sun/star/report/XShape.hpp> -#include <svx/globlmn.hrc> -#include <svx/svxids.hrc> #include "helpids.hrc" #include "RptResId.hrc" #include "rptui_slotid.hrc" diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 7b6b077d6d07..cfc3ef7cb0b2 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -35,8 +35,6 @@ #include "RptDef.hxx" #include "helpids.hrc" #include <vcl/msgbox.hxx> -#include <svx/globlmn.hrc> -#include <svx/svxids.hrc> #include "UITools.hxx" #include "uistrings.hrc" #include "ReportController.hxx" |