diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-20 13:39:38 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-04-21 04:12:04 +0200 |
commit | 94acabe8d0cb555e76635c4bceeb48a14bd16a2b (patch) | |
tree | 5342dac802e5ae009c12734bb2d23e482a6166f1 /svx | |
parent | 9374352f242d2dcfd39a3a6f0504efbaf1abb2dc (diff) |
loplugin:unusedmethods
Change-Id: I9dc6e81149eae3ba2284fa7fe608dd9252503dce
Reviewed-on: https://gerrit.libreoffice.org/53197
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/sdr/contact/viewcontactofgraphic.hxx | 3 | ||||
-rw-r--r-- | svx/source/dialog/txencbox.cxx | 63 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofgraphic.cxx | 11 | ||||
-rw-r--r-- | svx/source/svdraw/svdpage.cxx | 7 |
4 files changed, 0 insertions, 84 deletions
diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx index eee418387bd6..148817bdd8f5 100644 --- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx @@ -62,9 +62,6 @@ namespace sdr explicit ViewContactOfGraphic(SdrGrafObj& rGrafObj); virtual ~ViewContactOfGraphic() override; - // #i102380# - void flushGraphicObjects(); - // helpers for visualisation state bool visualisationUsesPresObj() const; bool visualisationUsesDraft() const; diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 3dd0de769d4e..4eb656d0746e 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -281,69 +281,6 @@ void TextEncodingBox::FillFromTextEncodingTable( } -void TextEncodingBox::FillFromDbTextEncodingMap( - bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags ) -{ -#if !HAVE_FEATURE_DBCONNECTIVITY - (void)bExcludeImportSubsets; - (void)nExcludeInfoFlags; -#else - rtl_TextEncodingInfo aInfo; - aInfo.StructSize = sizeof(rtl_TextEncodingInfo); - ::std::vector< rtl_TextEncoding > aEncs; - sal_Int32 nCount = svxform::charset_helper::getSupportedTextEncodings( aEncs ); - for ( sal_Int32 j=0; j<nCount; j++ ) - { - bool bInsert = true; - rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] ); - if ( nExcludeInfoFlags ) - { - if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) ) - bInsert = false; - else - { - if ( (aInfo.Flags & nExcludeInfoFlags) == 0 ) - { - if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) && - ((nEnc == RTL_TEXTENCODING_UCS2) || - nEnc == RTL_TEXTENCODING_UCS4) ) - bInsert = false; // InfoFlags don't work for Unicode :-( - } - else - bInsert = false; - } - } - if ( bInsert ) - { - if ( bExcludeImportSubsets ) - { - switch ( nEnc ) - { - // subsets of RTL_TEXTENCODING_GB_18030 - case RTL_TEXTENCODING_GB_2312 : - case RTL_TEXTENCODING_GBK : - case RTL_TEXTENCODING_MS_936 : - bInsert = false; - break; - } - } - // CharsetMap offers a RTL_TEXTENCODING_DONTKNOW for internal use, - // makes no sense here and would result in an empty string as list - // entry. - if ( bInsert && nEnc != RTL_TEXTENCODING_DONTKNOW ) - InsertTextEncoding( nEnc ); - } - } -#endif -} - -void TextEncodingBox::FillWithMimeAndSelectBest() -{ - FillFromTextEncodingTable( false, 0xffffffff, RTL_TEXTENCODING_INFO_MIME ); - rtl_TextEncoding nEnc = SvtSysLocale::GetBestMimeEncoding(); - SelectTextEncoding( nEnc ); -} - void TextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, const OUString& rEntry ) { diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index b379757408ba..2f449704f3fc 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -71,17 +71,6 @@ namespace sdr { } - void ViewContactOfGraphic::flushGraphicObjects() - { - // #i102380# The graphic is swapped out. To let that have an effect, it is necessary to - // delete copies of the GraphicObject which are not swapped out and have no SwapHandler set - // (this is what happens when the GraphicObject gets copied to a SdrGrafPrimitive2D). This - // is best achieved for the VC by clearing the local decomposition cache. It would be possible - // to also do this for the VOC cache, but that VOCs exist exactly express that the object - // gets visualised, so this would be wrong. - flushViewIndependentPrimitive2DSequence(); - } - drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGraphic::createVIP2DSForPresObj( const basegfx::B2DHomMatrix& rObjectMatrix, const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 1532ee47cd3d..71207b6d4f88 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -89,13 +89,6 @@ SdrObjList::~SdrObjList() Clear(); // delete contents of container } -SdrObjList* SdrObjList::CloneSdrObjList(SdrModel* pNewModelel) const -{ - SdrObjList* pObjList = new SdrObjList(); - pObjList->copyDataFromSdrObjList(*this, pNewModelel); - return pObjList; -} - void SdrObjList::copyDataFromSdrObjList(const SdrObjList& rSrcList, SdrModel* pNewModelel) { // this function is only supposed to be called once, right after construction |