summaryrefslogtreecommitdiff
path: root/reportdesign/inc
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-01-10 11:09:42 -0500
committerAshod Nakashian <ashnakash@gmail.com>2016-01-11 03:55:46 +0000
commit24ef3924d885a37fb15442208c027c77781175b8 (patch)
treee0f65212139149d3792b2a1a1c92d3eb85d5ce56 /reportdesign/inc
parent09a1566bf18cdf98b111d4979e4f4ad52ce65b07 (diff)
PCH support on Linux
Fixes and improvements to support Precompiled Headers on Linux. Change-Id: I8145c146b0dba56c7a4d0fdf9c330164b67ada53 Reviewed-on: https://gerrit.libreoffice.org/21307 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'reportdesign/inc')
-rw-r--r--reportdesign/inc/RptDef.hxx14
-rw-r--r--reportdesign/inc/pch/precompiled_rpt.hxx4
-rw-r--r--reportdesign/inc/pch/precompiled_rptui.hxx7
3 files changed, 12 insertions, 13 deletions
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 869bae875cf7..41c7ea6b77a6 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -20,15 +20,16 @@
#ifndef INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
#define INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
-#include <sal/config.h>
-
+#include <memory>
#include <map>
+#include <sal/config.h>
+
#include "dllapi.h"
-#include <svx/svdobj.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/uno3.hxx>
#include <svx/fmglob.hxx>
-#include <memory>
+#include <svx/svdobj.hxx>
namespace com { namespace sun { namespace star {
namespace report {
@@ -38,9 +39,6 @@ namespace com { namespace sun { namespace star {
namespace style {
class XStyle;
}
- namespace beans {
- class XPropertySet;
- }
}}}
namespace rptui
@@ -100,7 +98,7 @@ REPORTDESIGN_DLLPUBLIC css::uno::Reference< css::style::XStyle> getUsedStyle(con
template < typename T> T getStyleProperty(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
{
T nReturn = T();
- css::uno::Reference< css::beans::XPropertySet> xProp(getUsedStyle(_xReport),css::uno::UNO_QUERY_THROW);
+ css::uno::Reference<css::beans::XPropertySet> xProp(getUsedStyle(_xReport),css::uno::UNO_QUERY_THROW);
xProp->getPropertyValue(_sPropertyName) >>= nReturn;
return nReturn;
}
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index 4b3fa9c6dbba..97dbd4db0a70 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 2015-11-14 14:16:39 using:
+ Generated on 2016-01-07 21:31:36 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:
@@ -23,7 +23,6 @@
#include <algorithm>
#include <cassert>
#include <climits>
-#include <config_features.h>
#include <config_global.h>
#include <config_typesizes.h>
#include <config_vcl.h>
@@ -134,7 +133,6 @@
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
#include <vcl/hatch.hxx>
-#include <vcl/idle.hxx>
#include <vcl/impdel.hxx>
#include <vcl/inputctx.hxx>
#include <vcl/keycod.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 9e224ca87072..7e6e44efc295 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 2015-11-14 14:16:38 using:
+ Generated on 2016-01-07 21:31:36 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:
@@ -23,7 +23,6 @@
#include <algorithm>
#include <cassert>
#include <climits>
-#include <config_features.h>
#include <config_global.h>
#include <config_typesizes.h>
#include <config_vcl.h>
@@ -165,6 +164,7 @@
#include <vcl/prntypes.hxx>
#include <vcl/ptrstyle.hxx>
#include <vcl/region.hxx>
+#include <vcl/salgtype.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/scheduler.hxx>
#include <vcl/scopedbitmapaccess.hxx>
@@ -255,6 +255,7 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/FeatureStateEvent.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -316,6 +317,8 @@
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Time.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/view/PrintableState.hpp>