tools: remove unused #include from solar.h

Change-Id: I214e13add371380701ae39403d90a574a63e495d

basic/source/uno/dlgcont.cxx

@@ -32,6 +32,7 @@
 #include <com/sun/star/resource/StringResourceWithLocation.hpp>
 #include <com/sun/star/document/GraphicObjectResolver.hpp>
 #include <dlgcont.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 

chart2/source/view/main/ChartView.cxx

@@ -56,6 +56,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <rtl/uuid.h>
 #include <tools/globname.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>

editeng/source/items/frmitems.cxx

@@ -51,6 +51,7 @@
 #include <comphelper/processfactory.hxx>
 #include <svtools/grfmgr.hxx>
 #include <tools/urlobj.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/types.hxx>
 #include <svl/memberid.h>
 #include <svtools/borderhelper.hxx>

editeng/source/items/numitem.cxx

@@ -40,6 +40,7 @@
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <tools/mapunit.hxx>
 #include <unotools/configmgr.hxx>

editeng/source/items/paraitem.cxx

@@ -21,6 +21,7 @@
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
 #include <osl/diagnose.h>

editeng/source/items/textitem.cxx

@@ -41,6 +41,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <svl/itemset.hxx>
 
+#include <comphelper/fileformat.h>
 #include <svtools/langtab.hxx>
 #include <svl/itempool.hxx>
 #include <svtools/ctrltool.hxx>

filter/source/msfilter/msoleexp.cxx

@@ -37,6 +37,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/storagehelper.hxx>

include/tools/solar.h

@@ -22,7 +22,6 @@
 
 #include <sal/types.h>
 #include <osl/endian.h>
-#include <comphelper/fileformat.h>
 
 /** Intermediate type to solve type clash with Windows headers.
  Should be removed as soon as all code parts have been reviewed

sc/qa/unit/helper/qahelper.hxx

@@ -23,6 +23,7 @@
 #include <osl/detail/android-bootstrap.h>
 
 #include <unotools/tempfile.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/storagehelper.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>

sc/source/core/data/documen8.cxx

@@ -20,6 +20,7 @@
 #include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 #include <o3tl/make_unique.hxx>
+#include <comphelper/fileformat.h>
 #include <tools/urlobj.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/editstat.hxx>

sc/source/core/tool/autoform.cxx

@@ -31,6 +31,7 @@
 #include <svx/strings.hrc>
 #include <editeng/langitem.hxx>
 #include <tools/urlobj.hxx>
+#include <comphelper/fileformat.h>
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/tenccvt.hxx>
 #include <o3tl/make_unique.hxx>

sc/source/core/tool/ddelink.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <comphelper/fileformat.h>
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 #include <sfx2/linkmgr.hxx>

sc/source/filter/xml/xmlwrap.cxx

@@ -23,6 +23,7 @@
 #include <sfx2/objsh.hxx>
 #include <sot/storage.hxx>
 #include <osl/diagnose.h>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <unotools/streamwrap.hxx>

sc/source/ui/app/drwtrans.cxx

@@ -30,6 +30,7 @@
 #include <svx/unomodel.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/servicehelper.hxx>
 

sc/source/ui/app/transobj.cxx

@@ -26,6 +26,7 @@
 
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <sot/storage.hxx>

sc/source/ui/docshell/docsh.cxx

@@ -22,6 +22,7 @@
 #include <scitems.hxx>
 #include <vcl/errinf.hxx>
 #include <editeng/justifyitem.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <formula/errorcodes.hxx>
 #include <vcl/msgbox.hxx>

sd/inc/sdxmlwrp.hxx

@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SD_INC_SDXMLWRP_HXX
 #define INCLUDED_SD_INC_SDXMLWRP_HXX
 
+#include <comphelper/fileformat.h>
 #include <vcl/errcode.hxx>
 #include "sdfilter.hxx"
 

sd/qa/unit/sdmodeltestbase.hxx

@@ -23,6 +23,7 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/color.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 
 #include <rtl/strbuf.hxx>

sd/source/ui/app/sdxfer.cxx

@@ -21,6 +21,7 @@
 #include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <comphelper/fileformat.h>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
 #include <editeng/eeitem.hxx>

sfx2/source/appl/fileobj.cxx

@@ -34,6 +34,7 @@
 #include <sfx2/docfac.hxx>
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <unotools/mediadescriptor.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/opengrf.hxx>

sfx2/source/doc/SfxDocumentMetaData.cxx

@@ -65,6 +65,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/datetime.hxx>
 #include <osl/mutex.hxx>
+#include <comphelper/fileformat.h>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/storagehelper.hxx>

sfx2/source/doc/docfilt.cxx

@@ -24,6 +24,7 @@
 #include <string>
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>

sfx2/source/doc/objembed.cxx

@@ -29,6 +29,7 @@
 #include <objshimp.hxx>
 #include <sfx2/event.hxx>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/seqstream.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>

sfx2/source/doc/objserv.cxx

@@ -60,6 +60,7 @@
 #include <unotools/useroptions.hxx>
 #include <unotools/saveopt.hxx>
 #include <svtools/asynclink.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/documentconstants.hxx>
 #include <tools/link.hxx>
 

sfx2/source/doc/objstor.cxx

@@ -69,6 +69,7 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/interaction.hxx>
 #include <svtools/sfxecode.hxx>

sfx2/source/doc/sfxbasemodel.cxx

@@ -75,6 +75,7 @@
 #include <vcl/salctype.hxx>
 #include <comphelper/classids.hxx>
 #include <sot/storinfo.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/storagehelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/transfer.hxx>

slideshow/source/engine/shapes/gdimtftools.cxx

@@ -31,6 +31,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/uno3.hxx>
 
 #include <tools/stream.hxx>

sot/source/base/formats.cxx

@@ -24,6 +24,7 @@
 #include <sot/filelist.hxx>
 #include <sysformats.hxx>
 #include <comphelper/classids.hxx>
+#include <comphelper/fileformat.h>
 
 #include <tools/globname.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>

sot/source/sdstor/storage.cxx

@@ -34,6 +34,7 @@
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbhelper.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>

starmath/qa/extras/mmlimport-test.cxx

@@ -10,6 +10,8 @@
 #include <sal/config.h>
 #include <test/bootstrapfixture.hxx>
 
+#include <comphelper/fileformat.h>
+
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/sfxmodelfactory.hxx>

starmath/source/document.cxx

@@ -20,6 +20,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/uno/Any.h>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/accessibletexthelper.hxx>
 #include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>

starmath/source/mathmlexport.cxx

@@ -38,6 +38,7 @@
 #include <unotools/saveopt.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <sax/tools/converter.hxx>

starmath/source/mathmlimport.cxx

@@ -33,6 +33,7 @@ one go*/
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/uno/Any.h>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>

svl/source/items/macitem.cxx

@@ -20,6 +20,7 @@
 #include <sal/config.h>
 
 #include <sal/log.hxx>
+#include <comphelper/fileformat.h>
 #include <tools/stream.hxx>
 
 #include <svl/macitem.hxx>

svtools/source/graphic/provider.cxx

@@ -36,6 +36,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <comphelper/fileformat.h>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>

svtools/source/misc/embedhlp.cxx

@@ -24,6 +24,7 @@
 #include <bitmaps.hlst>
 #include <svtools/svtresid.hxx>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <comphelper/seqstream.hxx>
 #include <toolkit/helper/vclunohelper.hxx>

svtools/source/misc/embedtransfer.cxx

@@ -28,6 +28,7 @@
 #include <svtools/embedtransfer.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>

svtools/source/misc/transfer.cxx

@@ -35,6 +35,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/sequence.hxx>

svtools/source/misc/transfer2.cxx

@@ -26,6 +26,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
 #include <svl/urlbmk.hxx>

svx/source/dialog/compressgraphicdialog.cxx

@@ -32,6 +32,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/compressgraphicdialog.hxx>
 #include <sfx2/dispatch.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>

svx/source/gallery2/galobj.cxx

@@ -21,6 +21,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/pathoptions.hxx>

svx/source/gallery2/galtheme.cxx

@@ -23,6 +23,7 @@
 
 #include <algorithm>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>

svx/source/items/chrtitem.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <comphelper/fileformat.h>
 #include <tools/stream.hxx>
 #include <basic/sbxvar.hxx>
 #include <rtl/math.hxx>

svx/source/items/e3ditem.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/drawing/Direction3D.hpp>
+#include <comphelper/fileformat.h>
 #include <tools/stream.hxx>
 #include <rtl/math.hxx>
 

svx/source/xml/xmleohlp.cxx

@@ -41,6 +41,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <svx/xmleohlp.hxx>

svx/source/xml/xmlgrhlp.cxx

@@ -27,6 +27,7 @@
 #include <com/sun/star/io/NotConnectedException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <comphelper/fileformat.h>
 #include <comphelper/graphicmimetype.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>

sw/qa/core/filters-test.cxx

@@ -10,6 +10,7 @@
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 
 #include <sfx2/app.hxx>

sw/source/core/doc/tblafmt.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <o3tl/make_unique.hxx>
+#include <comphelper/fileformat.h>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/docfile.hxx>

sw/source/core/swg/SwXMLTextBlocks1.cxx

@@ -23,6 +23,7 @@
 #include <svtools/unoevent.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/streamwrap.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/io/IOException.hpp>

sw/source/filter/xml/swxml.cxx

@@ -44,6 +44,7 @@
 #include <svx/strings.hrc>
 #include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/genericpropertyset.hxx>
 #include <rtl/strbuf.hxx>
 #include <sfx2/frame.hxx>

sw/source/filter/xml/wrtxml.cxx

@@ -25,6 +25,8 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/frame/XModule.hpp>
+
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <vcl/errinf.hxx>

sw/source/uibase/app/docsh2.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/drawing/ModuleDispatcher.hpp>
 #include <com/sun/star/frame/DispatchHelper.hpp>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 
 #include <edtwin.hxx>

sw/source/uibase/dochdl/swdtflvr.cxx

@@ -28,6 +28,7 @@
 #include <svtools/embedtransfer.hxx>
 #include <svtools/insdlg.hxx>
 #include <unotools/tempfile.hxx>
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>

sw/source/uibase/globdoc/globdoc.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <unotools/moduleoptions.hxx>
 

sw/source/uibase/web/wdocsh.cxx

@@ -21,6 +21,7 @@
 #include <sfx2/app.hxx>
 #include <svx/svxids.hrc>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/classids.hxx>
 #include <sfx2/objface.hxx>
 

tools/source/stream/stream.cxx

@@ -30,6 +30,7 @@
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/string.hxx>
 
 #define SWAPNIBBLES(c)      \

vcl/qa/cppunit/graphicfilter/filters-test.cxx

@@ -13,6 +13,8 @@
 #include <osl/file.hxx>
 #include <osl/process.h>
 
+#include <comphelper/fileformat.h>
+
 #include <vcl/graphicfilter.hxx>
 
 using namespace ::com::sun::star;

vcl/source/gdi/dibtools.cxx

@@ -23,6 +23,7 @@
 
 #include <vcl/salbtype.hxx>
 #include <vcl/dibtools.hxx>
+#include <comphelper/fileformat.h>
 #include <tools/zcodec.hxx>
 #include <tools/stream.hxx>
 #include <tools/fract.hxx>

vcl/source/gdi/gdimtf.cxx

@@ -31,6 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graphictools.hxx>
+#include <comphelper/fileformat.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <vcl/canvastools.hxx>
 

vcl/source/gdi/impgraph.cxx

@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <tools/fract.hxx>
 #include <tools/vcompat.hxx>

vcl/source/gdi/pdfwriter_impl2.cxx

@@ -33,6 +33,7 @@
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
 
+#include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>

xmloff/source/core/xmlimp.cxx

@@ -47,6 +47,7 @@
 #include <com/sun/star/xml/sax/XLocator.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
+#include <comphelper/fileformat.h>
 #include <comphelper/namecontainer.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>