diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
| commit | 2883c00e18ce8bdef69ed13932ce90bcb5fecdd0 (patch) | |
| tree | ce36319af8d08f7ff5d919edc14a5f729f0f3342 /cui/source/tabpages/borderconn.cxx | |
| parent | 8e6c5c7adf97d2cc0b6c36d622f3aab867615c20 (diff) | |
| parent | 16680c16eb84b5315dbbeeb61b3693c4d567640a (diff) | |
sw34bf03: merge to-be-m100 DEV300_next
Diffstat (limited to 'cui/source/tabpages/borderconn.cxx')
| -rw-r--r-- | cui/source/tabpages/borderconn.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 0e9039b0d5b1..b46f24d5cbfd 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -51,7 +51,7 @@ of the tab page. class LineItemWrapper : public sfx::SingleItemWrapper< SvxLineItem, const SvxBorderLine* > { public: - inline explicit LineItemWrapper( USHORT nSlot ) : SingleItemWrapperType( nSlot ) {} + inline explicit LineItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapperType( nSlot ) {} virtual const SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const { return rItem.GetLine(); } @@ -277,7 +277,7 @@ ShadowConnection::ShadowConnection( const SfxItemSet& rItemSet, // ============================================================================ // ============================================================================ -sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot, +sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot, FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags ) { return new FrameLineConnection( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags ); |