From 012072ebd70a2180918864818f522944e46adf07 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 26 Aug 2011 22:26:24 +0100 Subject: valgrind: various unused code --- editeng/inc/editeng/editeng.hxx | 4 - editeng/inc/editeng/outliner.hxx | 1 - editeng/source/editeng/editdbg.cxx | 23 ----- editeng/source/editeng/editdbg.hxx | 3 - editeng/source/editeng/editeng.cxx | 21 ----- editeng/source/outliner/outlvw.cxx | 10 -- filter/inc/filter/msfilter/svdfppt.hxx | 5 - filter/source/msfilter/svdfppt.cxx | 37 -------- l10ntools/inc/cfgmerge.hxx | 1 - l10ntools/source/cfgmerge.cxx | 6 -- lotuswordpro/source/filter/bento.hxx | 10 -- lotuswordpro/source/filter/benval.cxx | 113 ----------------------- lotuswordpro/source/filter/lwpsdwrect.cxx | 8 -- lotuswordpro/source/filter/lwpsdwrect.hxx | 3 - lotuswordpro/source/filter/utlist.cxx | 82 ----------------- lotuswordpro/source/filter/utlist.hxx | 6 -- sd/source/ui/dlg/tpoption.cxx | 56 ------------ sd/source/ui/inc/tpoption.hxx | 2 - svtools/inc/svtools/editsyntaxhighlighter.hxx | 2 - svtools/source/edit/editsyntaxhighlighter.cxx | 10 -- svx/inc/svx/dlgctrl.hxx | 11 --- svx/inc/svx/svdograf.hxx | 1 - svx/source/dialog/dlgctrl.cxx | 116 ------------------------ svx/source/sdr/properties/graphicproperties.cxx | 2 +- svx/source/svdraw/svdograf.cxx | 16 ---- svx/workben/edittest.cxx | 30 ------ unusedcode.easy | 43 --------- vcl/inc/unx/glyphcache.hxx | 1 - vcl/inc/vcl/bitmapex.hxx | 3 - vcl/source/gdi/bitmapex.cxx | 7 -- vcl/unx/generic/glyphs/glyphcache.cxx | 14 --- 31 files changed, 1 insertion(+), 646 deletions(-) diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index 6f48a66112fd..5ab7c23f4866 100644 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -357,9 +357,6 @@ public: void EnablePasteSpecial( sal_Bool bEnable ); sal_Bool IsPasteSpecialEnabled() const; - void EnableIdleFormatter( sal_Bool bEnable ); - sal_Bool IsIdleFormatterEnabled() const; - void EraseVirtualDevice(); void SetSpeller( ::com::sun::star::uno::Reference< @@ -470,7 +467,6 @@ public: static sal_uInt16 GetAvailableSearchOptions(); static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const Font& rFont ); static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const SvxFont& rFont ); - static Font CreateFontFromItemSet( const SfxItemSet& rItemSet ); static Font CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType ); static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); static sal_Bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index 8fc3e576f3a4..9a6872712623 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -236,7 +236,6 @@ private: EDITENG_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara ); EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds ); EDITENG_DLLPRIVATE void ImpHideDDCursor(); - EDITENG_DLLPRIVATE void ImpShowDDCursor(); EDITENG_DLLPRIVATE void ImpPaintDDCursor(); EDITENG_DLLPRIVATE void ImpDragScroll( const Point& rPosPix ); diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index 1f00e90799c2..8ad732bcd06f 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -533,29 +533,6 @@ rtl::OString EditDbg::GetPortionInfo( ParaPortion* pPPortion ) return aDebStr.makeStringAndClear(); } -rtl::OString EditDbg::GetTextPortionInfo(TextPortionList& rPortions) -{ - rtl::OStringBuffer aDebStr; - for (sal_uInt16 z = 0; z < rPortions.Count(); ++z) - { - TextPortion* pPortion = rPortions.GetObject( z ); - aDebStr.append(' '); - aDebStr.append(static_cast(pPortion->GetLen())); - aDebStr.append('('); - aDebStr.append(static_cast(pPortion->GetSize().Width())); - aDebStr.append(')'); - aDebStr.append(';'); - } - return aDebStr.makeStringAndClear(); -} - -void EditDbg::ShowPortionData( ParaPortion* pPortion ) -{ - ByteString aDebStr( GetPortionInfo( pPortion ) ); - InfoBox( 0, String( aDebStr, RTL_TEXTENCODING_ASCII_US ) ).Execute(); -} - - sal_Bool ParaPortion::DbgCheckTextPortions() { // check, if Portion length ok: diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx index 79c1f6634888..7154dfdb06e5 100644 --- a/editeng/source/editeng/editdbg.hxx +++ b/editeng/source/editeng/editdbg.hxx @@ -48,13 +48,10 @@ class EditDbg { public: static void ShowEditEngineData( EditEngine* pEditEngine, sal_Bool bInfoBox = sal_True ); - static void ShowPortionData( ParaPortion* pPortion ); static rtl::OString GetPortionInfo( ParaPortion* pPPortion ); - static rtl::OString GetTextPortionInfo(TextPortionList& rPortions); static ByteString GetUndoDebStr( EditUndoList* pUndoList ); }; - #endif // _EDITDBG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index c28248ad078a..64547e6c5cc3 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2081,21 +2081,6 @@ sal_Bool EditEngine::IsPasteSpecialEnabled() const return pImpEditEngine->GetStatus().AllowPasteSpecial(); } -void EditEngine::EnableIdleFormatter( sal_Bool bEnable ) -{ - DBG_CHKTHIS( EditEngine, 0 ); - if ( bEnable ) - pImpEditEngine->GetStatus().TurnOnFlags( EE_CNTRL_DOIDLEFORMAT ); - else - pImpEditEngine->GetStatus().TurnOffFlags( EE_CNTRL_DOIDLEFORMAT); -} - -sal_Bool EditEngine::IsIdleFormatterEnabled() const -{ - DBG_CHKTHIS( EditEngine, 0 ); - return pImpEditEngine->GetStatus().UseIdleFormatter(); -} - void EditEngine::EraseVirtualDevice() { DBG_CHKTHIS( EditEngine, 0 ); @@ -2666,12 +2651,6 @@ Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 n return aFont; } -// Maybe we can remove the next two methods, check after 6.x -Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet ) -{ - return CreateSvxFontFromItemSet( rItemSet ); -} - SvxFont EditEngine::CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ) { SvxFont aFont; diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 1bf148648f33..f8fe488adb9d 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -412,16 +412,6 @@ void OutlinerView::ImpHideDDCursor() } } -void OutlinerView::ImpShowDDCursor() -{ - DBG_CHKTHIS(OutlinerView,0); - if ( !bDDCursorVisible ) - { - bDDCursorVisible = sal_True; - ImpPaintDDCursor(); - } -} - void OutlinerView::ImpPaintDDCursor() { DBG_CHKTHIS(OutlinerView,0); 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 ), diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index c8f3d99a7b14..23bd45089415 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -79,7 +79,6 @@ public: CfgStack() {} ~CfgStack(); - size_t Push( CfgStackData *pStackData ); CfgStackData *Push( const ByteString &rTag, const ByteString &rId ); CfgStackData *Pop() { diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index 55aed2c4210c..cf4fe7fef8c6 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -793,12 +793,6 @@ void CfgMerge::Output( const ByteString& rOutput ) pOutputStream->Write( rOutput.GetBuffer(), rOutput.Len()); } -size_t CfgStack::Push( CfgStackData *pStackData ) -{ - maList.push_back( pStackData ); - return maList.size() - 1; -} - /*****************************************************************************/ void CfgMerge::WorkOnRessourceEnd() /*****************************************************************************/ diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 6f534d03051c..e2b4379780ae 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -336,20 +336,11 @@ public: unsigned long GetValueSize(); BenError ReadValueData(BenDataPtr pBuffer, unsigned long Offset, unsigned long MaxSize, unsigned long * pAmtRead); - BenError ReadValueDataKnownSize(BenDataPtr pBuffer, - unsigned long Offset, unsigned long Amt); BenError BEN_EXPORT WriteValueData(BenConstDataPtr pBuffer, unsigned long Offset, unsigned long Size); BenError BEN_EXPORT WriteValueData(BenConstDataPtr pBuffer, unsigned long Offset, unsigned long Size, unsigned long * pAmtWritten); - BenError BEN_EXPORT WriteImmediateValueData(BenConstDataPtr pBuffer, - unsigned short Size); - BenError BEN_EXPORT TruncateValueSize(unsigned long NewSize); - BenError BEN_EXPORT NewReference(BenObjectID ReferencedObjectID, - pCBenReference pReference); - BenObjectID BEN_EXPORT GetReferencedObject(pCBenReference pReference); - pCBenProperty BEN_EXPORT GetProperty() { return cpProperty; } @@ -377,7 +368,6 @@ public: // Internal methods pCurrValueSegment); inline pLtcBenContainer GetContainer(); pCUtList GetValueSegments() { return &cValueSegments; } - BenObjectID GetReferencedListID(); // Currently, no generation support BenGeneration GetGeneration() { return 1; } diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx index ae3d1d9956c6..de1fc1248304 100644 --- a/lotuswordpro/source/filter/benval.cxx +++ b/lotuswordpro/source/filter/benval.cxx @@ -132,19 +132,6 @@ CBenValue::ReadValueData(BenDataPtr pReadBuffer, unsigned long Offset, return BenErr_OK; } -BenError -CBenValue::ReadValueDataKnownSize(BenDataPtr pBuffer, unsigned long Offset, - unsigned long Amt) -{ - unsigned long AmtRead; - BenError Err = ReadValueData(pBuffer, Offset, Amt, &AmtRead); - - if (Err == UtErr_OK && AmtRead != Amt) - Err = (BenError) UtErr_Fail; - - return Err; -} - BenError CBenValue::WriteValueData(BenConstDataPtr /*pWriteBuffer*/, unsigned long /*Offset*/, unsigned long /*Amt*/, unsigned long * /*pAmtWritten*/) @@ -152,30 +139,6 @@ CBenValue::WriteValueData(BenConstDataPtr /*pWriteBuffer*/, unsigned long /*Offs return BenErr_OK; } -BenError -CBenValue::TruncateValueSize(unsigned long NewSize) -{ - unsigned long SegOffset = 0; - - pCBenValueSegment pCurrSeg = GetNextValueSegment(NULL); - while (pCurrSeg != NULL) - { - pCBenValueSegment pNextSeg = GetNextValueSegment(pCurrSeg); - - long SegSize = UtMin((long) pCurrSeg->GetSize(), (long) NewSize - - (long) SegOffset); - - if (SegSize <= 0) - delete pCurrSeg; - else pCurrSeg->SetSize(SegSize); - - SegOffset += SegSize; - pCurrSeg = pNextSeg; - } - - return BenErr_OK; -} - BenError CBenValue::WriteValueData(BenConstDataPtr pWriteBuffer, unsigned long Offset, unsigned long Amt) @@ -184,82 +147,6 @@ CBenValue::WriteValueData(BenConstDataPtr pWriteBuffer, unsigned long Offset, return WriteValueData(pWriteBuffer, Offset, Amt, &AmtWritten); } -BenError -CBenValue::WriteImmediateValueData(BenConstDataPtr pBuffer, - unsigned short Size) -{ - // Only one write can be an immediate value in current implementation - if (cValueSegments.GetFirst() != cValueSegments.GetTerminating() || - Size > 4) - return BenErr_InvalidImmediateWrite; - - if (Size == 0) - return BenErr_OK; - - new CBenValueSegment(this, pBuffer, Size); - return BenErr_OK; -} - -BenError -CBenValue::NewReference(BenObjectID ReferencedObjectID, pCBenReference - pReference) -{ - BenError Err; - - if (cpReferencedList == NULL) - { - pLtcBenContainer pContainer = cpProperty->GetContainer(); - - pCBenObject pNewObject; - if ((Err = pContainer->NewObject(&pNewObject)) != BenErr_OK) - return Err; - - pCBenValue pNewValue; - if ((Err = pNewObject->NewValue(BEN_PROPID_OBJ_REFERENCES, - BEN_TYPEID_OBJ_REFERENCES_DATA, &pNewValue)) != BenErr_OK) - { - delete pNewObject; - return Err; - } - - cpReferencedList = pNewValue; - cReferencedObjectsSize = 0; - } - - BenByte Buffer[8]; - UtPutIntelDWord(Buffer, ReferencedObjectID); - UtPutIntelDWord(Buffer + 4, ReferencedObjectID); - - UtPutIntelDWord(pReference->GetData(), ReferencedObjectID); - - if ((Err = cpReferencedList->WriteValueData(Buffer, - cReferencedObjectsSize, 8)) != BenErr_OK) - return Err; - - cReferencedObjectsSize += 8; - return BenErr_OK; -} - -BenObjectID -CBenValue::GetReferencedObject(pCBenReference pReference) -{ - return UtGetIntelDWord(pReference->GetData()); -} - -BenObjectID -CBenValue::GetReferencedListID() -{ - if (cpReferencedList != NULL) - return cpReferencedList->GetProperty()->GetBenObject()->GetID(); - else - { -#ifdef BENUTIL_SUPPORT - return cReferencedListID; -#else - return 0; -#endif - } -} }//end namespace OpenStormBento /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpsdwrect.cxx b/lotuswordpro/source/filter/lwpsdwrect.cxx index b84b2520e77a..0fb18519e55b 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.cxx +++ b/lotuswordpro/source/filter/lwpsdwrect.cxx @@ -222,12 +222,4 @@ double SdwRectangle::CalcDistBetween2Points(long nX1, long nY1, long nX2, long n return sqrt((double)((nX1-nX2)*(nX1-nX2) + (nY1-nY2)*(nY1-nY2))); } -Rectangle SdwRectangle::GetOriginalRect(const Point& rCenter, long nHalfWidth, long nHalfHeight) -{ - Point aLT(rCenter.X()-nHalfWidth, rCenter.Y()-nHalfHeight); - Point aRB(rCenter.X()+nHalfWidth, rCenter.Y()+nHalfHeight); - - return Rectangle(aLT, aRB); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx index 074077d05872..0b2b401184b5 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.hxx +++ b/lotuswordpro/source/filter/lwpsdwrect.hxx @@ -121,9 +121,6 @@ public: double GetRotationAngle() const; static double CalcDistBetween2Points(long nX1, long nY1, long nX2, long nY2); - - static Rectangle GetOriginalRect(const Point& rCenter, long nHalfWidth, long nHalfHeight); - }; #endif diff --git a/lotuswordpro/source/filter/utlist.cxx b/lotuswordpro/source/filter/utlist.cxx index d68b49cbe20c..55fa883a17a5 100644 --- a/lotuswordpro/source/filter/utlist.cxx +++ b/lotuswordpro/source/filter/utlist.cxx @@ -91,72 +91,6 @@ CUtList::~CUtList() pTerminating->SetNext(pTerminating); } -int -CUtList::GetCount() -{ - int Count = 0; - - pCUtListElmt pTerminating = GetTerminating(); - for (pCUtListElmt pCurr = GetFirst(); pCurr != pTerminating; - pCurr = pCurr->GetNext()) - { - Count++; - } - return Count; -} - -pCUtListElmt -CUtList::GetIndex(int Index) -{ - int Count = 0; - - pCUtListElmt pTerminating = GetTerminating(); - for (pCUtListElmt pCurr = GetFirst(); pCurr != pTerminating; - pCurr = pCurr->GetNext()) - { - if (Count == Index) - return pCurr; - Count++; - } - return NULL; -} - -int -CUtList::GetIndex(pCUtListElmt pNode) -{ - int Count = 0; - - pCUtListElmt pTerminating = GetTerminating(); - for (pCUtListElmt pCurr = GetFirst(); pCurr != pTerminating; - pCurr = pCurr->GetNext()) - { - if (pNode == pCurr) - break; - Count++; - } - return Count; -} - -// If pCurr is last item in list, returns first item in list (terminating -// item is skipped when circle around) -pCUtListElmt -CUtList::CircularGetNext(pConstCUtListElmt pCurr) -{ - pCUtListElmt pNext = pCurr->GetNext(); - if (pNext == GetTerminating()) - pNext = GetFirst(); - return pNext; -} - -pCUtListElmt -CUtList::CircularGetPrev(pConstCUtListElmt pCurr) -{ - pCUtListElmt pPrev = pCurr->GetPrev(); - if (pPrev == GetTerminating()) - pPrev = GetLast(); - return pPrev; -} - // If pCurr is NULL, returns first item in list. Otherwise, returns item // in list after pCurr or NULL if no more items in list. Terminating item // is never returned @@ -173,22 +107,6 @@ CUtList::GetNextOrNULL(pCUtListElmt pCurr) return pNext; } -// If pCurr is NULL, returns last item in list. Otherwise, returns item -// in list before pCurr or NULL if no more items in list. Terminating item -// is never returned -pCUtListElmt -CUtList::GetPrevOrNULL(pCUtListElmt pCurr) -{ - pCUtListElmt pPrev; - - if (pCurr == NULL) - pPrev = GetLast(); - else pPrev = pCurr->GetPrev(); - if (pPrev == GetTerminating()) - pPrev = NULL; - return pPrev; -} - void CUtList::Destroy() { diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx index 1e318bd9726b..29f7fc39645e 100644 --- a/lotuswordpro/source/filter/utlist.hxx +++ b/lotuswordpro/source/filter/utlist.hxx @@ -128,17 +128,11 @@ public: // Methods pCUtListElmt GetFirst() { return cDummyElmt.GetNext(); } pCUtListElmt GetLast() { return cDummyElmt.GetPrev(); } pCUtListElmt GetTerminating() { return &cDummyElmt; } - pCUtListElmt CircularGetNext(pConstCUtListElmt pCurr); - pCUtListElmt CircularGetPrev(pConstCUtListElmt pCurr); pCUtListElmt GetNextOrNULL(pCUtListElmt pCurr); - pCUtListElmt GetPrevOrNULL(pCUtListElmt pCurr); UtBool IsEmpty() { return GetFirst() == GetTerminating(); }; UtBool ContainsAtLeastTwoItems() { return GetFirst() != GetLast(); }; - int GetCount(void); void Destroy(void); - pCUtListElmt GetIndex(int Index); - int GetIndex(pCUtListElmt pNode); private: // Data CUtListElmt cDummyElmt; diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index f0f2fd2b1953..e12cd976ea7c 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -684,62 +684,6 @@ void SdTpOptionsMisc::SetDrawMode() // spacing-between-paragraphs check box normally is in. aCbxUsePrinterMetrics.SetPosPixel (aCbxCompatibility.GetPosPixel()); } -// ----------------------------------------------------------------------- - -IMPL_LINK( SdTpOptionsMisc, ModifyScaleHdl, void *, EMPTYARG ) -{ - // Originalgroesse berechnen - sal_Int32 nX, nY; - if( SetScale( aCbScale.GetText(), nX, nY ) ) - { - sal_Int32 nW = nWidth * nY / nX; - sal_Int32 nH = nHeight * nY / nX; - - SetMetricValue( aMtrFldOriginalWidth, nW, ePoolUnit ); - SetMetricValue( aMtrFldOriginalHeight, nH, ePoolUnit ); - } - - return( 0L ); -} - -// ----------------------------------------------------------------------- - -IMPL_LINK( SdTpOptionsMisc, ModifyOriginalScaleHdl, void *, EMPTYARG ) -{ - // Berechnen des Massstabs - long nOrgW = static_cast(aMtrFldOriginalWidth.GetValue()); - long nOrgH = static_cast(aMtrFldOriginalHeight.GetValue()); - - if( nOrgW == 0 || nOrgH == 0 ) - return( 0L ); - - Fraction aFract1( nOrgW, static_cast(aMtrFldInfo1.GetValue()) ); - Fraction aFract2( nOrgH, static_cast(aMtrFldInfo2.GetValue()) ); - Fraction aFract( aFract1 > aFract2 ? aFract1 : aFract2 ); - - long nValue; - if( aFract < Fraction( 1, 1 ) ) - { - // Fraction umdrehen - aFract1 = aFract; - aFract = Fraction( aFract1.GetDenominator(), aFract1.GetNumerator() ); - nValue = aFract; - - // Swap nominator and denominator - aCbScale.SetText( GetScale( nValue, 1 ) ); - } - else - { - double fValue = aFract; - nValue = aFract; - if( fValue > (double)nValue ) - nValue++; - - // Swap nominator and denominator - aCbScale.SetText( GetScale( 1, nValue ) ); - } - return( 0L ); -} // ----------------------------------------------------------------------- diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index c99e9f7af23e..bc080604b069 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -144,8 +144,6 @@ private: String GetScale( sal_Int32 nX, sal_Int32 nY ); sal_Bool SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ); - DECL_LINK( ModifyScaleHdl, void * ); - DECL_LINK( ModifyOriginalScaleHdl, void * ); DECL_LINK( SelectMetricHdl_Impl, ListBox * ); /** Enable or disable the controls in the compatibility section of the diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/svtools/inc/svtools/editsyntaxhighlighter.hxx index caba30f37e1f..86ab70f4b339 100644 --- a/svtools/inc/svtools/editsyntaxhighlighter.hxx +++ b/svtools/inc/svtools/editsyntaxhighlighter.hxx @@ -52,8 +52,6 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); ~MultiLineEditSyntaxHighlight(); - void EnableBracketHilight(bool aHilight = true); - bool IsBracketHilight(); virtual void UpdateData(); virtual void SetText(const String& rNewText); virtual void SetText( const XubString& rStr, const Selection& rNewSelection ) diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index bc81a96ea142..fb10db55a781 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -53,16 +53,6 @@ MultiLineEditSyntaxHighlight::~MultiLineEditSyntaxHighlight() { } -void MultiLineEditSyntaxHighlight::EnableBracketHilight(bool aHilight) -{ - mbDoBracketHilight = aHilight; -} - -bool MultiLineEditSyntaxHighlight::IsBracketHilight() -{ - return mbDoBracketHilight; -} - void MultiLineEditSyntaxHighlight::SetText(const String& rNewText) { MultiLineEdit::SetText(rNewText); diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index 75303629b64a..0ccda5df85f8 100644 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -278,15 +278,12 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox public: HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True ); - HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True ); virtual void Fill( const XHatchList* pList ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL ); void Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); - void SelectEntryByList( const XHatchList* pList, const String& rStr, - const XHatch& rXHatch, sal_uInt16 nDist = 0 ); private: XHatchList* mpList; @@ -332,8 +329,6 @@ public: void Append( XBitmapEntry* pEntry, Bitmap* pBmp = NULL ); void Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); - void SelectEntryByList( const XBitmapList* pList, const String& rStr, - const Bitmap& rBmp); private: VirtualDevice aVD; @@ -359,16 +354,12 @@ private: void SetVirtualDevice(); public: - FillAttrLB( Window* pParent, ResId Id ); FillAttrLB( Window* pParent, WinBits aWB ); virtual void Fill( const XColorTable* pTab ); virtual void Fill( const XHatchList* pList ); virtual void Fill( const XGradientList* pList ); virtual void Fill( const XBitmapList* pList ); - - void SelectEntryByList( const XBitmapList* pList, const String& rStr, - const Bitmap& rBmp); }; /************************************************************************* @@ -402,8 +393,6 @@ public: void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL ); void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); - void SelectEntryByList( const XDashList* pList, const String& rStr, - const XDash& rDash, sal_uInt16 nDist = 0 ); void FillStyles(); }; diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 88cf28d7f093..34e45837b8b5 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -98,7 +98,6 @@ protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); void ImpSetAttrToGrafInfo(); // Werte vom Pool kopieren - void ImpSetGrafInfoToAttr(); // Werte in den Pool kopieren GraphicAttr aGrafInfo; Rectangle aCropRect; // Wenn aCropRect nicht Empty ist, dann enthaelt es den sichtbaren diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index c9e3373f08ed..1d6404c03dcc 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1031,14 +1031,6 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_Tr EnableUserDraw( mbUserDraw ); } -HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ ) -: ListBox( pParent, aWB ), - mpList ( NULL ), - mbUserDraw( bUserDraw ) -{ - EnableUserDraw( mbUserDraw ); -} - void HatchingLB::Fill( const XHatchList* pList ) { mpList = (XHatchList*)pList; @@ -1128,30 +1120,6 @@ void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) InsertEntry( pEntry->GetName(), nPos ); } -/************************************************************************/ - -void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr, - const XHatch& rHatch, sal_uInt16 nDist ) -{ - long nCount = pList->Count(); - XHatchEntry* pEntry; - sal_Bool bFound = sal_False; - String aStr; - - long i; - for( i = 0; i < nCount && !bFound; i++ ) - { - pEntry = pList->GetHatch( i ); - - aStr = pEntry->GetName(); - - if( rStr == aStr && rHatch == pEntry->GetHatch() ) - bFound = sal_True; - } - if( bFound ) - SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); -} - // Fills the listbox (provisional) with strings void FillAttrLB::Fill( const XHatchList* pList ) @@ -1477,41 +1445,8 @@ void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) InsertEntry( pEntry->GetName() ); } -/************************************************************************/ - -void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, - const Bitmap& ) -{ - long nCount = pList->Count(); - XBitmapEntry* pEntry; - sal_Bool bFound = sal_False; - - long i; - for( i = 0; i < nCount && !bFound; i++ ) - { - pEntry = pList->GetBitmap( i ); - - String aStr = pEntry->GetName(); - - if( rStr == aStr ) - { - bFound = sal_True; - } - } - if( bFound ) - SelectEntryPos( (sal_uInt16) ( i - 1 ) ); -} - // FillAttrLB Constructor -FillAttrLB::FillAttrLB( Window* pParent, ResId Id ) : - ColorListBox( pParent, Id ) -{ - aVD.SetOutputSizePixel( Size( 32, 16 ) ); -} - -/************************************************************************/ - FillAttrLB::FillAttrLB( Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) { @@ -1560,31 +1495,6 @@ void FillAttrLB::Fill( const XBitmapList* pList ) ListBox::SetUpdateMode( sal_True ); } -/************************************************************************/ - -void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, - const Bitmap& /*rBmp*/) -{ - long nCount = pList->Count(); - XBitmapEntry* pEntry; - sal_Bool bFound = sal_False; - - long i; - for( i = 0; i < nCount && !bFound; i++ ) - { - pEntry = pList->GetBitmap( i ); - - String aStr = pEntry->GetName(); - - if( rStr == aStr ) - { - bFound = sal_True; - } - } - if( bFound ) - SelectEntryPos( (sal_uInt16) ( i - 1 ) ); -} - // Fills the listbox (provisional) with strings void FillTypeLB::Fill() @@ -1667,32 +1577,6 @@ void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) InsertEntry( pEntry->GetName(), nPos ); } -/************************************************************************/ - -void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr, - const XDash& rDash, sal_uInt16 nDist ) -{ - long nCount = pList->Count(); - XDashEntry* pEntry; - sal_Bool bFound = sal_False; - String aStr; - XDash aDash; - - long i; - for( i = 0; i < nCount && !bFound; i++ ) - { - pEntry = pList->GetDash( i ); - - aStr = pEntry->GetName(); - aDash = pEntry->GetDash(); - - if( rStr == aStr && rDash == aDash ) - bFound = sal_True; - } - if( bFound ) - SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); -} - // Fills the listbox (provisional) with strings void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart ) diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index d72a8117afaa..2160138c2eb2 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -91,7 +91,7 @@ namespace sdr // #i29367# Update GraphicAttr, too. This was formerly // triggered by SdrGrafObj::Notify, which is no longer // called nowadays. BTW: strictly speaking, the whole - // ImpSetAttrToGrafInfo/ImpSetGrafInfoToAttr stuff could + // ImpSetAttrToGrafInfostuff could // be dumped, when SdrGrafObj::aGrafInfo is removed and // always created on the fly for repaint. rObj.ImpSetAttrToGrafInfo(); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 926e011110be..ff24d2a0fc1b 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1161,22 +1161,6 @@ void SdrGrafObj::ImpSetAttrToGrafInfo() // ----------------------------------------------------------------------------- -void SdrGrafObj::ImpSetGrafInfoToAttr() -{ - SetObjectItem( SdrGrafLuminanceItem( aGrafInfo.GetLuminance() ) ); - SetObjectItem( SdrGrafContrastItem( aGrafInfo.GetContrast() ) ); - SetObjectItem( SdrGrafRedItem( aGrafInfo.GetChannelR() ) ); - SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) ); - SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) ); - SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) ); - SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) ); - SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) ); - SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) ); - SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) ); -} - -// ----------------------------------------------------------------------------- - void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly ) { Size aSize; diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 966f56b594fa..fc0da685e23a 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -823,36 +823,6 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p ) break; case TB_FONT2: pNewItem = new SvxFontItem( FAMILY_SWISS, String( RTL_CONSTASCII_USTRINGPARAM( "Helv" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ); break; -/* - case TB_FONT: - { - FontDialog* pDlg = new FontDialog( this, WB_SVLOOK ); - pDlg->SetPrinter( pPrinter ); - Font aFont = pEditEngine->CreateFontFromItemSet( pEditView->GetAttribs() ); - MapMode aPntMode( MAP_POINT ); - MapMode aCurrent( aViewWin.GetMapMode() ); - Size aSz( aViewWin.LogicToLogic( aFont.GetSize(), &aCurrent, &aPntMode ) ); - aSz.Width() *= 10; - aSz.Height() *= 10; - aFont.SetSize( aSz ); - pDlg->SetSelectFont( aFont ); - if ( pDlg->Execute() ) - { - Font aNewFont( pDlg->GetSelectFont() ); - aSz = aViewWin.LogicToLogic( aNewFont.GetSize(), &aPntMode, &aCurrent ); - aSz.Width() /= 10; - aSz.Height() /= 10; - aNewFont.SetSize( aSz ); - - SfxItemSet aSet( pEditEngine->GetEmptyItemSet() ); - - pEditEngine->SetFontInfoInItemSet( aSet, aNewFont ); - pEditView->SetAttribs( aSet ); - } - delete pDlg; - } - break; -*/ case TB_BOLD: if ( bChecked ) pNewItem = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT); else diff --git a/unusedcode.easy b/unusedcode.easy index 94c3179667a8..6f99d0cb7511 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,10 +1,5 @@ (anonymous namespace)::getState(std::vector > const&) (anonymous namespace)::writeInfo(com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&) -BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const -BitmapLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&) -BitmapPalette::IsGreyPalette() const -BreakPointList::clear() -BreakPointList::push_back(BreakPoint*) BufferNode::childAt(int) const CAT::Inverse() const CAT::makeChromaticAdaptationTag() const @@ -65,9 +60,6 @@ CalendarWrapper::setFirstDayOfWeek(short) CalendarWrapper::setMinimumNumberOfDaysForFirstWeek(short) CertificateContainer::impl_createFactory(com::sun::star::uno::Reference const&) CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence, com::sun::star::uno::Sequence, unsigned char) -CfgStack::Push(CfgStackData*) -CharAttribList::DbgCheckAttribs() -CharAttribList::HasAttrib(unsigned short) const CharClass::isAlpha(String const&) const CharClass::isAlphaNumeric(String const&) const CharClass::isAsciiAlphaNumeric(String const&) @@ -117,12 +109,8 @@ EECharAttribArray::Insert(EECharAttribArray const*, unsigned short, unsigned sho EECharAttribArray::Replace(EECharAttrib const&, unsigned short) EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short) EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(EECharAttrib const&, void*), void*) -EditDbg::GetTextPortionInfo(TextPortionList&) -EditDbg::ShowPortionData(ParaPortion*) -EditEngine::CreateFontFromItemSet(SfxItemSet const&) EditEngine::CursorLeft(ESelection const&, unsigned short) const EditEngine::CursorRight(ESelection const&, unsigned short) const -EditEngine::EnableIdleFormatter(unsigned char) EditEngine::EnablePasteSpecial(unsigned char) EditEngine::EndSpelling() EditEngine::GetAsianCompressionMode() const @@ -138,7 +126,6 @@ EditEngine::IsAddExtLeading() const EditEngine::IsAutoColorEnabled() const EditEngine::IsFirstWordCapitalization() const EditEngine::IsFixedCellHeight() const -EditEngine::IsIdleFormatterEnabled() const EditEngine::IsKernAsianPunctuation() const EditEngine::IsParagraphVisible(unsigned short) EditEngine::IsPasteSpecialEnabled() const @@ -180,8 +167,6 @@ FileStat::FileStat(void const*, void const*) FileStat::IsYounger(FileStat const&) const FileStat::SetDateTime(String const&, DateTime const&) FileStream::FileStream(rtl::OString const&, FileAccessMode) -FillAttrLB::FillAttrLB(Window*, ResId) -FillAttrLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&) FilterConfigItem::WriteString(rtl::OUString const&, rtl::OUString const&) FixedBitmap::GetModeBitmap() const FixedBitmap::SetModeBitmap(Bitmap const&) @@ -246,8 +231,6 @@ HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short) HTMLControls::Remove(HTMLControl const*&, unsigned short) HTMLControls::Remove(unsigned short, unsigned short) Hatch::SetStyle(HatchStyle) -HatchingLB::HatchingLB(Window*, long, unsigned char) -HatchingLB::SelectEntryByList(XHatchList const*, String const&, XHatch const&, unsigned short) HeaderBar::GetItemData(unsigned short) const HeaderBar::GetItemImage(unsigned short) const HeaderBar::InsertItem(unsigned short, Image const&, String const&, long, unsigned short, unsigned short) @@ -308,7 +291,6 @@ KeyboardSettings::CopyData() Line::Enum(Link const&) Line::NearestPoint(Point const&) const LineInfo::isDashDotOrFatLineUsed() const -LineLB::SelectEntryByList(XDashList const*, String const&, XDash const&, unsigned short) LineListBox::GetEntryDistance(unsigned short) const LineListBox::GetEntryLine1(unsigned short) const LineListBox::GetEntryLine2(unsigned short) const @@ -362,8 +344,6 @@ MultiLineEdit::GetLeftMargin() const MultiLineEdit::GetTextLines() const MultiLineEdit::IsFocusSelectionHideEnabled() const MultiLineEdit::IsRightToLeft() const -MultiLineEditSyntaxHighlight::EnableBracketHilight(bool) -MultiLineEditSyntaxHighlight::IsBracketHilight() MultiPropertySetHelper::MultiPropertySetHelper(rtl::OUString const*) MultiSelection::Append(long) MultiSelection::PrevSelected() @@ -403,18 +383,6 @@ OpenStormBento::CBenObject::GetNextProperty(OpenStormBento::CBenProperty*) OpenStormBento::CBenObject::UseSingleValue() OpenStormBento::CBenObject::UseValueWithPropertyName(char const*) OpenStormBento::CBenTOCReader::GetWord(unsigned short*) -OpenStormBento::CBenValue::GetReferencedListID() -OpenStormBento::CBenValue::GetReferencedObject(OpenStormBento::CBenReference*) -OpenStormBento::CBenValue::NewReference(unsigned long, OpenStormBento::CBenReference*) -OpenStormBento::CBenValue::ReadValueDataKnownSize(void*, unsigned long, unsigned long) -OpenStormBento::CBenValue::TruncateValueSize(unsigned long) -OpenStormBento::CBenValue::WriteImmediateValueData(void const*, unsigned short) -OpenStormBento::CUtList::CircularGetNext(OpenStormBento::CUtListElmt const*) -OpenStormBento::CUtList::CircularGetPrev(OpenStormBento::CUtListElmt const*) -OpenStormBento::CUtList::GetCount() -OpenStormBento::CUtList::GetIndex(OpenStormBento::CUtListElmt*) -OpenStormBento::CUtList::GetIndex(int) -OpenStormBento::CUtList::GetPrevOrNULL(OpenStormBento::CUtListElmt*) OutlinerView::AdjustDepth(Paragraph*, short, unsigned char) OutlinerView::AdjustHeight(Paragraph*, long, unsigned char) OutlinerView::Collapse(Paragraph*) @@ -425,7 +393,6 @@ OutlinerView::GetFieldUnderMousePointer(unsigned short&, unsigned short&) const OutlinerView::ImpDragScroll(Point const&) OutlinerView::ImpGetDocPos(Point const&) OutlinerView::ImpGetInsertionPara(Point const&) -OutlinerView::ImpShowDDCursor() OutlinerView::Redo() OutlinerView::RemoveCharAttribs(unsigned long, unsigned short) OutlinerView::SetOutliner(Outliner*) @@ -700,8 +667,6 @@ ScrollableWindow::ScrollableWindow(Window*, ResId const&, unsigned short) ScrollableWindow::SetLineSize(unsigned long, unsigned long) ScrollableWindow::SetVisibleSize(Size const&) SdFilterDetect::impl_createFactory(com::sun::star::uno::Reference const&) -SdTpOptionsMisc::LinkStubModifyOriginalScaleHdl(void*, void*) -SdTpOptionsMisc::LinkStubModifyScaleHdl(void*, void*) SdrCaptionObj::SdrCaptionObj(Rectangle const&) SdrCreateView::ImpDelCreateAttr() SdrCustomShapeDataItem::SdrCustomShapeDataItem(String const&) @@ -714,11 +679,6 @@ SdrDragView::SetRubberEdgeDragging(unsigned char) SdrDragView::SetRubberEdgeDraggingLimit(unsigned short) SdrEditView::MoveLayer(String const&, unsigned short) SdrEngineDefaults::LanguageHasChanged() -SdrEscherImport::CheckMonotypeSorts() const -SdrEscherImport::CheckTimesNewRoman() const -SdrEscherImport::CheckWingdings() const -SdrEscherImport::GetCharSet(unsigned int) const -SdrEscherImport::IsFontAvailable(unsigned int) const SdrExchangeView::CutMarked(unsigned long) SdrExchangeView::GetPastePos(SdrObjList*, OutputDevice*) SdrExchangeView::IsExchangeFormatSupported(unsigned long) const @@ -730,7 +690,6 @@ SdrGlobalData::~SdrGlobalData() SdrGluePoint::Draw(OutputDevice&, SdrObject const*) const SdrGluePoint::Mirror(Point const&, Point const&, SdrObject const*) SdrGrafObj::GetGDIMetaFile() const -SdrGrafObj::ImpSetGrafInfoToAttr() SdrGrafObj::IsGrafAnimationAllowed() const SdrGrafObj::SetFileName(String const&) SdrGrafObj::SetFilterName(String const&) @@ -818,7 +777,6 @@ SdrViewIter::NextPageView() SdrViewIter::NextWindow() SdrViewIter::SdrViewIter(SdrModel const*) SdrVirtObj::SdrVirtObj(SdrObject&, Point const&) -SdwRectangle::GetOriginalRect(Point const&, long, long) SectReprArr::Insert(SectRepr* const&, unsigned short&) SectReprArr::Insert(SectRepr* const*, unsigned short) SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short) @@ -826,7 +784,6 @@ SectReprArr::Remove(SectRepr* const&, unsigned short) SectReprArr::Remove(unsigned short, unsigned short) SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference) SelectionEngine::ActivateDragMode() -ServerFont::TransformPoint(Point const&) const SetOfByte::GetClearBit(unsigned short) const SetOfByte::GetClearCount() const SetOfByte::GetSetBit(unsigned short) const diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 164bc0cbffed..e46fba2de3f5 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -211,7 +211,6 @@ public: int GetGlyphKernValue( int, int ) const; const ImplFontCharMap* GetImplFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities &) const; - Point TransformPoint( const Point& ) const; GlyphData& GetGlyphData( int nGlyphIndex ); const GlyphMetric& GetGlyphMetric( int nGlyphIndex ) diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx index 9a6259fa61eb..c9e462723169 100644 --- a/vcl/inc/vcl/bitmapex.hxx +++ b/vcl/inc/vcl/bitmapex.hxx @@ -95,9 +95,6 @@ public: const Point& rDestPt ) const; void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize ) const; - void Draw( OutputDevice* pOutDev, - const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel ) const; sal_Bool IsTransparent() const; TransparentType GetTransparentType() const { return eTransparent; } diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 2e77b666f8c8..584eacf2c360 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -723,13 +723,6 @@ void BitmapEx::Draw( OutputDevice* pOutDev, // ------------------------------------------------------------------ -void BitmapEx::Draw( OutputDevice* pOutDev, - const Point& rDestPt, const Size& rDestSize, - const Point& rSrcPtPixel, const Size& rSrcSizePixel ) const -{ - pOutDev->DrawBitmapEx( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, *this ); -} - BitmapEx BitmapEx:: AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize) { Point aEmptyPoint(0,0); diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx index 51614966a68d..5322b6502310 100644 --- a/vcl/unx/generic/glyphs/glyphcache.cxx +++ b/vcl/unx/generic/glyphs/glyphcache.cxx @@ -406,20 +406,6 @@ void ServerFont::GarbageCollect( long nMinLruIndex ) } } -// ----------------------------------------------------------------------- - -Point ServerFont::TransformPoint( const Point& rPoint ) const -{ - if( mnCos == 0x10000 ) - return rPoint; - // TODO: use 32x32=>64bit intermediate - const double dCos = mnCos * (1.0 / 0x10000); - const double dSin = mnSin * (1.0 / 0x10000); - long nX = (long)(rPoint.X() * dCos + rPoint.Y() * dSin); - long nY = (long)(rPoint.Y() * dCos - rPoint.X() * dSin); - return Point( nX, nY ); -} - bool ServerFont::IsGlyphInvisible( int nGlyphIndex ) { if (!mbCollectedZW) -- cgit