diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
| commit | 9cd038e5b89c978ea24ba7efa7c3152801190455 (patch) | |
| tree | 7d938fd9373eb827095787955e2feffca942b8fd /svx/inc/svdibrow.hxx | |
| parent | e65c0fe553a9d1b85dcacfff7af9df8231427876 (diff) | |
fix mis-merge all-around.
Diffstat (limited to 'svx/inc/svdibrow.hxx')
| -rwxr-xr-x | svx/inc/svdibrow.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 67c605fc6e31..968a5b1a4d31 100755 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -81,7 +81,7 @@ public: void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); sal_uIntPtr GetCurrentPos() const; sal_uInt16 GetCurrentWhich() const; - virtual bool BegChangeEntry(ULONG nPos); + virtual bool BegChangeEntry(sal_uIntPtr nPos); virtual bool EndChangeEntry(); virtual void BrkChangeEntry(); |