[Libreoffice-commits] core.git: comphelper/source include/comphelper include/sfx2 sfx2/source unusedcode.easy

Caolán McNamara caolanm at redhat.com
Mon Aug 19 00:26:45 PDT 2013


 comphelper/source/misc/componentcontext.cxx |    6 ------
 include/comphelper/componentcontext.hxx     |    8 --------
 include/sfx2/templdlg.hxx                   |    1 -
 sfx2/source/dialog/templdlg.cxx             |    8 --------
 unusedcode.easy                             |    2 --
 5 files changed, 25 deletions(-)

New commits:
commit a3b06ecf4217016c883ce40e52fcd4b6a2d25860
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 19 08:25:05 2013 +0100

    callcatcher: remove some more unused code
    
    Change-Id: I7332b0ead075e09b60549203bc32eb99a2bb0430

diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index dded964..ac9194c 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.cxx
@@ -108,12 +108,6 @@ namespace comphelper
         return Reference< XInterface >( getContextValueByName( sKey ), UNO_QUERY );
     }
 
-    //------------------------------------------------------------------------
-    Reference< XMultiServiceFactory > ComponentContext::getLegacyServiceFactory() const
-    {
-        return Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY_THROW );
-    }
-
 //........................................................................
 } // namespace comphelper
 //........................................................................
diff --git a/include/comphelper/componentcontext.hxx b/include/comphelper/componentcontext.hxx
index ce2f583..f99fb56 100644
--- a/include/comphelper/componentcontext.hxx
+++ b/include/comphelper/componentcontext.hxx
@@ -199,14 +199,6 @@ namespace comphelper
             return getSingleton( OUString::createFromAscii( _pAsciiInstanceName ) );
         }
 
-        /** returns the ->XMultiServiceFactory interface of ->m_xORB, for passing to
-            older code which does not yet support ->XMultiComponentFactory
-            @throws ::com::sun::star::uno::RuntimeException
-                if our our component factory does not support this interface
-        */
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-            getLegacyServiceFactory() const;
-
         /** retrieves a value from our component context
             @param _rName
                 the name of the value to retrieve
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 9c57455..9cee34d 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -94,7 +94,6 @@ public:
     virtual void                StateChanged( StateChangedType nStateChange );
     virtual void                FreeResource (void);
 
-    ISfxTemplateCommon*         GetISfxTemplateCommon();
     void                        SetParagraphFamily();
 
 private:
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 1dee9ac..b86bb00 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -412,14 +412,6 @@ SfxTemplatePanelControl::~SfxTemplatePanelControl (void)
 
 
 
-ISfxTemplateCommon* SfxTemplatePanelControl::GetISfxTemplateCommon()
-{
-    return pImpl->GetISfxTemplateCommon();
-}
-
-
-
-
 void SfxTemplatePanelControl::SetParagraphFamily()
 {
     // first select the paragraph family
diff --git a/unusedcode.easy b/unusedcode.easy
index 2eebe0a..1469ac1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -71,7 +71,6 @@ ServerFont::GetGlyphBitmap1(int, RawBitmap&) const
 ServerFont::GetGlyphBitmap8(int, RawBitmap&) const
 SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
 SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno::Any, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, com::sun::star::uno::Any> > > const&)
-SfxTemplatePanelControl::GetISfxTemplateCommon()
 SfxTemplatePanelControl::SetParagraphFamily()
 SmFontPickList::Contains(Font const&) const
 StatusBar::CopyItems(StatusBar const&)
@@ -132,7 +131,6 @@ basegfx::unotools::homMatrixFromMatrix(basegfx::B2DHomMatrix&, com::sun::star::g
 canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
 comphelper::ComponentContext::ComponentContext(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
 comphelper::ComponentContext::createComponentWithArguments(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const
-comphelper::ComponentContext::getLegacyServiceFactory() const
 comphelper::ComponentContext::getSingleton(rtl::OUString const&) const
 comphelper::MediaDescriptor::PROP_DEEPDETECTION()
 comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const


More information about the Libreoffice-commits mailing list