[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/sfx2 vcl/unx
Noel Grandin
noel at peralex.com
Mon Jul 20 01:58:51 PDT 2015
compilerplugins/clang/unusedmethods.py | 12 ++++++++----
include/sfx2/app.hxx | 1 -
include/sfx2/docfac.hxx | 1 -
include/sfx2/docfile.hxx | 1 -
include/sfx2/progress.hxx | 3 ---
include/sfx2/sfxbasemodel.hxx | 2 --
include/sfx2/tbxctrl.hxx | 7 ++-----
vcl/unx/gtk/window/gtksalframe.cxx | 2 +-
8 files changed, 11 insertions(+), 18 deletions(-)
New commits:
commit 63c29ff0adfc3893adf8bcb8934720312aaf11e8
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jul 20 10:55:59 2015 +0200
fix linux buildbot
the GTK3 version check for the GDK_IS_X11_DISPLAY macro
does not appear to work well on all the machines
Change-Id: I7020afdca1b270f89910753737c2c70b61453b34
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 2abc94f..2cb31bc 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -105,7 +105,7 @@
#define IS_WIDGET_MAPPED GTK_WIDGET_MAPPED
#endif
-#if !GTK_CHECK_VERSION(3,10,0)
+#ifndef GDK_IS_X11_DISPLAY
#define GDK_IS_X11_DISPLAY(foo) (true)
#endif
commit 600ed089e242a80f5fbf3131b63995eed9d33f3f
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 17 15:50:48 2015 +0200
loplugin:unusedmethods sfx2
Change-Id: I40be06a4859a38ef64b6267515917f625a5f176d
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index 27118b2..f76fcb7 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -89,16 +89,16 @@ for clazz in sorted(definitionSet - callSet - exclusionSet):
continue
# if this method is const, and there is a non-const variant of it, and the non-const variant is in use, then leave it alone
if (clazz.startswith("const ") and clazz.endswith(" const")):
- clazz2 = clazz[6:len(clazz)-12]
+ clazz2 = clazz[6:len(clazz)-6]
if (clazz2 in callSet):
continue
elif (clazz.endswith(" const")):
- clazz2 = clazz[:len(clazz)-6]
+ clazz2 = clazz[:len(clazz)-6] # strip off " const"
if (clazz2 in callSet):
continue
if (clazz.endswith(" const") and clazz.find("::iterator") != -1):
- clazz2 = clazz.replace("::const_iterator", "::iterator")
- clazz2 = clazz2[:len(clazz)-6] # strip off " const"
+ clazz2 = clazz[:len(clazz)-6] # strip off " const"
+ clazz2 = clazz2.replace("::const_iterator", "::iterator")
if (clazz2 in callSet):
continue
# if this method is non-const, and there is a const variant of it, and the const variant is in use, then leave it alone
@@ -121,6 +121,10 @@ for clazz in sorted(definitionSet - callSet - exclusionSet):
or clazz.find("DdeItem::") != -1
or clazz.find("DdeGetPutItem::") != -1):
continue
+ # the include/tools/rtti.hxx stuff
+ if (clazz.find("::StaticType()") != -1
+ or clazz.find("::IsOf(void *(*)(void))") != -1):
+ continue
print clazz
# add an empty line at the end to make it easier for the unusedmethodsremove plugin to mmap() the output file
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 1cb6fd7..77e6267 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -119,7 +119,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
DECL_DLLPRIVATE_LINK_TYPED( GlobalBasicErrorHdl_Impl, StarBASIC*, bool );
- static SfxApplication* Create();
void Deinitialize();
public:
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index 02eb345..ea8d0e8 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -79,7 +79,6 @@ public:
SfxModule* GetModule() const;
SAL_DLLPRIVATE void SetModule_Impl( SfxModule* );
- SAL_DLLPRIVATE static void UpdateFilterContainers_Impl();
SAL_DLLPRIVATE sal_uInt16 GetViewNo_Impl( const sal_uInt16 i_nViewId, const sal_uInt16 i_nFallback ) const;
private:
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 338986e2..d5404e2 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -63,7 +63,6 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
SAL_DLLPRIVATE void CloseInStream_Impl();
SAL_DLLPRIVATE bool CloseOutStream_Impl();
SAL_DLLPRIVATE void CloseStreams_Impl();
- DECL_DLLPRIVATE_STATIC_LINK( SfxMedium, UCBHdl_Impl, sal_uInt32 * );
SAL_DLLPRIVATE void SetEncryptionDataToStorage_Impl();
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 4a618c5..b1c05e3 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -62,9 +62,6 @@ public:
static SfxProgress* GetActiveProgress( SfxObjectShell *pDocSh = 0 );
static void EnterLock();
static void LeaveLock();
-
- DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
- DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
};
#endif
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 497878f..a19852e 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -814,9 +814,7 @@ public:
SAL_DLLPRIVATE bool impl_isDisposed() const ;
bool IsInitialized() const;
- bool IsDisposed() const { return impl_isDisposed(); }
void MethodEntryCheck( const bool i_mustBeInitialized ) const;
- ::osl::Mutex& getMutex() const { return m_aMutex; }
css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 7632ca2..2ceb704 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -273,7 +273,6 @@ public:
class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
{
public:
- SFX_DECL_TOOLBOX_CONTROL();
SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE;
virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
@@ -319,11 +318,10 @@ protected:
class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
{
- protected:
+protected:
virtual void Select(sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
- public:
- SFX_DECL_TOOLBOX_CONTROL();
+public:
SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
};
@@ -346,7 +344,6 @@ protected:
virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
public:
- SFX_DECL_TOOLBOX_CONTROL();
SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
virtual ~SfxAddonsToolBoxControl_Impl();
};
More information about the Libreoffice-commits
mailing list