diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 06:22:49 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 06:22:49 -0500 |
| commit | 2f0e193a38a448425f0e2ba4e83675ea4d80b968 (patch) | |
| tree | 8e5cf8e185d2682af5165964a152489a5f404c13 /sd/source/ui/view/drviews3.cxx | |
| parent | mis-merge clean-up tools types (diff) | |
| download | core-2f0e193a38a448425f0e2ba4e83675ea4d80b968.tar.gz core-2f0e193a38a448425f0e2ba4e83675ea4d80b968.zip | |
fix mis-merge... qa disabled
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 6503e70066d1..2c3b0bd4a796 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -682,7 +682,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&) pArgs->Get( nId ); - static const USHORT aWhichTable[]= + static const sal_uInt16 aWhichTable[]= { EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL, EE_PARA_LRSPACE, EE_PARA_LRSPACE, @@ -699,7 +699,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) rItem.GetRight(), rItem.GetTxtLeft(), rItem.GetTxtFirstLineOfst(), nId ); - const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue(); + const sal_Int16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue(); const SvxLRSpaceItem& rOrigLRSpaceItem = (const SvxLRSpaceItem&) aEditAttr.Get( EE_PARA_LRSPACE ); const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET ); if( nOutlineLevel != -1 && @@ -832,7 +832,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(), rLRSpaceItem.GetTxtFirstLineOfst(), nId ); - const INT16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue(); + const sal_Int16 nOutlineLevel = ((const SfxInt16Item&)aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue(); const SvxNumBulletItem& rNumBulletItem = (const SvxNumBulletItem&) aEditAttr.Get( EE_PARA_NUMBULLET ); if( nOutlineLevel != -1 && rNumBulletItem.GetNumRule() && |