strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

warning as error fixes

Browse source
This commit is contained in:
Noel Power 2009-10-07 14:45:16 +00:00
parent f212afb71b
commit 8dc5bfac10
6 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
svx/source/msfilter/msvbahelper.cxx
View file

@ -28,6 +28,7 @@
*
************************************************************************/
#include "precompiled_svx.hxx"
#include <svx/msvbahelper.hxx>
#include <basic/sbx.hxx>
#include <basic/sbstar.hxx>

3
vbahelper/source/msforms/makefile.mk
View file

@ -33,7 +33,8 @@ PRJ=..$/..
PRJNAME=vbahelper
TARGET=msforms
ENABLE_EXCEPTIONS := TRUE
ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------

6
vbahelper/source/msforms/service.cxx
View file

@ -53,14 +53,14 @@ extern sdecl::ServiceDecl const serviceDecl;
extern "C"
{
void SAL_CALL component_getImplementationEnvironment(
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
OSL_TRACE("In component_getImplementationEnv");
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
sal_Bool SAL_CALL component_writeInfo(
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
{
OSL_TRACE("In component_writeInfo");
@ -70,7 +70,7 @@ extern "C"
controlprovider::serviceDecl, userform::serviceDecl );
}
void * SAL_CALL component_getFactory(
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{

2
vbahelper/source/vbahelper/vbaapplicationbase.cxx
View file

@ -179,7 +179,7 @@ void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const u
float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
{
// i cm = 28.35 points
static const float rate = 28.35;
static const float rate = 28.35f;
return ( _Centimeters * rate );
}

6
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
View file

@ -124,7 +124,7 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
{
// currently only the menu in the MenuBat support Enable/Disable
// FIXME: how to support the menu item in Toolbar
bEnabled = m_xParentMenu->isItemEnabled( m_xParentMenu->getItemId( m_nPosition ) );
bEnabled = m_xParentMenu->isItemEnabled( m_xParentMenu->getItemId( sal::static_int_cast< sal_Int16 >( m_nPosition ) ) );
}
else
{
@ -140,7 +140,7 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep
if( m_xParentMenu.is() )
{
// currently only the menu in the MenuBat support Enable/Disable
m_xParentMenu->enableItem( m_xParentMenu->getItemId( m_nPosition ), _enabled );
m_xParentMenu->enableItem( m_xParentMenu->getItemId( sal::static_int_cast< sal_Int16 >( m_nPosition ) ), _enabled );
}
else
{
@ -173,7 +173,7 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE
uno::Reference< awt::XMenu > xMenu;
if( m_xParentMenu.is() )
{
sal_Int32 nItemId = m_xParentMenu->getItemId( m_nPosition );
sal_Int16 nItemId = m_xParentMenu->getItemId( sal::static_int_cast< sal_Int16 >( m_nPosition ) );
xMenu.set( m_xParentMenu->getPopupMenu( nItemId ), uno::UNO_QUERY );
}

2
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
View file

@ -207,7 +207,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
// create control
uno::Sequence< beans::PropertyValue > aProps;
rtl::OUString sHelpUrl;
sal_Int32 nItemType = 0;
sal_uInt16 nItemType = 0;
if( IsMenu() )
{
aProps = CreateMenuItemData( sCommandUrl, sHelpUrl, sLabel, nItemType, aSubMenu );