diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-05-07 20:41:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-05-09 15:41:46 +0200 |
| commit | 959496794c8af815c571cab1d53b9f904e198754 (patch) | |
| tree | 30d03c2e62f2ddc5b3878ef93e81d8d05d71f09b | |
| parent | 3adadbd10501e1baa87a9833ecc84626a625d9a9 (diff) | |
cleanup osl/diagnose.h includes
with command
> git grep -l osl/diagnose.h *.cxx |
xargs grep -L -w 'OSL_\w*' |
xargs sed -i '/#include *\(<\|\"\)osl\/diagnose.h\(>\|\"\).*/d'
headers need more work
Change-Id: I906519ebbd47a04703b4fa5943b2f7abea7a97ab
Reviewed-on: https://gerrit.libreoffice.org/37350
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
221 files changed, 1 insertions, 220 deletions
diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx index 0beaa40c2e33..64941c24dad2 100644 --- a/basegfx/source/color/bcolormodifier.cxx +++ b/basegfx/source/color/bcolormodifier.cxx @@ -19,7 +19,6 @@ #include <basegfx/color/bcolormodifier.hxx> -#include <osl/diagnose.h> namespace basegfx { diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx index 7e228ca48dea..b852a013a20a 100644 --- a/basegfx/source/matrix/b2dhommatrix.cxx +++ b/basegfx/source/matrix/b2dhommatrix.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <rtl/instance.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <hommatrixtemplate.hxx> diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index 38c1d1a1e738..852189d3a1f9 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -18,7 +18,6 @@ */ #include <basegfx/polygon/b2dpolygonclipper.hxx> -#include <osl/diagnose.h> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx index a986a7cff4e2..c2df4c1c8a30 100644 --- a/basegfx/source/polygon/b2dpolygontriangulator.cxx +++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx @@ -18,7 +18,6 @@ */ #include <basegfx/polygon/b2dpolygontriangulator.hxx> -#include <osl/diagnose.h> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/vector/b2dvector.hxx> diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index f2cbf2123c92..dade6dca9a7b 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <basegfx/numeric/ftools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 7504edc9825c..71b6717e2625 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -23,7 +23,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/math.hxx> #include <stringconversiontools.hxx> diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx index 5ce779c94a03..5e0453fbf529 100644 --- a/basegfx/source/tools/b2dclipstate.cxx +++ b/basegfx/source/tools/b2dclipstate.cxx @@ -28,7 +28,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> -#include <osl/diagnose.h> namespace basegfx { diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 3eef2a4e2e73..6f6880c32df8 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -19,7 +19,6 @@ #include <basic/sbx.hxx> #include "parser.hxx" -#include <osl/diagnose.h> #include <com/sun/star/script/ModuleType.hpp> #include <svtools/miscopt.hxx> #include <rtl/character.hxx> diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx index b6aa946d8e9a..705ae2cbda5e 100644 --- a/binaryurp/source/outgoingrequests.cxx +++ b/binaryurp/source/outgoingrequests.cxx @@ -24,7 +24,6 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "rtl/byteseq.hxx" #include "osl/mutex.hxx" -#include <osl/diagnose.h> #include "lessoperators.hxx" #include "outgoingrequest.hxx" diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index d09606402abc..e82df7dbe3fb 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <osl/time.h> -#include <osl/diagnose.h> #include <canvas/elapsedtime.hxx> diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index e9edd6d8e146..9b0c2cdb7e4a 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -21,7 +21,6 @@ #include "codemaker/exceptiontree.hxx" #include "codemaker/typemanager.hxx" -#include "osl/diagnose.h" #include "rtl/ref.hxx" #include "rtl/string.hxx" #include "rtl/textenc.h" diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index a4279e3a98dd..df04d89c435b 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -25,7 +25,6 @@ #include "codemaker/typemanager.hxx" #include "codemaker/unotype.hxx" -#include "osl/diagnose.h" #include "rtl/strbuf.hxx" #include "rtl/string.hxx" #include "rtl/ustring.hxx" diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx index 37a6ffe604be..b4e9002c4713 100644 --- a/codemaker/source/commonjava/commonjava.cxx +++ b/codemaker/source/commonjava/commonjava.cxx @@ -26,7 +26,6 @@ #include "codemaker/typemanager.hxx" #include "codemaker/unotype.hxx" -#include "osl/diagnose.h" #include "rtl/strbuf.h" #include "rtl/string.h" #include "rtl/string.hxx" diff --git a/codemaker/source/cppumaker/dependencies.cxx b/codemaker/source/cppumaker/dependencies.cxx index c4a224f1f69e..99da99fdf7a4 100644 --- a/codemaker/source/cppumaker/dependencies.cxx +++ b/codemaker/source/cppumaker/dependencies.cxx @@ -27,7 +27,6 @@ #include "codemaker/typemanager.hxx" #include "codemaker/unotype.hxx" -#include "osl/diagnose.h" #include "rtl/ref.hxx" #include "rtl/string.hxx" #include "rtl/ustring.hxx" diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index ed10fbb72076..0b51ba050e75 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -24,7 +24,6 @@ #include <comphelper/namecontainer.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/diagnose.h> #include <osl/mutex.hxx> typedef std::map<OUString, css::uno::Any> SvGenericNameContainerMapImpl; diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx index 8378304f6520..a0495a69d0cf 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.cxx @@ -19,7 +19,6 @@ #include <comphelper/SelectionMultiplex.hxx> -#include <osl/diagnose.h> namespace comphelper diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index 507b4f8c79de..702d03bab8fd 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -18,7 +18,6 @@ */ #include <comphelper/accessibleeventnotifier.hxx> -#include <osl/diagnose.h> #include <rtl/instance.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/guarding.hxx> diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index 1a546598d827..9371384c1efc 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -20,7 +20,6 @@ #include <comphelper/accimplaccess.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <cppuhelper/typeprovider.hxx> -#include <osl/diagnose.h> #include <set> #include <string.h> diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx index 8a9056f028ac..51257fe3c414 100644 --- a/comphelper/source/misc/anytostring.cxx +++ b/comphelper/source/misc/anytostring.cxx @@ -19,7 +19,6 @@ #include <comphelper/anytostring.hxx> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <typelib/typedescription.h> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index fe509536ff73..942ba308e263 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -18,7 +18,6 @@ */ #include <comphelper/asyncnotification.hxx> -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <osl/conditn.hxx> #include <rtl/instance.hxx> diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 7a66a771b030..dc780d55ae78 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -20,7 +20,6 @@ #include <comphelper/componentmodule.hxx> #include <comphelper/sequence.hxx> -#include <osl/diagnose.h> #include <vector> diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 6cdf7b41bf94..787c3fefcb39 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -19,7 +19,6 @@ #include <comphelper/servicedecl.hxx> -#include <osl/diagnose.h> #include <rtl/string.hxx> #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase.hxx> diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index 65a0e29487a5..c847b393030b 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -21,7 +21,6 @@ #include <comphelper/ChainablePropertySetInfo.hxx> #include <comphelper/solarmutex.hxx> -#include <osl/diagnose.h> #include <memory> diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 7b74bbac046e..f4df2305e6c6 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -24,7 +24,6 @@ #include <comphelper/ChainablePropertySetInfo.hxx> #include <comphelper/solarmutex.hxx> -#include <osl/diagnose.h> #include <memory> #include <vector> diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index 01674353465c..c168ec5fa466 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -20,7 +20,6 @@ #include <comphelper/propertycontainer.hxx> #include <comphelper/property.hxx> #include <cppuhelper/typeprovider.hxx> -#include <osl/diagnose.h> #include <uno/data.h> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index 7ce9cf2d4752..44b674b901c9 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -18,7 +18,6 @@ */ #include <comphelper/attributelist.hxx> -#include <osl/diagnose.h> #include <vector> diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index f9448f098fe0..e656737eef90 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -18,7 +18,6 @@ */ -#include <osl/diagnose.h> #include "NPreparedStatement.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include <cppuhelper/typeprovider.hxx> diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 935c23bbcac0..c4e80d29f47d 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -19,7 +19,6 @@ #include "file/fanalyzer.hxx" #include <connectivity/sqlparse.hxx> -#include <osl/diagnose.h> #include <tools/debug.hxx> #include <comphelper/extract.hxx> #include <connectivity/sqlnode.hxx> diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 91b434047db2..89e1650e5213 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -26,7 +26,6 @@ #include <comphelper/sequence.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/typeprovider.hxx> -#include <osl/diagnose.h> #include <propertyids.hxx> #include <time.h> #include <connectivity/dbtools.hxx> diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 43856f78110b..5a55c0f0703f 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -20,7 +20,6 @@ #include "Driver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include <sal/types.h> using namespace connectivity::firebird; diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx index 8ec604760251..671f50107542 100644 --- a/connectivity/source/drivers/firebird/Statement.cxx +++ b/connectivity/source/drivers/firebird/Statement.cxx @@ -25,7 +25,6 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/queryinterface.hxx> -#include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 9ba697300b47..ebd6ac016c68 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -19,7 +19,6 @@ #include "MNSINIParser.hxx" #include <rtl/byteseq.hxx> -#include <osl/diagnose.h> IniParser::IniParser(OUString const & rIniName) { diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 8d1518845816..a23b2ccd1aeb 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -19,7 +19,6 @@ #include "mysql/YDriver.hxx" #include "mysql/YCatalog.hxx" -#include <osl/diagnose.h> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index b02099b19268..33485fbcaa00 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -50,7 +50,6 @@ #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/uno/Type.hxx" #include "com/sun/star/uno/XInterface.hpp" -#include "osl/diagnose.h" #include "osl/interlck.h" #include "rtl/string.h" #include "rtl/ustring.h" diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index ebc913e5a330..0d64c56e9e62 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -28,7 +28,6 @@ #include <rtl/string.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> -#include <osl/diagnose.h> #include <osl/file.hxx> #include <osl/security.hxx> #include <osl/thread.hxx> diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index c2e4266c8007..ce1249d4818a 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.cxx @@ -20,7 +20,6 @@ #include <cppuhelper/unourl.hxx> -#include <osl/diagnose.h> #include <rtl/malformeduriexception.hxx> #include <rtl/string.h> #include <rtl/textenc.h> diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index b5403eb9c537..f381b40fbb82 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -20,7 +20,6 @@ #include "datasettings.hxx" #include "apitools.hxx" #include "dbastrings.hrc" -#include <osl/diagnose.h> #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx index 093fedc1842b..eddb3fc2cd83 100644 --- a/dtrans/source/cnttype/mcnttfactory.cxx +++ b/dtrans/source/cnttype/mcnttfactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <cppuhelper/supportsservice.hxx> #include "mcnttfactory.hxx" #include "mcnttype.hxx" diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index ee045e43339f..2f77baab7031 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include "mcnttfactory.hxx" diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx index b81b3b6c8272..f531f12fd119 100644 --- a/dtrans/source/test/test_dtrans.cxx +++ b/dtrans/source/test/test_dtrans.cxx @@ -27,7 +27,6 @@ #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> -#include <osl/diagnose.h> #include <stdlib.h> #include <stdio.h> diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index fbc33cb85544..5e379bd894e0 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -20,7 +20,6 @@ #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include "WinClipboard.hxx" #define WINCLIPBOARD_SERVICE_NAME "com.sun.star.datatransfer.clipboard.SystemClipboard" diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index 170fe5388375..83e972a2be38 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -20,7 +20,6 @@ #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include "source.hxx" #include "target.hxx" diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index 19f5cd0773ad..8139b4a6b6b3 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -20,7 +20,6 @@ #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp> #include "ftransl.hxx" diff --git a/dtrans/source/win32/workbench/testmarshal.cxx b/dtrans/source/win32/workbench/testmarshal.cxx index f833133fa5e4..d9edfe753107 100644 --- a/dtrans/source/win32/workbench/testmarshal.cxx +++ b/dtrans/source/win32/workbench/testmarshal.cxx @@ -19,7 +19,6 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -#include <osl/diagnose.h> #include <stdio.h> #if defined _MSC_VER diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 06bd2eed2bb5..13745e2447e6 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -16,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index e01a3778b7c4..b08ad0843f6c 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/ucb/AlreadyInitializedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <osl/diagnose.h> #include <sal/macros.h> diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index 66689fe6b529..f728ff809d32 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <cppuhelper/factory.hxx> #include <uno/mapping.hxx> #include "scanner.hxx" diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index b10755903db6..b4885c83ae9a 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> #include "com/sun/star/frame/Desktop.hpp" #include "com/sun/star/frame/XTerminateListener.hpp" diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 94f2d0959671..d669d7f32192 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -21,7 +21,6 @@ #include "constant.hxx" #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> namespace filter{ namespace config{ diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index 7b1ce1addb4b..e02fe3feeed4 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -13,7 +13,6 @@ #include <basegfx/tools/canvastools.hxx> #include <com/sun/star/geometry/AffineMatrix2D.hpp> -#include <osl/diagnose.h> #include <limits.h> #include <boost/bind.hpp> diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx index 60a094a38711..84b82e6e90d0 100644 --- a/filter/source/svg/units.cxx +++ b/filter/source/svg/units.cxx @@ -11,7 +11,6 @@ #include <basegfx/range/b2drange.hxx> #include "gfxtypes.hxx" #include <rtl/ustring.hxx> -#include <osl/diagnose.h> #include <boost/spirit/include/classic.hpp> namespace svgi diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 1d90cd883c02..99cccf45f3dc 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <tools/urlobj.hxx> #include "XmlFilterAdaptor.hxx" -#include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx index 61fa52e82bbd..32ef2bf9cb3b 100644 --- a/formula/source/core/api/services.cxx +++ b/formula/source/core/api/services.cxx @@ -18,7 +18,6 @@ */ #include "sal/types.h" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> #include "formula/FormulaOpCodeMapperObj.hxx" diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index e543ab8e5fb4..7c8af8725e71 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include "FilePicker.hxx" #include "FPServiceInfo.hxx" diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index d2508c50e690..05ba2266f103 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -40,7 +40,6 @@ #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <osl/file.hxx> #include <officecfg/Office/Common.hxx> diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx index e867a4a3b396..6b4de5b4f597 100644 --- a/fpicker/source/win32/filepicker/controlaccess.cxx +++ b/fpicker/source/win32/filepicker/controlaccess.cxx @@ -18,7 +18,6 @@ */ #include <sal/macros.h> -#include <osl/diagnose.h> #include "controlaccess.hxx" #include "../misc/WinImplHelper.hxx" diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 5b427e3194c9..018922d81c21 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -18,7 +18,6 @@ */ #include "WinFOPImpl.hxx" -#include <osl/diagnose.h> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include "FopEvtDisp.hxx" diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 35ec2a2c8218..12a733ec01d1 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -22,7 +22,6 @@ #include <memory> #include <o3tl/make_unique.hxx> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include "resourceprovider.hxx" #include <osl/mutex.hxx> diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx index c5c16066c403..864a31c17935 100644 --- a/fpicker/test/svdem.cxx +++ b/fpicker/test/svdem.cxx @@ -25,7 +25,6 @@ #include <rtl/ustring> #include <sal/types.h> -#include <osl/diagnose.h> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 509c6d79c668..0d4dc39f73f1 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <osl/diagnose.h> #include <rtl/string.h> #include <rtl/ustring.hxx> #include <vcl/svapp.hxx> diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx index 479279f2bc49..3bfe57662656 100644 --- a/hwpfilter/source/hbox.cxx +++ b/hwpfilter/source/hbox.cxx @@ -19,7 +19,6 @@ #include "precompile.h" -#include <osl/diagnose.h> #include "hwpfile.h" #include "hbox.h" diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx index 25822a856827..cab73a626b8f 100644 --- a/hwpfilter/source/hiodev.cxx +++ b/hwpfilter/source/hiodev.cxx @@ -26,7 +26,6 @@ # include <unistd.h> #endif -#include <osl/diagnose.h> #include "hwplib.h" #include "hgzip.h" diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx index dfb63ddd48bd..f4e41c256347 100644 --- a/hwpfilter/source/hpara.cxx +++ b/hwpfilter/source/hpara.cxx @@ -20,7 +20,6 @@ #include <memory> #include "precompile.h" -#include <osl/diagnose.h> #include <comphelper/newarray.hxx> diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 30482f625868..729f31a9e317 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -36,7 +36,6 @@ #include "hcode.h" #include "hstream.hxx" -#include <osl/diagnose.h> HWPFile *HWPFile::cur_doc = nullptr; static int ccount = 0; diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index fd14c491e934..a5ae84cf92b1 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -39,7 +39,6 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/diagnose.h> #include "LocaleNode.hxx" diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index d55f21c515a0..ec743606cc69 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/i18n/MultipleCharsOutputException.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <osl/diagnose.h> #include <string.h> diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index a7db1adb8002..e90ff84e1678 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -24,7 +24,6 @@ #include <globals.hxx> #include <hash.hxx> #include <database.hxx> -#include <osl/diagnose.h> #include <tools/stream.hxx> bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index c3bad057958c..c068f86fffc7 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -18,7 +18,6 @@ */ #include <string.h> -#include <osl/diagnose.h> #include <uno/mapping.hxx> diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 12dd18d8c401..a0555e53cc7c 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -18,7 +18,6 @@ */ -#include <osl/diagnose.h> #include <uno/mapping.hxx> diff --git a/io/source/services.cxx b/io/source/services.cxx index 31487b61920e..597ce753a61c 100644 --- a/io/source/services.cxx +++ b/io/source/services.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <cppuhelper/factory.hxx> #include <cppuhelper/implementationentry.hxx> diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index 898805b068df..b328048dc88f 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -20,7 +20,6 @@ #include <stdio.h> #include <osl/time.h> -#include <osl/diagnose.h> #include <com/sun/star/test/XSimpleTest.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index d18979b7381d..aa48e4258f7b 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -19,7 +19,6 @@ #include "sal/config.h" -#include <osl/diagnose.h> #include <osl/module.hxx> #include <osl/thread.h> diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 39edb3e20f10..55223e4c4bea 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -31,7 +31,6 @@ #include <cppconn/prepared_statement.h> #include <cppconn/statement.h> #include <cppuhelper/typeprovider.hxx> -#include <osl/diagnose.h> #include <stdio.h> diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx index 81b0aa2f7246..df98a405510b 100644 --- a/mysqlc/source/mysqlc_services.cxx +++ b/mysqlc/source/mysqlc_services.cxx @@ -20,7 +20,6 @@ #include "mysqlc_driver.hxx" #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <uno/lbnames.h> diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 5258103010f1..e881dda8ddd4 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -38,7 +38,6 @@ #include <cppconn/statement.h> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <osl/diagnose.h> #include <osl/thread.h> using namespace connectivity::mysqlc; diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx index 4f9ed116a697..a11286e556b6 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/awt/XMessageBox.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> #include <rtl/ustring.hxx> using rtl::OUString; diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx index df2f32a73753..3034c95bad14 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx @@ -34,7 +34,6 @@ *************************************************************************/ #include <stdio.h> -#include <osl/diagnose.h> #include "SPreparedStatement.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include "SResultSetMetaData.hxx" diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index edb5e6a2b3dd..a5c67c6c8ced 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -34,7 +34,6 @@ *************************************************************************/ #include <stdio.h> -#include <osl/diagnose.h> #include "SStatement.hxx" #include "SConnection.hxx" #include "SResultSet.hxx" diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx index e71ed7924474..e8a80fa672a3 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx @@ -33,7 +33,6 @@ * *************************************************************************/ -#include <osl/diagnose.h> #include "propertyids.hxx" namespace connectivity { diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx index d269c236cf1b..c9323efb940f 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx @@ -34,7 +34,6 @@ *************************************************************************/ #include "filterdetect.hxx" -#include <osl/diagnose.h> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 4b23c4e93f76..c8f428994650 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/system/XSystemShellExecute.hpp> #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> using namespace com::sun::star::awt; using namespace com::sun::star::frame; diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index 85d6ae96e304..b848002f754f 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -20,7 +20,6 @@ #include "oox/core/relationshandler.hxx" #include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> #include "oox/helper/attributelist.hxx" #include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx index 51cf114ea369..56f81dca5867 100644 --- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx +++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx @@ -22,7 +22,6 @@ #include "datamodelcontext.hxx" #include <oox/helper/attributelist.hxx> #include <oox/token/namespaces.hxx> -#include <osl/diagnose.h> using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 8094929fa571..a85fe611dd18 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "diagramdefinitioncontext.hxx" #include "diagramfragmenthandler.hxx" diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 87fa59aef23c..46510dee0126 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -21,7 +21,6 @@ #include <functional> -#include <osl/diagnose.h> #include <basegfx/numeric/ftools.hxx> #include "oox/helper/attributelist.hxx" diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index d0d807989066..055e1cfb7785 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/xml/sax/XFastContextHandler.hpp> -#include <osl/diagnose.h> #include "oox/helper/propertymap.hxx" #include "oox/core/relations.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index 4a9cf3ae65bc..6a065eec67fd 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "drawingml/table/tablebackgroundstylecontext.hxx" #include "drawingml/misccontexts.hxx" diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index 0d738d4fd59b..b206bcfbfd2c 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "drawingml/table/tablecellcontext.hxx" #include "drawingml/textbodycontext.hxx" diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index c3c5f48b18a9..93308773d989 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "oox/helper/attributelist.hxx" #include "drawingml/guidcontext.hxx" #include "drawingml/table/tablecontext.hxx" diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx b/oox/source/drawingml/table/tablepartstylecontext.cxx index 4f076f4bb9d2..a4444ac3a25e 100644 --- a/oox/source/drawingml/table/tablepartstylecontext.cxx +++ b/oox/source/drawingml/table/tablepartstylecontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "drawingml/table/tablepartstylecontext.hxx" #include "drawingml/table/tablestyletextstylecontext.hxx" diff --git a/oox/source/drawingml/table/tablerowcontext.cxx b/oox/source/drawingml/table/tablerowcontext.cxx index 76f5a7a292e7..d8f5bb4b65fe 100644 --- a/oox/source/drawingml/table/tablerowcontext.cxx +++ b/oox/source/drawingml/table/tablerowcontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "drawingml/table/tablerowcontext.hxx" #include "drawingml/table/tablecellcontext.hxx" diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index e2dc4b596824..06bd6187b89d 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "drawingml/table/tablestylecellstylecontext.hxx" #include "drawingml/misccontexts.hxx" diff --git a/oox/source/drawingml/table/tablestylecontext.cxx b/oox/source/drawingml/table/tablestylecontext.cxx index 48608d902c6a..2ccbd0f298d6 100644 --- a/oox/source/drawingml/table/tablestylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "drawingml/table/tablestylecontext.hxx" #include "drawingml/table/tablebackgroundstylecontext.hxx" diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx index 55240664bed6..eb2feb53abc8 100644 --- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx +++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "drawingml/table/tablestyletextstylecontext.hxx" #include "drawingml/colorchoicecontext.hxx" diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 3905a406c996..df3be9cf4a9d 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -21,7 +21,6 @@ #include <list> -#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/string.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 141c963e6a4c..4c0b8a8434d3 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -18,7 +18,6 @@ */ #include "drawingml/textliststyle.hxx" -#include <osl/diagnose.h> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 92cfebe8811b..84e74b252438 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextField.hpp> -#include <osl/diagnose.h> #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index f80fca009037..5d7c1a140059 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -21,7 +21,6 @@ #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" -#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index ca0c1c01da82..3733719ac596 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -23,7 +23,6 @@ #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" -#include <osl/diagnose.h> #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/animations/XAnimationNode.hpp> diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index c17d2075b52d..b69d8009db60 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -21,7 +21,6 @@ #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" -#include <osl/diagnose.h> #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/animations/XAnimationNode.hpp> diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 6cb0d96bcbda..34c7e3eeeb55 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -21,7 +21,6 @@ #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" -#include <osl/diagnose.h> #include <rtl/math.hxx> #include <com/sun/star/animations/XTimeContainer.hpp> diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 2a15147abe5f..40feb66e191b 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -21,7 +21,6 @@ #include <ManifestWriter.hxx> #include <cppuhelper/factory.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> -#include <osl/diagnose.h> #include <ZipPackage.hxx> #include <zipfileaccess.hxx> diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx index 1d06531ab61b..e32f64e1ea7e 100644 --- a/package/source/xstor/register.cxx +++ b/package/source/xstor/register.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/InvalidRegistryException.hpp> #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include "xfactory.hxx" diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index 8e5b7fc31e6a..a1e60271287e 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> +#include <osl/diagnose.h> class OStorageFactory : public ::cppu::WeakImplHelper< css::lang::XSingleServiceFactory, css::lang::XServiceInfo > diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 29dca80b6e92..f7f54d6ff421 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <comphelper/storagehelper.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <osl/diagnose.h> #include <osl/time.h> #include <osl/thread.hxx> diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx index e2d7acc6ec2a..e23b74db20eb 100644 --- a/pyuno/source/module/pyuno_struct.cxx +++ b/pyuno/source/module/pyuno_struct.cxx @@ -24,7 +24,6 @@ #include <rtl/strbuf.hxx> -#include <osl/diagnose.h> #include <typelib/typedescription.hxx> diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx index 9f1270936812..4b15604766e0 100644 --- a/registry/tools/regmerge.cxx +++ b/registry/tools/regmerge.cxx @@ -23,7 +23,6 @@ #include "options.hxx" #include "rtl/ustring.hxx" -#include "osl/diagnose.h" #include <stdio.h> #include <string.h> diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 1e80b1b688df..1a1ba382c927 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -31,7 +31,6 @@ #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include "cppuhelper/unourl.hxx" -#include <osl/diagnose.h> #include <osl/mutex.hxx> using namespace cppu; diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 0b1260b60f0e..ba2ce3d55077 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -18,7 +18,6 @@ */ #include <sal/types.h> #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> #include "ReportDefinition.hxx" #include "FormattedField.hxx" diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index 5d3724a24a10..0fd09eea6058 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> #include "xmlfilter.hxx" #include "xmlExport.hxx" diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index d6720053fe83..72ccc2b5211b 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -23,7 +23,6 @@ #include "ModuleHelper.hxx" #include "helpids.hrc" #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <tools/debug.hxx> #include "metadata.hxx" diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index e7e8440cc51d..2424445129c0 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> #include "ReportController.hxx" #include "toolboxcontroller.hxx" diff --git a/sal/osl/unx/interlck.cxx b/sal/osl/unx/interlck.cxx index e799805c98fc..bd069e9638dd 100644 --- a/sal/osl/unx/interlck.cxx +++ b/sal/osl/unx/interlck.cxx @@ -20,7 +20,6 @@ #include "system.hxx" #include <osl/interlck.h> -#include <osl/diagnose.h> #if ( defined (__sun) || defined ( NETBSD ) ) && defined ( SPARC ) #error please use asm/interlck_sparc.s diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index f14107c1ba23..792ea8166c9c 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -31,7 +31,6 @@ #include "system.hxx" #include <osl/security.h> -#include <osl/diagnose.h> #include <rtl/bootstrap.h> #include <sal/log.hxx> diff --git a/sal/osl/unx/time.cxx b/sal/osl/unx/time.cxx index 8fe65f55ea7b..61d452434d64 100644 --- a/sal/osl/unx/time.cxx +++ b/sal/osl/unx/time.cxx @@ -22,7 +22,6 @@ #include "saltime.hxx" #include "system.hxx" -#include <osl/diagnose.h> #include <osl/time.h> #include <time.h> #include <unistd.h> diff --git a/sal/osl/w32/file_error.cxx b/sal/osl/w32/file_error.cxx index dc9425d20bf8..01d4a97d6ee6 100644 --- a/sal/osl/w32/file_error.cxx +++ b/sal/osl/w32/file_error.cxx @@ -22,7 +22,6 @@ #include "file_error.hxx" -#include "osl/diagnose.h" #include "osl/thread.hxx" #include <sal/macros.h> diff --git a/sal/osl/w32/interlck.cxx b/sal/osl/w32/interlck.cxx index 68c9504763a1..3866062d75c2 100644 --- a/sal/osl/w32/interlck.cxx +++ b/sal/osl/w32/interlck.cxx @@ -20,7 +20,6 @@ #include "system.h" #include <osl/interlck.h> -#include <osl/diagnose.h> oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount) { diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index 9f76dc40bd1a..6d86ae58bad8 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -31,7 +31,6 @@ #include <cassert> #include <memory> -#include <osl/diagnose.h> #include <osl/security.h> #include <osl/nlsupport.h> #include <osl/mutex.h> diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index dbf3f62a87a2..623cfdca3d90 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -29,7 +29,6 @@ #include "file_url.hxx" #include "path_helper.hxx" -#include <osl/diagnose.h> #include <osl/signal.h> #include <DbgHelp.h> #include <errorrep.h> diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index 721af2a97aa1..1193126d8c2d 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -26,7 +26,6 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <osl/diagnose.h> #include <rtl/random.h> #include <string.h> diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx index f3ac99ea349c..42cd84433ba2 100644 --- a/sal/rtl/alloc_arena.cxx +++ b/sal/rtl/alloc_arena.cxx @@ -22,7 +22,6 @@ #include "alloc_impl.hxx" #include "rtllifecycle.h" #include "sal/macros.h" -#include "osl/diagnose.h" #include <cassert> #include <string.h> diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx index 79c8e76e8ca3..f68d13909686 100644 --- a/sal/rtl/alloc_cache.cxx +++ b/sal/rtl/alloc_cache.cxx @@ -22,7 +22,6 @@ #include "alloc_arena.hxx" #include "rtllifecycle.h" #include "sal/macros.h" -#include "osl/diagnose.h" #include <osl/thread.hxx> #include <cassert> diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 91653f6cdabe..e23d5ac60db7 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osl/diagnose.h" #include "rtl/character.hxx" #include "rtl/strbuf.hxx" #include "rtl/textenc.h" diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index afae9c2eb41e..d435c8f317e2 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -26,7 +26,6 @@ #include <cstddef> #include <cstdlib> -#include "osl/diagnose.h" #include "osl/module.hxx" #include "rtl/instance.hxx" #include "rtl/textenc.h" diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 35509016b9fe..6747511840ed 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -22,7 +22,6 @@ #include <memory> #include <vector> -#include <osl/diagnose.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index a8227865b261..eb15b19e94be 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -34,7 +34,6 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/conditn.hxx> -#include <osl/diagnose.h> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index baab11f86780..5bf2f3ec1c70 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -42,7 +42,6 @@ #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/diagnose.h> using namespace ::std; using namespace ::cppu; diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx index 8380b3b43de2..83f9e224a53a 100644 --- a/sax/test/testcomponent.cxx +++ b/sax/test/testcomponent.cxx @@ -33,7 +33,6 @@ #include <cppuhelper/servicefactory.hxx> -#include <osl/diagnose.h> using namespace ::cppu; using namespace ::com::sun::star::uno; diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index ba1d5f3c54ee..09916337da1b 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -19,7 +19,6 @@ #include "sheetevents.hxx" #include <com/sun/star/script/vba/VBAEventId.hpp> -#include <osl/diagnose.h> OUString ScSheetEvents::GetEventName(ScSheetEventId nEvent) { diff --git a/sc/source/filter/oox/tablecolumnsbuffer.cxx b/sc/source/filter/oox/tablecolumnsbuffer.cxx index 56b0f7e094e9..80d21457101d 100644 --- a/sc/source/filter/oox/tablecolumnsbuffer.cxx +++ b/sc/source/filter/oox/tablecolumnsbuffer.cxx @@ -20,7 +20,6 @@ #include "tablecolumnsbuffer.hxx" #include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index 1c858f1de77a..602b47fa2849 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx @@ -18,7 +18,6 @@ */ #include "DrawModelBroadcaster.hxx" -#include <osl/diagnose.h> #include <rtl/strbuf.hxx> #include <svx/svdmodel.hxx> #include <svx/unomod.hxx> diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 808c28d80852..f4001d9587b6 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -22,7 +22,6 @@ #include <basic/basmgr.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/diagnose.h> #include <sfx2/objsh.hxx> #include "formulacell.hxx" #include <com/sun/star/container/XContainer.hpp> diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index f038be52597a..dd023dd473d3 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -25,7 +25,6 @@ #include <comphelper/random.hxx> #include <cppuhelper/supportsservice.hxx> #include <o3tl/any.hxx> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> #include <sal/macros.h> diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 718fbb675060..055f7bcc5525 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/util/Date.hpp> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <tools/rcid.h> #include <tools/resmgr.hxx> diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index b3a1a85612c3..e1843cf5b396 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -30,7 +30,6 @@ #include <cppuhelper/supportsservice.hxx> #include <iostream> #include <algorithm> -#include <osl/diagnose.h> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> #include <tools/rcid.h> diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 6d54f1cb47e9..19114a64ddce 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -31,7 +31,6 @@ #include <comphelper/propertysetinfo.hxx> #include <tools/urlobj.hxx> #include <svx/xtable.hxx> -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index eb43298013a0..585e37f5e23f 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -24,7 +24,6 @@ #include <cppuhelper/factory.hxx> #include <sfx2/sfxmodelfactory.hxx> -#include "osl/diagnose.h" #include "sal/types.h" #include <string.h> diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 5abfc7dcf580..3bd0dcfde17f 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <sal/macros.h> -#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 106c25c01093..4b27527b9034 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -22,7 +22,6 @@ #include "inc/pdfihelper.hxx" #include "inc/pdfparse.hxx" -#include <osl/diagnose.h> #include <osl/file.h> #include <osl/thread.h> #include <rtl/digest.h> diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 29c9e32f29de..4b6d4a82c3a0 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -32,7 +32,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -#include <osl/diagnose.h> #include <rtl/ref.hxx> #include <vcl/errcode.hxx> diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 07bf409b8c61..3e861b9ecede 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -20,7 +20,6 @@ #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/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index ee54a628d9d2..a8b71e7408b3 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <sfx2/styfitem.hxx> #include <tools/rcid.h> diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index e6d160f4a6fc..775659000cb8 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -41,7 +41,6 @@ #include <cppuhelper/implbase.hxx> #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/weak.hxx" -#include "osl/diagnose.h" #include "osl/file.hxx" #include "osl/security.hxx" #include "rtl/string.h" diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 006b3cf92c63..1e17dde9b3b4 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include "cmdmailsuppl.hxx" using namespace ::com::sun::star::uno; diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index d3d9d8011038..6a31af2fe52a 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -19,7 +19,6 @@ #include <config_folders.h> -#include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/bootstrap.hxx> diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx index ae7c82d883d8..5c6fe20f4054 100644 --- a/shell/source/tools/lngconvex/cmdline.cxx +++ b/shell/source/tools/lngconvex/cmdline.cxx @@ -19,7 +19,6 @@ #include <stdexcept> -#include <osl/diagnose.h> #include "cmdline.hxx" diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index fb7c56e22554..def9d67cdae6 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -19,7 +19,6 @@ #include <config_folders.h> -#include <osl/diagnose.h> #include <osl/thread.h> #include <osl/process.h> #include <osl/file.hxx> diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 2478f8c17808..bb6cd0c297fc 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -18,7 +18,6 @@ */ #include <cppuhelper/factory.hxx> -#include <osl/diagnose.h> #include "shellexec.hxx" using namespace ::com::sun::star::uno; diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index 4f208399ca5d..7a53c5436fef 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include "SysShExec.hxx" using namespace ::com::sun::star::uno; diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 752102f36908..25aaeb1d5f75 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/factory.hxx> #include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> #include "smplmailsuppl.hxx" using namespace ::com::sun::star::uno; diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index 19b8dd695652..63b17216cf0f 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <osl/file.h> #include "smplmailmsg.hxx" diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx index e6599fd17f5e..0ade1644f1ea 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.cxx +++ b/shell/source/win32/simplemail/smplmailsuppl.cxx @@ -18,7 +18,6 @@ */ #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> #include "smplmailsuppl.hxx" #include "smplmailclient.hxx" diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 8760d7aaa730..f6dd5d589ed3 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -21,7 +21,6 @@ #include <tools/stream.hxx> #include <sot/exchange.hxx> #include <sot/filelist.hxx> -#include <osl/diagnose.h> #include <osl/thread.h> /****************************************************************************** diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 4f3069904ce0..ca69846a617a 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -18,7 +18,6 @@ */ #include <osl/mutex.hxx> -#include <osl/diagnose.h> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/implbase.hxx> diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 7ff8f610c8aa..db850bdb5e6a 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -19,7 +19,6 @@ #include <cstdarg> -#include <osl/diagnose.h> #include <osl/process.h> #include <rtl/process.h> diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index f5b852553ddc..88787b7b5515 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -19,7 +19,6 @@ #include <osl/mutex.hxx> -#include <osl/diagnose.h> #include <uno/dispatcher.h> #include <uno/mapping.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index 32a5cc322d9c..fe8178d0d1d2 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -36,7 +36,6 @@ #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include <osl/diagnose.h> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/textenc.h> diff --git a/store/source/stordata.cxx b/store/source/stordata.cxx index 9c5e6318249c..01822cd44e56 100644 --- a/store/source/stordata.cxx +++ b/store/source/stordata.cxx @@ -21,7 +21,6 @@ #include <sal/types.h> #include <sal/log.hxx> -#include <osl/diagnose.h> #include "store/types.h" #include "storbase.hxx" diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx index 3d10ec04e4fc..0a53c096bb3a 100644 --- a/store/source/storpage.cxx +++ b/store/source/storpage.cxx @@ -23,7 +23,6 @@ #include "sal/log.hxx" #include "rtl/string.h" #include "rtl/ref.hxx" -#include "osl/diagnose.h" #include "osl/mutex.hxx" #include "store/types.h" diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 6c0dc09e6172..4a0cbd41b8af 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/uno/Any.hxx> -#include <osl/diagnose.h> #include <tools/stream.hxx> #include <svl/cenumitm.hxx> #include <svl/eitem.hxx> diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index bb5aaea88143..e6ef22205b85 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/uno/Any.hxx> -#include <osl/diagnose.h> #include <tools/stream.hxx> #include <svl/cintitem.hxx> diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index d84a2622c41c..9dd95296c354 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -24,7 +24,6 @@ #include <rtl/instance.hxx> #include <rtl/crc.h> -#include <osl/diagnose.h> #include <osl/getglobalmutex.hxx> #include <tools/solar.h> #include <tools/debug.hxx> diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 24da6cb89549..da7b8c00a909 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -24,7 +24,6 @@ #include <comphelper/string.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> -#include <osl/diagnose.h> #include <i18nlangtag/mslangid.hxx> #include <rtl/math.hxx> #include <unotools/charclass.hxx> diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index d9b749328357..4a79dc74d069 100644 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -21,7 +21,6 @@ #include "sal/types.h" -#include "osl/diagnose.h" #include "cppuhelper/factory.hxx" #include <coreservices.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 95363b05ce84..a8ec6032a234 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -59,7 +59,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/property.hxx> #include <comphelper/processfactory.hxx> -#include <osl/diagnose.h> using namespace ::svxform; using namespace ::com::sun::star::uno; diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 52ab4748cb55..dc4de5d8e1db 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -18,7 +18,6 @@ */ #include <tools/stream.hxx> -#include <osl/diagnose.h> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/CellVertJustify2.hpp> #include <com/sun/star/table/ShadowLocation.hpp> diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 5cbbe59fba18..f38dcf8a0d9a 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -27,7 +27,6 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <svl/itempool.hxx> #include "svx/unoapi.hxx" diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index ff955e1eacec..dfe61305670f 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -28,7 +28,6 @@ #include <unicode/uchar.h> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> -#include <osl/diagnose.h> #include <algorithm> using namespace com::sun::star; diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index f0b4c07bece1..59e5ea6bad22 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -21,7 +21,6 @@ #include <algorithm> -#include <osl/diagnose.h> #include <svl/poolitem.hxx> #include <comphelper/sequence.hxx> diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index 46674ebd4b6c..d9376ed79d07 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -77,7 +77,6 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> -#include <osl/diagnose.h> #include <swtypes.hxx> #include <unomap.hxx> #include <unoprnms.hxx> diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 3f45eb0563ff..f4d0dbf456f8 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <cppuhelper/implementationentry.hxx> -#include <osl/diagnose.h> #include <comphelper/servicedecl.hxx> #include <service.hxx> diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index d00a658cdf0a..59092cc3bd5f 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -18,7 +18,6 @@ */ #include "vbaaddins.hxx" #include "vbaaddin.hxx" -#include <osl/diagnose.h> #include <unotools/pathoptions.hxx> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index ae340194c406..3e35953f5547 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -30,7 +30,6 @@ #include <swtypes.hxx> #include <basic/sberrors.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/diagnose.h> using namespace ::ooo::vba; using namespace ::com::sun::star; diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index bfb0b1ba5ce6..92a385cc34a9 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -19,7 +19,6 @@ #include <vbahelper/helperdecl.hxx> #include "service.hxx" #include "vbaglobals.hxx" -#include <osl/diagnose.h> #include <sal/macros.h> #include <comphelper/unwrapargs.hxx> diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 8d51c715dde4..d2af12485e99 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -20,7 +20,6 @@ #include "vbastyle.hxx" #include <basic/sberrors.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/diagnose.h> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> diff --git a/sw/source/uibase/config/caption.cxx b/sw/source/uibase/config/caption.cxx index ab56dbccf3f2..83746c5bb31e 100644 --- a/sw/source/uibase/config/caption.cxx +++ b/sw/source/uibase/config/caption.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include "numrule.hxx" #include "caption.hxx" diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 7ea77caf924f..9747e192fc9c 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -21,7 +21,6 @@ #include <mmconfigitem.hxx> #include <vector> #include <swtypes.hxx> -#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx index 7834a954a415..be598e4b1dd3 100644 --- a/sw/source/uibase/uno/unofreg.cxx +++ b/sw/source/uibase/uno/unofreg.cxx @@ -24,7 +24,6 @@ #include "unofreg.hxx" #include "unomailmerge.hxx" #include <sal/types.h> -#include <osl/diagnose.h> #include <cppuhelper/factory.hxx> #include <sfx2/sfxmodelfactory.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index a538e1ab3e04..37dec64bbce5 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -26,7 +26,6 @@ #include <unotools.hxx> #include <unoprnms.hxx> #include <i18nutil/unicode.hxx> -#include <osl/diagnose.h> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index cf6de345d9ce..9f142018a142 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <osl/diagnose.h> #include "helper/unopropertyarrayhelper.hxx" diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index b7f2454d62d3..72e6f8a1c279 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <osl/diagnose.h> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 65850ce0b129..6725670f82ce 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -39,7 +39,6 @@ #include <typeinfo> #include <vector> -#include <osl/diagnose.h> #include <tools/diagnose_ex.h> #ifdef DBG_UTIL diff --git a/tools/source/generic/svborder.cxx b/tools/source/generic/svborder.cxx index 9e4f15133f9c..053fa25ab315 100644 --- a/tools/source/generic/svborder.cxx +++ b/tools/source/generic/svborder.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <tools/svborder.hxx> -#include <osl/diagnose.h> tools::Rectangle & operator += ( tools::Rectangle & rRect, const SvBorder & rBorder ) { diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 9f8f4c7888b1..f131851475aa 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -18,7 +18,6 @@ */ #include <osl/mutex.hxx> -#include <osl/diagnose.h> #include <uno/mapping.hxx> #include <comphelper/processfactory.hxx> diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 04870bb93896..46e37a3f93dc 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <ucbhelper/contentidentifier.hxx> -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 640717028361..1e7a4d55775b 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -23,7 +23,6 @@ #include <sal/macros.h> #include <osl/time.h> -#include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index d76440f3a25e..f7959606b84b 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -25,7 +25,6 @@ *************************************************************************/ #include "rtl/ustrbuf.hxx" -#include "osl/diagnose.h" #include "hierarchyuri.hxx" diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 585c792f1ded..c805603ee4e9 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -24,7 +24,6 @@ *************************************************************************/ -#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <cppuhelper/weak.hxx> #include <ucbhelper/contentidentifier.hxx> diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index 5b84e78f2c96..b797106dfcc0 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -25,7 +25,6 @@ *************************************************************************/ #include "rtl/ustrbuf.hxx" -#include "osl/diagnose.h" #include "comphelper/storagehelper.hxx" #include "../inc/urihelper.hxx" diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index ef82213e7937..cafb01c3aa13 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -33,7 +33,6 @@ *************************************************************************/ #include <memory> -#include <osl/diagnose.h> #include <com/sun/star/util/DateTime.hpp> #include "NeonUri.hxx" #include "DAVResource.hxx" diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 1162e88ef659..5603f49798af 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -27,7 +27,6 @@ ************************************************************************/ -#include "osl/diagnose.h" #include "com/sun/star/io/IOException.hpp" #include "com/sun/star/lang/IllegalArgumentException.hpp" #include "com/sun/star/task/XInteractionAbort.hpp" diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx index b75db5a8b428..de145e5727ed 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx @@ -29,7 +29,6 @@ #include <config_lgpl.h> #include <string.h> #include <ne_xml.h> -#include <osl/diagnose.h> #include "LockSequence.hxx" #include <memory> diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx index 5e7945dcae58..d49223da33a3 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyState.hpp> diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 5e37bd4690ec..c2b0459c9294 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -31,7 +31,6 @@ #include "rtl/ustring.hxx" #include "osl/time.h" #include "osl/thread.hxx" -#include <osl/diagnose.h> #include "salhelper/thread.hxx" #include "NeonSession.hxx" #include "NeonLockStore.hxx" diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx index d8a4b2f083ee..df1e99aad052 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx @@ -27,7 +27,6 @@ ************************************************************************/ -#include "osl/diagnose.h" #include <osl/mutex.hxx> #include "rtl/strbuf.hxx" #include "NeonSession.hxx" diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index d2ce9673d375..85e6ab1794c5 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -29,7 +29,6 @@ #include <config_lgpl.h> #include <string.h> #include <ne_xml.h> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include "UCBDeadPropertyValue.hxx" diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index 0723af97546f..f86ed585c718 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -33,7 +33,6 @@ *************************************************************************/ -#include <osl/diagnose.h> #include <o3tl/make_unique.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/OpenMode.hpp> diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index ddeefbdd41aa..b695b9c8a598 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <osl/diagnose.h> #include <com/sun/star/util/DateTime.hpp> #include "SerfUri.hxx" #include "DAVResource.hxx" diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index f0bf077ba82f..8ffc11305536 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp> diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx index 46769669e942..ca1131038bcb 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -18,7 +18,6 @@ */ #include <string.h> -#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include "UCBDeadPropertyValue.hxx" diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 6da72d26aa8f..3a8a2ea8d8bb 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -23,7 +23,6 @@ #include <utility> #include <o3tl/make_unique.hxx> -#include <osl/diagnose.h> #include <com/sun/star/ucb/OpenMode.hpp> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/providerhelper.hxx> diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 0c93d576e787..2ad3edc29d5d 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -26,7 +26,6 @@ #include <com/sun/star//ucb/UnsupportedCommandException.hpp> #include <com/sun/star/ucb/XPropertySetRegistry.hpp> -#include "osl/diagnose.h" #include "osl/mutex.hxx" #include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contentinfo.hxx> diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index f2538dc5c9bf..f9be432a9a7a 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -29,7 +29,6 @@ #include <cppuhelper/weakref.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> -#include <osl/diagnose.h> #include "itemholder1.hxx" diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 5d0dda0c1266..95d015b41d7c 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -28,7 +28,6 @@ #include <o3tl/enumrange.hxx> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> #include "itemholder1.hxx" diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx index dc3691d8a1da..a695b2cd2d01 100644 --- a/vcl/osx/documentfocuslistener.cxx +++ b/vcl/osx/documentfocuslistener.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <osl/diagnose.h> using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; diff --git a/vcl/osx/service_entry.cxx b/vcl/osx/service_entry.cxx index ba863013d68d..111983d68fba 100644 --- a/vcl/osx/service_entry.cxx +++ b/vcl/osx/service_entry.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "osl/diagnose.h" #include <vcl/svapp.hxx> diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 694c0c2cd7ab..c674c667c788 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx @@ -25,7 +25,6 @@ #include <jerror.h> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <osl/diagnose.h> extern "C" { #include "transupp.h" diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index cddc1210630f..84ca679f66dd 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -23,7 +23,6 @@ #include <impbmp.hxx> -#include <osl/diagnose.h> #include <string.h> diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 3be630dd8611..756b8e3fddcf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#include <osl/diagnose.h> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index c6b09452df91..42ef78a59132 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/diagnose.h> #include <vcl/svapp.hxx> #include <tools/resmgr.hxx> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 5aa2a6b48c92..03c53211c742 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -20,7 +20,6 @@ #include <iostream> #include <libetonyek/libetonyek.h> #include <libodfgen/libodfgen.hxx> -#include <osl/diagnose.h> #include <rtl/tencinfo.h> #include <ucbhelper/content.hxx> #include <unotools/ucbhelper.hxx> diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index b3c5837fafdc..beb3213eed41 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp> -#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 6f5fad966224..b1bbf6ae467c 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -23,7 +23,6 @@ #include <officecfg/Office/Common.hxx> #include <officecfg/Setup.hxx> #include <osl/file.hxx> -#include <osl/diagnose.h> #include <ucbhelper/contentidentifier.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 884baed3d213..f38a2e2eb860 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -25,7 +25,6 @@ #include <string.h> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> -#include <osl/diagnose.h> #include <cppuhelper/factory.hxx> diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 4f55f1ec2726..709b703ca6b0 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/chart/XChartDocument.hpp> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> -#include <osl/diagnose.h> #include <list> diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index c94a9dcc6191..4477ff92e957 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -20,7 +20,6 @@ #include <cassert> #include <tools/debug.hxx> -#include <osl/diagnose.h> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/presentation/ClickAction.hpp> diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 2b657689635d..1fe91cd88fd2 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -34,7 +34,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> #include "callbacks.hxx" #include <xmloff/XMLConstantsPropertyHandler.hxx> diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index a3738d48e910..62be80443c31 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -18,7 +18,6 @@ */ #include "eventexport.hxx" -#include <osl/diagnose.h> #include "strings.hxx" #include <comphelper/sequence.hxx> diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index b0da002e7e60..86e23a4220ab 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -18,7 +18,6 @@ */ #include "formenums.hxx" -#include <osl/diagnose.h> #include <com/sun/star/form/FormSubmitEncoding.hpp> #include <com/sun/star/form/FormSubmitMethod.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index a031bfc1dad0..9b42098a5698 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -18,7 +18,6 @@ */ #include <xmloff/txtprmap.hxx> -#include <osl/diagnose.h> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/maptype.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index bba21a99c47b..13f1576f8095 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/script/vba/XVBACompatibility.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> -#include <osl/diagnose.h> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <i18nlangtag/languagetag.hxx> |