diff options
Diffstat (limited to 'svx/source/table/tablelayouter.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/table/tablelayouter.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 3d40963107db..2ae3d172b653 100644..100755 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -45,8 +45,8 @@ #include "editeng/borderline.hxx" #include "editeng/boxitem.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" using ::rtl::OUString; using ::com::sun::star::awt::XLayoutConstrains; @@ -926,8 +926,8 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine if (!pOther || (pOther == &gEmptyBorder)) return true; - USHORT nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth(); - USHORT nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth(); + sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth(); + sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth(); if (nThisSize > nOtherSize) return true; |