remove unused ucbstreamhelper includes

and a few vclunohelper includes Change-Id: I4803605766d155fe5044c2a65c0444631146831c Reviewed-on: https://gerrit.libreoffice.org/51496 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-03-19 07:38:49 +01:00
parent 7be3dfa4b4
commit b2147abdf6
52 changed files with 5 additions and 47 deletions
@@ -51,7 +51,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 #include <rtl/strbuf.hxx>

@@ -20,7 +20,6 @@
 #include <memory>
 #include <vcl/wrkwin.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dialoghelper.hxx>
@@ -33,7 +33,6 @@
 #include <osl/diagnose.h>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <dsntypes.hxx>
@@ -33,7 +33,6 @@
 #include <osl/diagnose.h>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlimp.hxx>

 #include <map>
@@ -25,7 +25,6 @@
 #include <osl/thread.h>
 #include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/textsearch.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
@@ -90,7 +90,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/string.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/virdev.hxx>
 #include <rtl/crc.h>
 #include <rtl/strbuf.hxx>
@@ -110,7 +110,6 @@
 #include <editeng/svxfont.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <svx/sdtfchim.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/table/XMergeableCellRange.hpp>
@@ -23,6 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <svl/outstrm.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <memory>

@@ -38,7 +38,6 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>

 using namespace ::com::sun::star;
@@ -47,6 +47,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <i18nlangtag/lang.h>
 #include <svl/zforlist.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
@@ -40,7 +40,6 @@
 #include <comphelper/processfactory.hxx>
 #include <editeng/flditem.hxx>
 #include <unotools/tempfile.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/svapp.hxx>
@@ -40,6 +40,7 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>

 #include <unotools/mediadescriptor.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 #include <tools/zcodec.hxx>

 #include <memory>
@@ -34,7 +34,6 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/sequence.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::XInterface;
@@ -39,7 +39,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <osl/file.hxx>
 #include <comphelper/sequence.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 //  namespaces

@@ -32,7 +32,6 @@
 #include <rtl/uri.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/window.hxx>
@@ -29,7 +29,6 @@

 #include <rtl/uri.hxx>
 #include <comphelper/processfactory.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/window.hxx>
@@ -16,7 +16,6 @@
 #include <functional>

 #include <comphelper/processfactory.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <sfx2/thumbnailviewitem.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/timer.hxx>
@@ -37,7 +37,6 @@
 #include <osl/diagnose.h>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -33,7 +33,6 @@
 #include <osl/diagnose.h>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -18,7 +18,6 @@
 #include <test/xmltesttools.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotest/macros_test.hxx>
 #include <sfx2/docfilt.hxx>
@@ -53,7 +53,6 @@
 #include <vcl/settings.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -39,7 +39,6 @@

 #include <CustomAnimationPreset.hxx>
 #include <TransitionPreset.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 #include <algorithm>

@@ -28,7 +28,6 @@
 #include <sfx2/app.hxx>
 #include <svl/itemset.hxx>

-#include <unotools/ucbstreamhelper.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svditer.hxx>
@@ -70,7 +70,6 @@
 #include <comphelper/extract.hxx>
 #include <rtl/crc.h>
 #include <comphelper/classids.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/text/FontRelief.hpp>
 #include <editeng/frmdiritem.hxx>
 #include <vcl/fltcall.hxx>
@@ -37,7 +37,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <tools/poly.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 #include <com/sun/star/animations/AnimationAdditiveMode.hpp>
 #include <com/sun/star/animations/AnimationCalcMode.hpp>
@@ -51,7 +51,6 @@
 #include <svx/linkwarn.hxx>
 #include <svx/svdetc.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <sfx2/printer.hxx>
 #include <comphelper/classids.hxx>
 #include <svtools/sfxecode.hxx>
@@ -26,7 +26,6 @@
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/thumbnailview.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/image.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/StorageFactory.hpp>
@@ -35,7 +35,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <unotools/configmgr.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <framework/menuconfiguration.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/localfilehelper.hxx>
@@ -36,7 +36,6 @@
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <o3tl/any.hxx>
 #include <svl/urihelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <svtools/transfer.hxx>
 #include <sot/formats.hxx>
 #include <vcl/svapp.hxx>
@@ -26,6 +26,7 @@
 #include <unotools/historyoptions.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/pngread.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -19,7 +19,6 @@
 #include <sfx2/docfac.hxx>
 #include <svl/inettype.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/help.hxx>
@@ -30,6 +30,7 @@
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
 #include <rtl/ustring.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/scrbar.hxx>
@@ -30,7 +30,6 @@
 #include <svtools/javainteractionhandler.hxx>
 #include <svl/itempool.hxx>
 #include <tools/urlobj.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
@@ -28,7 +28,6 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/configurationhelper.hxx>

@@ -86,7 +86,6 @@
 #include <framework/interaction.hxx>
 #include <framework/titlehelper.hxx>
 #include <comphelper/numberedcollection.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/ucbhelper.hxx>

 #include <sfx2/sfxbasecontroller.hxx>
@@ -21,7 +21,6 @@
 #include <vcl/GraphicObject.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -26,7 +26,6 @@
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <osl/diagnose.h>
-#include <unotools/ucbstreamhelper.hxx>
 #include <tools/stream.hxx>
 #include <unotools/streamwrap.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -18,7 +18,6 @@
 */

 #include <osl/mutex.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
 #include <vcl/bitmap.hxx>
@@ -21,7 +21,6 @@

 #include <sot/storage.hxx>
 #include <unotools/streamwrap.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <ucbhelper/content.hxx>
@@ -17,7 +17,6 @@
 #include <vector>

 #include <unotools/streamwrap.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
@@ -31,7 +31,6 @@
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>

-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/configmgr.hxx>

 #include <svl/whiter.hxx>
@@ -39,7 +39,6 @@

 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
@@ -14,7 +14,6 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/numvset.hxx>
@@ -65,7 +65,6 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <toolkit/helper/vclunohelper.hxx>


 #include <memory>
@@ -25,7 +25,6 @@
 #include <svl/intitem.hxx>
 #include <editeng/forbiddencharacterstable.hxx>

-#include <unotools/ucbstreamhelper.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
 #include <viewsh.hxx>
@@ -48,7 +48,6 @@
 #include <comphelper/classids.hxx>
 #include <vcl/graph.hxx>
 #include <sot/formats.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <strings.hrc>
 #include <svx/charthelper.hxx>
@@ -48,7 +48,6 @@
 #include <editeng/editeng.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/shaditem.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/unoapi.hxx>
@@ -44,7 +44,6 @@
 #include <vcl/outdev.hxx>
 #include <comphelper/types.hxx>

-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/image.hxx>

@@ -38,7 +38,6 @@
 #include <comphelper/sequence.hxx>
 #include <vcl/outdev.hxx>

-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/image.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -35,7 +35,6 @@
 #include <comphelper/sequence.hxx>
 #include <vcl/outdev.hxx>

-#include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/image.hxx>
 #include <toolkit/controls/geometrycontrolmodel.hxx>
@@ -26,7 +26,6 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/instance.hxx>
 #include <osl/detail/file.h>
@@ -21,7 +21,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
 #include <vcl/metaact.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <svl/solar.hrc>
 #include <vcl/salbtype.hxx>
 #include <vcl/virdev.hxx>