extensions/source/propctrlr/propertycomposer.hxx | 4 ++--
include/sfx2/childwin.hxx | 2 +-
include/svx/obj3d.hxx | 2 +-
include/vcl/opengl/OpenGLContext.hxx | 1 -
slideshow/source/engine/shapes/gdimtftools.cxx | 4 +---
svx/source/dialog/hyperdlg.cxx | 15 +--------------
svx/source/inc/GraphCtlAccessibleContext.hxx | 4 +++-
svx/source/table/tablemodel.hxx | 4 ++--
vcl/workben/vcldemo.cxx | 2 +-
9 files changed, 12 insertions(+), 26 deletions(-)
New commits:
commit 0888dfe7f25abac100b5a23c078c3582e1f6a6a9
Author: Noel Grandin <n...@peralex.com>
Date: Tue Dec 2 14:54:44 2014 +0200
loplugin:saloverride
Change-Id: I62e8c07faf1fb38b39dfb41e0ba408d5c534312f
(cherry picked from commit 63fbe59d054a99224dac5fa25ff1a16890365746)
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index d65ea20..95329f3 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1275,7 +1275,7 @@ public:
virtual ~DemoWidgets()
{
}
- virtual void Paint(const Rectangle&)
+ virtual void Paint(const Rectangle&) SAL_OVERRIDE
{
Rectangle aWholeSize(Point(0, 0),GetOutputSizePixel());
vcl::Region aClip(aWholeSize);
commit 34c2b231b057ab6c1cf7af83aeb046ac4fea2b90
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 25 10:34:30 2014 +0100
-Werror,-Wuninitialized
(in DummyRenderer ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: I5b151176c676a58593933b3f2e33a3e2dfdcc630
(cherry picked from commit 34d464316872fec13fc024d630cbfcc26b77185a)
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx
b/slideshow/source/engine/shapes/gdimtftools.cxx
index 4d2b046..f3a52ca 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -107,9 +107,7 @@ namespace {
typedef ::cppu::WeakComponentImplHelper1< graphic::XGraphicRenderer >
DummyRenderer_Base;
-class DummyRenderer :
- public DummyRenderer_Base,
- public cppu::BaseMutex
+class DummyRenderer: public cppu::BaseMutex, public DummyRenderer_Base
{
public:
DummyRenderer() :
commit 2da946d4789716aa5480eae3ce8ccde99dd1af25
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 25 09:46:13 2014 +0100
-Werror,-Wuninitialized
(in PropertyComposer ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: I41ede9ab34e89c8dde23ce2e4fd6393b05c979c6
(cherry picked from commit da9fd02a4d1a36cf9d22d5b36ba36240585284f6)
diff --git a/extensions/source/propctrlr/propertycomposer.hxx
b/extensions/source/propctrlr/propertycomposer.hxx
index 4c71696..159d437 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -50,8 +50,8 @@ namespace pcr
/** implements an <type>XPropertyHandler</type> which composes it's
information
from a set of other property handlers
*/
- class PropertyComposer :public PropertyComposer_Base
- ,public ::comphelper::OBaseMutex
+ class PropertyComposer :public ::comphelper::OBaseMutex
+ ,public PropertyComposer_Base
,public IPropertyExistenceCheck
{
public:
commit 5bb5ddf9336ae2ee5a17598716e1c86196c1403a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 25 09:06:36 2014 +0100
-Werror,-Wuninitialized
(in SvxGraphCtrlAccessibleContext ctor: base class 'comphelper::OBaseMutex'
is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: Ic6791043828b7b9f69c76867e26ee02a5ee66817
(cherry picked from commit a8a8cb216fd2b25a1ed8b9c217685dccacaa428e)
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx
b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 95cbf3a..b2c6650 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -77,7 +77,9 @@ typedef ::cppu::WeakAggComponentImplHelper7<
::com::sun::star::lang::XServiceName >
SvxGraphCtrlAccessibleContext_Base;
-class SvxGraphCtrlAccessibleContext : public
SvxGraphCtrlAccessibleContext_Base, ::comphelper::OBaseMutex, SfxListener,
::accessibility::IAccessibleViewForwarder
+class SvxGraphCtrlAccessibleContext:
+ comphelper::OBaseMutex, public SvxGraphCtrlAccessibleContext_Base,
+ SfxListener, accessibility::IAccessibleViewForwarder
{
public:
friend class GraphCtrl;
commit 8cddcb48c63b5fafb6e9c573fd6aef9f505de74e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 25 08:58:32 2014 +0100
-Werror,-Wuninitialized
(in TableModel ctor: base class 'comphelper::OBaseMutex' is
uninitialized when used here to access 'comphelper::OBaseMutex::m_aMutex')
Change-Id: I2a54a1123384bdeaee917ad9f1f0047f13c3860f
(cherry picked from commit f0332a4a77880a04697b93cec8f1c2b913f60d1a)
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index df13cd1..8ad480e 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -52,8 +52,8 @@ protected:
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::table::XTable,
::com::sun::star::util::XBroadcaster > TableModelBase;
-class TableModel : public TableModelBase,
- public ::comphelper::OBaseMutex,
+class TableModel : public ::comphelper::OBaseMutex,
+ public TableModelBase,
public ICellRange
{
friend class InsertRowUndo;
commit f3124d1d42f70375d3c45f3186c774b2891c74ab
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 5 09:06:40 2014 +0100
-Werror,-Winconsistent-missing-override
...looks like loplugin:saloverride has problems detecting missing overrides
in
case of covariant return types
Change-Id: I08f2f67a33cd1cfaf9308cd87d7a5f92203980ed
(cherry picked from commit 166fe80d65f1d46e52d313cf8894d9604b6a2ab8)
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index f370f20..b11f1d5 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -85,7 +85,7 @@ public:
E3dObjList(SdrModel* pNewModel = 0, SdrPage* pNewPage = 0, E3dObjList*
pNewUpList = 0);
SVX_DLLPUBLIC virtual ~E3dObjList();
- virtual E3dObjList* Clone() const;
+ virtual E3dObjList* Clone() const SAL_OVERRIDE;
virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE,
const SdrInsertReason* pReason=NULL) SAL_OVERRIDE;
virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const
SdrInsertReason* pReason=NULL) SAL_OVERRIDE;
commit 19846fddcd67c13351d2ce4fb11981332f516ce3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Dec 2 10:14:03 2014 +0100
-Werror,-Wunused-private-field
Change-Id: Id34e28a76cd686496e7d5e65fff89d7a8d3d2d08
(cherry picked from commit 3b0db84516503ce72b803bf04b0432b36c1ac70c)
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index a78972c..20731a6 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -268,7 +268,6 @@ private:
bool mbPixmap; // is a pixmap instead of a window
#endif
- int mnFramebufferCount;
OpenGLFramebuffer* mpCurrentFramebuffer;
OpenGLFramebuffer* mpFirstFramebuffer;
OpenGLFramebuffer* mpLastFramebuffer;
commit b51d44462f52188f4e1574168ec759c8008a40b7
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 5 12:42:34 2014 +0100
Broken cast
All the way back since 2001 (ed53aaf5842e82f9a8d4d053b39e7db61c6d62ce
"#89611#
react for (Beamer!)Frame->dispose() from outside," adding member
SfxChildWindow_Impl::xListener), that MyStruct hack was not in sync with
SfxChildWindow_Impl, so
((MyStruct*)pImp)->bVisible = false;
probably corrputed pFact rather than change bVisible. The origin of that
MyStruct hack is lost to history, but probably stems from an ancient time
when
changes across modules where prohibitively expensive, esp. when some
feature had
to be crammed in shortly before release...
Change-Id: I13dc30c96ef70b2cc09dc117231c021910e0ce1e
(cherry picked from commit 0cb6a92f86e02f6342be5e8f931dc1849114230c)
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 4fe4c00..c1b8890 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -217,7 +217,7 @@ public:
void SetFrame( const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > & );
SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16,
SfxChildWinInfo&);
- SAL_DLLPRIVATE void SetVisible_Impl( bool bVis );
+ void SetVisible_Impl( bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
SAL_DLLPRIVATE void Activate_Impl();
SAL_DLLPRIVATE void Deactivate_Impl();
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 9aeefe8..40464de 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -32,19 +32,6 @@
SFX_IMPL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper, SID_HYPERLINK_DIALOG)
-
-
-struct MyStruct
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
- SfxChildWinFactory* pFact;
- bool bHideNotDelete;
- bool bVisible;
- bool bHideAtToggle;
- SfxModule* pContextModule;
- SfxWorkWindow* pWorkWin;
-};
-
SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
@@ -58,7 +45,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window*
_pParent, sal_uInt16 nId,
mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings,
SID_HYPERLINK_DIALOG );
DBG_ASSERT(mpDlg, "Dialog creation failed!");
pWindow = mpDlg->GetWindow();
- ((MyStruct*)pImp)->bVisible = false;
+ SetVisible_Impl(false);
vcl::Window* pTopWindow = 0;
if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 &&
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
