summaryrefslogtreecommitdiff
path: root/sw/inc/hintids.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-20 10:48:55 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-20 10:48:55 +0100
commit4137f39d7b13c0ad2e649d7efb02ecfc14a31a25 (patch)
treec648feebc267f58186c467955ebc76f24854dc5e /sw/inc/hintids.hxx
parent2044aef13b163e8ba977013c152e919271ac4352 (diff)
Revert "fdo#63154 Remove unused solar.h reference in sw."
sal_uIntPtr should only be used to represent pointers cast to integers. This reverts commit 067d08029384af6e620f0fc48e31ff2a740e1fc8.
Diffstat (limited to 'sw/inc/hintids.hxx')
-rw-r--r--sw/inc/hintids.hxx17
1 files changed, 5 insertions, 12 deletions
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 344d67d9b3d0..cf911ab8bb0c 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_SW_INC_HINTIDS_HXX
#define INCLUDED_SW_INC_HINTIDS_HXX
+#include <tools/solar.h>
#include <sal/types.h>
#include "swdllapi.h"
@@ -276,6 +277,8 @@ RES_UNKNOWNATR_BEGIN = RES_BOXATR_END,
RES_UNKNOWNATR_END
};
+
+
// Format IDs
enum RES_FMT
{
@@ -375,59 +378,49 @@ inline bool isATR(const sal_uInt16 nWhich)
{
return (RES_CHRATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich);
}
-
inline bool isCHRATR(const sal_uInt16 nWhich)
{
return (RES_CHRATR_BEGIN <= nWhich) && (RES_CHRATR_END > nWhich);
}
-
inline bool isTXTATR_WITHEND(const sal_uInt16 nWhich)
{
return (RES_TXTATR_WITHEND_BEGIN <= nWhich)
&& (RES_TXTATR_WITHEND_END > nWhich);
}
-
inline bool isTXTATR_NOEND(const sal_uInt16 nWhich)
{
return (RES_TXTATR_NOEND_BEGIN <= nWhich)
&& (RES_TXTATR_NOEND_END > nWhich);
}
-
inline bool isTXTATR(const sal_uInt16 nWhich)
{
return (RES_TXTATR_BEGIN <= nWhich) && (RES_TXTATR_END > nWhich);
}
-
inline bool isPARATR(const sal_uInt16 nWhich)
{
return (RES_PARATR_BEGIN <= nWhich) && (RES_PARATR_END > nWhich);
}
-
inline bool isPARATR_LIST(const sal_uInt16 nWhich)
{
- return (RES_PARATR_LIST_BEGIN <= nWhich) && (RES_PARATR_LIST_END > nWhich);
-}
-
+ return (RES_PARATR_LIST_BEGIN <= nWhich) && (RES_PARATR_LIST_END > nWhich); }
inline bool isFRMATR(const sal_uInt16 nWhich)
{
return (RES_FRMATR_BEGIN <= nWhich) && (RES_FRMATR_END > nWhich);
}
-
inline bool isGRFATR(const sal_uInt16 nWhich)
{
return (RES_GRFATR_BEGIN <= nWhich) && (RES_GRFATR_END > nWhich);
}
-
inline bool isBOXATR(const sal_uInt16 nWhich)
{
return (RES_BOXATR_BEGIN <= nWhich) && (RES_BOXATR_END > nWhich);
}
-
inline bool isUNKNOWNATR(const sal_uInt16 nWhich)
{
return (RES_UNKNOWNATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich);
}
+
// Take the respective default attribute from the statistical default
// attributes table over the Which-value.
// If none exists, return a 0 pointer!!!