diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-01-28 12:49:53 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-01-28 12:49:53 +0100 |
| commit | cb0aa041c29c747eaff469ea545ed5ae13627f97 (patch) | |
| tree | ebe8e402cc4cb52125203e3d350afcc8b524b44e | |
| parent | 7c810cb4d733ccaa9e8f66415e252d1e0369fc5f (diff) | |
gnumake3: remove comphelper version; fix including extract.hxx
| -rw-r--r-- | comphelper/Library_comphelp.mk | 4 | ||||
| -rw-r--r-- | svl/source/items/cenumitm.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 0d6c57bc741c..841b0522a38f 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc)) $(eval $(call gb_Library_add_precompiled_header,comphelper,$(SRCDIR)/comphelper/inc/pch/precompiled_comphelper)) -$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp4)) +$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp)) $(eval $(call gb_Library_set_include,comphelper,\ -I$(SRCDIR)/comphelper/inc/pch \ @@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_defs,comphelper,\ $$(DEFS) \ -DCOMPHELPER_DLLIMPLEMENTATION \ )) - + $(eval $(call gb_Library_add_linked_libs,comphelper,\ sal \ cppuhelper \ diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index c5e1a09ec324..e8770cd7f4c6 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -33,7 +33,7 @@ #include <whassert.hxx> #ifndef _CPPUHELPER_EXTRACT_HXX_ -#include <cppuhelper/extract.hxx> +#include <comphelper/extract.hxx> #endif //============================================================================ diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index bfcdfe98ea5a..2fe5e04a1de3 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -41,7 +41,7 @@ #include <vcl/waitobj.hxx> #include <vcl/msgbox.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <cppuhelper/extract.hxx> +#include <comphelper/extract.hxx> #include <comphelper/interaction.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/awt/XWindow.hpp> diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 91d202409e86..02577296e706 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -41,7 +41,6 @@ #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/extract.hxx> #include <rtl/memory.h> #include <rtl/uuid.h> #include <tools/diagnose_ex.h> @@ -59,6 +58,7 @@ #include <unotools/configmgr.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/extract.hxx> #include <vcl/svapp.hxx> #include <uno/data.h> |