diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-26 15:54:26 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-26 15:56:33 +0100 |
commit | 62fcdfa34aa302aa9051e90e75b94eb442fa1db7 (patch) | |
tree | 29a573c371599fded62431bf1e0f0eb923726a0e | |
parent | 1dc1eaadd108883bd187411c721507df3d0d779e (diff) |
-Werror,-Wunused-private-field
...fixed more thoroughly than 49c1964b427c9f2f169ba4d826d346adc7555ae0 "WaE:
private field 'm_bCompoundControlChild' is not used."
Change-Id: Ief1093c054fe272b82da78ab103e8ca3feb72b90
-rw-r--r-- | accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 2 | ||||
-rw-r--r-- | accessibility/source/extended/textwindowaccessibility.cxx | 2 | ||||
-rw-r--r-- | accessibility/source/helper/acc_factory.cxx | 6 | ||||
-rw-r--r-- | include/svtools/accessiblefactory.hxx | 2 | ||||
-rw-r--r-- | include/svtools/textwindowpeer.hxx | 3 | ||||
-rw-r--r-- | svtools/source/edit/textwindowpeer.cxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/svtaccessiblefactory.cxx | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index befe02a552ce..20433beba2e8 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -396,7 +396,7 @@ class Document: public ::VCLXAccessibleComponent, public ::SfxListener { public: Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, - ::TextView & rView, bool bCompoundControlChild); + ::TextView & rView); inline css::uno::Reference< css::accessibility::XAccessible > getAccessible() { return m_xAccessible; } diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index f969bcbd1de2..002326fed912 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -770,7 +770,7 @@ void ParagraphImpl::checkDisposed() } Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine, - ::TextView & rView, bool /* bCompoundControlChild */): + ::TextView & rView): VCLXAccessibleComponent(pVclXWindow), m_xAccessible(pVclXWindow), m_rEngine(rEngine), diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 93f6bf54912e..640c2d58be79 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -158,7 +158,7 @@ inline bool hasFloatingChild(Window *pWindow) virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > createAccessibleTextWindowContext( - VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool bCompoundControlChild + VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -451,9 +451,9 @@ inline bool hasFloatingChild(Window *pWindow) //-------------------------------------------------------------------- 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 ); } //-------------------------------------------------------------------- diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx index 18eec036a239..cd8a65483bed 100644 --- a/include/svtools/accessiblefactory.hxx +++ b/include/svtools/accessiblefactory.hxx @@ -103,7 +103,7 @@ namespace svt virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > createAccessibleTextWindowContext( - VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool bCompoundControlChild + VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/include/svtools/textwindowpeer.hxx b/include/svtools/textwindowpeer.hxx index cdcc6f89b98d..14ef753c3f5a 100644 --- a/include/svtools/textwindowpeer.hxx +++ b/include/svtools/textwindowpeer.hxx @@ -35,7 +35,7 @@ namespace svt class TextWindowPeer: public ::VCLXWindow { public: - SVT_DLLPUBLIC TextWindowPeer(::TextView & rView, bool bCompoundControlChild = false); + SVT_DLLPUBLIC TextWindowPeer(::TextView & rView); virtual ~TextWindowPeer(); @@ -53,7 +53,6 @@ private: ::TextEngine & m_rEngine; ::TextView & m_rView; - bool m_bCompoundControlChild; ::std::auto_ptr< ::svt::AccessibleFactoryAccess > m_pFactoryAccess; }; diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx index bbe30dd9f894..11fa8c9eb38c 100644 --- a/svtools/source/edit/textwindowpeer.cxx +++ b/svtools/source/edit/textwindowpeer.cxx @@ -24,8 +24,8 @@ namespace svt { - TextWindowPeer::TextWindowPeer(::TextView & rView, bool bCompoundControlChild): - m_rEngine(*rView.GetTextEngine()), m_rView(rView), m_bCompoundControlChild(bCompoundControlChild) + TextWindowPeer::TextWindowPeer(::TextView & rView): + m_rEngine(*rView.GetTextEngine()), m_rView(rView) { SetWindow(rView.GetWindow()); m_pFactoryAccess.reset( new AccessibleFactoryAccess ); @@ -39,7 +39,7 @@ namespace svt css::uno::Reference< css::accessibility::XAccessibleContext > TextWindowPeer::CreateAccessibleContext() { return m_pFactoryAccess->getFactory().createAccessibleTextWindowContext( - this, m_rEngine, m_rView, m_bCompoundControlChild + this, m_rEngine, m_rView ); } } diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index ee5a9c048ac8..86b81037b5b9 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -124,7 +124,7 @@ namespace svt virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > createAccessibleTextWindowContext( - VCLXWindow* /*pVclXWindow*/, TextEngine& /*rEngine*/, TextView& /*rView*/, bool /*bCompoundControlChild*/ + VCLXWindow* /*pVclXWindow*/, TextEngine& /*rEngine*/, TextView& /*rView*/ ) const { return NULL; |