summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-19 12:46:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-02-19 17:24:02 +0100
commit1ffa4bf52597ca1bf8870bf3750d63f2cfb4a650 (patch)
treeaa9fd21b1c0680685c5673b801d97fdeb7b7a3a9
parent925c2c9842e548ab31fc3bed6c6d2840d1260861 (diff)
can avoid including svtools/ctrlbox.hxx
Change-Id: I953089dd1416cd24721241fff3a6d21354211a5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89018 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--basctl/inc/pch/precompiled_basctl.hxx10
-rw-r--r--include/sfx2/dinfdlg.hxx9
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx16
-rw-r--r--sfx2/source/doc/objcont.cxx1
-rw-r--r--svtools/inc/pch/precompiled_svt.hxx3
-rw-r--r--svx/inc/pch/precompiled_svxcore.hxx4
-rw-r--r--sw/inc/pch/precompiled_swui.hxx3
7 files changed, 26 insertions, 20 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 3601ccaf130f..129cef565a54 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-18 11:59:52 using:
+ Generated on 2020-02-19 12:44:58 using:
./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -110,13 +110,10 @@
#include <vcl/builderpage.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
-#include <vcl/dndhelp.hxx>
-#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/floatwin.hxx>
@@ -135,7 +132,6 @@
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaactiontypes.hxx>
-#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
#include <vcl/outdevstate.hxx>
@@ -149,7 +145,6 @@
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
#include <vcl/task.hxx>
-#include <vcl/textfilter.hxx>
#include <vcl/textview.hxx>
#include <vcl/timer.hxx>
#include <vcl/transfer.hxx>
@@ -267,7 +262,6 @@
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/table/BorderLineStyle.hpp>
#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
#include <com/sun/star/text/textfield/Type.hpp>
#include <com/sun/star/ui/XContextMenuInterception.hpp>
@@ -344,7 +338,6 @@
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <editeng/borderline.hxx>
#include <editeng/editdata.hxx>
#include <editeng/editengdllapi.h>
#include <editeng/editstat.hxx>
@@ -409,7 +402,6 @@
#include <svl/undo.hxx>
#include <svl/visitem.hxx>
#include <svl/whiter.hxx>
-#include <svtools/borderline.hxx>
#include <svtools/colorcfg.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/statusbarcontroller.hxx>
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 7ceaaa79767b..6cc71e319cda 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -30,8 +30,6 @@
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
-#include <svtools/ctrlbox.hxx>
-
#include <vcl/idle.hxx>
#include <sfx2/tabdlg.hxx>
@@ -48,6 +46,7 @@ namespace com { namespace sun { namespace star {
} } }
struct CustomProperty;
+class SvtCalendarBox;
// class SfxDocumentInfoItem ---------------------------------------------
@@ -242,9 +241,9 @@ public:
::o3tl::optional<sal_Int16> m_TZ;
CustomPropertiesDateField(SvtCalendarBox* pDateField);
- void set_visible(bool bVisible) { m_xDateField->set_visible(bVisible); }
- Date get_date() const { return m_xDateField->get_date(); }
- void set_date(const Date& rDate) { m_xDateField->set_date(rDate); }
+ void set_visible(bool bVisible);
+ Date get_date() const;
+ void set_date(const Date& rDate);
~CustomPropertiesDateField();
};
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index f91ec15f8d51..ed4cb60e4ec8 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -29,6 +29,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/xmlsechelper.hxx>
#include <unotools/useroptions.hxx>
+#include <svtools/ctrlbox.hxx>
#include <svtools/imagemgr.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
@@ -1539,6 +1540,21 @@ CustomPropertiesDateField::CustomPropertiesDateField(SvtCalendarBox* pDateField)
m_xDateField->set_date(aDateTime);
}
+void CustomPropertiesDateField::set_visible(bool bVisible)
+{
+ m_xDateField->set_visible(bVisible);
+}
+
+Date CustomPropertiesDateField::get_date() const
+{
+ return m_xDateField->get_date();
+}
+
+void CustomPropertiesDateField::set_date(const Date& rDate)
+{
+ m_xDateField->set_date(rDate);
+}
+
CustomPropertiesDateField::~CustomPropertiesDateField()
{
}
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index fc2fe9b1b726..17f3f1263404 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -26,6 +26,7 @@
#include <comphelper/fileurl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
+#include <vcl/window.hxx>
#include <svl/style.hxx>
#include <svl/intitem.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index c19910941278..341212e13319 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-17 15:12:29 using:
+ Generated on 2020-02-19 12:45:36 using:
./bin/update_pch svtools svt --cutoff=4 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -141,7 +141,6 @@
#include <vcl/transfer.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclevent.hxx>
-#include <vcl/vclmedit.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
#include <vcl/vectorgraphicdata.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 0107e452e2c7..4d9b28ba20df 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-17 12:26:22 using:
+ Generated on 2020-02-19 12:45:36 using:
./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -62,6 +62,7 @@
#include <osl/getglobalmutex.hxx>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
+#include <osl/thread.h>
#include <osl/time.h>
#include <rtl/alloc.h>
#include <rtl/character.hxx>
@@ -405,7 +406,6 @@
#include <tools/gen.hxx>
#include <tools/globname.hxx>
#include <tools/helpers.hxx>
-#include <tools/lineend.hxx>
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
#include <tools/ref.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index a6096d05e3e0..f84dfe35cd5c 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-17 12:28:23 using:
+ Generated on 2020-02-19 12:45:34 using:
./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -160,7 +160,6 @@
#include <vcl/uitest/factory.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclevent.hxx>
-#include <vcl/vclmedit.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
#include <vcl/vectorgraphicdata.hxx>