diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-26 22:26:24 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-29 09:56:05 +0100 |
commit | 012072ebd70a2180918864818f522944e46adf07 (patch) | |
tree | ba33e6c949b52aa7f61ef410f809c817fea5c328 /filter | |
parent | eb71f3d572b6e1c24a072bd2fcd9c29e08113d32 (diff) |
valgrind: various unused code
Diffstat (limited to 'filter')
-rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 5 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 37 |
2 files changed, 0 insertions, 42 deletions
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 57ab915cec71..3374699de3ba 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -428,9 +428,6 @@ protected: sal_Bool ReadString( String& rStr ) const; // nur fuer PowerPoint-Filter: virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const; - void CheckWingdings() const; - void CheckMonotypeSorts() const; - void CheckTimesNewRoman() const; public: using SvxMSDffManager::ReadObjText; @@ -447,8 +444,6 @@ public: virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const; virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const; PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const; - CharSet GetCharSet( sal_uInt32 nNum ) const; - sal_Bool IsFontAvailable( sal_uInt32 nNum ) const; void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph ); virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const; virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 04b0947c2d94..6b6e6835f5de 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -591,22 +591,6 @@ PptFontEntityAtom* SdrEscherImport::GetFontEnityAtom( sal_uInt32 nNum ) const return pRetValue; } -CharSet SdrEscherImport::GetCharSet( sal_uInt32 nNum ) const -{ - CharSet eRetValue( eCharSetSystem ); - if ( pFonts && ( nNum < pFonts->Count() ) ) - eRetValue = (*pFonts)[ (sal_uInt16)nNum ]->eCharSet; - return eRetValue; -} - -sal_Bool SdrEscherImport::IsFontAvailable( sal_uInt32 nNum ) const -{ - sal_Bool bRetValue = sal_False; - if ( pFonts && ( nNum < pFonts->Count() ) ) - bRetValue = (*pFonts)[ (sal_uInt16)nNum ]->bAvailable; - return bRetValue; -} - SdrObject* SdrEscherImport::ReadObjText( PPTTextObj* /*pTextObj*/, SdrObject* pObj, SdPage* /*pPage*/) const { return pObj; @@ -1293,27 +1277,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi return pRet; } -void SdrEscherImport::CheckWingdings() const -{ - OutputDevice* pDev = (OutputDevice*)Application::GetDefaultDevice(); - ((SdrEscherImport*)this)->bWingdingsAvailable = pDev->IsFontAvailable( String( RTL_CONSTASCII_USTRINGPARAM( "WINGDINGS" ) ) ); - ((SdrEscherImport*)this)->bWingdingsChecked = sal_True; -} - -void SdrEscherImport::CheckMonotypeSorts() const -{ - OutputDevice* pDev = (OutputDevice*)Application::GetDefaultDevice(); - ((SdrEscherImport*)this)->bMonotypeSortsAvailable = pDev->IsFontAvailable( String( RTL_CONSTASCII_USTRINGPARAM( "MONOTYPE SORTS" ) ) ); - ((SdrEscherImport*)this)->bMonotypeSortsChecked = sal_True; -} - -void SdrEscherImport::CheckTimesNewRoman() const -{ - OutputDevice* pDev = (OutputDevice*)Application::GetDefaultDevice(); - ((SdrEscherImport*)this)->bTimesNewRomanAvailable = pDev->IsFontAvailable( String( RTL_CONSTASCII_USTRINGPARAM( "TIMES NEW ROMAN" ) ) ); - ((SdrEscherImport*)this)->bTimesNewRomanChecked = sal_True; -} - SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const String& rBaseURL ) : SdrEscherImport ( rParam, rBaseURL ), bOk ( rStCtrl.GetErrorCode() == SVSTREAM_OK ), |