diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:41:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:41:58 +0000 |
| commit | e65bc2c732bcbc1d4d7f5302f055c293a2550caa (patch) | |
| tree | 0c21b9f4161af4aa98b4e5b6e49b9986d8c216c6 /svx/source/tbxctrls | |
| parent | d5f1cf88151170c519cab7051de007423b6fd7c7 (diff) | |
INTEGRATION: CWS obo30 (1.21.90); FILE MERGED
2008/06/02 12:27:51 obo 1.21.90.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index fbe6eed4fcfb..ee4d62dd950c 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: layctrl.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.22 $ * * This file is part of OpenOffice.org. * @@ -49,7 +49,6 @@ #include <svtools/colorcfg.hxx> // namespaces -using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; @@ -451,9 +450,9 @@ void TableWindow::PopupModeEnd() if ( xDispatch.is() ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" )); + aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" )); aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Rows" )); + aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Rows" )); aArgs[1].Value = makeAny( sal_Int16( nLine )); xDispatch->dispatch( aTargetURL, aArgs ); @@ -482,11 +481,11 @@ private: BOOL m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; - OUString maCommand; + ::rtl::OUString maCommand; void UpdateSize_Impl( long nNewCol ); public: - ColumnsWindow( USHORT nId, const OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); + ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); void KeyInput( const KeyEvent& rKEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -501,7 +500,7 @@ public: // ----------------------------------------------------------------------- -ColumnsWindow::ColumnsWindow( USHORT nId, const OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : +ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_SYSTEMWINDOW ), bInitialKeyInput(TRUE), m_bMod1(FALSE), @@ -763,9 +762,9 @@ void ColumnsWindow::PopupModeEnd() pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" )); + aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Columns" )); aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Modifier" )); + aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Modifier" )); aArgs[1].Value = makeAny( sal_Int16( m_bMod1 ? KEY_MOD1 : 0 )); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), @@ -902,4 +901,3 @@ void SvxColumnsToolBoxControl::StateChanged( USHORT nSID, bEnabled = SFX_ITEM_DISABLED != eState; SfxToolBoxControl::StateChanged(nSID, eState, pState ); } - |