summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-18 12:00:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-18 12:00:15 +0200
commit0d5ff972fb51d11f01e8062e73a24dd4bab60417 (patch)
treeee89de6a075ee88e2af63963396168fab6b9b504 /framework
parent968e6b5e66da73d6cd1f07d46db015d1f339c509 (diff)
SAL_WARN_UNUSED Link
Change-Id: I646677611e46a7e33e977a5afeea9bf831b28733
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/substitutepathvars.cxx19
1 files changed, 2 insertions, 17 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index bb02d348884c..acead687f975 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;