Kaydet (Commit) 0d5ff972 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

SAL_WARN_UNUSED Link

Change-Id: I646677611e46a7e33e977a5afeea9bf831b28733
üst 968e6b5e
...@@ -114,7 +114,7 @@ typedef std::vector< SubstituteRule > SubstituteRuleVector; ...@@ -114,7 +114,7 @@ typedef std::vector< SubstituteRule > SubstituteRuleVector;
class SubstitutePathVariables_Impl : public utl::ConfigItem class SubstitutePathVariables_Impl : public utl::ConfigItem
{ {
public: public:
SubstitutePathVariables_Impl( const Link<>& aNotifyLink ); SubstitutePathVariables_Impl();
virtual ~SubstitutePathVariables_Impl(); virtual ~SubstitutePathVariables_Impl();
static OperatingSystem GetOperatingSystemFromString( const OUString& ); static OperatingSystem GetOperatingSystemFromString( const OUString& );
...@@ -153,7 +153,6 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem ...@@ -153,7 +153,6 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
bool m_bHostRetrieved; bool m_bHostRetrieved;
OUString m_aHost; OUString m_aHost;
Link<> m_aListenerNotify;
const OUString m_aSharePointsNodeName; const OUString m_aSharePointsNodeName;
const OUString m_aDirPropertyName; const OUString m_aDirPropertyName;
const OUString m_aEnvPropertyName; const OUString m_aEnvPropertyName;
...@@ -261,8 +260,6 @@ public: ...@@ -261,8 +260,6 @@ public:
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected: protected:
DECL_LINK(implts_ConfigurationNotify, void *);
void SetPredefinedPathVariables(); void SetPredefinedPathVariables();
OUString ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const; OUString ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const;
...@@ -395,13 +392,12 @@ EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const OUStri ...@@ -395,13 +392,12 @@ EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const OUStri
return ET_UNKNOWN; return ET_UNKNOWN;
} }
SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link<>& aNotifyLink ) : SubstitutePathVariables_Impl::SubstitutePathVariables_Impl() :
utl::ConfigItem( OUString( "Office.Substitution" )), utl::ConfigItem( OUString( "Office.Substitution" )),
m_bYPDomainRetrieved( false ), m_bYPDomainRetrieved( false ),
m_bDNSDomainRetrieved( false ), m_bDNSDomainRetrieved( false ),
m_bNTDomainRetrieved( false ), m_bNTDomainRetrieved( false ),
m_bHostRetrieved( false ), m_bHostRetrieved( false ),
m_aListenerNotify( aNotifyLink ),
m_aSharePointsNodeName( OUString( "SharePoints" )), m_aSharePointsNodeName( OUString( "SharePoints" )),
m_aDirPropertyName( OUString( "/Directory" )), m_aDirPropertyName( OUString( "/Directory" )),
m_aEnvPropertyName( OUString( "/Environment" )), m_aEnvPropertyName( OUString( "/Environment" )),
...@@ -719,7 +715,6 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( ...@@ -719,7 +715,6 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration(
SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentContext >& xContext ) : SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentContext >& xContext ) :
SubstitutePathVariables_BASE(m_aMutex), SubstitutePathVariables_BASE(m_aMutex),
m_aImpl( LINK( this, SubstitutePathVariables, implts_ConfigurationNotify )),
m_xContext( xContext ) m_xContext( xContext )
{ {
int i; int i;
...@@ -793,16 +788,6 @@ throw ( NoSuchElementException, RuntimeException, std::exception ) ...@@ -793,16 +788,6 @@ throw ( NoSuchElementException, RuntimeException, std::exception )
return impl_getSubstituteVariableValue( aVariable ); 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 SubstitutePathVariables::ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const
{ {
OUString aResult; OUString aResult;
......
...@@ -113,7 +113,8 @@ ...@@ -113,7 +113,8 @@
#define LINK(Instance, Class, Member) ::tools::detail::makeLink( \ #define LINK(Instance, Class, Member) ::tools::detail::makeLink( \
static_cast<Class *>(Instance), &Class::LinkStub##Member) 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: public:
typedef Ret Stub(void *, Arg); typedef Ret Stub(void *, Arg);
......
...@@ -1609,7 +1609,6 @@ private: ...@@ -1609,7 +1609,6 @@ private:
Size( nRotatedWidth, nRotatedHeight ) ); Size( nRotatedWidth, nRotatedHeight ) );
} }
Link<> aOldLink;
Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner(); Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner();
pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); pOutliner->Init(OUTLINERMODE_OUTLINEVIEW);
const sal_uInt16 nSavedOutlMode (pOutliner->GetMode()); const sal_uInt16 nSavedOutlMode (pOutliner->GetMode());
......
...@@ -31,7 +31,6 @@ private: ...@@ -31,7 +31,6 @@ private:
SwView* pView; SwView* pView;
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > xHyph; ::com::sun::star::linguistic2::XHyphenator > xHyph;
Link<> aOldLnk;
sal_uInt16 nPageCount; // page count for progress view sal_uInt16 nPageCount; // page count for progress view
sal_uInt16 nPageStart; // 1st checked page sal_uInt16 nPageStart; // 1st checked page
bool bInSelection : 1; // separating selected text bool bInSelection : 1; // separating selected text
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment