[Libreoffice-commits] core.git: compilerplugins/clang editeng/source include/editeng
Noel Grandin
noel.grandin at collabora.co.uk
Sat Jul 22 06:52:29 UTC 2017
compilerplugins/clang/unusedfields.readonly.results | 4 ----
editeng/source/outliner/outleeng.cxx | 6 ------
editeng/source/outliner/outleeng.hxx | 1 -
editeng/source/outliner/outliner.cxx | 11 -----------
editeng/source/rtf/svxrtf.cxx | 6 +-----
editeng/source/uno/unoforou.cxx | 3 +--
include/editeng/outliner.hxx | 2 --
include/editeng/svxrtf.hxx | 1 -
8 files changed, 2 insertions(+), 32 deletions(-)
New commits:
commit 5fad6eb1b38d369f4f7ca401f3c651292667486e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jul 21 12:31:18 2017 +0200
loplugin:unusedfields in editeng
Change-Id: I61ddd2ce8ded65251fdf1903e6cb67f0d18c9451
Reviewed-on: https://gerrit.libreoffice.org/40293
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 7d45f9e52041..cd0e14d13418 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -542,10 +542,6 @@ include/editeng/brushitem.hxx:53
SvxBrushItem maSecOptions class SvtSecurityOptions
include/editeng/numitem.hxx:318
SvxNodeNum nLevelVal sal_uInt16 [10]
-include/editeng/outliner.hxx:610
- Outliner aFieldClickedHdl Link<class EditFieldInfo *, void>
-include/editeng/svxrtf.hxx:206
- SvxRTFParser bReadDocInfo _Bool
include/filter/msfilter/svdfppt.hxx:210
PptSlideLayoutAtom aPlaceholderId enum PptPlaceholder [8]
include/filter/msfilter/svdfppt.hxx:865
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 185bef339690..97b63edf9f3f 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -169,12 +169,6 @@ void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const OUS
bEndOfLine, bEndOfParagraph, rOverlineColor, rTextLineColor );
}
-void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos )
-{
- EditEngine::FieldClicked( rField, nPara, nPos ); // If URL
- pOwner->FieldClicked( rField, nPara, nPos );
-}
-
OUString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
return pOwner->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index 093ef2991c8e..2b45610c16d3 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -71,7 +71,6 @@ public:
// for text conversion
virtual bool ConvertNextDocument() override;
- virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) override;
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) override;
virtual tools::Rectangle GetBulletArea( sal_Int32 nPara ) override;
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index a1fc3a229b6b..f89d5895a89f 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -632,17 +632,6 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
pEditEngine->SetUpdateMode( bUpdate );
}
-void Outliner::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos )
-{
-
- if ( aFieldClickedHdl.IsSet() )
- {
- EditFieldInfo aFldInfo( this, rField, nPara, nPos );
- aFieldClickedHdl.Call( &aFldInfo );
- }
-}
-
-
OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
if ( !aCalcFieldValueHdl.IsSet() )
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index c93841466570..419482a91903 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -72,7 +72,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
, bIsSetDfltTab( false)
, bChkStyleAttr( false )
, bCalcValue( false )
- , bReadDocInfo( false )
, bIsLeftToRightDef( true)
, bIsInReadStyleTab( false)
{
@@ -214,10 +213,7 @@ INSINGLECHAR:
bNewGroup = false;
break;
case RTF_INFO:
- if (bReadDocInfo && bNewDoc && m_xDocProps.is())
- ReadInfo();
- else
- SkipGroup();
+ SkipGroup();
break;
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 050f3c8c85b1..e5f6275c13b3 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -228,9 +228,8 @@ 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*/, sal_Int32 /*nPara*/, sal_Int32 /*nPos*/ )
{
- rOutliner.FieldClicked( rField, nPara, nPos );
}
bool SvxOutlinerForwarder::IsValid() const
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 7b7f028c6aec..49f6d5ea19cb 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -607,7 +607,6 @@ private:
Link<Outliner*,void> aEndMovingHdl;
Link<OutlinerView*,bool> aIndentingPagesHdl;
Link<OutlinerView*,bool> aRemovingPagesHdl;
- Link<EditFieldInfo*,void> aFieldClickedHdl;
Link<EditFieldInfo*,void> aCalcFieldValueHdl;
Link<PaintFirstLineInfo*,void> maPaintFirstLineHdl;
Link<PasteOrDropInfos*,void> maBeginPasteOrDropHdl;
@@ -904,7 +903,6 @@ public:
bool UpdateFields();
void RemoveFields( const std::function<bool ( const SvxFieldData* )>& isFieldData = [] (const SvxFieldData* ){return true;} );
- void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
void SetSpeller( css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpeller );
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 126c55a0378a..cec918130ec2 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -203,7 +203,6 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
bool bIsSetDfltTab : 1; // sal_True - DefTab was loaded
bool bChkStyleAttr : 1; // sal_True - StyleSheets are evaluated
bool bCalcValue : 1; // sal_True - Twip values adapt to App
- bool bReadDocInfo : 1; // sal_True - DocInfo to read
bool bIsLeftToRightDef : 1; // sal_True - in LeftToRight char run def.
// sal_False - in RightToLeft char run def.
bool bIsInReadStyleTab : 1; // sal_True - in ReadStyleTable
More information about the Libreoffice-commits
mailing list