summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/CppunitTest_sw_filters_test.mk1
-rw-r--r--sw/CppunitTest_sw_htmlexport.mk1
-rw-r--r--sw/CppunitTest_sw_macros_test.mk1
-rw-r--r--sw/CppunitTest_sw_mailmerge.mk1
-rw-r--r--sw/CppunitTest_sw_odfimport.mk1
-rw-r--r--sw/CppunitTest_sw_ooxmlexport8.mk1
-rw-r--r--sw/CppunitTest_sw_ooxmlimport.mk1
-rw-r--r--sw/CppunitTest_sw_rtfimport.mk1
-rw-r--r--sw/CppunitTest_sw_ww8export.mk1
-rw-r--r--sw/CppunitTest_sw_ww8export2.mk1
-rw-r--r--sw/CppunitTest_sw_ww8import.mk1
-rw-r--r--sw/inc/grfatr.hxx2
-rw-r--r--sw/inc/ndgrf.hxx4
-rw-r--r--sw/inc/pch/precompiled_msword.hxx2
-rw-r--r--sw/inc/pch/precompiled_sw.hxx2
-rw-r--r--sw/inc/pch/precompiled_swui.hxx2
-rw-r--r--sw/ooxmlexport_setup.mk1
-rw-r--r--sw/source/core/graphic/grfatr.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx2
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx2
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx2
21 files changed, 23 insertions, 9 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 49758fd1f4d5..cf0f978a26eb 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
unoxml/source/service/unoxml \
writerfilter/util/writerfilter \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/source/transform/xof \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 2fe3e02e358a..850c105efd13 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
unotools/util/utl \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 3b47059546cf..49718251c6b5 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
xmloff/util/xo \
xmlsecurity/util/$(if $(filter WNT,$(OS)),xsec_xmlsec.windows,xsec_xmlsec) \
))
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index 336b235a7df1..925c639e8b25 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
$(if $(filter-out MACOSX WNT,$(OS)), \
$(if $(ENABLE_HEADLESS),, \
vcl/vcl.unx \
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index be599de21a48..2f33310d9cf8 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
) \
) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/util/xo \
svgio/svgio \
))
diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk b/sw/CppunitTest_sw_ooxmlexport8.mk
index 202e4398abc4..c46530afaef0 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport8,\
unoxml/source/service/unoxml \
unoxml/source/rdf/unordf \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 4638a3d32c61..3f887efa53ed 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
unoxml/source/service/unoxml \
unoxml/source/rdf/unordf \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 4867f92096da..4f227b919fa1 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\
unoxml/source/service/unoxml \
uui/util/uui \
writerfilter/util/writerfilter \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 45680deb9231..fda20b5c2e28 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
unoxml/source/rdf/unordf \
uui/util/uui \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk
index 99551b36750e..5ece5d90a0a3 100644
--- a/sw/CppunitTest_sw_ww8export2.mk
+++ b/sw/CppunitTest_sw_ww8export2.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export2,\
unoxml/source/rdf/unordf \
uui/util/uui \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+ vcl/vcl.common \
xmloff/util/xo \
))
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index 7881d6ea656c..7e40c058e722 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
))
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 7936bd51bb0d..024c91849a62 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -23,7 +23,7 @@
#include <tools/gen.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <svx/grfcrop.hxx>
#include "swdllapi.h"
#include "swatrset.hxx"
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 5d465d76d2d1..104b3eb68dd6 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -19,11 +19,13 @@
#ifndef INCLUDED_SW_INC_NDGRF_HXX
#define INCLUDED_SW_INC_NDGRF_HXX
+
#include <sfx2/lnkbase.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include "ndnotxt.hxx"
#include <com/sun/star/embed/XStorage.hpp>
#include <memory>
+
class SwAsyncRetrieveInputStreamThreadConsumer;
class SwGrfFormatColl;
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index faa6ba21b06d..3eaf043af617 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -138,6 +138,7 @@
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/hatch.hxx>
#include <vcl/idle.hxx>
@@ -551,7 +552,6 @@
#include <svtools/colorcfg.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/embedhlp.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/ruler.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 61baf2411795..12419305f50f 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -115,6 +115,7 @@
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/help.hxx>
#include <vcl/image.hxx>
@@ -463,7 +464,6 @@
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <svtools/ctrltool.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/htmlcfg.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmlout.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index deee95c725bf..6322d2fa84a9 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -150,6 +150,7 @@
#include <vcl/gfxlink.hxx>
#include <vcl/gradient.hxx>
#include <vcl/graph.hxx>
+#include <vcl/GraphicObject.hxx>
#include <vcl/group.hxx>
#include <vcl/hatch.hxx>
#include <vcl/help.hxx>
@@ -594,7 +595,6 @@
#include <svtools/ehdl.hxx>
#include <svtools/embedhlp.hxx>
#include <svtools/framestatuslistener.hxx>
-#include <svtools/grfmgr.hxx>
#include <svtools/headbar.hxx>
#include <svtools/htmlcfg.hxx>
#include <svtools/miscopt.hxx>
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 927873992c28..443556f02d30 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -76,6 +76,7 @@ define sw_ooxmlexport_components
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
uui/util/uui \
+ vcl/vcl.common \
writerfilter/util/writerfilter \
xmloff/util/xo
endef
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 2ff88c18797f..a9b318aebbe6 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -19,7 +19,7 @@
#include <com/sun/star/drawing/ColorMode.hpp>
#include <o3tl/any.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <swtypes.hxx>
#include <grfatr.hxx>
#include <swunohelper.hxx>
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 237372b10d81..91d8e155869e 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -70,7 +70,7 @@
#include <unotextbodyhf.hxx>
#include <SwStyleNameMapper.hxx>
#include <editeng/brushitem.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <unomid.h>
#include <strings.hrc>
#include <svx/svdundo.hxx>
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 85d6bd963143..c9ed33c53dc7 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -25,7 +25,7 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/XMLBase64ImportContext.hxx>
-#include <svtools/grfmgr.hxx>
+#include <vcl/GraphicObject.hxx>
#include <svx/unomid.hxx>
#include <editeng/brushitem.hxx>
#include <xmloff/xmluconv.hxx>
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 5f9cbf1369a1..2a0978c24c7f 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -21,9 +21,9 @@
#include <svl/itemiter.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/GraphicObject.hxx>
#include <editeng/itemtype.hxx>
-#include <svtools/grfmgr.hxx>
#include <unotools/intlwrapper.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
generated by cgit (git 2.34.1) at 2024-08-04 18:47:39 +0000