mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror,-Wunused-private-field

Browse Source 
...fixed more thoroughly than 49c1964b42 "WaE:
private field 'm_bCompoundControlChild' is not used."

Change-Id: Ief1093c054fe272b82da78ab103e8ca3feb72b90
This commit is contained in:
Stephan Bergmann
2013-11-26 15:54:26 +01:00
parent 1dc1eaadd1
commit 62fcdfa34a
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
View File

@@ -396,7 +396,7 @@ class Document: public ::VCLXAccessibleComponent, public ::SfxListener
{ {
public: public:
Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
::TextView & rView, bool bCompoundControlChild); ::TextView & rView);
inline css::uno::Reference< css::accessibility::XAccessible > inline css::uno::Reference< css::accessibility::XAccessible >
getAccessible() { return m_xAccessible; } getAccessible() { return m_xAccessible; }

2
accessibility/source/extended/textwindowaccessibility.cxx
View File

@@ -770,7 +770,7 @@ void ParagraphImpl::checkDisposed()
} }
Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
::TextView & rView, bool /* bCompoundControlChild */): ::TextView & rView):
VCLXAccessibleComponent(pVclXWindow), VCLXAccessibleComponent(pVclXWindow),
m_xAccessible(pVclXWindow), m_xAccessible(pVclXWindow),
m_rEngine(rEngine), m_rEngine(rEngine),

6
accessibility/source/helper/acc_factory.cxx
View File

@@ -158,7 +158,7 @@ inline bool hasFloatingChild(Window *pWindow)
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
createAccessibleTextWindowContext( createAccessibleTextWindowContext(
VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool bCompoundControlChild VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
) const; ) const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
@@ -451,9 +451,9 @@ inline bool hasFloatingChild(Window *pWindow)
//-------------------------------------------------------------------- //--------------------------------------------------------------------
Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext( Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext(
VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool bCompoundControlChild ) const VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const
{ {
return new Document( pVclXWindow, rEngine, rView, bCompoundControlChild ); return new Document( pVclXWindow, rEngine, rView );
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------

2
include/svtools/accessiblefactory.hxx
View File

@@ -103,7 +103,7 @@ namespace svt
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
createAccessibleTextWindowContext( createAccessibleTextWindowContext(
VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool bCompoundControlChild VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
) const = 0; ) const = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >

3
include/svtools/textwindowpeer.hxx
View File

@@ -35,7 +35,7 @@ namespace svt
class TextWindowPeer: public ::VCLXWindow class TextWindowPeer: public ::VCLXWindow
{ {
public: public:
SVT_DLLPUBLIC TextWindowPeer(::TextView & rView, bool bCompoundControlChild = false); SVT_DLLPUBLIC TextWindowPeer(::TextView & rView);
virtual ~TextWindowPeer(); virtual ~TextWindowPeer();
@@ -53,7 +53,6 @@ private:
::TextEngine & m_rEngine; ::TextEngine & m_rEngine;
::TextView & m_rView; ::TextView & m_rView;
bool m_bCompoundControlChild;
::std::auto_ptr< ::svt::AccessibleFactoryAccess > m_pFactoryAccess; ::std::auto_ptr< ::svt::AccessibleFactoryAccess > m_pFactoryAccess;
}; };

6
svtools/source/edit/textwindowpeer.cxx
View File

@@ -24,8 +24,8 @@
namespace svt namespace svt
{ {
TextWindowPeer::TextWindowPeer(::TextView & rView, bool bCompoundControlChild): TextWindowPeer::TextWindowPeer(::TextView & rView):
m_rEngine(*rView.GetTextEngine()), m_rView(rView), m_bCompoundControlChild(bCompoundControlChild) m_rEngine(*rView.GetTextEngine()), m_rView(rView)
{ {
SetWindow(rView.GetWindow()); SetWindow(rView.GetWindow());
m_pFactoryAccess.reset( new AccessibleFactoryAccess ); m_pFactoryAccess.reset( new AccessibleFactoryAccess );
@@ -39,7 +39,7 @@ namespace svt
css::uno::Reference< css::accessibility::XAccessibleContext > TextWindowPeer::CreateAccessibleContext() css::uno::Reference< css::accessibility::XAccessibleContext > TextWindowPeer::CreateAccessibleContext()
{ {
return m_pFactoryAccess->getFactory().createAccessibleTextWindowContext( return m_pFactoryAccess->getFactory().createAccessibleTextWindowContext(
this, m_rEngine, m_rView, m_bCompoundControlChild this, m_rEngine, m_rView
); );
} }
} }

2
svtools/source/misc/svtaccessiblefactory.cxx
View File

@@ -124,7 +124,7 @@ namespace svt
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
createAccessibleTextWindowContext( createAccessibleTextWindowContext(
VCLXWindow* /*pVclXWindow*/, TextEngine& /*rEngine*/, TextView& /*rView*/, bool /*bCompoundControlChild*/ VCLXWindow* /*pVclXWindow*/, TextEngine& /*rEngine*/, TextView& /*rView*/
) const ) const
{ {
return NULL; return NULL;