diff options
| author | os <os@openoffice.org> | 2011-02-15 16:01:31 +0100 |
|---|---|---|
| committer | os <os@openoffice.org> | 2011-02-15 16:01:31 +0100 |
| commit | aee7923651770cac9fffde1e8116edf78c156239 (patch) | |
| tree | 7a1b49c9c97e0408453ed6428b66ae908e33d7d5 /cui/source/tabpages/borderconn.cxx | |
| parent | 0f6ac374bbb565a631e10588ccd67184c3998820 (diff) | |
| parent | 9648a577f081b0468702fb7f0db69b2582b96e72 (diff) | |
m100 merged
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 c56061927..07eb0d896 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 ); |