mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ScVbaButton -> VbaButton in vbahelper, the same name is in sc/source/ui/vba.

Browse Source 
Change-Id: Id85002ba80335a2a7c662cb1189ecabb05bbf8b9
This commit is contained in:
Matúš Kukan 2014-02-20 23:51:07 +01:00
parent 6dd1da1045
commit ffaa20a1de
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vbahelper/source/msforms/vbabutton.cxx
View File

@ -25,13 +25,13 @@ using namespace ooo::vba;
const static OUString LABEL( "Label" );
ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
VbaButton::VbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
{
}
// Attributes
OUString SAL_CALL
ScVbaButton::getCaption() throw (css::uno::RuntimeException)
VbaButton::getCaption() throw (css::uno::RuntimeException)
{
OUString Label;
m_xProps->getPropertyValue( LABEL ) >>= Label;
@ -39,85 +39,85 @@ ScVbaButton::getCaption() throw (css::uno::RuntimeException)
}
void SAL_CALL
ScVbaButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
VbaButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
{
m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
}
sal_Bool SAL_CALL ScVbaButton::getAutoSize() throw (uno::RuntimeException)
sal_Bool SAL_CALL VbaButton::getAutoSize() throw (uno::RuntimeException)
{
return ScVbaControl::getAutoSize();
}
void SAL_CALL ScVbaButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException)
void SAL_CALL VbaButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException)
{
ScVbaControl::setAutoSize( bAutoSize );
}
sal_Bool SAL_CALL ScVbaButton::getLocked() throw (uno::RuntimeException)
sal_Bool SAL_CALL VbaButton::getLocked() throw (uno::RuntimeException)
{
return ScVbaControl::getLocked();
}
void SAL_CALL ScVbaButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException)
void SAL_CALL VbaButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException)
{
ScVbaControl::setLocked( bLocked );
}
sal_Bool SAL_CALL ScVbaButton::getCancel() throw (uno::RuntimeException)
sal_Bool SAL_CALL VbaButton::getCancel() throw (uno::RuntimeException)
{
return sal_False;
}
void SAL_CALL ScVbaButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException)
void SAL_CALL VbaButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException)
{
// #STUB
}
sal_Bool SAL_CALL ScVbaButton::getDefault() throw (uno::RuntimeException)
sal_Bool SAL_CALL VbaButton::getDefault() throw (uno::RuntimeException)
{
// #STUB
return sal_False;
}
void SAL_CALL ScVbaButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException)
void SAL_CALL VbaButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException)
{
// #STUB
}
sal_Int32 SAL_CALL ScVbaButton::getBackColor() throw (uno::RuntimeException)
sal_Int32 SAL_CALL VbaButton::getBackColor() throw (uno::RuntimeException)
{
return ScVbaControl::getBackColor();
}
void SAL_CALL ScVbaButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException)
void SAL_CALL VbaButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException)
{
ScVbaControl::setBackColor( nBackColor );
}
sal_Int32 SAL_CALL ScVbaButton::getForeColor() throw (uno::RuntimeException)
sal_Int32 SAL_CALL VbaButton::getForeColor() throw (uno::RuntimeException)
{
return ScVbaControl::getForeColor();
}
void SAL_CALL ScVbaButton::setForeColor( sal_Int32 /*nForeColor*/ ) throw (uno::RuntimeException)
void SAL_CALL VbaButton::setForeColor( sal_Int32 /*nForeColor*/ ) throw (uno::RuntimeException)
{
// #STUB
}
uno::Reference< msforms::XNewFont > SAL_CALL ScVbaButton::getFont() throw (uno::RuntimeException)
uno::Reference< msforms::XNewFont > SAL_CALL VbaButton::getFont() throw (uno::RuntimeException)
{
return new VbaNewFont( this, mxContext, m_xProps );
}
OUString
ScVbaButton::getServiceImplName()
VbaButton::getServiceImplName()
{
return OUString("ScVbaButton");
return OUString("VbaButton");
}
uno::Sequence< OUString >
ScVbaButton::getServiceNames()
VbaButton::getServiceNames()
{
static uno::Sequence< OUString > aServiceNames;
if ( aServiceNames.getLength() == 0 )

4
vbahelper/source/msforms/vbabutton.hxx
View File

@ -26,10 +26,10 @@
typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XCommandButton > ButtonImpl_BASE;
class ScVbaButton : public ButtonImpl_BASE
class VbaButton : public ButtonImpl_BASE
{
public:
ScVbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
VbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
// Attributes
virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException);

4
vbahelper/source/msforms/vbacontrol.cxx
View File

@ -624,7 +624,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R
if ( bToggle )
return new ScVbaToggleButton( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
else
return new ScVbaButton( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
return new VbaButton( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
}
case form::FormComponentType::FIXEDTEXT:
return new ScVbaLabel( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
@ -672,7 +672,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R
if ( bToggle )
xVBAControl.set( new ScVbaToggleButton( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );
else
xVBAControl.set( new ScVbaButton( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );
xVBAControl.set( new VbaButton( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ) )
xVBAControl.set( new ScVbaComboBox( xVbaParent, xContext, xControl, xModel, xGeoHelper.release() ) );