resyncing to master

8 files changed, 29 insertions, 25 deletions

diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index e1b00c72643e..c01e2d397940 100755
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -41,7 +41,12 @@ $(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms))
 # add any additional include paths for this library here
 $(eval $(call gb_Library_set_include,msforms,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,msforms,\
+	udkapi \
+	offapi \
+	oovbaapi \
 ))
 
 # add libraries to be linked to LIB; again these names need to be given as
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 45691f8066a7..dd25d01c027a 100755
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -39,13 +39,18 @@ $(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc))
 # add any additional include paths for this library here
 $(eval $(call gb_Library_set_include,vbahelper,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_add_defs,vbahelper,\
     -DVBAHELPER_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,vbahelper,\
+	udkapi \
+	offapi \
+	oovbaapi \
+))
+
 # add libraries to be linked to vbahelper; again these names need to be given as
 # specified in Repository.mk
 $(eval $(call gb_Library_add_linked_libs,vbahelper,\
diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst
index 8c411d422e29..a3435c2b9529 100644
--- a/vbahelper/prj/build.lst
+++ b/vbahelper/prj/build.lst
@@ -1,3 +1,3 @@
-vba     vbahelper       :    offuh oox basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal LIBXSLT:libxslt NULL
+vba     vbahelper       :    oovbaapi offapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal LIBXSLT:libxslt NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
 vba	vbahelper\prj	nmake	-	all	vba_prj NULL
diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index eca207f49ad9..a5045fc51245 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -51,13 +51,6 @@ extern sdecl::ServiceDecl const serviceDecl;
 
 extern "C"
 {
-    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_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 143db79e9c01..8bebe6050d44 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -93,7 +93,7 @@ ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
         uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
         xWinPeer =  xControl->getPeer();
     }
-    catch( uno::Exception )
+    catch(const uno::Exception&)
     {
         throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The Control does not exsit")),
                 uno::Reference< uno::XInterface >() );
@@ -305,7 +305,7 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException)
             xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address") ), uno::makeAny( aAddress ) );
                     xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sControlSource;
         }
-        catch( uno::Exception& )
+        catch(const uno::Exception&)
         {
         }
     }
@@ -345,7 +345,7 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException)
             xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address")), uno::makeAny( aAddress ) );
             xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
         }
-        catch( uno::Exception& )
+        catch(const uno::Exception&)
         {
         }
     }
@@ -469,7 +469,7 @@ void ScVbaControl::fireEvent( script::ScriptEvent& evt )
             }
         }
     }
-    catch( uno::Exception& e )
+    catch(const uno::Exception&)
     {
     }
 }
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index e51aadbe6364..e377fe19d9fc 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -100,7 +100,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
             getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ) >>= bVisible;
         }
     }
-    catch ( uno::Exception e )
+    catch (const uno::Exception&)
     {
     }
     return bVisible;
@@ -122,7 +122,7 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
             xLayoutManager->destroyElement( m_sResourceUrl );
         }
     }
-    catch( uno::Exception& )
+    catch(const uno::Exception&)
     {
         OSL_TRACE( "SetVisible get an exception\n" );
     }
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index e8aa501a40df..156d386b3880 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -157,7 +157,7 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
         xDispatch->dispatch( aURL, uno::Sequence< beans::PropertyValue >() );
         bUIClose = sal_True;
     }
-    catch( uno::Exception& )
+    catch(const uno::Exception&)
     {
     }
 
@@ -172,10 +172,11 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
             // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
             // assume ownership if they object the closure by throwing a CloseVetoException
             // Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
-            try{
+            try
+            {
                 xCloseable->close(sal_True);
             }
-            catch( util::CloseVetoException )
+            catch(const util::CloseVetoException&)
             {
                 //close is cancelled, nothing to do
             }
@@ -193,7 +194,7 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
                 {
                     xDisposable->dispose();
                 }
-                catch( uno::Exception& )
+                catch(const uno::Exception&)
                 {
                 }
             }
@@ -239,11 +240,11 @@ VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
     {
         xModifiable->setModified( !bSave );
     }
-    catch ( lang::DisposedException& )
+    catch (const lang::DisposedException&)
     {
         // impossibility to set the modified state on disposed document should not trigger an error
     }
-    catch ( beans::PropertyVetoException& )
+    catch (const beans::PropertyVetoException&)
     {
         uno::Any aCaught( ::cppu::getCaughtException() );
         throw lang::WrappedTargetRuntimeException(
@@ -289,7 +290,7 @@ VbaDocumentBase::getVBProject() throw (uno::RuntimeException)
         mxVBProject = xServiceManager->createInstanceWithArgumentsAndContext(
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.vbide.VBProject" ) ), aArgs, mxContext );
     }
-    catch( uno::Exception& )
+    catch(const uno::Exception&)
     {
     }
     return uno::Any( mxVBProject );
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index 761d8de625f3..2a2e0ef7c407 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -220,7 +220,7 @@ ScVbaShapes::SelectAll() throw (uno::RuntimeException)
     // viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException
     // if one of the shapes is no 'markable' e.g. a button
     // the method still works
-    catch( lang::IllegalArgumentException& )
+    catch(const lang::IllegalArgumentException&)
     {
     }
 }
@@ -463,7 +463,7 @@ ScVbaShapes::setShape_NameProperty( uno::Reference< css::drawing::XShape > xShap
     {
         xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), uno::makeAny( sName ) );
     }
-    catch( script::BasicErrorException e )
+    catch(const script::BasicErrorException&)
     {
     }
 }