strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move ErrCode to comphelper and improve debug output string

Browse source 
need to move it, because modules "below" vcl want
to use the debug output method

Change-Id: Ibcaf4089a1e0b3fcc0b5189c7ebf1aae90f50b48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139791
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2022-09-12 12:15:35 +02:00
parent 5cc45f148d
commit fd3888c69a
124 changed files with 194 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
accessibility/inc/pch/precompiled_acc.hxx
View file

@ -108,7 +108,7 @@
#include <vcl/dllapi.h>
#include <vcl/dndhelp.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

2
basctl/inc/pch/precompiled_basctl.hxx
View file

@ -121,7 +121,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

2
basic/inc/basic.hrc
View file

@ -21,7 +21,7 @@
#include <basic/sberrors.hxx>
#include <unotools/resmgr.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <utility>

2
basic/inc/pch/precompiled_sb.hxx
View file

@ -52,7 +52,7 @@
#include <sal/saldllapi.h>
#include <sal/types.h>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/graph.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/settings.hxx>

2
basic/inc/sbxbase.hxx
View file

@ -23,7 +23,7 @@
#include <basic/sbxvar.hxx>
#include <i18nlangtag/lang.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <memory>
#include <vector>

2
basic/source/classes/sbunoobj.cxx
View file

@ -23,7 +23,7 @@
#include <o3tl/safeint.hxx>
#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <svl/hint.hxx>
#include <cppuhelper/implbase.hxx>

2
basic/source/inc/buffer.hxx
View file

@ -21,7 +21,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vector>
// Stores all numbers big endian

2
basic/source/inc/sbintern.hxx
View file

@ -22,7 +22,7 @@
#include <basic/sbstar.hxx>
#include <sbxfac.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <config_features.h>
namespace utl

2
basic/source/inc/scanner.hxx
View file

@ -20,7 +20,7 @@
#pragma once
#include <basic/sbxdef.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
// The scanner is stand-alone, i. e. it can be used from everywhere.
// A BASIC-instance is necessary for error messages. Without BASIC

2
basic/source/runtime/ddectrl.cxx
View file

@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <svl/svdde.hxx>
#include "ddectrl.hxx"
#include <basic/sberrors.hxx>

2
basic/source/runtime/ddectrl.hxx
View file

@ -20,7 +20,7 @@
#pragma once
#include <tools/link.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <memory>
#include <vector>

2
basic/source/runtime/dllmgr.hxx
View file

@ -20,7 +20,7 @@
#pragma once
#include <sal/config.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <memory>
class SbxArray;

2
basic/source/sbx/sbxbool.cxx
View file

@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include "sbxres.hxx"

2
basic/source/sbx/sbxbyte.cxx
View file

@ -20,7 +20,7 @@
#include <sal/config.h>
#include <o3tl/safeint.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
//#include <basic/sbx.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"

2
basic/source/sbx/sbxchar.cxx
View file

@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>

2
basic/source/sbx/sbxdbl.cxx
View file

@ -19,7 +19,7 @@
#include <config_features.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>
#include <runtime.hxx>

2
basic/source/sbx/sbxint.cxx
View file

@ -20,7 +20,7 @@
#include <sal/config.h>
#include <o3tl/safeint.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>

2
basic/source/sbx/sbxlng.cxx
View file

@ -19,7 +19,7 @@
#include <sal/config.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>

2
basic/source/sbx/sbxscan.cxx
View file

@ -23,7 +23,7 @@
#include <config_features.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <unotools/resmgr.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>

2
basic/source/sbx/sbxsng.cxx
View file

@ -19,7 +19,7 @@
#include <sal/config.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>

2
basic/source/sbx/sbxuint.cxx
View file

@ -19,7 +19,7 @@
#include <sal/config.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>

2
basic/source/sbx/sbxulng.cxx
View file

@ -19,7 +19,7 @@
#include <sal/config.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sberrors.hxx>
#include "sbxconv.hxx"
#include <rtlproto.hxx>

2
chart2/inc/pch/precompiled_chartcontroller.hxx
View file

@ -113,7 +113,7 @@
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

2
chart2/inc/pch/precompiled_chartcore.hxx
View file

@ -73,7 +73,7 @@
#include <vcl/cairo.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/font.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/metaactiontypes.hxx>

2
chart2/source/model/inc/XMLFilter.hxx
View file

@ -25,7 +25,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <osl/mutex.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::uno { class XComponentContext; }

1
comphelper/Library_comphelper.mk
View file

@ -104,6 +104,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/docpasswordhelper \
comphelper/source/misc/docpasswordrequest \
comphelper/source/misc/documentinfo \
comphelper/source/misc/errcode \
comphelper/source/misc/evtlistenerhlp \
comphelper/source/misc/evtmethodhelper \
comphelper/source/misc/fileurl \

108
vcl/source/helper/errcode.cxx → comphelper/source/misc/errcode.cxx
View file

@ -17,130 +17,144 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <rtl/ustrbuf.hxx>
VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err)
COMPHELPER_DLLPUBLIC OUString ErrCode::toString() const
{
os << err.toHexString() << "(" << (err.IsWarning() ? "Warning" : "Error");
if (err.IsDynamic())
os << " Dynamic";
OUStringBuffer buf(128);
buf.append(toHexString() + "(");
if (IsWarning())
buf.append("Warning");
else
buf.append("Error");
if (IsDynamic())
buf.append(" Dynamic");
else
{
os << " Area:";
switch (err.GetArea())
std::u16string_view pArea;
switch (GetArea())
{
case ErrCodeArea::Io:
os << "Io";
pArea = u"Io";
break;
case ErrCodeArea::Sfx:
os << "Sfx";
pArea = u"Sfx";
break;
case ErrCodeArea::Inet:
os << "Inet";
pArea = u"Inet";
break;
case ErrCodeArea::Vcl:
os << "Vcl";
pArea = u"Vcl";
break;
case ErrCodeArea::Svx:
os << "Svx";
pArea = u"Svx";
break;
case ErrCodeArea::So:
os << "So";
pArea = u"So";
break;
case ErrCodeArea::Sbx:
os << "Sbx";
pArea = u"Sbx";
break;
case ErrCodeArea::Uui:
os << "Uui";
pArea = u"Uui";
break;
case ErrCodeArea::Sc:
os << "Sc";
pArea = u"Sc";
break;
case ErrCodeArea::Sd:
os << "Sd";
pArea = u"Sd";
break;
case ErrCodeArea::Sw:
os << "Sw";
pArea = u"Sw";
break;
default:
os << "Unknown";
}
os << " Class:";
switch (err.GetClass())
buf.append(OUString::Concat(" Area:") + pArea);
std::u16string_view pClass;
switch (GetClass())
{
case ErrCodeClass::NONE:
os << "NONE";
pClass = u"NONE";
break;
case ErrCodeClass::Abort:
os << "Abort";
pClass = u"Abort";
break;
case ErrCodeClass::General:
os << "General";
pClass = u"General";
break;
case ErrCodeClass::NotExists:
os << "NotExists";
pClass = u"NotExists";
break;
case ErrCodeClass::AlreadyExists:
os << "AlreadyExists";
pClass = u"AlreadyExists";
break;
case ErrCodeClass::Access:
os << "Access";
pClass = u"Access";
break;
case ErrCodeClass::Path:
os << "Path";
pClass = u"Path";
break;
case ErrCodeClass::Locking:
os << "Locking";
pClass = u"Locking";
break;
case ErrCodeClass::Parameter:
os << "Parameter";
pClass = u"Parameter";
break;
case ErrCodeClass::Space:
os << "Space";
pClass = u"Space";
break;
case ErrCodeClass::NotSupported:
os << "NotSupported";
pClass = u"NotSupported";
break;
case ErrCodeClass::Read:
os << "Read";
pClass = u"Read";
break;
case ErrCodeClass::Write:
os << "Write";
pClass = u"Write";
break;
case ErrCodeClass::Unknown:
os << "Unknown";
pClass = u"Unknown";
break;
case ErrCodeClass::Version:
os << "Version";
pClass = u"Version";
break;
case ErrCodeClass::Format:
os << "Format";
pClass = u"Format";
break;
case ErrCodeClass::Create:
os << "Create";
pClass = u"Create";
break;
case ErrCodeClass::Import:
os << "Import";
pClass = u"Import";
break;
case ErrCodeClass::Export:
os << "Export";
pClass = u"Export";
break;
case ErrCodeClass::So:
os << "So";
pClass = u"So";
break;
case ErrCodeClass::Sbx:
os << "Sbx";
pClass = u"Sbx";
break;
case ErrCodeClass::Runtime:
os << "Runtime";
pClass = u"Runtime";
break;
case ErrCodeClass::Compiler:
os << "Compiler";
pClass = u"Compiler";
break;
}
os << " Code:" << OUString::number(err.GetCode());
buf.append(OUString::Concat(" Class:") + pClass);
buf.append(" Code:" + OUString::number(GetCode()));
}
os << ")";
buf.append(")");
return buf.makeStringAndClear();
}
COMPHELPER_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err)
{
os << err.toString();
return os;
}

2
connectivity/inc/pch/precompiled_dbase.hxx
View file

@ -83,7 +83,7 @@
#include <sal/types.h>
#include <sal/typesizes.h>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#endif // PCH_LEVEL >= 2
#if PCH_LEVEL >= 3
#include <com/sun/star/beans/Property.hpp>

2
connectivity/inc/pch/precompiled_file.hxx
View file

@ -81,7 +81,7 @@
#include <sal/types.h>
#include <sal/typesizes.h>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#endif // PCH_LEVEL >= 2
#if PCH_LEVEL >= 3
#include <com/sun/star/beans/Property.hpp>

2
cui/inc/pch/precompiled_cui.hxx
View file

@ -114,7 +114,7 @@
#include <vcl/customweld.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

2
desktop/inc/pch/precompiled_sofficeapp.hxx
View file

@ -102,7 +102,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/checksum.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/mapmod.hxx>

2
desktop/source/lib/lokinteractionhandler.hxx
View file

@ -21,7 +21,7 @@
#include <osl/conditn.hxx>
#include <cppuhelper/implbase.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>

2
editeng/inc/pch/precompiled_editeng.hxx
View file

@ -105,7 +105,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/checksum.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/font.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.hxx>

2
forms/inc/pch/precompiled_frm.hxx
View file

@ -69,7 +69,7 @@
#include <sal/macros.h>
#include <sal/types.h>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/graph.hxx>
#include <vcl/image.hxx>
#include <vcl/keycod.hxx>

2
framework/source/interaction/quietinteraction.cxx
View file

@ -28,7 +28,7 @@
#include <com/sun/star/document/LockedDocumentRequest.hpp>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/svapp.hxx>
namespace framework{

2
framework/source/loadenv/loadenv.cxx
View file

@ -85,7 +85,7 @@
#include <comphelper/configurationhelper.hxx>
#include <rtl/bootstrap.hxx>
#include <sal/log.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/profilezone.hxx>

2
framework/source/services/desktop.cxx
View file

@ -56,7 +56,7 @@
#include <desktop/crashreport.hxx>
#include <vcl/scheduler.hxx>
#include <sal/log.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/threadex.hxx>
#include <unotools/configmgr.hxx>

2
include/IwyuFilter_include.yaml
View file

@ -529,7 +529,7 @@ excludelist:
- com/sun/star/task/XInteractionRequest.hpp
include/basic/sberrors.hxx:
# Needed for macro defines
- vcl/errcode.hxx
- comphelper/errcode.hxx
include/connectivity/BlobHelper.hxx:
# base class has to be a complete type
- com/sun/star/sdbc/XBlob.hpp

2
include/basic/basmgr.hxx
View file

@ -20,7 +20,7 @@
#define INCLUDED_BASIC_BASMGR_HXX
#include <utility>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <basic/sbstar.hxx>
#include <basic/basicdllapi.h>

2
include/basic/sberrors.hxx
View file

@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SBERRORS_HXX
#define INCLUDED_BASIC_SBERRORS_HXX
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#define ERRCODE_BASIC_SYNTAX ErrCode( ErrCodeArea::Sbx, ErrCodeClass::Compiler, 1) // unspecified syntax error
#define ERRCODE_BASIC_BAD_ARGUMENT ErrCode( ErrCodeArea::Sbx, ErrCodeClass::NotSupported, 2) // Invalid procedure call

2
include/basic/sbmeth.hxx
View file

@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SBMETH_HXX
#define INCLUDED_BASIC_SBMETH_HXX
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <basic/sbxmeth.hxx>
#include <basic/sbdef.hxx>
#include <basic/basicdllapi.h>

13
include/vcl/errcode.hxx → include/comphelper/errcode.hxx
View file

@ -16,12 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_VCL_ERRCODE_HXX
#define INCLUDED_VCL_ERRCODE_HXX
#pragma once
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
#include <comphelper/comphelperdllapi.h>
#include <ostream>
/*
@ -141,6 +139,9 @@ public:
return "0x" + OUString::number(m_value, 16);
}
/// Return a string suitable for debug output, the same as the operator<< function
COMPHELPER_DLLPUBLIC OUString toString() const;
template <typename... Args> bool anyOf(Args... args) const
{
static_assert(sizeof...(args) > 0);
@ -151,7 +152,7 @@ private:
sal_uInt32 m_value;
};
VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err);
COMPHELPER_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& err);
enum class ErrCodeArea {
Io = 0 ,
@ -274,6 +275,4 @@ enum class ErrCodeClass {
#define ERRCODE_INET_GENERAL ErrCode(ErrCodeArea::Inet, ErrCodeClass::Write, 5)
#define ERRCODE_INET_OFFLINE ErrCode(ErrCodeArea::Inet, ErrCodeClass::Read, 6)
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
include/editeng/editeng.hxx
View file

@ -44,7 +44,7 @@
#include <editeng/eedata.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <svl/languageoptions.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <functional>
template <typename Arg, typename Ret> class Link;

2
include/editeng/editerr.hxx
View file

@ -19,7 +19,7 @@
#ifndef INCLUDED_EDITENG_EDITERR_HXX
#define INCLUDED_EDITENG_EDITERR_HXX
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS ErrCode(ErrCodeArea::Svx, 2)
#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT ErrCode(ErrCodeArea::Svx, ErrCodeClass::Read, 8)

2
include/editeng/editview.hxx
View file

@ -26,7 +26,7 @@
#include <i18nlangtag/lang.h>
#include <tools/color.hxx>
#include <tools/gen.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/vclptr.hxx>
#include <editeng/editstat.hxx>
#include <editeng/flditem.hxx>

2
include/editeng/outliner.hxx
View file

@ -31,7 +31,7 @@
#include <tools/color.hxx>
#include <utility>
#include <vcl/outdev.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <tools/link.hxx>
#include <editeng/editengdllapi.h>

2
include/filter/msfilter/msdffimp.hxx
View file

@ -40,7 +40,7 @@
#include <rtl/ref.hxx>
#include <sal/types.h>
#include <svx/msdffdef.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <tools/degree.hxx>
#include <tools/gen.hxx>
#include <tools/ref.hxx>

2
include/filter/msfilter/svxmsbas.hxx
View file

@ -23,7 +23,7 @@
#include <filter/msfilter/msfilterdllapi.h>
#include <rtl/ustring.hxx>
#include <sot/storage.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <tools/ref.hxx>
class SfxObjectShell;

2
include/sfx2/app.hxx
View file

@ -23,7 +23,7 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <svl/poolitem.hxx>
#include <vcl/bitmapex.hxx>
#include <tools/link.hxx>

2
include/sfx2/docinf.hxx
View file

@ -22,7 +22,7 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sal/types.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
class GDIMetaFile;

2
include/sfx2/docinsert.hxx
View file

@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <sfx2/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <tools/link.hxx>
#include <memory>
#include <vector>

2
include/sfx2/filedlghelper.hxx
View file

@ -28,7 +28,7 @@
#include <rtl/ustring.hxx>
#include <comphelper/documentconstants.hxx>
#include <tools/link.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>

2
include/sfx2/ipclient.hxx
View file

@ -26,7 +26,7 @@
#include <tools/gen.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/vclptr.hxx>
namespace com::sun::star::embed { class XEmbeddedObject; }

2
include/sfx2/objsh.hxx
View file

@ -23,7 +23,7 @@
#include <sfx2/dllapi.h>
#include <sfx2/signaturestate.hxx>
#include <sal/types.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/frame/XModel3.hpp>

2
include/sfx2/opengrf.hxx
View file

@ -22,7 +22,7 @@
#include <memory>
#include <sfx2/dllapi.h>
#include <rtl/ustring.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
namespace com::sun::star::ui::dialogs { class XFilePickerControlAccess; }
namespace com::sun::star::uno { template <class interface_type> class Reference; }

2
include/sfx2/viewsh.hxx
View file

@ -29,7 +29,7 @@
#include <sfx2/shell.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <vcl/IDialogRenderable.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vcl/vclptr.hxx>
#include <editeng/outliner.hxx>

2
include/sot/storage.hxx
View file

@ -23,7 +23,7 @@
#include <sot/object.hxx>
#include <tools/stream.hxx>
#include <tools/globname.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <sot/storinfo.hxx>
#include <sot/sotdllapi.h>

2
include/svx/svxerr.hxx
View file

@ -19,7 +19,7 @@
#ifndef INCLUDED_SVX_SVXERR_HXX
#define INCLUDED_SVX_SVXERR_HXX
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <svtools/ehdl.hxx>
#include <svx/svxdllapi.h>

2
include/svx/xoutbmp.hxx
View file

@ -21,7 +21,7 @@
#define INCLUDED_SVX_XOUTBMP_HXX
#include <vcl/graph.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <svx/svxdllapi.h>

2
include/tools/stream.hxx
View file

@ -23,7 +23,7 @@
#include <tools/lineend.hxx>
#include <tools/long.hxx>
#include <tools/ref.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <rtl/string.hxx>
#include <rtl/strbuf.hxx>
#include <o3tl/typed_flags_set.hxx>

2
include/vbahelper/vbahelper.hxx
View file

@ -31,7 +31,7 @@
#include <tools/color.hxx>
#include <vbahelper/vbadllapi.h>
#include <vcl/ptrstyle.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
namespace com::sun::star {
namespace awt { class XControl; }

2
include/vcl/cvtgrf.hxx
View file

@ -23,7 +23,7 @@
#include <vcl/dllapi.h>
#include <tools/link.hxx>
#include <vcl/salctype.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
class Graphic;

2
include/vcl/errinf.hxx
View file

@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <utility>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/dllapi.h>
#include <o3tl/typed_flags_set.hxx>

2
include/vcl/graphicfilter.hxx
View file

@ -23,7 +23,7 @@
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
#include <vcl/graph.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vcl/graphic/GraphicMetadata.hxx>

2
include/vcl/print.hxx
View file

@ -31,7 +31,7 @@
#include <vcl/dllapi.h>
#include <utility>
#include <vcl/PrinterSupport.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/outdev.hxx>
#include <vcl/prntypes.hxx>
#include <vcl/region.hxx>

2
include/xmloff/xmlexp.hxx
View file

@ -49,7 +49,7 @@
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <tools/fldunit.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vector>
#include <memory>

2
linguistic/source/dicimp.hxx
View file

@ -26,7 +26,7 @@
#include <cppuhelper/implbase.hxx>
#include <comphelper/interfacecontainer3.hxx>
#include <i18nlangtag/lang.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include "defs.hxx"

2
reportdesign/inc/pch/precompiled_rpt.hxx
View file

@ -103,7 +103,7 @@
#include <vcl/checksum.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gfxlink.hxx>

2
reportdesign/inc/pch/precompiled_rptui.hxx
View file

@ -115,7 +115,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

2
sc/IwyuFilter_sc.yaml
View file

@ -283,7 +283,7 @@ excludelist:
- vcl/outdev.hxx
sc/inc/scerrors.hxx:
# needed for defines
- vcl/errcode.hxx
- comphelper/errcode.hxx
sc/inc/scitems.hxx:
# needed for defines
- svl/typedwhich.hxx

2
sc/inc/document.hxx
View file

@ -20,7 +20,7 @@
#pragma once
#include <vcl/idle.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <vcl/vclptr.hxx>
#include "patattr.hxx"

2
sc/inc/filter.hxx
View file

@ -21,7 +21,7 @@
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include "scdllapi.h"
#include <memory>

2
sc/inc/pch/precompiled_sc.hxx
View file

@ -129,7 +129,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

2
sc/inc/pch/precompiled_scfilt.hxx
View file

@ -88,7 +88,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/checksum.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/font.hxx>
#include <vcl/gfxlink.hxx>
#include <vcl/graph.hxx>

2
sc/inc/scerrors.hxx
View file

@ -19,7 +19,7 @@
#pragma once
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
// ErrCodeClass::Read - file related, displays "Read-Error" in MsgBox
#define SCERR_IMPORT_CONNECT ErrCode( ErrCodeArea::Sc, ErrCodeClass::Read, 1 )

2
sc/inc/xmlwrap.hxx
View file

@ -22,7 +22,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include "importfilterdata.hxx"
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
namespace com::sun::star {
namespace beans { struct PropertyValue; }

2
sc/source/filter/inc/eeparser.hxx
View file

@ -21,7 +21,7 @@
#include <tools/gen.hxx>
#include <utility>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/graph.hxx>
#include <svl/itemset.hxx>
#include <svl/itempool.hxx>

2
sc/source/filter/inc/qpro.hxx
View file

@ -21,7 +21,7 @@
#include <rtl/ustring.hxx>
#include <sal/config.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <types.hxx>
class ScDocument;

2
sd/IwyuFilter_sd.yaml
View file

@ -35,7 +35,7 @@ excludelist:
- svx/svdobj.hxx
sd/inc/sderror.hxx:
# needed for defines
- vcl/errcode.hxx
- comphelper/errcode.hxx
sd/inc/sdfilter.hxx:
# base class has to be a complete type
- com/sun/star/frame/XModel.hpp

2
sd/inc/errhdl.hrc
View file

@ -22,7 +22,7 @@
#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
#include <svtools/ehdl.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include "sderror.hxx"
const ErrMsgCode RID_SD_ERRHDL[] =

2
sd/inc/pch/precompiled_sd.hxx
View file

@ -83,7 +83,7 @@
#include <vcl/commandinfoprovider.hxx>
#include <vcl/customweld.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/errinf.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>

2
sd/inc/pch/precompiled_sdui.hxx
View file

@ -121,7 +121,7 @@
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

2
sd/inc/sderror.hxx
View file

@ -19,7 +19,7 @@
#pragma once
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
// Import errors
#define ERR_FORMAT_ROWCOL ErrCode(ErrCodeArea::Sd, ErrCodeClass::Read, 1)

2
sd/source/ui/inc/filedlg.hxx
View file

@ -19,7 +19,7 @@
#pragma once
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/weld.hxx>
#include <memory>

2
sdext/inc/pch/precompiled_PresentationMinimizer.hxx
View file

@ -79,7 +79,7 @@
#include <sal/typesizes.h>
#include <vcl/IDialogRenderable.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/errinf.hxx>
#include <vcl/exceptiontypes.hxx>
#include <vcl/fntstyle.hxx>

2
sdext/source/pdfimport/misc/pwdinteract.cxx
View file

@ -32,7 +32,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
using namespace com::sun::star;

2
sfx2/inc/pch/precompiled_sfx.hxx
View file

@ -101,7 +101,7 @@
#include <vcl/customweld.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>

2
sfx2/source/doc/DocumentMetadataAccess.cxx
View file

@ -1370,7 +1370,7 @@ DocumentMetadataAccess::storeMetadataToMedium(
nError = ERRCODE_IO_GENERAL;
}
task::ErrorCodeIOException ex(
"DocumentMetadataAccess::storeMetadataToMedium Commit failed: " + nError.toHexString(),
"DocumentMetadataAccess::storeMetadataToMedium Commit failed: " + nError.toString(),
uno::Reference< uno::XInterface >(), sal_uInt32(nError));
throw lang::WrappedTargetException(OUString(), *this,
uno::Any(ex));

2
sfx2/source/doc/SfxDocumentMetaData.cxx
View file

@ -2000,7 +2000,7 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL,
}
throw css::task::ErrorCodeIOException(
"SfxDocumentMetaData::storeToMedium <" + URL + "> Commit failed: " + nError.toHexString(),
"SfxDocumentMetaData::storeToMedium <" + URL + "> Commit failed: " + nError.toString(),
css::uno::Reference< css::uno::XInterface >(), sal_uInt32(nError));
}

14
sfx2/source/doc/sfxbasemodel.cxx
View file

@ -81,7 +81,7 @@
#include <tools/svborder.hxx>
#include <unotools/tempfile.hxx>
#include <osl/mutex.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/filter/SvmWriter.hxx>
#include <vcl/salctype.hxx>
#include <vcl/gdimtf.hxx>
@ -1695,7 +1695,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue >
SfxGetpApp()->NotifyEvent( SfxEventHint( SfxEventHintId::SaveDocFailed, GlobalEventConfig::GetEventName(GlobalEventId::SAVEDOCFAILED), m_pData->m_pObjectShell.get() ) );
throw task::ErrorCodeIOException(
"SfxBaseModel::storeSelf: " + nErrCode.toHexString(),
"SfxBaseModel::storeSelf: " + nErrCode.toString(),
Reference< XInterface >(), sal_uInt32(nErrCode));
}
}
@ -1860,7 +1860,7 @@ void SAL_CALL SfxBaseModel::initNew()
if ( !bRes )
throw task::ErrorCodeIOException(
"SfxBaseModel::initNew: " + nErrCode.toHexString(),
"SfxBaseModel::initNew: " + nErrCode.toString(),
Reference< XInterface >(), sal_uInt32(nErrCode));
}
@ -2799,7 +2799,7 @@ SfxMedium* SfxBaseModel::handleLoadError( ErrCode nError, SfxMedium* pMedium )
{
nError = nError ? nError : ERRCODE_IO_CANTREAD;
throw task::ErrorCodeIOException(
"SfxBaseModel::handleLoadError: 0x" + nError.toHexString(),
"SfxBaseModel::handleLoadError: 0x" + nError.toString(),
Reference< XInterface >(), sal_uInt32(nError));
}
@ -3785,7 +3785,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >&
ErrCode nError = m_pData->m_pObjectShell->GetErrorCode();
nError = nError ? nError : ERRCODE_IO_CANTREAD;
throw task::ErrorCodeIOException(
"SfxBaseModel::loadFromStorage: " + nError.toHexString(),
"SfxBaseModel::loadFromStorage: " + nError.toString(),
Reference< XInterface >(), sal_uInt32(nError));
}
loadCmisProperties( );
@ -3843,7 +3843,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >&
{
nError = nError ? nError : ERRCODE_IO_GENERAL;
throw task::ErrorCodeIOException(
"SfxBaseModel::storeToStorage: " + nError.toHexString(),
"SfxBaseModel::storeToStorage: " + nError.toString(),
Reference< XInterface >(), sal_uInt32(nError));
}
}
@ -3863,7 +3863,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >&
ErrCode nError = m_pData->m_pObjectShell->GetErrorCode();
nError = nError ? nError : ERRCODE_IO_GENERAL;
throw task::ErrorCodeIOException(
"SfxBaseModel::switchToStorage: " + nError.toHexString(),
"SfxBaseModel::switchToStorage: " + nError.toString(),
Reference< XInterface >(), sal_uInt32(nError));
}
else

2
sfx2/source/inc/appopen.hxx
View file

@ -21,7 +21,7 @@
#define INCLUDED_SFX2_SOURCE_INC_APPOPEN_HXX
#include <sal/config.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
class SfxItemPool;
class SfxMedium;

2
sfx2/source/inc/macroloader.hxx
View file

@ -35,7 +35,7 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
class SfxObjectShell;

2
slideshow/inc/pch/precompiled_slideshow.hxx
View file

@ -105,7 +105,7 @@
#include <vcl/checksum.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
#include <vcl/gdimtf.hxx>

2
solenv/clang-format/excludelist
View file

@ -4908,6 +4908,7 @@ include/comphelper/documentconstants.hxx
include/comphelper/documentinfo.hxx
include/comphelper/embeddedobjectcontainer.hxx
include/comphelper/enumhelper.hxx
include/comphelper/errcode.hxx
include/comphelper/eventattachermgr.hxx
include/comphelper/evtlistenerhlp.hxx
include/comphelper/flagguard.hxx
@ -6329,7 +6330,6 @@ include/vcl/dndhelp.hxx
include/vcl/dockingarea.hxx
include/vcl/dockwin.hxx
include/vcl/embeddedfontshelper.hxx
include/vcl/errcode.hxx
include/vcl/errinf.hxx
include/vcl/event.hxx
include/vcl/evntpost.hxx

2
sot/inc/pch/precompiled_sot.hxx
View file

@ -49,7 +49,7 @@
#include <sal/log.hxx>
#include <sal/types.h>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#endif // PCH_LEVEL >= 2
#if PCH_LEVEL >= 3
#include <com/sun/star/uno/Reference.hxx>

2
sot/source/sdstor/storinfo.cxx
View file

@ -21,7 +21,7 @@
#include <sot/storinfo.hxx>
#include <sot/exchange.hxx>
#include <tools/stream.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <memory>
/************** class SvStorageInfo **************************************

2
starmath/inc/mathml/import.hxx
View file

@ -14,7 +14,7 @@
// XML tools
#include <utility>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <xmloff/xmlimp.hxx>
// Extras

2
starmath/inc/mathml/mathmlimport.hxx
View file

@ -21,7 +21,7 @@
#include <utility>
#include <xmloff/xmlimp.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <deque>

2
starmath/inc/pch/precompiled_sm.hxx
View file

@ -65,7 +65,7 @@
#include <vcl/cairo.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/font.hxx>
#include <vcl/gradient.hxx>
#include <vcl/mapmod.hxx>

2
svtools/inc/pch/precompiled_svt.hxx
View file

@ -105,7 +105,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
#include <vcl/errcode.hxx>
#include <comphelper/errcode.hxx>
#include <vcl/event.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>

Some files were not shown because too many files have changed in this diff Show more