diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-16 15:05:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:51 +0100 |
| commit | 182a74d937088f0f08850014a7b918719e106b7d (patch) | |
| tree | 0a286f4a6a5adcd32fd32a26b61b247d247c93d2 /include/vcl | |
| parent | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (diff) | |
de-hrc various things
e.g. helpid[s].hrc -> helpids.h
and insert include guards where missing
move "ordinary" defines into .hxx files
remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead
Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/errcode.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/errinf.hxx | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx index 05e88a2d94dc..2563c12ab957 100644 --- a/include/vcl/errcode.hxx +++ b/include/vcl/errcode.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_VCL_ERRCODE_HXX #define INCLUDED_VCL_ERRCODE_HXX -#ifndef __RSC #include <rtl/ustring.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> #include <ostream> -#endif - /* @@ -62,7 +59,6 @@ Warning || || | #define ERRCODE_DYNAMIC_MASK (31UL << ERRCODE_DYNAMIC_SHIFT) /** we get included in contexts that don't have access to config_typesizes.h or C++11 */ -#ifndef __RSC class SAL_WARN_UNUSED ErrCode final { @@ -140,10 +136,6 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) os << sal_uInt32(err); return os; } -#else -#define ErrCode(X) (X) -#endif - #define ERRCODE_AREA_IO (0 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SV (1 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SFX (2 << ERRCODE_AREA_SHIFT) diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx index 996afd23f8f1..428a46eb72e4 100644 --- a/include/vcl/errinf.hxx +++ b/include/vcl/errinf.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __RSC - #ifndef INCLUDED_VCL_ERRINF_HXX #define INCLUDED_VCL_ERRINF_HXX @@ -221,6 +219,5 @@ private: }; #endif -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |