compilerplugins/clang/staticmethods.cxx | 2 +-
sd/source/ui/dlg/navigatr.cxx | 3 ++-
sd/source/ui/inc/navigatr.hxx | 2 +-
sw/inc/dbmgr.hxx | 2 +-
sw/source/core/doc/doc.cxx | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit aa50b1c03f18a10c281786c69e24d8255613ac5a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 16:57:23 2015 +0200
Enable loplugin:staticmethods
Change-Id: Ic0062eddebf9225d298569bb4900047a0ee0b112
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index a0d6099..decb3ff 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -206,7 +206,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
return true;
}
-loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false);
+loplugin::Plugin::Registration<StaticMethods> X("staticmethods");
}
commit 516d3007444fe2dd07b2cde24066637281c2a217
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 16:57:03 2015 +0200
loplugin:staticmethods
Change-Id: I0041724d340bf75a184910805f7f927efb3b2131
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index e5f719c..dfcd231 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -371,7 +371,7 @@ public:
const
::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >
*pSettings = 0);
/// Load the embedded data source of the document and also register it.
- void LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const
SwDocShell& rDocShell);
+ static void LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const
SwDocShell& rDocShell);
/** try to get the data source from the given connection through the
XChild interface.
If this is not possible, the data source will be created through its
name.
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 4886e29..9c3e75f 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -495,7 +495,7 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
if( rNewData != maDBData )
{
if (maDBData.sEmbeddedName != rNewData.sEmbeddedName && GetDocShell())
- mpDBManager->LoadAndRegisterEmbeddedDataSource(rNewData,
*GetDocShell());
+ SwDBManager::LoadAndRegisterEmbeddedDataSource(rNewData,
*GetDocShell());
maDBData = rNewData;
getIDocumentState().SetModified();
commit 7fabc2300bc7255c839eb42c2185cad92029009d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 8 16:57:00 2015 +0200
loplugin:staticmethods
Change-Id: I33d722c27d85732d23510ebaaaba0b8792d0d61d
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index ec19ebf..1f891e5 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -313,7 +313,8 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl,
ToolBox *, void)
}
}
-IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickToolboxHdl, ToolBox *, void)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(
+ SdNavigatorWin, ClickToolboxHdl, ToolBox *, void)
{}
IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void
)
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 77b7a7e..e16e21e 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -146,7 +146,7 @@ private:
DECL_LINK( GetFocusObjectsHdl, void * );
DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *,
void );
- DECL_LINK_TYPED(ClickToolboxHdl, ToolBox *,
void);
+ DECL_STATIC_LINK_TYPED(SdNavigatorWin,
ClickToolboxHdl, ToolBox *, void);
DECL_LINK_TYPED( DropdownClickToolBoxHdl,
ToolBox *, void );
DECL_LINK( ClickPageHdl, void * );
DECL_LINK( ClickObjectHdl, void * );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
