warning as error fixes

5 files changed, 10 insertions, 9 deletions

diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
index ad5e7b4685b3..1d550c8409c2 100644
--- a/vbahelper/source/msforms/makefile.mk
+++ b/vbahelper/source/msforms/makefile.mk
@@ -33,7 +33,8 @@ PRJ=..$/..
 PRJNAME=vbahelper
 TARGET=msforms
 
-ENABLE_EXCEPTIONS := TRUE
+ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index 20a5a727515a..395256bcf61a 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -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 )
     {
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 409e33f19167..9f5c78e71858 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -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 );
 }
 
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 6c0b3b4e7f2c..a10767998b28 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -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 );
     }
 
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 3c0b022ebe3c..f4f29ccb04d4 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -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 );