framework/source/services/substitutepathvars.cxx | 19 ++-----------------
include/tools/link.hxx | 3 ++-
sd/source/ui/view/DocumentRenderer.cxx | 1 -
sw/source/uibase/inc/hyp.hxx | 1 -
4 files changed, 4 insertions(+), 20 deletions(-)
New commits:
commit 0d5ff972fb51d11f01e8062e73a24dd4bab60417
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon May 18 12:00:15 2015 +0200
SAL_WARN_UNUSED Link
Change-Id: I646677611e46a7e33e977a5afeea9bf831b28733
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index bb02d34..acead68 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -114,7 +114,7 @@ typedef std::vector< SubstituteRule > SubstituteRuleVector;
class SubstitutePathVariables_Impl : public utl::ConfigItem
{
public:
- SubstitutePathVariables_Impl( const Link<>& aNotifyLink );
+ SubstitutePathVariables_Impl();
virtual ~SubstitutePathVariables_Impl();
static OperatingSystem GetOperatingSystemFromString( const OUString& );
@@ -153,7 +153,6 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
bool m_bHostRetrieved;
OUString m_aHost;
- Link<> m_aListenerNotify;
const OUString m_aSharePointsNodeName;
const OUString m_aDirPropertyName;
const OUString m_aEnvPropertyName;
@@ -261,8 +260,6 @@ public:
throw (::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
- DECL_LINK(implts_ConfigurationNotify, void *);
-
void SetPredefinedPathVariables();
OUString ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const;
@@ -395,13 +392,12 @@ EnvironmentType
SubstitutePathVariables_Impl::GetEnvTypeFromString( const OUStri
return ET_UNKNOWN;
}
-SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link<>&
aNotifyLink ) :
+SubstitutePathVariables_Impl::SubstitutePathVariables_Impl() :
utl::ConfigItem( OUString( "Office.Substitution" )),
m_bYPDomainRetrieved( false ),
m_bDNSDomainRetrieved( false ),
m_bNTDomainRetrieved( false ),
m_bHostRetrieved( false ),
- m_aListenerNotify( aNotifyLink ),
m_aSharePointsNodeName( OUString( "SharePoints" )),
m_aDirPropertyName( OUString( "/Directory" )),
m_aEnvPropertyName( OUString( "/Environment" )),
@@ -719,7 +715,6 @@ void
SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration(
SubstitutePathVariables::SubstitutePathVariables( const Reference<
XComponentContext >& xContext ) :
SubstitutePathVariables_BASE(m_aMutex),
- m_aImpl( LINK( this, SubstitutePathVariables, implts_ConfigurationNotify
)),
m_xContext( xContext )
{
int i;
@@ -793,16 +788,6 @@ throw ( NoSuchElementException, RuntimeException,
std::exception )
return impl_getSubstituteVariableValue( aVariable );
}
-// protected methods
-
-IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify)
-{
- /* SAFE AREA
-----------------------------------------------------------------------------------------------
*/
- osl::MutexGuard g(rBHelper.rMutex);
-
- return 0;
-}
-
OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const OUString&
aOSLCompliantURL ) const
{
OUString aResult;
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index a48c3b8..fa86e5d 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -113,7 +113,8 @@
#define LINK(Instance, Class, Member) ::tools::detail::makeLink( \
static_cast<Class *>(Instance), &Class::LinkStub##Member)
-template<typename Arg = void *, typename Ret = sal_IntPtr> class Link {
+template<typename Arg = void *, typename Ret = sal_IntPtr>
+class SAL_WARN_UNUSED Link {
public:
typedef Ret Stub(void *, Arg);
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 0fae5ca..c9b38a6 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1609,7 +1609,6 @@ private:
Size( nRotatedWidth, nRotatedHeight ) );
}
- Link<> aOldLink;
Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner();
pOutliner->Init(OUTLINERMODE_OUTLINEVIEW);
const sal_uInt16 nSavedOutlMode (pOutliner->GetMode());
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index d2f035c..f1f1440 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -31,7 +31,6 @@ private:
SwView* pView;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > xHyph;
- Link<> aOldLnk;
sal_uInt16 nPageCount; // page count for progress view
sal_uInt16 nPageStart; // 1st checked page
bool bInSelection : 1; // separating selected text
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
