summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-08 11:48:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-08 13:04:46 +0100
commit5298b1b32d90002be8d09fe82955550c18eae8bc (patch)
tree3af0cf62eed719894b77c99d1e0896c7ad260c25 /framework
parent3e6613964f10ff10b71188293a2e4d4d1b29944c (diff)
callcatcher: ditch some more methods
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/framework/menuextensionsupplier.hxx2
-rw-r--r--framework/inc/framework/titlehelper.hxx1
-rw-r--r--framework/source/fwe/classes/menuextensionsupplier.cxx9
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx17
4 files changed, 0 insertions, 29 deletions
diff --git a/framework/inc/framework/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx
index d6b8d88e89a6..4e1dcbdfc271 100644
--- a/framework/inc/framework/menuextensionsupplier.hxx
+++ b/framework/inc/framework/menuextensionsupplier.hxx
@@ -43,8 +43,6 @@ typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
namespace framework
{
-FWE_DLLPUBLIC pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
-
FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
}
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index ed1ded3d06c5..6b3ba6ce1fc6 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -185,7 +185,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle);
void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle);
- ::rtl::OUString impl_getSubTitle ();
::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL);
diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
index 20256a756c0d..40826eb325df 100644
--- a/framework/source/fwe/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
@@ -36,15 +36,6 @@ static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL;
namespace framework
{
-pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFuncArg )
-{
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-
- pfunc_setMenuExtensionSupplier pOldMenuExtensionSupplierFunc = pMenuExtensionSupplierFunc;
- pMenuExtensionSupplierFunc = pMenuExtensionSupplierFuncArg;
- return pOldMenuExtensionSupplierFunc;
-}
-
MenuExtensionItem SAL_CALL GetMenuExtension()
{
MenuExtensionItem aItem;
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 23d18b82a544..7b39cf071a7d 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -680,23 +680,6 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl
}
//-----------------------------------------------
-::rtl::OUString TitleHelper::impl_getSubTitle ()
-{
- // SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::uno::Reference< css::frame::XTitle > xSubTitle(m_xSubTitle.get (), css::uno::UNO_QUERY);
-
- aLock.clear ();
- // <- SYNCHRONIZED
-
- if (xSubTitle.is ())
- return xSubTitle->getTitle ();
-
- return ::rtl::OUString ();
-}
-
-//-----------------------------------------------
::rtl::OUString TitleHelper::impl_convertURL2Title(const ::rtl::OUString& sURL)
{
INetURLObject aURL (sURL);