diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-07-28 17:43:23 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-02 10:39:00 +0200 |
commit | bd8320952522165ee7f5f6cbe2675ea674ec5749 (patch) | |
tree | c0574742c59a06239a4a8be681ddadac50531f5c /svtools | |
parent | 1e9f594f7eb4a813c3a566114198632352a163d8 (diff) |
Add missing sal/log.hxx headers
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it.
This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes.
This commit adds missing headers to every file found by:
grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG')
to directories from stoc to svx
Change-Id: If562b1aa1d676d2c1cf513e953238abbb846c65c
Reviewed-on: https://gerrit.libreoffice.org/58224
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svtools')
40 files changed, 40 insertions, 0 deletions
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx index 4da9b4a98a1e..263e04845310 100644 --- a/svtools/langsupport/langsupport.cxx +++ b/svtools/langsupport/langsupport.cxx @@ -17,6 +17,7 @@ #include <tools/extendapplicationenvironment.hxx> #include <vcl/svapp.hxx> #include <iostream> +#include <sal/log.hxx> using namespace com::sun::star; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 634469df1ae7..c5fe02e2f167 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -24,6 +24,7 @@ #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/fract.hxx> +#include <sal/log.hxx> #include <functional> #include <algorithm> diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 0963e067a1da..6126f341ec6a 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/log.hxx> #include <tools/debug.hxx> #include <svtools/brwbox.hxx> #include "datwin.hxx" diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index e43f634e36bd..f4db7a2b29f6 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -19,6 +19,7 @@ #include <svtools/brwbox.hxx> #include <svtools/AccessibleBrowseBoxObjType.hxx> +#include <sal/log.hxx> #include <tools/debug.hxx> #include <tools/multisel.hxx> #include "datwin.hxx" diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 8e09110ca02f..867525cf8f77 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -33,6 +33,7 @@ #include <svl/poolitem.hxx> #include <svl/hint.hxx> #include <osl/mutex.hxx> +#include <sal/log.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 6200fb002e85..900b67c31505 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <vcl/help.hxx> #include <osl/mutex.hxx> +#include <sal/log.hxx> #include "itemholder2.hxx" diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index e9a18b21054a..c6b1034618ba 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -21,6 +21,7 @@ #include "itemholder2.hxx" #include <osl/diagnose.h> +#include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index d4a7335770c7..de4a910050c1 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -39,6 +39,7 @@ #include <rtl/ustring> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> +#include <sal/log.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index cc99f026081e..42e0f6698da3 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -18,6 +18,7 @@ */ #include <sal/config.h> +#include <sal/log.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 55415653b920..e65ffa291635 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -31,6 +31,7 @@ #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> +#include <sal/log.hxx> namespace svt { diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 7d3c41bc7045..f129b25c12ca 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -21,6 +21,7 @@ #include <svtools/iconview.hxx> #include "fileview.hxx" #include <sal/config.h> +#include <sal/log.hxx> #include <svtools/treelistentry.hxx> #include <svtools/fileview.hxx> #include <svtools/svtresid.hxx> diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index e8ea911c1506..ccbbe3e33c59 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -18,6 +18,7 @@ */ #include "imivctl.hxx" +#include <sal/log.hxx> IcnCursor_Impl::IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner ) { diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 28495cf5e47b..c9e6acc2df65 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <svtaccessiblefactory.hxx> #include <o3tl/make_unique.hxx> +#include <sal/log.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 7a930883f51d..bbc4e4c71024 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -34,6 +34,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <rtl/instance.hxx> #include <comphelper/string.hxx> +#include <sal/log.hxx> #include <svtools/svmedit.hxx> #include <svtools/svlbitm.hxx> diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 5778b291ef86..d5cde4fe66dc 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -20,6 +20,7 @@ #include <svtools/asynclink.hxx> #include <osl/mutex.hxx> +#include <sal/log.hxx> #include <tools/debug.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 57af295f0a6d..60beb1ef9135 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/i18n/Weekdays.hpp> #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> +#include <sal/log.hxx> #include <svtools/strings.hrc> #include <svtools/svtresid.hxx> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 2ae2506cf33f..386597541494 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -26,6 +26,7 @@ #include <vcl/field.hxx> #include <vcl/settings.hxx> #include <sal/macros.h> +#include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <unotools/charclass.hxx> diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 4d81dff3ea36..b18efb264b27 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -36,6 +36,7 @@ #include <map> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> +#include <sal/log.hxx> using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 9a1da4bed7bd..cf7f7c7e0473 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -41,6 +41,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <rtl/instance.hxx> +#include <sal/log.hxx> #include <salhelper/thread.hxx> #include <osl/file.hxx> #include <osl/mutex.hxx> diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index a4d81f1e9adc..acfea2528f31 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -23,6 +23,7 @@ #include <tools/poly.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/settings.hxx> +#include <sal/log.hxx> #include <svtools/ruler.hxx> #include <svtools/svtresid.hxx> diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 656289c268ec..219243548702 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -20,6 +20,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <sal/log.hxx> #include <svtools/valueset.hxx> #include "valueimp.hxx" #include <comphelper/servicehelper.hxx> diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index bd2cb8e0b427..34f980bec084 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <rtl/ustring.hxx> +#include <sal/log.hxx> #include "valueimp.hxx" #include <svtools/valueset.hxx> diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 2ea05073f492..23479c9f9eb5 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -29,6 +29,7 @@ #include <vcl/waitobj.hxx> #include <vcl/settings.hxx> #include <vcl/weld.hxx> +#include <sal/log.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp> #include <com/sun/star/awt/XWindow.hpp> diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index aadae0d5bf04..c6f4e5a4a3cd 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -22,6 +22,7 @@ #include <svtools/svtresid.hxx> #include <vcl/svapp.hxx> #include <vcl/print.hxx> +#include <sal/log.hxx> void ImplFillPrnDlgListBox( const Printer* pPrinter, weld::ComboBoxText* pBox, weld::Button* pPropBtn ) diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 45f538371b42..c9914a693ac1 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> +#include <sal/log.hxx> #include <svtools/ehdl.hxx> #include <svtools/soerr.hxx> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 4d98a55c19df..bebf898596c7 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -22,6 +22,7 @@ #include <vcl/graphicfilter.hxx> #include <bitmaps.hlst> +#include <sal/log.hxx> #include <comphelper/fileformat.h> #include <comphelper/embeddedobjectcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx index daca97fb1d30..a90b8b81b8f3 100644 --- a/svtools/source/misc/filechangedchecker.cxx +++ b/svtools/source/misc/filechangedchecker.cxx @@ -8,6 +8,7 @@ */ #include <sal/config.h> +#include <sal/log.hxx> #include <svtools/filechangedchecker.hxx> diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 817a06f52430..477de6016cac 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -20,6 +20,7 @@ #include <svtools/imagemgr.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> +#include <sal/log.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/image.hxx> diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 19965aa8b50f..5118f52db82d 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -34,6 +34,7 @@ #include <string.h> #include <math.h> #include <memory> +#include <sal/log.hxx> #define SCALEPOINT(aPT,aFracX,aFracY) (aPT).setX(long((aPT).X()*aFracX)); \ diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index 75ce24b589a3..c51e9e7f9e4f 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -14,6 +14,7 @@ #include <officecfg/System.hxx> #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp> #include <rtl/ustring.hxx> +#include <sal/log.hxx> #include <svtools/langhelp.hxx> #include <vcl/idle.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 91647533d104..da486b63b90c 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -26,6 +26,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> +#include <sal/log.hxx> #include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <svtools/langtab.hxx> diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index ba66d8310b8a..530e2d27979b 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -13,6 +13,7 @@ #include <vcl/metric.hxx> #include <vcl/fontcharmap.hxx> #include <i18nutil/unicode.hxx> +#include <sal/log.hxx> // This should only be used when a commonly used font incorrectly declares its // coverage. If you add a font here, please leave a note explaining the issue diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 6fd4f6944ee7..23a9b299839a 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -18,6 +18,7 @@ */ #include <sal/config.h> +#include <sal/log.hxx> #include <osl/file.hxx> #include <svtools/templatefoldercache.hxx> diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 49d08ef3d979..f3863e6dc6c4 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -24,6 +24,7 @@ #endif #include <osl/mutex.hxx> #include <rtl/uri.hxx> +#include <sal/log.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index a25f6f547517..71aa5acd7620 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -25,6 +25,7 @@ #include <rtl/strbuf.hxx> #include <rtl/character.hxx> #include <rtl/tencinfo.h> +#include <sal/log.hxx> #include <tools/tenccvt.hxx> #include <tools/datetime.hxx> #include <unotools/datetime.hxx> diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 4ba540ce96d9..0208635b1860 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -23,6 +23,7 @@ #include <rtl/textcvt.h> #include <rtl/tencinfo.h> #include <rtl/character.hxx> +#include <sal/log.hxx> #include <vector> #include <climits> diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index 4a07ae840725..ac663a61fc0a 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <rtl/strbuf.hxx> #include <rtl/math.hxx> +#include <sal/log.hxx> #include <tools/date.hxx> #include <tools/time.hxx> #include <tools/diagnose_ex.h> diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index bfe82edbe926..b0e66414f5e9 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> +#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <vcl/settings.hxx> diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 84f13ebcfe15..1d92c659623a 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -24,6 +24,7 @@ #include <table/tablecontrol.hxx> #include "unocontroltablemodel.hxx" #include <rtl/ref.hxx> +#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/grid/XGridColumn.hpp> diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index b0402df09602..f74ab35a515a 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/view/SelectionType.hpp> #include <com/sun/star/awt/grid/XSortableGridData.hpp> +#include <sal/log.hxx> #include <cppuhelper/weakref.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> |