summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAlexandre Vicenzi <vicenzi.alexandre@gmail.com>2014-03-13 23:27:24 -0300
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-15 22:55:02 +0000
commit364ac5acf491ce4654ff9ca85fc416343b55b685 (patch)
tree3ec0f3c8fcaa4056f80a0e865c1b5622c5a20ee4 /sd
parent93e6291c29d547c0c29c6e43b2ca4b36a3e8506f (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 'sd')
-rw-r--r--sd/source/ui/inc/zoomlist.hxx2
-rw-r--r--sd/source/ui/view/zoomlist.cxx6
2 files changed, 4 insertions, 4 deletions
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;
}