[Libreoffice-commits] core.git: starmath/inc starmath/source

Takeshi Abe tabe at fixedpoint.jp
Tue Mar 10 07:26:28 PDT 2015


 starmath/inc/unomodel.hxx    |    3 ---
 starmath/source/unomodel.cxx |   13 -------------
 2 files changed, 16 deletions(-)

New commits:
commit 9de93c8e06da3f79929ac208b666fb562b48bd49
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Mar 5 22:14:10 2015 +0900

    Spare extra call stack
    
    This also drops an unnecessary lock.
    
    Change-Id: Ia5eb459adf3cb585aa2484866670949120315780
    Reviewed-on: https://gerrit.libreoffice.org/14765
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 9fcddc7..b6a1db0 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -96,9 +96,6 @@ public:
     // oox::FormulaImportBase
     virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ) SAL_OVERRIDE;
     virtual Size getFormulaSize() const SAL_OVERRIDE;
-
-    static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
-    static OUString getImplementationName_Static();
 };
 
 
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index d45f732..f85e044 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -399,12 +399,6 @@ static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny)
 
 OUString SmModel::getImplementationName(void) throw( uno::RuntimeException, std::exception )
 {
-    return getImplementationName_Static();
-}
-
-
-OUString SmModel::getImplementationName_Static()
-{
     return OUString("com.sun.star.comp.math.FormulaDocument");
 }
 
@@ -415,13 +409,6 @@ sal_Bool SmModel::supportsService(const OUString& rServiceName) throw( uno::Runt
 
 uno::Sequence< OUString > SmModel::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception )
 {
-    return getSupportedServiceNames_Static();
-}
-
-uno::Sequence< OUString > SmModel::getSupportedServiceNames_Static(void)
-{
-    SolarMutexGuard aGuard;
-
     return uno::Sequence<OUString>{
         "com.sun.star.document.OfficeDocument",
         "com.sun.star.formula.FormulaProperties"


More information about the Libreoffice-commits mailing list