diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:42:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:42:15 +0000 |
| commit | 00422fc96406ffced206002db54f735413b9e339 (patch) | |
| tree | 2e2b2e4b27334f82a4338f6b23b4434e3417e2e7 /svx/source/tbxctrls/linectrl.cxx | |
| parent | e65bc2c732bcbc1d4d7f5302f055c293a2550caa (diff) | |
INTEGRATION: CWS obo30 (1.19.90); FILE MERGED
2008/06/02 12:27:51 obo 1.19.90.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'svx/source/tbxctrls/linectrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index abb473057f0b..3db48fe04d57 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: linectrl.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.20 $ * * This file is part of OpenOffice.org. * @@ -52,7 +52,6 @@ #include <svx/itemwin.hxx> #include <svx/dialmgr.hxx> -using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; @@ -100,8 +99,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( USHORT nSlotId, pDashItem ( NULL ), bUpdate ( FALSE ) { - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" ))); - addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" ))); + addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" ))); + addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" ))); } //======================================================================== @@ -500,13 +499,13 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG ) if ( pLineStartItem ) { - aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStart" )); + aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStart" )); pLineStartItem->QueryValue( a ); aArgs[0].Value = a; } else { - aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "LineEnd" )); + aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineEnd" )); pLineEndItem->QueryValue( a ); aArgs[0].Value = a; } @@ -517,7 +516,7 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG ) aLineEndSet.SetNoSelection(); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndStyle" )), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndStyle" )), aArgs ); delete pLineEndItem; @@ -786,4 +785,3 @@ void SvxLineEndToolBoxControl::StateChanged( USHORT, SfxItemState eState, const rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); } - |