canvas/Library_canvasfactory.mk | 4 ++++ canvas/source/factory/cf_service.cxx | 1 - desktop/AllLangResTarget_deploymentgui.mk | 4 ++++ desktop/source/deployment/registry/help/dp_help.cxx | 1 - desktop/source/migration/services/oo3extensionmigration.hxx | 1 - desktop/source/offacc/acceptor.cxx | 5 +---- editeng/AllLangResTarget_editeng.mk | 2 +- embeddedobj/Library_embobj.mk | 4 ++++ extensions/Library_bib.mk | 6 ++++++ extensions/Library_log.mk | 4 ++++ extensions/Library_npsoplugin.mk | 4 ++++ extensions/source/logging/consolehandler.cxx | 2 -- extensions/source/logging/logger.cxx | 2 -- extensions/source/nsplugin/source/npshell.cxx | 3 ++- filter/source/graphicfilter/idxf/dxfgrprd.hxx | 4 +++- filter/source/graphicfilter/idxf/idxf.cxx | 2 ++ filter/source/graphicfilter/ieps/ieps.cxx | 3 ++- filter/source/graphicfilter/ios2met/ios2met.cxx | 3 ++- filter/source/graphicfilter/ipbm/ipbm.cxx | 3 ++- filter/source/graphicfilter/ipcx/ipcx.cxx | 3 ++- filter/source/graphicfilter/ipict/ipict.cxx | 3 ++- filter/source/graphicfilter/ipsd/ipsd.cxx | 4 +++- filter/source/graphicfilter/iras/iras.cxx | 3 ++- filter/source/graphicfilter/itga/itga.cxx | 3 ++- filter/source/graphicfilter/itiff/itiff.cxx | 3 ++- i18npool/Library_i18nisolang1.mk | 5 ++++- sc/source/filter/inc/ftools.hxx | 1 - svtools/AllLangResTarget_svt.mk | 1 + 28 files changed, 59 insertions(+), 25 deletions(-)
New commits: commit 5d900f6ef8573dfe40fef236fbc3c788cea15224 Author: David Tardon <dtar...@redhat.com> Date: Sat Oct 6 14:21:57 2012 +0200 drop unused #include Change-Id: Ic0de83ff615a1dde575d90cff7594c830b96c063 diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 323586f..ace84e1 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -35,7 +35,6 @@ #include <memory> #include <tools/string.hxx> #include <sal/macros.h> -#include <oox/helper/helper.hxx> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include "filter.hxx" commit 5bc87c1bce72bf670958a0a06e5b63ff259659ad Author: David Tardon <dtar...@redhat.com> Date: Fri Oct 5 18:44:27 2012 +0200 drop unused includes Change-Id: Iba9f3dcb5404d28b60585bbddd2af4ec0511cea2 diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 4510f65..6174952 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -28,9 +28,6 @@ #include "acceptor.hxx" -#include <unotools/bootstrap.hxx> -#include <tools/stream.hxx> -#include <vcl/svapp.hxx> #include <com/sun/star/bridge/BridgeFactory.hpp> #include <com/sun/star/uno/XNamingService.hpp> #include <comphelper/processfactory.hxx> @@ -293,7 +290,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(const sal_Char Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >(pServiceManager)); - if (Acceptor::impl_getImplementationName().compareToAscii( pImplementationName ) == COMPARE_EQUAL ) + if (Acceptor::impl_getImplementationName().equalsAscii( pImplementationName ) ) { xFactory = Reference< XSingleServiceFactory >( cppu::createSingleFactory( xServiceManager, Acceptor::impl_getImplementationName(), commit 5df47e2a17abb2a2455df42fa65756d862e5c6f0 Author: David Tardon <dtar...@redhat.com> Date: Fri Oct 5 18:12:24 2012 +0200 add missing dep on comphelper/documentconstants.hxx Change-Id: I80f46c774f0cb177b2b38e5cf753d03ddd342992 diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 6528b3d..00a4785 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,npsoplugin)) +$(eval $(call gb_Library_use_packages,npsoplugin,\ + comphelper_inc \ +)) + $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ commit 62e51648ff16af103330c5d5e55b1d753e1cdcdb Author: David Tardon <dtar...@redhat.com> Date: Fri Oct 5 18:08:32 2012 +0200 tools/pathutils.hxx is windows-only Change-Id: I280342029d830e4ffac2902dbb76e6ee9635dc70 diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index e9aae65..b7ee74d 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -63,6 +63,8 @@ #pragma warning (pop) #endif +#include "tools/pathutils.hxx" + #endif //end of WNT @@ -71,7 +73,6 @@ #include <string.h> #include <errno.h> #include "boost/scoped_array.hpp" -#include "tools/pathutils.hxx" #include "npapi.h" #include "npshell.hxx" commit aa06349cff8b7f28d1e0ec2e4bc41fb2d7a2d65e Author: David Tardon <dtar...@redhat.com> Date: Fri Oct 5 16:22:03 2012 +0200 drop unused #include Change-Id: I11b59681a101c3e89db8d7a15d196e8bf11114ed diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index d941c3b..950473a 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -43,7 +43,6 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/compbase3.hxx> #include <ucbhelper/content.hxx> -#include <xmlscript/xmllib_imexp.hxx> namespace com { namespace sun { namespace star { namespace uno { commit 431a9505196f63a982f6a3452edae1bff5cc2c2c Author: David Tardon <dtar...@redhat.com> Date: Fri Oct 5 15:09:23 2012 +0200 add missing dep on tools/diagnose_ex.h Change-Id: I171a134250a2fc00f51c550a785125bb9708603b diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index d09c1d0..05a5186 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,log)) +$(eval $(call gb_Library_use_packages,log,\ + tools_inc \ +)) + $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) $(eval $(call gb_Library_use_sdk_api,log)) diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index 84f1cb7..5145f3a 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -39,8 +39,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <tools/diagnose_ex.h> - #include <comphelper/componentcontext.hxx> #include <cppuhelper/compbase3.hxx> diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index 9bdd202..8052d61 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -28,8 +28,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/logging/XLoggerPool.hpp> -#include <tools/diagnose_ex.h> - #include <comphelper/componentcontext.hxx> #include <cppuhelper/basemutex.hxx> commit 387005a2c37afed50107d7bae5ead2edff6031d6 Author: David Tardon <dtar...@redhat.com> Date: Thu Oct 4 19:50:38 2012 +0200 drop unneeded #include Change-Id: I20fed5357c55e6c4444b1e100d15600636ffe25d diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx index 5208237..2e6612c 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx @@ -20,7 +20,9 @@ #ifndef _DXFGRPRD_HXX #define _DXFGRPRD_HXX -#include <svtools/fltcall.hxx> +#include <sal/types.h> + +#include <tools/stream.hxx> #define DXF_MAX_STRING_LEN 256 // Max Stringlaenge (ohne die 0) diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index e589e29..b40dfcc 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -25,6 +25,8 @@ #include "dxf2mtf.hxx" #include <math.h> +class FilterConfigItem; + //================== GraphicImport - die exportierte Funktion ================ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 3447349..ab56b41 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -34,11 +34,12 @@ #include <vcl/virdev.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> #include <tools/tempfile.hxx> #include <osl/process.h> #include <osl/file.hxx> +class FilterConfigItem; + /************************************************************************* |* |* ImpSearchEntry() diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 2e3b78b..4da779f 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -22,10 +22,11 @@ #include <tools/poly.hxx> #include <vcl/virdev.hxx> #include <vcl/lineinfo.hxx> -#include <svtools/fltcall.hxx> #include <math.h> +class FilterConfigItem; + // MT: NOOLDSV, someone should change the code... enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 1ddb08b..fabe4f0 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -20,7 +20,8 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> + +class FilterConfigItem; //============================ PBMReader ================================== diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index c8651f8..324c8ab 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -20,7 +20,8 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> + +class FilterConfigItem; //============================ PCXReader ================================== diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index e0a7f14..8344a5f 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -23,11 +23,12 @@ #include <vcl/graph.hxx> #include <tools/poly.hxx> #include <vcl/virdev.hxx> -#include <svtools/fltcall.hxx> #include <math.h> #include "shape.hxx" +class FilterConfigItem; + namespace PictReaderInternal { //! utilitary class to store a pattern, ... class Pattern { diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 73750ef..41bd66c 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -20,7 +20,9 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> +#include <vcl/outdev.hxx> + +class FilterConfigItem; //============================ PSDReader ================================== diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 469151a..8b69038 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -20,7 +20,8 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> + +class FilterConfigItem; #define RAS_TYPE_OLD 0x00000000 // supported formats by this filter #define RAS_TYPE_STANDARD 0x00000001 diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 3fa4104..4074683 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -20,7 +20,8 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> + +class FilterConfigItem; //============================ TGAReader ================================== diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index f5b31f6..37cbf77 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -19,11 +19,12 @@ #include <vcl/graph.hxx> #include <vcl/bmpacc.hxx> -#include <svtools/fltcall.hxx> #include <vcl/animate.hxx> #include "lzwdecom.hxx" #include "ccidecom.hxx" +class FilterConfigItem; + #define OOODEBUG(str,Num) //(InfoBox(NULL,String(str)+String(" ")+String(Num)).Execute(); namespace { commit 61d8e02a7b3742600dfc3af0f32057638e4d371b Author: David Tardon <dtar...@redhat.com> Date: Thu Oct 4 18:54:00 2012 +0200 add missing dep on cppu/macros.hxx Change-Id: Ie6793b6032ddfc44c5514e2e8c826590a924d177 diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 3432d9d..d38a238 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -28,7 +28,10 @@ $(eval $(call gb_Library_Library,i18nisolang1)) -$(eval $(call gb_Library_use_package,i18nisolang1,i18npool_inc)) +$(eval $(call gb_Library_use_packages,i18nisolang1,\ + cppu_inc \ + i18npool_inc \ +)) $(eval $(call gb_Library_set_include,i18nisolang1,\ -I$(SRCDIR)/i18npool/inc \ commit cc201f7faaaf77e6585ca9f389e0974687c700cf Author: David Tardon <dtar...@redhat.com> Date: Wed Oct 3 16:27:00 2012 +0200 add missing dep for tools/diagnose_ex.h Change-Id: Ib2558d444545cbeedc188ade5265e1bb665ade37 diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 47963a0..99456ed 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,embobj)) +$(eval $(call gb_Library_use_packages,embobj,\ + tools_inc \ +)) + $(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj)) $(eval $(call gb_Library_set_include,embobj,\ commit 873edb93645f477d3a91751db62a1f58e745803d Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 2 21:05:53 2012 +0200 drop unused #include Change-Id: I88173adc7ee9f3c3bb909190e983474fb201467f diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 7af2060..a5bd861 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -37,7 +37,6 @@ #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" #include "svl/inettype.hxx" -#include "svtools/javainteractionhandler.hxx" #include "uno/current_context.hxx" #include "unotools/pathoptions.hxx" commit 9efdb4c02f7b646d2d22bea546256b806a075b10 Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 2 14:57:59 2012 +0200 add missing dep on o3tl Change-Id: Ib188836d0359491b556f16c0a5b22dbe1104e56f diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index ec143c3..bda2146 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -28,6 +28,10 @@ $(eval $(call gb_Library_Library,canvasfactory)) +$(eval $(call gb_Library_use_package,canvasfactory,\ + o3tl_inc \ +)) + $(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory)) $(eval $(call gb_Library_set_include,canvasfactory,\ commit e60b346a303abf1cb5ad2216ab20ebaa3e0f7ece Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 2 14:57:41 2012 +0200 drop unused #include Change-Id: I55b5815feb5674c830993440027c9f3fbbf1ec02 diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 8ede9a9..2594c8c 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -32,7 +32,6 @@ #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase3.hxx> -#include <vcl/configsettings.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> commit 211df60268afc57e6295785101b9591d77161e6e Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 2 14:19:42 2012 +0200 add missing deps on headers Change-Id: I665ec137c0c1249b4c8a566015026cfe44c88fff diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 4e46e07..cd0cc2f 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -30,6 +30,12 @@ $(eval $(call gb_Library_Library,bib)) +$(eval $(call gb_Library_use_packages,bib,\ + editeng_inc \ + sfx2_inc \ + svx_inc \ +)) + $(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib)) $(eval $(call gb_Library_set_include,bib,\ commit 7d8b7b70f4945844f69078c7e7ae9aa9967c22af Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 2 08:14:17 2012 +0200 fix deps on .hrc files Change-Id: Id50515efae1729d08bd8d90488ab77a82b1ad7c8 diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk index d9e82cc..4dde2fc 100644 --- a/desktop/AllLangResTarget_deploymentgui.mk +++ b/desktop/AllLangResTarget_deploymentgui.mk @@ -35,6 +35,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,deploymentgui,\ $(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res)) +$(eval $(call gb_SrsTarget_use_packages,deploymentgui/res,\ + svtools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk index 512de2d..c2a4010 100644 --- a/editeng/AllLangResTarget_editeng.mk +++ b/editeng/AllLangResTarget_editeng.mk @@ -33,7 +33,7 @@ $(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx)) $(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res)) $(eval $(call gb_SrsTarget_SrsTarget,editeng/res)) -$(eval $(call gb_SrsTarget_use_packages,editeng/srs,\ +$(eval $(call gb_SrsTarget_use_packages,editeng/res,\ svl_inc \ )) diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index 1774783..3cdff1a 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -40,6 +40,7 @@ $(eval $(call gb_SrsTarget_use_packages,svt/res,\ i18npool_inc \ svl_inc \ svtools_inc \ + vcl_inc \ tools_inc \ )) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits