diff options
Diffstat (limited to 'sw/source/filter/inc/msfilter.hxx')
| -rw-r--r-- | sw/source/filter/inc/msfilter.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 2f93e279c21d..d4f02f690245 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -120,7 +120,7 @@ namespace sw @author <a href="mailto:mmaher@openoffice.org">Martin Maher</a */ - ULONG MSDateTimeFormatToSwFormat(String& rParams, SvNumberFormatter *pFormatter, USHORT &rLang, bool bHijri); + sal_uLong MSDateTimeFormatToSwFormat(String& rParams, SvNumberFormatter *pFormatter, sal_uInt16 &rLang, bool bHijri); /** Used by MSDateTimeFormatToSwFormat to identify AM time fields @@ -146,10 +146,10 @@ namespace sw /// Redlining Authors struct AuthorInfo { - USHORT nWWAuthorId; - USHORT nOurId; + sal_uInt16 nWWAuthorId; + sal_uInt16 nOurId; - AuthorInfo(USHORT nWWAuthorId_, USHORT nOurId_ = 0): + AuthorInfo(sal_uInt16 nWWAuthorId_, sal_uInt16 nOurId_ = 0): nWWAuthorId( nWWAuthorId_ ), nOurId( nOurId_ ) {} @@ -438,7 +438,7 @@ namespace sw protected: std::vector<String> maAuthors; // Array of Sw - Bookmarknames - USHORT GetPos( const String& rNm ); + sal_uInt16 GetPos( const String& rNm ); //No copying WrtRedlineAuthor(const WrtRedlineAuthor&); @@ -447,7 +447,7 @@ namespace sw WrtRedlineAuthor() {} virtual ~WrtRedlineAuthor() {} - USHORT AddName( const String& rNm ); + sal_uInt16 AddName( const String& rNm ); virtual void Write(Writer &rWrt) = 0; // std::vector<String> GetNames(); }; |