diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:55:08 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:55:08 +0100 |
| commit | 4fdd55226d2972e3a256426db3122ac23b0615c6 (patch) | |
| tree | 23f5b3a68382d6d3b8db0cb5e2537ed74a228d7c /svtools/bmpmaker/bmpcore.hxx | |
| parent | c3d5444d84e18fa82235bb9d419861ac5e54f544 (diff) | |
| parent | e1028d9225bc47922c387aa462887c7643bc6c40 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
comphelper/source/misc/servicedecl.cxx
i18npool/source/breakiterator/breakiteratorImpl.cxx
l10ntools/scripts/localize.pl
svl/source/items/itemset.cxx
svl/source/memtools/svarray.cxx
svl/source/numbers/zformat.cxx
svtools/source/brwbox/brwbox1.cxx
tools/source/stream/strmwnt.cxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/graphite_serverfont.hxx
vcl/source/control/imgctrl.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/window/winproc.cxx
vcl/unx/source/fontmanager/fontconfig.cxx
Diffstat (limited to 'svtools/bmpmaker/bmpcore.hxx')
| -rw-r--r-- | svtools/bmpmaker/bmpcore.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx index b5d0c2919c75..4e0d08da7db6 100644 --- a/svtools/bmpmaker/bmpcore.hxx +++ b/svtools/bmpmaker/bmpcore.hxx @@ -56,7 +56,7 @@ struct LangInfo { char maLangDir[ 257 ]; - USHORT mnLangNum; + sal_uInt16 mnLangNum; }; // -------------- @@ -72,8 +72,8 @@ private: Size aTotSize; Point aPos; SvFileStream* pSRS; - ULONG nTotCount; - USHORT nPos; + sal_uLong nTotCount; + sal_uInt16 nPos; void ImplCreate( const ::std::vector< DirEntry >& rInDirs, const DirEntry& rOut, @@ -82,7 +82,7 @@ private: protected: - virtual void Message( const String& rText, BYTE cExitCode = EXIT_NOERROR ); + virtual void Message( const String& rText, sal_uInt8 cExitCode = EXIT_NOERROR ); public: |