[Libreoffice-commits] core.git: svx/source vbahelper/source

Andrea Gelmini andrea.gelmini at gelma.net
Mon Jan 19 00:46:34 PST 2015


 svx/source/form/fmobj.cxx               |    8 ++++----
 vbahelper/source/msforms/vbacontrol.cxx |    4 ++--
 vbahelper/source/msforms/vbacontrol.hxx |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 83e8d0166d4dba92aafead49c427d5ffddd38b72
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date:   Sun Jan 18 23:35:56 2015 +0100

    Fix typo code Resouce->Resource
    
    Change-Id: I6e68c13e4513c2f8cc38e237646db7dffc88fe3b
    Reviewed-on: https://gerrit.libreoffice.org/13986
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 6e2627e..7d7bd1b 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -443,14 +443,14 @@ namespace
 
 Reference< XInterface >  FmFormObj::ensureModelEnv(const Reference< XInterface > & _rSourceContainer, const Reference<css::form::XForms>& _rTopLevelDestContainer)
 {
-    Reference< XInterface >  xTopLevelSouce;
-    OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce);
-    if (!xTopLevelSouce.is())
+    Reference< XInterface >  xTopLevelSource;
+    OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSource);
+    if (!xTopLevelSource.is())
         // something went wrong, maybe _rSourceContainer isn't part of a valid forms hierarchy
         return Reference< XInterface > ();
 
     Reference< XIndexContainer >  xDestContainer(_rTopLevelDestContainer, UNO_QUERY_THROW);
-    Reference< XIndexContainer >  xSourceContainer(xTopLevelSouce, UNO_QUERY);
+    Reference< XIndexContainer >  xSourceContainer(xTopLevelSource, UNO_QUERY);
     DBG_ASSERT(xSourceContainer.is(), "FmFormObj::ensureModelEnv : the top level source is invalid !");
 
     sal_Int32 nTokIndex = 0;
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 31588f4..42fc9d3 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -117,7 +117,7 @@ ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeE
 {
     if( pControl )
     {
-        pControl->removeResouce();
+        pControl->removeResource();
         pControl = NULL;
     }
 }
@@ -165,7 +165,7 @@ ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
     mpGeometryHelper.reset( pHelper );
 }
 
-void ScVbaControl::removeResouce() throw( uno::RuntimeException )
+void ScVbaControl::removeResource() throw( uno::RuntimeException )
 {
     uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
     xComponent->removeEventListener( m_xEventListener );
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index 34b1c02..7a6e6e1 100644
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -101,7 +101,7 @@ public:
     virtual ::sal_Int32 SAL_CALL getMousePointer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     //remove resource because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
-    virtual void removeResouce() throw( css::uno::RuntimeException );
+    virtual void removeResource() throw( css::uno::RuntimeException );
     virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException);
     //XHelperInterface


More information about the Libreoffice-commits mailing list