summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx4
-rw-r--r--editeng/source/editeng/editobj.cxx2
-rw-r--r--editeng/source/editeng/editobj2.hxx6
3 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 2eb3b6c4ce38..831d20cf4a1f 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -65,8 +65,8 @@ OApplicationIconControl::~OApplicationIconControl()
void OApplicationIconControl::dispose()
{
- sal_uLong nCount = GetEntryCount();
- for ( sal_uLong i = 0; i < nCount; ++i )
+ sal_Int32 nCount = GetEntryCount();
+ for ( sal_Int32 i = 0; i < nCount; ++i )
{
SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
if ( pEntry )
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index a0f46f0329ee..ec4e964f83fd 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -79,7 +79,7 @@ void XEditAttribute::SetItem(const SfxPoolItem& rNew)
}
XParaPortionList::XParaPortionList(
- OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY)
+ OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY)
: pRefDevPtr(pRefDev)
, nStretchX(_nStretchX)
, nStretchY(_nStretchY)
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index b7d045d459f4..41bbc5404e50 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -97,16 +97,16 @@ class XParaPortionList
VclPtr<OutputDevice> pRefDevPtr;
sal_uInt16 nStretchX;
sal_uInt16 nStretchY;
- sal_uLong nPaperWidth;
+ sal_uInt32 nPaperWidth;
public:
- XParaPortionList(OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY);
+ XParaPortionList(OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY);
void push_back(XParaPortion* p);
const XParaPortion& operator[](size_t i) const;
OutputDevice* GetRefDevPtr() const { return pRefDevPtr; }
- sal_uLong GetPaperWidth() const { return nPaperWidth; }
+ sal_uInt32 GetPaperWidth() const { return nPaperWidth; }
bool RefDevIsVirtual() const {return pRefDevPtr->IsVirtual();}
const MapMode& GetRefMapMode() const { return pRefDevPtr->GetMapMode(); }
sal_uInt16 GetStretchX() const { return nStretchX; }