sal: clean up public headers with include-what-you-use

Sadly cannot forward declare "struct {...} TimeValue;".

rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h
was painful enough for now...

Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05

7 files changed, 9 insertions, 4 deletions

diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index ad2c437ad303..e611c6103cba 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -94,7 +94,6 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2)
 
 void MetadatableTest::test()
 {
-    OSL_TRACE("SwMetadatable test(): start");
     boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pReg(
         ::sfx2::createXmlIdRegistry(false) );
     boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pRegClip(
@@ -260,8 +259,6 @@ void MetadatableTest::test()
     m5.SetMetadataReference(id4e);
     CPPUNIT_ASSERT_MESSAGE("auto-detect (styles)",
             m5.GetMetadataReference() == id4);
-
-    OSL_TRACE("sfx2::Metadatable test(): finished");
 }
 
 
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 4fc4cbf18e93..2326a2747ae2 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -20,7 +20,7 @@
 #include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/msg.hxx>
-
+#include <osl/diagnose.h>
 
 
 SfxSlotKind SfxSlot::GetKind() const
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 0782951986a3..8e084c15fc96 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -20,6 +20,8 @@
 
 #include <sfx2/sfxsids.hrc>
 #include "sorgitm.hxx"
+#include <osl/diagnose.h>
+
 // STATIC DATA -----------------------------------------------------------
 
 TYPEINIT1_AUTOFACTORY(SfxScriptOrganizerItem, SfxStringItem);
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index 15c8e732a8d3..0fb5ed8a8af6 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -27,6 +27,8 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <osl/diagnose.h>
+
 #include <algorithm>
 #include <functional>
 
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index c776698c00c8..0b9d11cfedaa 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/zoomitem.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <osl/diagnose.h>
 #include <sfx2/sfx.hrc>
 
 
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 9cc4c3154977..a45a8038b779 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/ui/ContextChangeEventObject.hpp>
 #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
+#include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
 
 
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index 94e62d87a5c8..139121cdc33a 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -18,6 +18,8 @@
  */
 #include <sfx2/sidebar/EnumContext.hxx>
 
+#include <osl/diagnose.h>
+
 #include <map>
 
 namespace sfx2 { namespace sidebar {