diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-16 08:11:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-16 08:37:25 +0000 |
| commit | 7ab881a57d01e58eebcc2608ae8dd61af4552ae8 (patch) | |
| tree | e8a5a50805ebd653834adbb03e7e98b8b6f22dc6 | |
| parent | 795ac5bc53f6c15f2ab4634201747eb1c3e3331f (diff) | |
loplugin:unusedmethods editeng
Change-Id: I15b2be5a9cd6e72447b674a65eabe9f89cb6ff12
Reviewed-on: https://gerrit.libreoffice.org/17115
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
51 files changed, 32 insertions, 389 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index deb061ea694d..b481e00d03ce 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -342,26 +342,6 @@ OUString AbstractThesaurusDialog_Impl::GetWord() return pDlg->GetWord(); }; -sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const -{ - return pDlg->GetLanguage(); -}; - -vcl::Window* AbstractThesaurusDialog_Impl::GetWindow() -{ - return pDlg; -} - -void AbstractHyphenWordDialog_Impl::SelLeft() -{ - pDlg->SelLeft(); -} - -void AbstractHyphenWordDialog_Impl::SelRight() -{ - pDlg->SelRight(); -} - vcl::Window* AbstractHyphenWordDialog_Impl::GetWindow() { return pDlg; diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index dd10939008ea..8e86679cc584 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -166,15 +166,11 @@ class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog { DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) virtual OUString GetWord() SAL_OVERRIDE; - virtual sal_uInt16 GetLanguage() const SAL_OVERRIDE; - virtual vcl::Window* GetWindow() SAL_OVERRIDE; }; class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog { DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog) - virtual void SelLeft() SAL_OVERRIDE; - virtual void SelRight() SAL_OVERRIDE; virtual vcl::Window* GetWindow() SAL_OVERRIDE; }; diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index ed36be0c825a..d107bdf27749 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -99,16 +99,6 @@ namespace accessibility return maChildren.end(); } - AccessibleParaManager::VectorOfChildren::const_iterator AccessibleParaManager::begin() const - { - return maChildren.begin(); - } - - AccessibleParaManager::VectorOfChildren::const_iterator AccessibleParaManager::end() const - { - return maChildren.end(); - } - void AccessibleParaManager::FireEvent( sal_Int32 nPara, const sal_Int16 nEventId, const uno::Any& rNewValue, diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index ce5e117e0b54..4e97c611cc73 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -198,7 +198,6 @@ public: ~CharAttribList(); void DeleteEmptyAttribs( SfxItemPool& rItemPool ); - void RemoveItemsFromPool( SfxItemPool* pItemPool ); const EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const; EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ); @@ -505,38 +504,37 @@ public: { return ( ( nIndex >= nStart ) && ( bInclEnd ? ( nIndex <= nEnd ) : ( nIndex < nEnd ) ) ); } void SetStart( sal_Int32 n ) { nStart = n; } - sal_Int32 GetStart() const { return nStart; } - sal_Int32& GetStart() { return nStart; } + sal_Int32 GetStart() const { return nStart; } + sal_Int32& GetStart() { return nStart; } void SetEnd( sal_Int32 n ) { nEnd = n; } - sal_Int32 GetEnd() const { return nEnd; } - sal_Int32& GetEnd() { return nEnd; } + sal_Int32 GetEnd() const { return nEnd; } + sal_Int32& GetEnd() { return nEnd; } void SetStartPortion( sal_Int32 n ) { nStartPortion = n; } - sal_Int32 GetStartPortion() const { return nStartPortion; } - sal_Int32& GetStartPortion() { return nStartPortion; } + sal_Int32 GetStartPortion() const { return nStartPortion; } + sal_Int32& GetStartPortion() { return nStartPortion; } void SetEndPortion( sal_Int32 n ) { nEndPortion = n; } - sal_Int32 GetEndPortion() const { return nEndPortion; } - sal_Int32& GetEndPortion() { return nEndPortion; } + sal_Int32 GetEndPortion() const { return nEndPortion; } + sal_Int32& GetEndPortion() { return nEndPortion; } void SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16 nCrsrH = 0 ); - sal_uInt16 GetHeight() const { return nHeight; } - sal_uInt16 GetTxtHeight() const { return nTxtHeight; } - sal_uInt16 GetCrsrHeight() const { return nCrsrHeight; } + sal_uInt16 GetHeight() const { return nHeight; } + sal_uInt16 GetTxtHeight() const { return nTxtHeight; } void SetTextWidth( long n ) { nTxtWidth = n; } long GetTextWidth() const { return nTxtWidth; } void SetMaxAscent( sal_uInt16 n ) { nMaxAscent = n; } - sal_uInt16 GetMaxAscent() const { return nMaxAscent; } + sal_uInt16 GetMaxAscent() const { return nMaxAscent; } void SetHangingPunctuation( bool b ) { bHangingPunctuation = b; } bool IsHangingPunctuation() const { return bHangingPunctuation; } - sal_Int32 GetLen() const { return nEnd - nStart; } + sal_Int32 GetLen() const { return nEnd - nStart; } - sal_uInt16 GetStartPosX() const { return nStartPosX; } + sal_uInt16 GetStartPosX() const { return nStartPosX; } void SetStartPosX( long start ); Size CalcTextSize( ParaPortion& rParaPortion ); @@ -624,7 +622,7 @@ public: bool MustRepaint() const { return bForceRepaint; } void SetMustRepaint( bool bRP ) { bForceRepaint = bRP; } - sal_uInt16 GetBulletX() const { return nBulletX; } + sal_uInt16 GetBulletX() const { return nBulletX; } void SetBulletX( sal_uInt16 n ) { nBulletX = n; } void MarkInvalid( sal_Int32 nStart, sal_Int32 nDiff); @@ -633,7 +631,7 @@ public: void SetVisible( bool bVisible ); bool IsVisible() const { return bVisible; } - bool IsEmpty() { return GetTextPortions().Count() == 1 && GetTextPortions()[0].GetLen() == 0; } + bool IsEmpty() { return GetTextPortions().Count() == 1 && GetTextPortions()[0].GetLen() == 0; } long GetHeight() const { return ( bVisible ? nHeight : 0 ); } sal_Int32 GetFirstLineOffset() const { return ( bVisible ? nFirstLineOffset : 0 ); } @@ -752,7 +750,7 @@ private: Link<> aModifyHdl; SvxFont aDefFont; //faster than ever from the pool!! - sal_uInt16 nDefTab; + sal_uInt16 nDefTab; bool bIsVertical:1; bool bIsFixedCellHeight:1; @@ -772,13 +770,12 @@ public: void SetModified( bool b ); void SetModifyHdl( const Link<>& rLink ) { aModifyHdl = rLink; } - Link<> GetModifyHdl() const { return aModifyHdl; } void CreateDefFont( bool bUseStyles ); const SvxFont& GetDefFont() { return aDefFont; } void SetDefTab( sal_uInt16 nTab ) { nDefTab = nTab ? nTab : DEFTAB; } - sal_uInt16 GetDefTab() const { return nDefTab; } + sal_uInt16 GetDefTab() const { return nDefTab; } void SetVertical( bool bVertical ) { bIsVertical = bVertical; } bool IsVertical() const { return bIsVertical; } diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index e6c2fc091dc2..7797db7bb549 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2547,10 +2547,6 @@ void EditEngine::FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32 ) { } -void EditEngine::FieldSelected( const SvxFieldItem&, sal_Int32, sal_Int32 ) -{ -} - // ====================== Static Methods ======================= diff --git a/editeng/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx index 44f1ed739c5c..f846c165e5d0 100644 --- a/editeng/source/editeng/editstt2.hxx +++ b/editeng/source/editeng/editstt2.hxx @@ -34,13 +34,6 @@ public: void TurnOffFlags( EEControlBits nFlags ) { nControlBits &= ~nFlags; } - void TurnOnStatusBits( EditStatusFlags nBits ) - { nStatusBits |= nBits; } - - void TurnOffStatusBits( EditStatusFlags nBits ) - { nStatusBits &= ~nBits; } - - bool UseCharAttribs() const { return bool( nControlBits & EEControlBits::USECHARATTRIBS ); } diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx index a31261a38ee8..b0c4953b9565 100644 --- a/editeng/source/editeng/editundo.hxx +++ b/editeng/source/editeng/editundo.hxx @@ -104,9 +104,6 @@ private: public: EditUndoInsertChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr); - const EPaM& GetEPaM() { return aEPaM; } - OUString GetStr() const { return aText; } - virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index a872de884329..90d8cf462338 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -144,13 +144,6 @@ bool EditSpellWrapper::SpellMore() return bMore; } -void EditSpellWrapper::ScrollArea() -{ - // No further action needed ... - // Except for, that the area is to be scrolled in the center, and not stand - // still anywhere. -} - void EditSpellWrapper::ReplaceAll( const OUString &rNewText, sal_Int16 ) { @@ -159,29 +152,6 @@ void EditSpellWrapper::ReplaceAll( const OUString &rNewText, CheckSpellTo(); } -void EditSpellWrapper::ChangeWord( const OUString& rNewWord, - const sal_uInt16 ) -{ - // Will be called when Word Button Change - // or internally by me ChangeAll - - // If there is a dot Punkt after the word, this dot will be stripped away. - // If '"' => PreStripped. - OUString aNewWord( rNewWord ); - pEditView->InsertText( aNewWord ); - CheckSpellTo(); -} - -void EditSpellWrapper::ChangeThesWord( const OUString& rNewWord ) -{ - pEditView->InsertText( rNewWord ); - CheckSpellTo(); -} - -void EditSpellWrapper::AutoCorrect( const OUString&, const OUString& ) -{ -} - void EditSpellWrapper::CheckSpellTo() { ImpEditEngine* pImpEE = pEditView->GetImpEditEngine(); diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index a3b1382090e3..4048e97f7dcd 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -51,10 +51,6 @@ protected: virtual void SpellEnd() SAL_OVERRIDE; virtual bool SpellMore() SAL_OVERRIDE; virtual bool HasOtherCnt() SAL_OVERRIDE; - virtual void ScrollArea() SAL_OVERRIDE; - virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang ) SAL_OVERRIDE; - virtual void ChangeThesWord( const OUString& rNewWord ) SAL_OVERRIDE; - virtual void AutoCorrect( const OUString& rOldWord, const OUString& rNewWord ) SAL_OVERRIDE; public: EditSpellWrapper( vcl::Window* pWin, diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index 59d215ec8c78..90f41e23a225 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.hxx @@ -101,15 +101,9 @@ public: virtual SvParserState CallParser() SAL_OVERRIDE; - - void SetDestCharSet( rtl_TextEncoding eCharSet ) { eDestCharSet = eCharSet; } - rtl_TextEncoding - GetDestCharSet() const { return eDestCharSet; } - - sal_uInt16 GetDefTab() const { return nDefTab; } vcl::Font GetDefFont() { return GetFont( nDefFont ); } - EditPaM GetCurPaM() const { return aCurSel.Max(); } + EditPaM GetCurPaM() const { return aCurSel.Max(); } }; typedef tools::SvRef<EditRTFParser> EditRTFParserRef; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index bad7347ae36a..f78185b2cc1c 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -305,7 +305,6 @@ public: void Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, bool bUseSpecial = false ); void SetVisDocStartPos( const Point& rPos ) { aVisDocStartPos = rPos; } - const Point& GetVisDocStartPos() const { return aVisDocStartPos; } long GetVisDocLeft() const { return aVisDocStartPos.X(); } long GetVisDocTop() const { return aVisDocStartPos.Y(); } @@ -325,10 +324,8 @@ public: EESelectionMode GetSelectionMode() const { return eSelectionMode; } void SetSelectionMode( EESelectionMode eMode ); - inline void SetPointer( const Pointer& rPointer ); inline const Pointer& GetPointer(); - inline void SetCursor( const vcl::Cursor& rCursor ); inline vcl::Cursor* GetCursor(); void AddDragAndDropListeners(); @@ -339,9 +336,9 @@ public: // For the Selection Engine... void CreateAnchor(); void DeselectAll(); - bool SetCursorAtPoint( const Point& rPointPixel ); - bool IsSelectionAtPoint( const Point& rPosPixel ); - bool IsInSelection( const EditPaM& rPaM ); + bool SetCursorAtPoint( const Point& rPointPixel ); + bool IsSelectionAtPoint( const Point& rPosPixel ); + bool IsInSelection( const EditPaM& rPaM ); void SetAnchorMode( EVAnchorMode eMode ); @@ -349,14 +346,12 @@ public: void CalcAnchorPoint(); void RecalcOutputArea(); - void ShowCursor( bool bGotoCursor, bool bForceVisCursor, bool test ); void ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16 nShowCursorFlags = 0 ); Pair Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck = RGCHK_NEG ); void SetInsertMode( bool bInsert ); bool IsInsertMode() const { return !( nControl & EVControlBits::OVERWRITE ); } - void EnablePaste( bool bEnable ) { SetFlags( nControl, EVControlBits::ENABLEPASTE, bEnable ); } bool IsPasteEnabled() const { return bool( nControl & EVControlBits::ENABLEPASTE ); } bool DoSingleLinePaste() const { return bool( nControl & EVControlBits::SINGLELINEPASTE ); } @@ -547,11 +542,9 @@ private: EditPaM Clear(); EditPaM RemoveText(); - EditPaM RemoveText( EditSelection aEditSelection ); - bool CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ); + bool CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ); void CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY ); - bool FinishCreateLines( ParaPortion* pParaPortion ); - void CalcCharPositions( ParaPortion* pParaPortion ); + bool FinishCreateLines( ParaPortion* pParaPortion ); void CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rStartPos /*, sal_Bool bCreateBlockPortions */ ); void RecalcTextPortion( ParaPortion* pParaPortion, sal_Int32 nStartPos, sal_Int32 nNewChars ); sal_Int32 SplitTextPortion( ParaPortion* pParaPortion, sal_Int32 nPos, EditLine* pCurLine = 0 ); @@ -634,13 +627,12 @@ private: sal_uInt32 WriteBin(SvStream& rOutput, const EditSelection& rSel, bool bStoreUnicode = false); void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_Int32 nPara, sal_Int32 nPos, - std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList ); - bool WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_Int32 nPara, sal_Int32 nPos, - std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList ); - sal_Int32 LogicToTwips( sal_Int32 n ); + std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList ); + bool WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_Int32 nPara, sal_Int32 nPos, + std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList ); + sal_Int32 LogicToTwips( sal_Int32 n ); inline short GetXValue( short nXValue ) const; - inline sal_uInt16 GetXValue( sal_uInt16 nXValue ) const; inline long GetXValue( long nXValue ) const; inline short GetYValue( short nYValue ) const; @@ -917,8 +909,6 @@ public: void SetDefaultLanguage( LanguageType eLang ) { eDefLanguage = eLang; } LanguageType GetDefaultLanguage() const { return eDefLanguage; } - - LanguageType GetLanguage( const EditSelection &rSelection ) const; LanguageType GetLanguage( const EditPaM& rPaM, sal_Int32* pEndPos = NULL ) const; ::com::sun::star::lang::Locale GetLocale( const EditPaM& rPaM ) const; @@ -988,7 +978,6 @@ public: void SetCharStretching( sal_uInt16 nX, sal_uInt16 nY ); inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const; - void SetBigTextObjectStart( sal_Int32 nStartAtPortionCount ) { nBigTextObjectStart = nStartAtPortionCount; } sal_Int32 GetBigTextObjectStart() const { return nBigTextObjectStart; } inline EditEngine* GetEditEnginePtr() const { return pEditEngine; } @@ -1147,13 +1136,7 @@ inline short ImpEditEngine::GetXValue( short nXValue ) const return (short) ((long)nXValue*nStretchX/100); } -inline sal_uInt16 ImpEditEngine::GetXValue( sal_uInt16 nXValue ) const -{ - if ( !aStatus.DoStretch() || ( nStretchX == 100 ) ) - return nXValue; - return (sal_uInt16) ((long)nXValue*nStretchX/100); -} inline long ImpEditEngine::GetXValue( long nXValue ) const { @@ -1179,12 +1162,6 @@ inline sal_uInt16 ImpEditEngine::GetYValue( sal_uInt16 nYValue ) const return (sal_uInt16) ((long)nYValue*nStretchY/100); } -inline void ImpEditView::SetPointer( const Pointer& rPointer ) -{ - delete pPointer; - pPointer = new Pointer( rPointer ); -} - inline const Pointer& ImpEditView::GetPointer() { if ( !pPointer ) @@ -1207,12 +1184,6 @@ inline const Pointer& ImpEditView::GetPointer() return *pPointer; } -inline void ImpEditView::SetCursor( const vcl::Cursor& rCursor ) -{ - delete pCursor; - pCursor = new vcl::Cursor( rCursor ); -} - inline vcl::Cursor* ImpEditView::GetCursor() { if ( !pCursor ) diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index c1402d9b6b38..b1fb26cfb459 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -830,23 +830,6 @@ void SvxTabStop::fillDecimal() const } -OUString SvxTabStop::GetValueString() const -{ - OUString aStr = "(" - + OUString::number(nTabPos) - + ", " - + EE_RESSTR(RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment) - + ", [" - + EE_RESSTR(RID_SVXITEMS_TAB_DECIMAL_CHAR) - + OUString(GetDecimal()) - + "], , [" - + EE_RESSTR(RID_SVXITEMS_TAB_FILL_CHAR) - + OUString(cFill) - + "])"; - - return aStr; -} - // class SvxTabStopItem -------------------------------------------------- SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) : diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index bf2cf17601da..6ddafdf6b09b 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -277,23 +277,6 @@ bool SvxSpellWrapper::SpellContinue() return false; } -void SvxSpellWrapper::AutoCorrect( const OUString&, const OUString& ) -{ -} - -void SvxSpellWrapper::ScrollArea() -{ // Set Scroll area -} - -void SvxSpellWrapper::ChangeWord( const OUString&, const sal_uInt16 ) -{ // Insert Word -} - -void SvxSpellWrapper::ChangeThesWord( const OUString& ) -{ - // replace word due to Thesaurus. -} - void SvxSpellWrapper::ReplaceAll( const OUString &, sal_Int16 ) { // Replace Word from the Replace list } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 070ab119f052..635c751b6c24 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2653,46 +2653,6 @@ bool SvxAutoCorrectLanguageLists::PutText( const OUString& rShort, return bRet; } -// Delete an entry -bool SvxAutoCorrectLanguageLists::DeleteText( const OUString& rShort ) -{ - // First get the current list! - GetAutocorrWordList(); - - MakeUserStorage_Impl(); - - tools::SvRef<SotStorage> xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE ); - bool bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError(); - if( bRet ) - { - SvxAutocorrWord aTmp( rShort, rShort ); - SvxAutocorrWord *pFnd = pAutocorr_List->FindAndRemove( &aTmp ); - if( pFnd ) - { - if( !pFnd->IsTextOnly() ) - { - OUString aName( rShort ); - if (xStg->IsOLEStorage()) - aName = EncryptBlockName_Imp(aName); - else - GeneratePackageName ( rShort, aName ); - if( xStg->IsContained( aName ) ) - { - xStg->Remove( aName ); - bRet = xStg->Commit(); - } - - } - delete pFnd; - MakeBlocklist_Imp( *xStg ); - xStg = 0; - } - else - bRet = false; - } - return bRet; -} - // Keep the list sorted ... struct CompareSvxAutocorrWordList { diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index ea0af4fb794f..5a15d5372fb7 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -176,11 +176,6 @@ void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, pOwner->FieldClicked( rField, nPara, nPos ); } -void OutlinerEditEng::FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) -{ - pOwner->FieldSelected( 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 09eebfacf62e..c581b9395474 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -73,7 +73,6 @@ public: virtual bool ConvertNextDocument() SAL_OVERRIDE; virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE; - virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE; virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE; virtual Rectangle GetBulletArea( sal_Int32 nPara ) SAL_OVERRIDE; diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx index fb3311d8f89b..8bf2d9adf179 100644 --- a/editeng/source/outliner/paralist.hxx +++ b/editeng/source/outliner/paralist.hxx @@ -67,7 +67,6 @@ public: void Collapse( Paragraph* pParent ); void SetVisibleStateChangedHdl( const Link<>& rLink ) { aVisibleStateChangedHdl = rLink; } - Link<> GetVisibleStateChangedHdl() const { return aVisibleStateChangedHdl; } private: diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 1b4d7c44a553..37a6a25da8ea 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -373,9 +373,6 @@ namespace accessibility /// Our listeners (guarded by maMutex) int mnNotifierClientId; -public: - void SetParagraphBackColorAccessible(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > & ref) - { m_xAccInfo = ref ;} private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccInfo; diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index 081e36c03893..e1460512d11e 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -169,8 +169,6 @@ namespace accessibility // iterators VectorOfChildren::iterator begin(); VectorOfChildren::iterator end(); - VectorOfChildren::const_iterator begin() const; - VectorOfChildren::const_iterator end() const; /// Set focus to given child void SetFocus( sal_Int32 nChild ); diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index e2fd887ad02e..7bc0e291cc9c 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -105,14 +105,10 @@ public: bool IsSaveRelNet() const { return bNetRel; } void SetSaveRelNet( bool bSet ) { bNetRel = bSet; aSwConfig.SetModified();} - bool IsAutoTextPreview() const {return bAutoTextPreview;} - void SetAutoTextPreview(bool bSet) {bAutoTextPreview = bSet; aSwConfig.SetModified();} - bool IsAutoTextTip() const { return bAutoTextTip; } void SetAutoTextTip(bool bSet ) { bAutoTextTip = bSet;aSwConfig.SetModified();} bool IsSearchInAllCategories() const { return bSearchInAllCategories;} - void SetSearchInAllCategories(bool bSet ) { bSearchInAllCategories = bSet; aSwConfig.SetModified(); } SvxAutoCorrCfg(); virtual ~SvxAutoCorrCfg(); diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index c080a9413200..1afc40348c8e 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -124,10 +124,6 @@ namespace editeng { SvxBorderStyle GetBorderLineStyle() const { return m_nStyle; } void SetColor( const Color &rColor ) { aColor = rColor; } - void SetColorOutFn( Color (*pColorOutFn)( Color ) ) { m_pColorOutFn = pColorOutFn; } - void SetColorInFn( Color (*pColorInFn)( Color ) ) { m_pColorInFn = pColorInFn; } - void SetColorGapFn( Color (*pColorGapFn)( Color ) ) { m_pColorGapFn = pColorGapFn; } - void SetUseLeftTop( bool bUseLeftTop ) { m_bUseLeftTop = bUseLeftTop; } void SetBorderLineStyle( SvxBorderStyle nNew ); void ScaleMetrics( long nMult, long nDiv ); diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index b64bf3b4fcb5..0dde644edb33 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -50,7 +50,6 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - inline rtl_TextEncoding& GetCharSet() { return eFrom; } inline rtl_TextEncoding GetCharSet() const { return eFrom; } inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor) diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 00ba3ad0bc2c..2af3c281ccf1 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -65,8 +65,6 @@ public: // enum cast SvxCaseMap GetCaseMap() const { return (SvxCaseMap)GetValue(); } - void SetCaseMap( SvxCaseMap eNew ) - { SetValue( (sal_uInt16)eNew ); } virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index 8e64ba9feff1..f182b5989b8a 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -70,8 +70,6 @@ public: // enum cast FontStrikeout GetStrikeout() const { return (FontStrikeout)GetValue(); } - void SetStrikeout( FontStrikeout eNew ) - { SetValue( (sal_uInt16)eNew ); } }; #endif // INCLUDED_EDITENG_CROSSEDOUTITEM_HXX diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 5c95c4d53077..66abc62852f4 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -214,8 +214,6 @@ public: void SetUpdateMode( bool bUpdate ); bool GetUpdateMode() const; - void SetUpdateModeForAcc( bool bUp); - bool GetUpdateModeForAcc( ) const; void SetBackgroundColor( const Color& rColor ); Color GetBackgroundColor() const; @@ -499,7 +497,6 @@ public: virtual OUString GetUndoComment( sal_uInt16 nUndoId ) const; virtual bool SpellNextDocument(); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); - virtual void FieldSelected( 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 ); // override this if access to bullet information needs to be provided diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx index b53c744c3092..46ddd44ad8df 100644 --- a/include/editeng/editstat.hxx +++ b/include/editeng/editstat.hxx @@ -125,16 +125,12 @@ public: EditStatus() { nStatusBits = EditStatusFlags::NONE; nControlBits = EEControlBits::NONE; nPrevPara = -1; } void Clear() { nStatusBits = EditStatusFlags::NONE; } - void SetControlBits( EEControlBits nMask, bool bOn ) - { SetFlags( nControlBits, nMask, bOn ); } EditStatusFlags GetStatusWord() const { return nStatusBits; } EditStatusFlags& GetStatusWord() { return nStatusBits; } - EEControlBits GetControlWord() const { return nControlBits; } EEControlBits& GetControlWord() { return nControlBits; } - sal_Int32 GetPrevParagraph() const { return nPrevPara; } sal_Int32& GetPrevParagraph() { return nPrevPara; } }; diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index bb091172c9ba..f67fa3480f31 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -118,7 +118,6 @@ public: bool IsInsertMode() const; void SetInsertMode( bool bInsert ); - void ReplaceSelected( const OUString& rStr ); OUString GetSelected(); void DeleteSelected(); @@ -205,14 +204,11 @@ public: // for text conversion void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const vcl::Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc ); - bool HasConvertibleTextPortion( LanguageType nLang ); void TransliterateText( sal_Int32 nTransliterationMode ); bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false ); bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); - bool IsShapeParaFocusable(); - bool WrongSpelledBreakPara(sal_Int32 nPara, sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex); void ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack = 0 ); void InsertField( const SvxFieldItem& rFld ); diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 01ff1ea7b9a6..6dc82f44756e 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -41,15 +41,11 @@ class AbstractThesaurusDialog : public VclAbstractDialog { public: virtual OUString GetWord() = 0; - virtual sal_uInt16 GetLanguage() const = 0; - virtual vcl::Window* GetWindow() = 0; }; class AbstractHyphenWordDialog : public VclAbstractDialog { public: - virtual void SelLeft() = 0; - virtual void SelRight() = 0; virtual vcl::Window* GetWindow() = 0; }; diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 44a3cbf27ff7..244d55007b04 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -64,8 +64,6 @@ public: // enum cast FontEmphasisMark GetEmphasisMark() const { return (FontEmphasisMark)GetValue(); } - void SetEmphasisMark( FontEmphasisMark eNew ) - { SetValue( (sal_uInt16)eNew ); } }; #endif // INCLUDED_EDITENG_EMPHASISMARKITEM_HXX diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 19cc8eb894c8..9096590f0e6d 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -366,22 +366,13 @@ public: SvxAuthorType eType = SVXAUTHORTYPE_VAR, SvxAuthorFormat eFormat = SVXAUTHORFORMAT_FULLNAME ); - OUString GetName() const { return aName; } - void SetName( const OUString& rString ) { aName = rString; } - - OUString GetFirstName() const { return aFirstName; } - void SetFirstName( const OUString& rString ) { aFirstName = rString; } - - OUString GetShortName() const { return aShortName; } - void SetShortName( const OUString& rString ) { aShortName = rString; } - SvxAuthorType GetType() const { return eType; } void SetType( SvxAuthorType eTp ) { eType = eTp; } SvxAuthorFormat GetFormat() const { return eFormat; } void SetFormat( SvxAuthorFormat eFmt ) { eFormat = eFmt; } - OUString GetFormatted() const; + OUString GetFormatted() const; virtual SvxFieldData* Clone() const SAL_OVERRIDE; virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 7dee5d66e039..ceeab5508e70 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -61,11 +61,9 @@ public: virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // MS VC4.0 messes things up - void SetValue( sal_uInt16 nNewVal ) + void SetValue( sal_uInt16 nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - SvxBreak GetBreak() const { return SvxBreak( GetValue() ); } - void SetBreak( const SvxBreak eNew ) - { SetValue( (sal_uInt16)eNew ); } + SvxBreak GetBreak() const { return SvxBreak( GetValue() ); } }; diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 34f281ecd51f..3d2d3bef2203 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -64,13 +64,6 @@ public: return *this; } - void SetWidth( sal_uInt16 nNewWidth, const sal_uInt16 nNewProp = 100 ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nWidth = sal_uInt16(( (sal_uInt32)nNewWidth * nNewProp ) / 100 ); - nProp = nNewProp; - } - sal_uInt16 GetWidth() const { return nWidth; } void SetWidthValue( sal_uInt16 nNewWidth ) diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index f8a5b03884e5..c69fb9ab7029 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -60,8 +60,6 @@ public: // enum cast LanguageType GetLanguage() const { return (LanguageType)GetValue(); } - void SetLanguage( const LanguageType eLang ) - { SetValue( (sal_uInt16)eLang ); } virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 4e1b0796bbd6..9751199628f3 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -106,11 +106,6 @@ public: inline bool IsExplicitZeroMarginValLeft() const { return bExplicitZeroMarginValLeft; } inline void SetExplicitZeroMarginValRight( const bool eR ) { bExplicitZeroMarginValRight = eR; } inline void SetExplicitZeroMarginValLeft( const bool eL ) { bExplicitZeroMarginValLeft = eL; } - // Query/Setting the percentage values - inline void SetPropLeft( const sal_uInt16 nProp = 100 ) - { nPropLeftMargin = nProp; } - inline void SetPropRight( const sal_uInt16 nProp = 100 ) - { nPropRightMargin = nProp;} inline sal_uInt16 GetPropLeft() const { return nPropLeftMargin; } inline sal_uInt16 GetPropRight() const { return nPropRightMargin;} diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index 17e7e88737aa..ae316da6d0b4 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -47,7 +47,6 @@ public: virtual SvxFieldData* Clone() const SAL_OVERRIDE; virtual bool operator==(const SvxFieldData&) const SAL_OVERRIDE; SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; } - void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; } }; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index bcf8b29b054a..9a0e5f8145e3 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -287,7 +287,6 @@ public: OUString MakeNumString( const SvxNodeNum&, bool bInclStrings = true ) const; SvxNumRuleType GetNumRuleType() const { return eNumberingType; } - void SetNumRuleType( const SvxNumRuleType& rType ) { eNumberingType = rType; } bool UnLinkGraphics(); }; @@ -327,12 +326,6 @@ public: sal_uInt8 GetLevel() const { return nMyLevel; } void SetLevel( sal_uInt8 nVal ) { nMyLevel = nVal; } - bool IsStart() const { return bStartNum; } - void SetStart( bool bFlag = true ) { bStartNum = bFlag; } - - sal_uInt16 GetSetValue() const { return nSetValue; } - void SetSetValue( sal_uInt16 nVal ) { nSetValue = nVal; } - const sal_uInt16* GetLevelVal() const { return nLevelVal; } sal_uInt16* GetLevelVal() { return nLevelVal; } }; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index d121f0110160..5921122c3f5f 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -173,7 +173,6 @@ struct ParaRange ParaRange( sal_Int32 nS, sal_Int32 nE ) { nStartPara = nS, nEndPara = nE; } void Adjust(); - sal_Int32 Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); } }; inline void ParaRange::Adjust() @@ -408,7 +407,6 @@ public: bool mbEndOfParagraph : 1; bool mbEndOfBullet : 1; - sal_uInt8 GetBiDiLevel() const { return mnBiDiLevel; } bool IsRTL() const { return mnBiDiLevel % 2 == 1; } DrawPortionInfo( @@ -537,7 +535,6 @@ public: sal_Int32 GetPara() const { return nPara; } sal_Int32 GetPos() const { return nPos; } - bool IsSimpleClick() const { return bSimpleClick; } void SetSimpleClick( bool bSimple ) { bSimpleClick = bSimple; } const OUString& GetRepresentation() const { return aRepresentation; } @@ -638,18 +635,12 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster void ImplBlockInsertionCallbacks( bool b ); - void ImplCheckStyleSheet( sal_Int32 nPara, bool bReplaceExistingStyle ); - void ImpRecalcBulletIndent( sal_Int32 nPara ); - - const SvxBulletItem& ImpGetBullet( sal_Int32 nPara, sal_uInt16& ); void ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara ); bool ImpConvertEdtToOut( sal_Int32 nPara, EditView* pView = 0 ); void ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ); - long ImpCalcMaxBulletWidth( sal_Int32 nPara, const SvxBulletItem& rBullet ); vcl::Font ImpCalcBulletFont( sal_Int32 nPara ) const; Rectangle ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bReturnPaperPos ); - long ImpGetTextIndent( sal_Int32 nPara ); bool ImpCanIndentSelectedPages( OutlinerView* pCurView ); bool ImpCanDeleteSelectedPages( OutlinerView* pCurView ); bool ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 nFirstPage, sal_Int32 nPages ); @@ -733,7 +724,6 @@ public: sal_Int32 GetParagraphCount() const; Paragraph* GetParagraph( sal_Int32 nAbsPos ) const; - bool HasParent( Paragraph* pParagraph ) const; bool HasChildren( Paragraph* pParagraph ) const; sal_Int32 GetChildCount( Paragraph* pParent ) const; bool IsExpanded( Paragraph* pPara ) const; @@ -756,7 +746,6 @@ public: bool IsModified() const; Paragraph* GetHdlParagraph() const { return pHdlParagraph; } - bool IsExpanding() const { return bIsExpanding; } void ParagraphInsertedHdl(); void SetParaInsertedHdl(const Link<Outliner*,void>& rLink){aParaInsertedHdl=rLink;} @@ -774,29 +763,19 @@ public: bool RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link<OutlinerView*,bool>& rLink){aRemovingPagesHdl=rLink;} - Link<OutlinerView*,bool> GetRemovingPagesHdl() const { return aRemovingPagesHdl; } bool IndentingPagesHdl( OutlinerView* ); void SetIndentingPagesHdl(const Link<OutlinerView*,bool>& rLink){aIndentingPagesHdl=rLink;} // valid only in the two upper handlers sal_Int32 GetSelPageCount() const { return nDepthChangedHdlPrevDepth; } - // valid only in the two upper handlers - sal_Int32 GetFirstSelPage() const { return mnFirstSelPage; } - void SetCalcFieldValueHdl(const Link<EditFieldInfo*,void>& rLink ) { aCalcFieldValueHdl= rLink; } Link<EditFieldInfo*,void> GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; } - void SetFieldClickedHdl(const Link<EditFieldInfo*,void>& rLink ) { aFieldClickedHdl= rLink; } - Link<EditFieldInfo*,void> GetFieldClickedHdl() const { return aFieldClickedHdl; } - void SetDrawPortionHdl(const Link<DrawPortionInfo*,void>& rLink){aDrawPortionHdl=rLink;} - Link<DrawPortionInfo*,void> GetDrawPortionHdl() const { return aDrawPortionHdl; } void SetDrawBulletHdl(const Link<DrawBulletInfo*,void>& rLink){aDrawBulletHdl=rLink;} - Link<DrawBulletInfo*,void> GetDrawBulletHdl() const { return aDrawBulletHdl; } void SetPaintFirstLineHdl(const Link<PaintFirstLineInfo*,void>& rLink) { maPaintFirstLineHdl = rLink; } - Link<PaintFirstLineInfo*,void> GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; } void SetModifyHdl( const Link<>& rLink ); Link<> GetModifyHdl() const; @@ -813,7 +792,6 @@ public: void SetPaperSize( const Size& rSize ); void SetFirstPageNumber( sal_Int32 n ) { nFirstPage = n; } - sal_Int32 GetFirstPageNumber() const { return nFirstPage; } void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); @@ -985,11 +963,9 @@ public: /** sets a link that is called before a drop or paste operation. */ void SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos*,void>& rLink ); - Link<PasteOrDropInfos*,void> GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; } /** sets a link that is called after a drop or paste operation. */ void SetEndPasteOrDropHdl( const Link<PasteOrDropInfos*,void>& rLink ); - Link<PasteOrDropInfos*,void> GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; } sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index 02db19da70aa..ae0964550447 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -51,7 +51,6 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - bool IsAuto() const { return bAuto; } }; inline SvxPageModelItem::SvxPageModelItem( sal_uInt16 nWh ) diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index d8a2b42c6360..4646c8de7e6a 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -67,8 +67,6 @@ public: // enum cast FontItalic GetPosture() const { return (FontItalic)GetValue(); } - void SetPosture( FontItalic eNew ) - { SetValue( (sal_uInt16)eNew ); } void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index f9ab9103a178..566e72ce405a 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -53,8 +53,6 @@ public: static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet, sal_uInt16 nWhich ); - inline const SfxPoolItem* GetItemOfScriptSet( sal_uInt16 _nWhich ) const - { return SvxScriptSetItem::GetItemOfScriptSet( GetItemSet(), _nWhich ); } static const SfxPoolItem* GetItemOfScript( sal_uInt16 nSlotId, const SfxItemSet& rSet, SvtScriptType nScript ); @@ -68,9 +66,6 @@ public: static void GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex ); - inline void GetSlotIds( sal_uInt16& rLatin, sal_uInt16& rAsian, - sal_uInt16& rComplex ) const - { GetSlotIds( Which(), rLatin, rAsian, rComplex ); } }; #endif diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index e9de2f7a31ec..602741bd5309 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -99,19 +99,9 @@ public: void SpellDocument(); // Perform Spell Checking inline bool IsStartDone(){ return bStartDone; } inline bool IsEndDone(){ return bEndDone; } - inline bool IsReverse(){ return bReverse; } - inline bool IsDialog(){ return bDialog; } // SvxSpellCheckDialog OnScreen inline bool IsHyphen(){ return bHyphen; } // Split instead of Spell check inline void SetHyphen( const bool bNew = true ){ bHyphen = bNew; } - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > - GetXSpellChecker() { return xSpell; } - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > - GetXHyphenator() { return xHyph; } inline bool IsAllRight() { return bAllRight; } - inline vcl::Window* GetWin() { return pWin; } - inline void EnableAutoCorrect() { bAuto = true; } protected: ::com::sun::star::uno::Reference< @@ -130,16 +120,9 @@ protected: ::com::sun::star::linguistic2::XDictionary > GetAllRightDic(); virtual void SpellEnd(); // Finish area - virtual void ScrollArea(); // Set ScrollArea - // Replace word - virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang ); - // Wort via Thesaurus ersetzen - virtual void ChangeThesWord( const OUString& rNewWord ); - virtual void AutoCorrect( const OUString& rAktStr, const OUString& rNewStr ); virtual void InsertHyphen( const sal_Int32 nPos ); // Insert hyphen void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; } - SdrObject* GetCurTextObj() { return mpTextObj; } }; #endif diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 7de2a0e6f109..41c1db3c4ae8 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -220,8 +220,6 @@ public: bool PutText( const OUString& rShort, const OUString& rLong ); // - Text with attribution (only the SWG - SWG format!) bool PutText( const OUString& rShort, SfxObjectShell& ); - // - Deleting an entry - bool DeleteText( const OUString& rShort ); // - Make combined changes in one pass bool MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNewEntries, std::vector<SvxAutocorrWord>& aDeleteEntries ); }; @@ -335,9 +333,6 @@ public: SvxAutocorrWordList* LoadAutocorrWordList( LanguageType eLang = LANGUAGE_SYSTEM ) { return _GetLanguageList( eLang ).LoadAutocorrWordList(); } - const SvxAutocorrWordList* GetAutocorrWordList( - LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).GetAutocorrWordList(); } // Save word substitutions: // Save these directly in the storage. The word list is updated diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 5dcb23efda69..fe93c33ae15a 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -217,7 +217,6 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser void _ClearStyleAttr( SvxRTFItemStackType& rStkType ); // Sets all the attributes that are different from the current - void SetAttrSet( SfxItemSet& rAttrSet, SvxPosition& rSttPos ); void SetAttrSet( SvxRTFItemStackType &rSet ); void SetDefault( int nToken, int nValue ); @@ -285,31 +284,15 @@ protected: bool bReadNewDoc = true ); virtual ~SvxRTFParser(); - bool IsNewDoc() const { return bNewDoc; } void SetNewDoc( bool bFlag ) { bNewDoc = bFlag; } - bool IsNewGroup() const { return bNewGroup; } - void SetNewGroup( bool bFlag ) { bNewGroup = bFlag; } bool IsChkStyleAttr() const { return bChkStyleAttr; } void SetChkStyleAttr( bool bFlag ) { bChkStyleAttr = bFlag; } bool IsCalcValue() const { return bCalcValue; } void SetCalcValue( bool bFlag ) { bCalcValue = bFlag; } - bool IsPardTokenRead() const { return bPardTokenRead; } - void SetPardTokenRead( bool bFlag ) { bPardTokenRead = bFlag; } - bool IsReadDocInfo() const { return bReadDocInfo; } - void SetReadDocInfo( bool bFlag ) { bReadDocInfo = bFlag; } // Query/Set the current insert position - SvxPosition& GetInsPos() const { return *pInsPos; } void SetInsPos( const SvxPosition& rNew ); - - long GetVersionNo() const { return nVersionNo; } - SvxRTFStyleTbl& GetStyleTbl() { return aStyleTbl; } - SvxRTFItemStack& GetAttrStack() { return aAttrStack; } - SvxRTFColorTbl& GetColorTbl() { return aColorTbl; } - SvxRTFFontTbl& GetFontTbl() { return aFontTbl; } - - const OUString& GetBaseURL() const { return sBaseURL; } public: @@ -325,7 +308,6 @@ public: void SetAttrPool( SfxItemPool* pNewPool ) { pAttrPool = pNewPool; } // to set different WhichIds for a different pool. RTFPardAttrMapIds& GetPardMap() { return aPardMap; } - RTFPlainAttrMapIds& GetPlainMap() { return aPlainMap; } // to be able to assign them from the outside as for example table cells void ReadBorderAttr( int nToken, SfxItemSet& rSet, bool bTableDef=false ); void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, bool bTableDef=false ); diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index 2d7384c696b4..fac8d431401f 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -64,8 +64,6 @@ public: sal_Unicode& GetFill() { return cFill; } sal_Unicode GetFill() const { return cFill; } - OUString GetValueString() const; - // the "old" operator==() bool IsEqual( const SvxTabStop& rTS ) const { @@ -125,8 +123,6 @@ public: bool Insert( const SvxTabStop& rTab ); void Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX ); - void Remove( SvxTabStop& rTab ) - { maTabStops.erase( rTab ); } void Remove( const sal_uInt16 nPos, const sal_uInt16 nLen = 1 ) { maTabStops.erase( maTabStops.begin() + nPos, maTabStops.begin() + nPos + nLen ); } diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx index f37d835724d5..2069152a58c9 100644 --- a/include/editeng/txtrange.hxx +++ b/include/editeng/txtrange.hxx @@ -74,9 +74,7 @@ public: bool IsSimple() const { return bSimple; } bool IsInner() const { return bInner; } bool IsVertical() const { return bVertical; } - bool HasBorder() const { return nRight || nLeft; } const tools::PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } - const tools::PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } const Rectangle& GetBoundRect() { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); } void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; } diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx index c44ec6740886..b416a2e6ff70 100644 --- a/include/editeng/unofield.hxx +++ b/include/editeng/unofield.hxx @@ -63,7 +63,6 @@ public: // Internal SvxFieldData* CreateFieldData() const throw(); - void SetAnchor( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xAnchor ) { mxAnchor = xAnchor; } static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx index 5403ef68e7ff..873df709b72a 100644 --- a/include/editeng/unoforou.hxx +++ b/include/editeng/unoforou.hxx @@ -77,10 +77,8 @@ public: virtual bool IsValid() const SAL_OVERRIDE; - Outliner& GetOutliner() const { return rOutliner; } - virtual LanguageType GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE; - virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; + virtual sal_Int32 GetFieldCount( sal_Int32 nPara ) const SAL_OVERRIDE; virtual EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const SAL_OVERRIDE; virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const SAL_OVERRIDE; virtual Rectangle GetCharBounds( sal_Int32 nPara, sal_Int32 nIndex ) const SAL_OVERRIDE; diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index e2f2c7e704a4..43ecb9dea6ce 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -60,8 +60,7 @@ public: void ClearAllUsrAny(); com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; - const SfxItemPropertyMapEntry* getPropertyMapEntries() const {return _pMap;} - const SfxItemPropertyMap& getPropertyMap()const { return m_aPropertyMap;} + const SfxItemPropertyMap& getPropertyMap() const { return m_aPropertyMap;} const SfxItemPropertySimpleEntry* getPropertyMapEntry(const OUString &rName) const; static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > getPropertySetInfo( const SfxItemPropertyMapEntry* pMap ); diff --git a/include/editeng/unopracc.hxx b/include/editeng/unopracc.hxx index ba0e79a5068d..b56b24681611 100644 --- a/include/editeng/unopracc.hxx +++ b/include/editeng/unopracc.hxx @@ -54,9 +54,6 @@ public: // lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // XServiceName - OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 2bc45c24e28e..3717a1f96f2a 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -401,7 +401,6 @@ protected: public: UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase ) - ESelection InsertField( const SvxFieldItem& rField ) throw(); static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getStaticTypes() throw(); ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > createTextCursorBySelection( const ESelection& rSel ); diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 834052674189..e7df17842e87 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -67,8 +67,6 @@ public: // enum cast FontWeight GetWeight() const { return (FontWeight)GetValue(); } - void SetWeight( FontWeight eNew ) - { SetValue( (sal_uInt16)eNew ); } void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; }; |