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/8582Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx

@@ -36,7 +36,7 @@
 #include <comphelper/accessibletexthelper.hxx>
 #include <tools/gen.hxx>
 
-// forward ---------------------------------------------------------------
+// forward
 
 class SvxIconChoiceCtrlEntry;
 class SvtIconChoiceCtrl;
@@ -45,8 +45,7 @@ class SvtIconChoiceCtrl;
 namespace accessibility
 {
 
-
-// class AccessibleIconChoiceCtrlEntry ------------------------------------------
+// class AccessibleIconChoiceCtrlEntry
 
     typedef ::cppu::WeakAggComponentImplHelper8< ::com::sun::star::accessibility::XAccessible
                                                 , ::com::sun::star::accessibility::XAccessibleContext
@@ -108,7 +107,7 @@ namespace accessibility
                 is our parent accessible object
         */
         AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
-                                       sal_uLong _nPos,
+                                       sal_Int32 _nPos,
                                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
 
         // XTypeProvider

accessibility/source/extended/accessibleiconchoicectrlentry.cxx

@@ -54,7 +54,7 @@ namespace
 namespace accessibility
 {
 
-    // class AccessibleIconChoiceCtrlEntry -----------------------------------------------------
+    // class AccessibleIconChoiceCtrlEntry
 
     using namespace ::com::sun::star::accessibility;
     using namespace ::com::sun::star::uno;
@@ -65,7 +65,7 @@ namespace accessibility
     // Ctor() and Dtor()
 
     AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
-                                                                  sal_uLong _nPos,
+                                                                  sal_Int32 _nPos,
                                                                   const Reference< XAccessible >& _xParent ) :
 
         AccessibleIconChoiceCtrlEntry_BASE  ( m_aMutex ),

editeng/source/editeng/editview.cxx

@@ -72,8 +72,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
 
-
-
 // static
 LanguageType EditView::CheckLanguage(
         const OUString &rText,
@@ -153,8 +151,6 @@ LanguageType EditView::CheckLanguage(
     return nLang;
 }
 
-
-
 // class EditView
 
 EditView::EditView( EditEngine* pEng, Window* pWindow )
@@ -475,7 +471,7 @@ void EditView::Redo()
     PIMPE->Redo( this );
 }
 
-sal_uLong EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uInt32 EditView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     EditSelection aOldSel( pImpEditView->GetEditSelection() );
     pImpEditView->DrawSelection();
@@ -708,7 +704,6 @@ EESpellState EditView::StartThesaurus()
     return PIMPEE->StartThesaurus( this );
 }
 
-
 void EditView::StartTextConversion(
         LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
         sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc )

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;

include/tools/contnr.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_TOOLS_CONTNR_HXX
 
 #include <tools/toolsdllapi.h>
-#include <tools/solar.h>
 
 #include <limits.h>
 

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>

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

sd/source/ui/inc/zoomlist.hxx

@@ -42,7 +42,7 @@ public:
 
 private:
     ViewShell*  mpViewShell;
-    sal_uLong   mnCurPos;
+    sal_uInt32  mnCurPos;
 
     std::vector<Rectangle> maRectangles;
 };

sd/source/ui/view/zoomlist.cxx

@@ -39,7 +39,7 @@ ZoomList::ZoomList(ViewShell* pViewShell)
 
 void ZoomList::InsertZoomRect(const Rectangle& rRect)
 {
-    sal_uLong nRectCount = maRectangles.size();
+    size_t nRectCount = maRectangles.size();
 
     if (nRectCount >= MAX_ENTRYS)
         maRectangles.erase(maRectangles.begin());
@@ -58,7 +58,7 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect)
 Rectangle ZoomList::GetNextZoomRect()
 {
     mnCurPos++;
-    sal_uLong nRectCount = maRectangles.size();
+    size_t nRectCount = maRectangles.size();
 
     if (nRectCount > 0 && mnCurPos > nRectCount - 1)
         mnCurPos = nRectCount - 1;
@@ -84,7 +84,7 @@ Rectangle ZoomList::GetPreviousZoomRect()
 
 sal_Bool ZoomList::IsNextPossible() const
 {
-    sal_uLong nRectCount = maRectangles.size();
+    size_t nRectCount = maRectangles.size();
 
     return nRectCount > 0 && mnCurPos < nRectCount - 1;
 }