diff options
| author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-03-13 23:27:24 -0300 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-15 22:55:02 +0000 |
| commit | 364ac5acf491ce4654ff9ca85fc416343b55b685 (patch) | |
| tree | 3ec0f3c8fcaa4056f80a0e865c1b5622c5a20ee4 /include | |
| parent | 93e6291c29d547c0c29c6e43b2ca4b36a3e8506f (diff) | |
fdo#63154 Remove some solar.h references
Remove some solar.h from tools.
Replace sal_uLong by size_t, sal_uInt32 and sal_Int32.
Change-Id: I38961db046337a3ea4ef75d64afa424d81391f34
Reviewed-on: https://gerrit.libreoffice.org/8582
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/editview.hxx | 2 | ||||
| -rw-r--r-- | include/tools/contnr.hxx | 1 | ||||
| -rw-r--r-- | include/tools/gen.hxx | 1 | ||||
| -rw-r--r-- | include/tools/wintypes.hxx | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 45a7c9dd90f8..9f11c216f48c 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -163,7 +163,7 @@ public: void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 ); void RemoveAttribsKeepLanguages( bool bRemoveParaAttribs = false ); - sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uInt32 Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); void SetBackgroundColor( const Color& rColor ); Color GetBackgroundColor() const; diff --git a/include/tools/contnr.hxx b/include/tools/contnr.hxx index 9fe673af92f2..80d7abd6bca0 100644 --- a/include/tools/contnr.hxx +++ b/include/tools/contnr.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_CONTNR_HXX #include <tools/toolsdllapi.h> -#include <tools/solar.h> #include <limits.h> diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 492a3104d6d6..6007f126a8d3 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_GEN_HXX #include <tools/toolsdllapi.h> -#include <tools/solar.h> #include <limits.h> #include <ostream> diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index abba9c63b5c0..5968cddab2fe 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_TOOLS_WINTYPES_HXX #define INCLUDED_TOOLS_WINTYPES_HXX -#include <tools/solar.h> #include <sal/types.h> // Window-Types |