summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx7
-rw-r--r--accessibility/source/extended/accessibleiconchoicectrlentry.cxx4
-rw-r--r--editeng/source/editeng/editview.cxx7
-rw-r--r--include/editeng/editview.hxx2
-rw-r--r--include/tools/contnr.hxx1
-rw-r--r--include/tools/gen.hxx1
-rw-r--r--include/tools/wintypes.hxx1
-rw-r--r--sd/source/ui/inc/zoomlist.hxx2
-rw-r--r--sd/source/ui/view/zoomlist.cxx6
9 files changed, 11 insertions, 20 deletions
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index c33141011965..55f758bde204 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/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
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 3d33822607fa..055cd05e4fa3 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/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 ),
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 7e697b87b640..48984473a1bc 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/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 )
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
diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx
index 198f7feec653..9c07a2a5f9e7 100644
--- a/sd/source/ui/inc/zoomlist.hxx
+++ b/sd/source/ui/inc/zoomlist.hxx
@@ -42,7 +42,7 @@ public:
private:
ViewShell* mpViewShell;
- sal_uLong mnCurPos;
+ sal_uInt32 mnCurPos;
std::vector<Rectangle> maRectangles;
};
diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx
index 462c08acc959..5a995ae7b3dc 100644
--- a/sd/source/ui/view/zoomlist.cxx
+++ b/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;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-24 04:42:38 +0000