cui/source/inc/FontFeaturesDialog.hxx | 2
cui/source/inc/chardlg.hxx | 2
include/svx/fntctrl.hxx | 6 +-
reportdesign/inc/pch/precompiled_rpt.hxx | 37 +++--------------
reportdesign/inc/pch/precompiled_rptui.hxx | 6 +-
reportdesign/inc/pch/precompiled_rptxml.hxx | 4 +
reportdesign/source/ui/dlg/Condition.hxx | 2
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/inc/condformatdlgentry.hxx | 6 +-
svx/source/dialog/fntctrl.cxx | 52 ++++++++++++-------------
sw/source/ui/config/optpage.cxx | 12 ++---
sw/source/uibase/inc/optpage.hxx | 8 +--
12 files changed, 60 insertions(+), 79 deletions(-)
New commits:
commit b883c7142b081ec121c546845ca1a228ea31ebb7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 12 16:39:46 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 13 16:17:33 2019 +0200
rename FontPrevWindow back to SvxFontPrevWindow
Change-Id: Ife6f7bbc64f397e502d50c629769a8b637a591c8
Reviewed-on: https://gerrit.libreoffice.org/80718
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/inc/FontFeaturesDialog.hxx
b/cui/source/inc/FontFeaturesDialog.hxx
index d30f92305067..93e5f7c4a76e 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -48,7 +48,7 @@ private:
OUString m_sFontName;
OUString m_sResultFontName;
- FontPrevWindow m_aPreviewWindow;
+ SvxFontPrevWindow m_aPreviewWindow;
std::unique_ptr<weld::ScrolledWindow> m_xContentWindow;
std::unique_ptr<weld::Container> m_xContentGrid;
std::unique_ptr<weld::CustomWeld> m_xPreviewWindow;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 15906a085657..7cf7f8e315ec 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -35,7 +35,7 @@ class FontList;
class SvxCharBasePage : public SfxTabPage
{
protected:
- FontPrevWindow m_aPreviewWin;
+ SvxFontPrevWindow m_aPreviewWin;
std::unique_ptr<weld::CustomWeld> m_xPreviewWin;
bool m_bPreviewBackgroundToCharacter;
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index f2489c750f3c..af085725dc3d 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -28,7 +28,7 @@
class SfxItemSet;
class FontPrevWin_Impl;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public
weld::CustomWidgetController
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontPrevWindow : public
weld::CustomWidgetController
{
private:
std::unique_ptr<FontPrevWin_Impl> pImpl;
@@ -39,8 +39,8 @@ private:
SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16
nSlot, SvxFont& rFont);
public:
- FontPrevWindow();
- virtual ~FontPrevWindow() override;
+ SvxFontPrevWindow();
+ virtual ~SvxFontPrevWindow() override;
SvxFont& GetFont();
const SvxFont& GetFont() const;
diff --git a/reportdesign/source/ui/dlg/Condition.hxx
b/reportdesign/source/ui/dlg/Condition.hxx
index 1b9a5ea365fa..680632e8db51 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -89,7 +89,7 @@ namespace rptui
ConditionalExpressions m_aConditionalExpressions;
- FontPrevWindow m_aPreview;
+ SvxFontPrevWindow m_aPreview;
weld::Window* m_pDialog;
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xContainer;
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 39170fcb9c77..4471ea81f80b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -417,7 +417,7 @@ void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const
SfxHint& rHint)
namespace {
-void StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle, const
ScDocument* pDoc, FontPrevWindow& rWdPreview)
+void StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle, const
ScDocument* pDoc, SvxFontPrevWindow& rWdPreview)
{
if (rLbStyle.get_active() == 0)
{
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx
b/sc/source/ui/inc/condformatdlgentry.hxx
index ed987a03c7ae..7110115355d6 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -99,7 +99,7 @@ public:
class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener
{
//cond format ui elements
- FontPrevWindow maWdPreview;
+ SvxFontPrevWindow maWdPreview;
std::unique_ptr<weld::ComboBox> mxLbCondType;
std::unique_ptr<formula::RefEdit> mxEdVal1;
std::unique_ptr<formula::RefEdit> mxEdVal2;
@@ -149,7 +149,7 @@ public:
class ScFormulaFrmtEntry : public ScCondFrmtEntry
{
- FontPrevWindow maWdPreview;
+ SvxFontPrevWindow maWdPreview;
std::unique_ptr<weld::Label> mxFtStyle;
std::unique_ptr<weld::ComboBox> mxLbStyle;
std::unique_ptr<weld::Widget> mxWdPreviewWin;
@@ -297,7 +297,7 @@ private:
DECL_LINK( StyleSelectHdl, weld::ComboBox&, void );
- FontPrevWindow maWdPreview;
+ SvxFontPrevWindow maWdPreview;
std::unique_ptr<weld::ComboBox> mxLbDateEntry;
std::unique_ptr<weld::Label> mxFtStyle;
std::unique_ptr<weld::ComboBox> mxLbStyle;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 96df4da9c639..d312d7ad5f49 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -140,7 +140,7 @@ bool CleanAndCheckEmpty(OUString& rText)
class FontPrevWin_Impl
{
- friend class FontPrevWindow;
+ friend class SvxFontPrevWindow;
SvxFont maFont;
VclPtr<Printer> mpPrinter;
@@ -502,7 +502,7 @@ static void SetPrevFontEscapement(SvxFont& rFont, sal_uInt8
nProp, sal_uInt8 nEs
rFont.SetEscapement(nEsc);
}
-void FontPrevWindow::ApplySettings(vcl::RenderContext& rRenderContext)
+void SvxFontPrevWindow::ApplySettings(vcl::RenderContext& rRenderContext)
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
@@ -513,7 +513,7 @@ void FontPrevWindow::ApplySettings(vcl::RenderContext&
rRenderContext)
rRenderContext.SetBackground(rStyleSettings.GetWindowColor());
}
-void FontPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void SvxFontPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
CustomWidgetController::SetDrawingArea(pDrawingArea);
Size aPrefSize(getPreviewStripSize(pDrawingArea->get_ref_device()));
@@ -537,47 +537,47 @@ void FontPrevWindow::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
Invalidate();
}
-FontPrevWindow::FontPrevWindow()
+SvxFontPrevWindow::SvxFontPrevWindow()
{
}
-FontPrevWindow::~FontPrevWindow()
+SvxFontPrevWindow::~SvxFontPrevWindow()
{
}
-SvxFont& FontPrevWindow::GetCTLFont()
+SvxFont& SvxFontPrevWindow::GetCTLFont()
{
return pImpl->maCTLFont;
}
-SvxFont& FontPrevWindow::GetCJKFont()
+SvxFont& SvxFontPrevWindow::GetCJKFont()
{
return pImpl->maCJKFont;
}
-SvxFont& FontPrevWindow::GetFont()
+SvxFont& SvxFontPrevWindow::GetFont()
{
pImpl->Invalidate100PercentFontWidth(); // because the user might
change the size
return pImpl->maFont;
}
-const SvxFont& FontPrevWindow::GetFont() const
+const SvxFont& SvxFontPrevWindow::GetFont() const
{
return pImpl->maFont;
}
-void FontPrevWindow::SetPreviewText( const OUString& rString )
+void SvxFontPrevWindow::SetPreviewText( const OUString& rString )
{
pImpl->maText = rString;
pImpl->mbTextInited = true;
}
-void FontPrevWindow::SetFontNameAsPreviewText()
+void SvxFontPrevWindow::SetFontNameAsPreviewText()
{
pImpl->mbUseFontNameAsText = true;
}
-void FontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont&
rCJKOutFont, const SvxFont& rCTLFont )
+void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont&
rCJKOutFont, const SvxFont& rCTLFont )
{
setFont(rNormalOutFont, pImpl->maFont);
setFont(rCJKOutFont, pImpl->maCJKFont);
@@ -587,37 +587,37 @@ void FontPrevWindow::SetFont( const SvxFont&
rNormalOutFont, const SvxFont& rCJK
Invalidate();
}
-void FontPrevWindow::SetColor(const Color &rColor)
+void SvxFontPrevWindow::SetColor(const Color &rColor)
{
pImpl->mpColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::ResetColor()
+void SvxFontPrevWindow::ResetColor()
{
pImpl->mpColor.reset();
Invalidate();
}
-void FontPrevWindow::SetBackColor(const Color &rColor)
+void SvxFontPrevWindow::SetBackColor(const Color &rColor)
{
pImpl->mpBackColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::SetTextLineColor(const Color &rColor)
+void SvxFontPrevWindow::SetTextLineColor(const Color &rColor)
{
pImpl->mpTextLineColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::SetOverlineColor(const Color &rColor)
+void SvxFontPrevWindow::SetOverlineColor(const Color &rColor)
{
pImpl->mpOverlineColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
+void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&)
{
rRenderContext.Push(PushFlags::ALL);
rRenderContext.SetMapMode(MapMode(MapUnit::MapTwip));
@@ -818,29 +818,29 @@ void FontPrevWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::Rect
rRenderContext.Pop();
}
-bool FontPrevWindow::IsTwoLines() const
+bool SvxFontPrevWindow::IsTwoLines() const
{
return pImpl->mbTwoLines;
}
-void FontPrevWindow::SetTwoLines(bool bSet)
+void SvxFontPrevWindow::SetTwoLines(bool bSet)
{
pImpl->mbTwoLines = bSet;
}
-void FontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
+void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
{
pImpl->mcStartBracket = cStart;
pImpl->mcEndBracket = cEnd;
}
-void FontPrevWindow::SetFontWidthScale( sal_uInt16 n )
+void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n )
{
if (pImpl->SetFontWidthScale(n))
Invalidate();
}
-void FontPrevWindow::AutoCorrectFontColor()
+void SvxFontPrevWindow::AutoCorrectFontColor()
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
Color aFontColor(rStyleSettings.GetWindowTextColor());
@@ -855,7 +855,7 @@ void FontPrevWindow::AutoCorrectFontColor()
pImpl->maCTLFont.SetColor(aFontColor);
}
-void FontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot,
SvxFont& rFont )
+void SvxFontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot,
SvxFont& rFont )
{
sal_uInt16 nWhich;
long nH;
@@ -871,7 +871,7 @@ void FontPrevWindow::SetFontSize( const SfxItemSet& rSet,
sal_uInt16 nSlot, SvxF
rFont.SetFontSize(Size(0, nH));
}
-void FontPrevWindow::SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot,
SvxFont& rFont)
+void SvxFontPrevWindow::SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot,
SvxFont& rFont)
{
sal_uInt16 nWhich;
LanguageType nLang;
@@ -882,7 +882,7 @@ void FontPrevWindow::SetFontLang(const SfxItemSet& rSet,
sal_uInt16 nSlot, SvxFo
rFont.SetLanguage(nLang);
}
-void FontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool
bPreviewBackgroundToCharacter)
+void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool
bPreviewBackgroundToCharacter)
{
sal_uInt16 nWhich;
SvxFont& rFont = GetFont();
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index a980c99c737e..1126ec8d478c 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1568,15 +1568,15 @@
SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(weld::Container* pPage, weld::D
: SfxTabPage(pPage, pController, "modules/swriter/ui/optredlinepage.ui",
"OptRedLinePage", &rSet)
, m_xInsertLB(m_xBuilder->weld_combo_box("insert"))
, m_xInsertColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("insertcolor"),
pController->getDialog()))
- , m_xInsertedPreviewWN(new FontPrevWindow)
+ , m_xInsertedPreviewWN(new SvxFontPrevWindow)
, m_xInsertedPreview(new weld::CustomWeld(*m_xBuilder, "insertedpreview",
*m_xInsertedPreviewWN))
, m_xDeletedLB(m_xBuilder->weld_combo_box("deleted"))
, m_xDeletedColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("deletedcolor"),
pController->getDialog()))
- , m_xDeletedPreviewWN(new FontPrevWindow)
+ , m_xDeletedPreviewWN(new SvxFontPrevWindow)
, m_xDeletedPreview(new weld::CustomWeld(*m_xBuilder, "deletedpreview",
*m_xDeletedPreviewWN))
, m_xChangedLB(m_xBuilder->weld_combo_box("changed"))
, m_xChangedColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("changedcolor"),
pController->getDialog()))
- , m_xChangedPreviewWN(new FontPrevWindow)
+ , m_xChangedPreviewWN(new SvxFontPrevWindow)
, m_xChangedPreview(new weld::CustomWeld(*m_xBuilder, "changedpreview",
*m_xChangedPreviewWN))
, m_xMarkPosLB(m_xBuilder->weld_combo_box("markpos"))
, m_xMarkColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("markcolor"),
pController->getDialog()))
@@ -1776,7 +1776,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet* )
IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, weld::ComboBox&, rLB, void )
{
- FontPrevWindow *pPrev = nullptr;
+ SvxFontPrevWindow *pPrev = nullptr;
ColorListBox *pColorLB;
if (&rLB == m_xInsertLB.get())
@@ -1880,7 +1880,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl,
weld::ComboBox&, rLB, void )
IMPL_LINK(SwRedlineOptionsTabPage, ColorHdl, ColorListBox&, rListBox, void)
{
ColorListBox* pColorLB = &rListBox;
- FontPrevWindow *pPrev = nullptr;
+ SvxFontPrevWindow *pPrev = nullptr;
weld::ComboBox* pLB;
if (pColorLB == m_xInsertColorLB.get())
@@ -1960,7 +1960,7 @@ IMPL_LINK_NOARG(SwRedlineOptionsTabPage,
ChangedMaskColorPrevHdl, ColorListBox&,
ChangedMaskPrev();
}
-void SwRedlineOptionsTabPage::InitFontStyle(FontPrevWindow& rExampleWin, const
OUString& rText)
+void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin,
const OUString& rText)
{
const AllSettings& rAllSettings = Application::GetSettings();
LanguageType eLangType =
rAllSettings.GetUILanguageTag().getLanguageType();
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 0abb5f29b6db..13c5d6194aef 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -290,17 +290,17 @@ class SwRedlineOptionsTabPage : public SfxTabPage
{
std::unique_ptr<weld::ComboBox> m_xInsertLB;
std::unique_ptr<ColorListBox> m_xInsertColorLB;
- std::unique_ptr<FontPrevWindow> m_xInsertedPreviewWN;
+ std::unique_ptr<SvxFontPrevWindow> m_xInsertedPreviewWN;
std::unique_ptr<weld::CustomWeld> m_xInsertedPreview;
std::unique_ptr<weld::ComboBox> m_xDeletedLB;
std::unique_ptr<ColorListBox> m_xDeletedColorLB;
- std::unique_ptr<FontPrevWindow> m_xDeletedPreviewWN;
+ std::unique_ptr<SvxFontPrevWindow> m_xDeletedPreviewWN;
std::unique_ptr<weld::CustomWeld> m_xDeletedPreview;
std::unique_ptr<weld::ComboBox> m_xChangedLB;
std::unique_ptr<ColorListBox> m_xChangedColorLB;
- std::unique_ptr<FontPrevWindow> m_xChangedPreviewWN;
+ std::unique_ptr<SvxFontPrevWindow> m_xChangedPreviewWN;
std::unique_ptr<weld::CustomWeld> m_xChangedPreview;
std::unique_ptr<weld::ComboBox> m_xMarkPosLB;
@@ -314,7 +314,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage
DECL_LINK(ChangedMaskColorPrevHdl, ColorListBox&, void);
DECL_LINK(ColorHdl, ColorListBox&, void);
- static void InitFontStyle(FontPrevWindow& rExampleWin, const OUString&
rText);
+ static void InitFontStyle(SvxFontPrevWindow& rExampleWin, const OUString&
rText);
public:
SwRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet& rSet);
commit 4e5e3c8dd44dc47c0488a7d881861b6d77573b3e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 12 16:36:56 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 13 16:17:18 2019 +0200
update reportdesign pches
Change-Id: I13bf96d1c177f8f7f1141b6edcc71c2d5b3af359
Reviewed-on: https://gerrit.libreoffice.org/80717
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx
b/reportdesign/inc/pch/precompiled_rpt.hxx
index 0c74201f71f2..b68d6a5c70d5 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.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 2019-05-12 16:56:59 using:
+ Generated on 2019-10-12 16:36:11 using:
./bin/update_pch reportdesign rpt --cutoff=9 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -29,7 +29,6 @@
#include <deque>
#include <float.h>
#include <functional>
-#include <initializer_list>
#include <iomanip>
#include <limits.h>
#include <limits>
@@ -49,6 +48,7 @@
#include <utility>
#include <vector>
#include <boost/optional.hpp>
+#include <boost/property_tree/ptree.hpp>
#endif // PCH_LEVEL >= 1
#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
@@ -93,24 +93,23 @@
#include <vcl/GraphicExternalLink.hxx>
#include <vcl/GraphicObject.hxx>
#include <vcl/IDialogRenderable.hxx>
+#include <vcl/Scanline.hxx>
#include <vcl/alpha.hxx>
#include <vcl/animate/Animation.hxx>
#include <vcl/animate/AnimationBitmap.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
+#include <vcl/builder.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/combobox.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/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.hxx>
+#include <vcl/image.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/mapmod.hxx>
@@ -122,7 +121,6 @@
#include <vcl/region.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/task.hxx>
#include <vcl/timer.hxx>
#include <vcl/uitest/factory.hxx>
@@ -145,7 +143,6 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/range/basicrange.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
-#include <basegfx/tuple/b2i64tuple.hxx>
#include <basegfx/tuple/b2ituple.hxx>
#include <basegfx/tuple/b3dtuple.hxx>
#include <basegfx/vector/b2dsize.hxx>
@@ -165,19 +162,15 @@
#include <com/sun/star/beans/XPropertySetOption.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/drawing/DashStyle.hpp>
#include <com/sun/star/drawing/HatchStyle.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/graphic/XPrimitive2D.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/style/XStyle.hpp>
@@ -223,11 +216,9 @@
#include <cppuhelper/weakagg.hxx>
#include <cppuhelper/weakref.hxx>
#include <drawinglayer/drawinglayerdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <editeng/editengdllapi.h>
#include <i18nlangtag/lang.h>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/deleter.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>
@@ -243,42 +234,28 @@
#include <svl/svldllapi.h>
#include <svl/typedwhich.hxx>
#include <svtools/svtdllapi.h>
-#include <svx/XPropertyEntry.hxx>
+#include <svx/DiagramDataInterface.hxx>
#include <svx/shapeproperty.hxx>
#include <svx/svddef.hxx>
#include <svx/svdobj.hxx>
-#include <svx/svdsob.hxx>
#include <svx/svdtypes.hxx>
#include <svx/svxdllapi.h>
-#include <svx/xdash.hxx>
#include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
-#include <svx/xflasit.hxx>
-#include <svx/xgrad.hxx>
-#include <svx/xhatch.hxx>
-#include <svx/xlnasit.hxx>
-#include <svx/xpoly.hxx>
-#include <svx/xtable.hxx>
#include <tools/color.hxx>
-#include <tools/contnr.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/gen.hxx>
-#include <tools/lineend.hxx>
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
#include <tools/poly.hxx>
#include <tools/ref.hxx>
#include <tools/solar.h>
-#include <tools/stream.hxx>
#include <tools/time.hxx>
#include <tools/toolsdllapi.h>
#include <tools/weakbase.h>
-#include <tools/weakbase.hxx>
#include <tools/wintypes.hxx>
#include <typelib/typeclass.h>
#include <typelib/typedescription.h>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx
b/reportdesign/inc/pch/precompiled_rptui.hxx
index e1fb7ce9b2b2..f8dd1452bfb2 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.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 2019-09-25 10:59:58 using:
+ Generated on 2019-10-12 16:36:16 using:
./bin/update_pch reportdesign rptui --cutoff=4 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -54,6 +54,7 @@
#include <vector>
#include <boost/intrusive_ptr.hpp>
#include <boost/optional.hpp>
+#include <boost/property_tree/ptree.hpp>
#endif // PCH_LEVEL >= 1
#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
@@ -113,7 +114,6 @@
#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
#include <vcl/devicecoordinate.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/dllapi.h>
#include <vcl/dndhelp.hxx>
#include <vcl/dockwin.hxx>
@@ -171,8 +171,10 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
#include <basegfx/range/basicrange.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/tuple/b2i64tuple.hxx>
#include <basegfx/tuple/b2ituple.hxx>
#include <basegfx/tuple/b3dtuple.hxx>
#include <basegfx/vector/b2dsize.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptxml.hxx
b/reportdesign/inc/pch/precompiled_rptxml.hxx
index 5037d196e79f..feff7dae436f 100644
--- a/reportdesign/inc/pch/precompiled_rptxml.hxx
+++ b/reportdesign/inc/pch/precompiled_rptxml.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 2019-05-12 16:57:00 using:
+ Generated on 2019-10-12 16:36:20 using:
./bin/update_pch reportdesign rptxml --cutoff=2 --exclude:system
--exclude:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -29,6 +29,7 @@
#include <new>
#include <unordered_set>
#include <vector>
+#include <boost/property_tree/ptree.hpp>
#endif // PCH_LEVEL >= 1
#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
@@ -89,6 +90,7 @@
#include <o3tl/typed_flags_set.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <sax/tools/converter.hxx>
+#include <tools/diagnose_ex.h>
#include <tools/link.hxx>
#include <tools/toolsdllapi.h>
#include <ucbhelper/content.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
