diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-20 10:48:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-20 10:48:55 +0100 |
| commit | 4137f39d7b13c0ad2e649d7efb02ecfc14a31a25 (patch) | |
| tree | c648feebc267f58186c467955ebc76f24854dc5e /sw/inc/unocoll.hxx | |
| parent | 2044aef13b163e8ba977013c152e919271ac4352 (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/unocoll.hxx')
| -rw-r--r-- | sw/inc/unocoll.hxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 6480b62f9d68..29a95bd8c1a6 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_SW_INC_UNOCOLL_HXX #define INCLUDED_SW_INC_UNOCOLL_HXX - +#include <tools/solar.h> #include <flyenum.hxx> #include <vcl/timer.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -189,8 +189,9 @@ class SwUnoCollection #define SW_SERVICE_INVALID USHRT_MAX +// // case-corrected versions of service-names (see #i67811) - +// #define CSS_TEXT_TEXTFIELD_DATE_TIME "com.sun.star.text.textfield.DateTime" #define CSS_TEXT_TEXTFIELD_USER "com.sun.star.text.textfield.User" #define CSS_TEXT_TEXTFIELD_SET_EXPRESSION "com.sun.star.text.textfield.SetExpression" @@ -533,4 +534,8 @@ public: #endif + + + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |