diff options
-rw-r--r-- | compilerplugins/clang/virtualdead.unusedparams.results | 3 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleHyperlink.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unoedprx.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unofored.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unoforou.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 2 | ||||
-rw-r--r-- | include/editeng/editeng.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unoedprx.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unoedsrc.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unofored.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unoforou.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unotext.hxx | 2 | ||||
-rw-r--r-- | sc/inc/editutil.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/editutil.cxx | 2 | ||||
-rw-r--r-- | starmath/source/accessibility.cxx | 2 | ||||
-rw-r--r-- | starmath/source/accessibility.hxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/weldeditview.cxx | 4 |
20 files changed, 22 insertions, 27 deletions
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 09c0bb4700d9..90a168fee2d6 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -109,9 +109,6 @@ include/editeng/editeng.hxx:475 include/editeng/editeng.hxx:478 void EditEngine::ParagraphConnected(int,int,) 01 -include/editeng/editeng.hxx:503 - void EditEngine::FieldClicked(const class SvxFieldItem &,int,int,) - 100 include/filter/msfilter/msdffimp.hxx:546 _Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const 00 diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index 104051824ea7..fea7bccfc0be 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -62,7 +62,7 @@ namespace accessibility bool bRet = false; if ( isValid() && ( nIndex == 0 ) ) { - rTA.FieldClicked( *pFld, nPara, nRealIdx ); + rTA.FieldClicked( *pFld ); bRet = true; } return bRet; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 7d72d45c3194..ac9fdd5202ce 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2567,7 +2567,7 @@ OUString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_Int32, return OUString(' '); } -void EditEngine::FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32 ) +void EditEngine::FieldClicked( const SvxFieldItem& ) { } diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 75a5e741c471..5be0d3113ce5 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -609,9 +609,7 @@ bool ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView ) css::system::SystemShellExecuteFlags::URIS_ONLY); } } - EditPaM aPaM( aCurSel.Max() ); - sal_Int32 nPara = GetEditDoc().GetPos( aPaM.GetNode() ); - GetEditEnginePtr()->FieldClicked( *pFld, nPara, aPaM.GetIndex() ); + GetEditEnginePtr()->FieldClicked( *pFld ); } } } diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 35784061f501..915fe7193eaa 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -622,11 +622,11 @@ OUString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, s return mpTextForwarder->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor ); } -void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) +void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField ) { assert(mpTextForwarder && "SvxAccessibleTextAdapter: no forwarder"); - mpTextForwarder->FieldClicked( rField, nPara, nPos ); + mpTextForwarder->FieldClicked( rField ); } sal_Int32 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_Int32 nPara, sal_Int32 nLogicalIndex ) diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 47a8accb4cca..73a49039fa3d 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -158,9 +158,9 @@ OUString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, sal return rEditEngine.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor ); } -void SvxEditEngineForwarder::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) +void SvxEditEngineForwarder::FieldClicked( const SvxFieldItem& rField ) { - rEditEngine.FieldClicked( rField, nPara, nPos ); + rEditEngine.FieldClicked( rField ); } SfxItemState GetSvxEditEngineItemState( EditEngine const & rEditEngine, const ESelection& rSel, sal_uInt16 nWhich ) diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index da0de656a2ad..d43ccbb97a65 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -226,7 +226,7 @@ OUString SvxOutlinerForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_I return rOutliner.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor ); } -void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_Int32 /*nPos*/ ) +void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& /*rField*/ ) { } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 8015933395df..4796732b2c74 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2363,7 +2363,7 @@ OUString SvxDummyTextSource::CalcFieldValue( const SvxFieldItem&, sal_Int32, sal return OUString(); } -void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32 ) +void SvxDummyTextSource::FieldClicked( const SvxFieldItem& ) { } diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 73a2b5eba5f6..414c0efcc010 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -500,7 +500,7 @@ public: const Color& rTextLineColor); virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const; virtual bool SpellNextDocument(); - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); + virtual void FieldClicked( const SvxFieldItem& rField ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rTxtColor, boost::optional<Color>& rFldColor ); // override this if access to bullet information needs to be provided diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index b0abe19ad0fd..d3e7a1f3461b 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -55,7 +55,7 @@ public: virtual SfxItemPool* GetPool() const override; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor ) override; - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) override; + virtual void FieldClicked( const SvxFieldItem& rField ) override; virtual bool IsValid() const override; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index a55cdf72adf7..e9f3ee0dd093 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -160,7 +160,7 @@ public: virtual void QuickInsertLineBreak( const ESelection& rSel ) = 0; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor ) = 0; - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) = 0; + virtual void FieldClicked( const SvxFieldItem& rField ) = 0; virtual SfxItemPool* GetPool() const = 0; diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx index 58ae00896756..7f5f6ced5e69 100644 --- a/include/editeng/unofored.hxx +++ b/include/editeng/unofored.hxx @@ -55,7 +55,7 @@ public: virtual SfxItemPool* GetPool() const override; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor ) override; - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) override; + virtual void FieldClicked( const SvxFieldItem& rField ) override; virtual bool IsValid() const override; virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const override; diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index 0eb490b466fd..f50d48c81a08 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -73,7 +73,7 @@ public: virtual SfxItemPool* GetPool() const override; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor ) override; - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) override; + virtual void FieldClicked( const SvxFieldItem& rField ) override; virtual bool IsValid() const override; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 6626cfe7c9de..5d65d6761ab6 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -189,7 +189,7 @@ public: virtual void QuickInsertLineBreak( const ESelection& rSel ) override; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor ) override; - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) override; + virtual void FieldClicked( const SvxFieldItem& rField ) override; virtual bool IsValid() const override; diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index f2b7ae0a01a4..af189f759f4f 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -185,7 +185,7 @@ public: void SetExecuteURL(bool bSet) { bExecuteURL = bSet; } - virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_Int32 ) override; + virtual void FieldClicked( const SvxFieldItem& rField ) override; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rTxtColor, boost::optional<Color>& rFldColor ) override; }; diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 03543f2f0b6e..040456d49ac2 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -870,7 +870,7 @@ OUString ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, return ScEditUtil::GetCellFieldValue(*pFieldData, mpDoc, &rTxtColor); } -void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_Int32, sal_Int32 ) +void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField ) { if (!bExecuteURL) return; diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 98868df14a55..d96300bf785b 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -1003,7 +1003,7 @@ OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 return pEditEngine ? pEditEngine->CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor) : OUString(); } -void SmTextForwarder::FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32) +void SmTextForwarder::FieldClicked(const SvxFieldItem&) { } diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index b1e3dc6ddd07..8dcf6a011a18 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -198,7 +198,7 @@ public: virtual SfxItemPool* GetPool() const override; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor ) override; - virtual void FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32) override; + virtual void FieldClicked(const SvxFieldItem&) override; virtual bool IsValid() const override; virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const override; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 7f179a042608..c39bbc26b6ac 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -124,7 +124,7 @@ namespace accessibility { return OUString(); } - void FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32 ) override {} + void FieldClicked( const SvxFieldItem& ) override {} bool IsValid() const override { return true; } diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index da5ac91bc4a2..56f179dba98c 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -231,7 +231,7 @@ public: virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, boost::optional<Color>& rpTxtColor, boost::optional<Color>& rpFldColor) override; - virtual void FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32) override; + virtual void FieldClicked(const SvxFieldItem&) override; virtual bool IsValid() const override; virtual LanguageType GetLanguage(sal_Int32, sal_Int32) const override; @@ -900,7 +900,7 @@ OUString WeldTextForwarder::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 : OUString(); } -void WeldTextForwarder::FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32) {} +void WeldTextForwarder::FieldClicked(const SvxFieldItem&) {} static SfxItemState GetSvxEditEngineItemState(EditEngine const& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich) |