mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused methods

Browse Source
This commit is contained in:
Thomas Arnhold
2012-01-17 15:28:11 +01:00
parent 3c8478e26b
commit 804e86170f
23 changed files with 0 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sc/inc/cell.hxx
View File

@@ -454,7 +454,6 @@ public:
void UpdateRenameTab(SCTAB nTable, const String& rName);
bool TestTabRefAbs(SCTAB nTable);
void UpdateCompile( bool bForceIfNameInUse = false );
bool IsRangeNameInUse(sal_uInt16 nIndex) const;
void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const;
void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap );
bool IsSubTotal() const { return bSubTotal; }

1
sc/inc/document.hxx
View File

@@ -576,7 +576,6 @@ public:
static SC_DLLPUBLIC bool ValidTabName( const rtl::OUString& rName );
SC_DLLPUBLIC bool ValidNewTabName( const rtl::OUString& rName ) const;
SC_DLLPUBLIC bool ValidNewTabName( const std::vector<rtl::OUString>& rName ) const;
SC_DLLPUBLIC void CreateValidTabName(rtl::OUString& rName) const;
SC_DLLPUBLIC void CreateValidTabNames(std::vector<rtl::OUString>& aNames, SCTAB nCount) const;

26
sc/source/core/data/cell2.cxx
View File

@@ -1534,32 +1534,6 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
StartListeningTo( pDocument ); // Listener wie vorher
}
bool lcl_IsRangeNameInUse(size_t nIndex, ScTokenArray* pCode, ScRangeName* pNames)
{
for (FormulaToken* p = pCode->First(); p; p = pCode->Next())
{
if (p->GetOpCode() == ocName)
{
if (p->GetIndex() == static_cast<sal_uInt16>(nIndex))
return true;
else
{
// RangeData kann Null sein in bestimmten Excel-Dateien
ScRangeData* pSubName = pNames->findByIndex(p->GetIndex());
if (pSubName && lcl_IsRangeNameInUse(nIndex,
pSubName->GetCode(), pNames))
return true;
}
}
}
return false;
}
bool ScFormulaCell::IsRangeNameInUse(sal_uInt16 nIndex) const
{
return lcl_IsRangeNameInUse( nIndex, pCode, pDocument->GetRangeName() );
}
void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames)
{
for (FormulaToken* p = pCode->First(); p; p = pCode->Next())

23
sc/source/core/data/document.cxx
View File

@@ -302,29 +302,6 @@ bool ScDocument::ValidNewTabName( const rtl::OUString& rName ) const
}
bool ScDocument::ValidNewTabName( const std::vector<rtl::OUString>& rNames ) const//TODO:FIXME what is if there are duplicates in rNames
{
bool bValid = true;
std::vector<rtl::OUString>::const_iterator nameIter = rNames.begin();
for (;nameIter != rNames.end() && bValid; ++nameIter)
{
bValid = ValidTabName(*nameIter);
}
TableContainer::const_iterator it = maTabs.begin();
for (; it != maTabs.end() && bValid; ++it)
if ( *it )
{
for (nameIter = rNames.begin(); nameIter != rNames.end(); ++nameIter)
{
rtl::OUString aOldName;
(*it)->GetName(aOldName);
bValid = !ScGlobal::GetpTransliteration()->isEqual( *nameIter, aOldName );
}
}
return bValid;
}
void ScDocument::CreateValidTabName(rtl::OUString& rName) const
{
if ( !ValidTabName(rName) )

11
sc/source/core/tool/scmatrix.cxx
View File

@@ -188,7 +188,6 @@ public:
void GetDimensions( SCSIZE& rC, SCSIZE& rR) const;
SCSIZE GetElementCount() const;
bool ValidColRow( SCSIZE nC, SCSIZE nR) const;
SCSIZE CalcOffset( SCSIZE nC, SCSIZE nR) const;
bool ValidColRowReplicated( SCSIZE & rC, SCSIZE & rR ) const;
bool ValidColRowOrReplicated( SCSIZE & rC, SCSIZE & rR ) const;
void SetErrorAtInterpreter( sal_uInt16 nError ) const;
@@ -300,11 +299,6 @@ bool ScMatrixImpl::ValidColRow( SCSIZE nC, SCSIZE nR) const
return nR < aDims.first && nC < aDims.second;
}
SCSIZE ScMatrixImpl::CalcOffset( SCSIZE nC, SCSIZE nR) const
{
return nC * maMat.size().first + nR;
}
bool ScMatrixImpl::ValidColRowReplicated( SCSIZE & rC, SCSIZE & rR ) const
{
pair<size_t, size_t> aDims = maMat.size();
@@ -997,11 +991,6 @@ bool ScMatrix::ValidColRow( SCSIZE nC, SCSIZE nR) const
return pImpl->ValidColRow(nC, nR);
}
SCSIZE ScMatrix::CalcOffset( SCSIZE nC, SCSIZE nR) const
{
return pImpl->CalcOffset(nC, nR);
}
bool ScMatrix::ValidColRowReplicated( SCSIZE & rC, SCSIZE & rR ) const
{
return pImpl->ValidColRowReplicated(rC, rR);

1
sc/source/ui/inc/namedlg.hxx
View File

@@ -106,7 +106,6 @@ private:
void UpdateChecks(ScRangeData* pData);
void ShowOptions(const ScRangeNameLine& rLine);
void UpdateNames();
void CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData );
bool IsNameValid();
bool IsFormulaValid();

14
sc/source/ui/namedlg/namedlg.cxx
View File

@@ -328,20 +328,6 @@ ScRangeName* ScNameDlg::GetRangeName(const rtl::OUString& rScope)
return maRangeMap.find(rScope)->second;
}
void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData )
{
if ( pRangeData )
{
rtl::OUStringBuffer sBuffer;
pRangeData->UpdateSymbol( sBuffer, maCursorPos );
aAssign = sBuffer.makeStringAndClear();
}
else
{
aAssign.Erase();
}
}
void ScNameDlg::ShowOptions(const ScRangeNameLine& rLine)
{
ScRangeName* pRangeName = GetRangeName(rLine.aScope);

12
sc/source/ui/vba/vbachart.cxx
View File

@@ -1061,18 +1061,6 @@ ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw( script::BasicError
return bret;
}
bool
ScVbaChart::areIndicesValid( sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( css::script::BasicErrorException )
{
if (isSeriesIndexValid(_seriesindex))
{
uno::Reference< chart::XChartDataArray > xChartDataArray( mxChartDocument->getData(), uno::UNO_QUERY_THROW );
dblValues = xChartDataArray->getData();
return (_valindex < dblValues[_seriesindex].getLength() );
}
return false;
}
uno::Reference< beans::XPropertySet >
ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException )

1
sc/source/ui/vba/vbachart.hxx
View File

@@ -75,7 +75,6 @@ public:
// Non-interface
css::uno::Reference< css::beans::XPropertySet > xDiagramPropertySet() const { return mxDiagramPropertySet; }
bool isSeriesIndexValid(sal_Int32 _seriesindex) throw( css::script::BasicErrorException );
bool areIndicesValid(sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( css::script::BasicErrorException );
bool is3D() throw ( css::uno::RuntimeException );
css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException );
// Methods

11
sfx2/source/appl/appuno.cxx
View File

@@ -2326,7 +2326,6 @@ class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< ::com::sun::sta
public:
NotifyBrokenPackage_Impl( ::rtl::OUString aName );
sal_Bool isAborted();
virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations()
throw( ::com::sun::star::uno::RuntimeException );
@@ -2345,11 +2344,6 @@ NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName )
m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort );
}
sal_Bool NotifyBrokenPackage_Impl::isAborted()
{
return m_pAbort->wasSelected();
}
::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage_Impl::getRequest()
throw( ::com::sun::star::uno::RuntimeException )
{
@@ -2374,11 +2368,6 @@ NotifyBrokenPackage::~NotifyBrokenPackage()
pImp->release();
}
sal_Bool NotifyBrokenPackage::isAborted()
{
return pImp->isAborted();
}
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > NotifyBrokenPackage::GetRequest()
{
return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);

1
tools/inc/tools/datetime.hxx
View File

@@ -82,7 +82,6 @@ public:
sal_Bool operator <=( const DateTime& rDateTime ) const;
long GetSecFromDateTime( const Date& rDate ) const;
void MakeDateTimeFromSec( const Date& rDate, sal_uIntPtr nSec );
void ConvertToUTC() { *this -= Time::GetUTCOffset(); }
void ConvertToLocalTime() { *this += Time::GetUTCOffset(); }

4
tools/inc/tools/line.hxx
View File

@@ -67,10 +67,6 @@ public:
double GetDistance( const double& rPtX, const double& rPtY ) const;
double GetDistance( const Point& rPoint ) const { return( GetDistance( rPoint.X(), rPoint.Y() ) ); }
Point NearestPoint( const Point& rPoint ) const;
void Enum( const Link& rEnumLink );
};
#endif // _SV_LINE_HXX

17
tools/source/datetime/datetime.cxx
View File

@@ -126,23 +126,6 @@ long DateTime::GetSecFromDateTime( const Date& rDate ) const
}
}
/*************************************************************************
|*
|* DateTime::GetSecFromDateTime()
|*
*************************************************************************/
void DateTime::MakeDateTimeFromSec( const Date& rDate, sal_uIntPtr nSec )
{
long nDays = nSec / (24UL*60*60);
((Date*)this)->operator=( rDate );
nSec -= nDays * (24UL*60*60);
sal_uInt16 nMin = (sal_uInt16)(nSec / 60);
nSec -= nMin * 60;
((Time*)this)->operator=( Time( 0, nMin, (sal_uInt16)nSec ) );
operator+=( nDays );
}
/*************************************************************************
|*
|* DateTime::operator +=()

147
tools/source/generic/line.cxx
View File

@@ -177,36 +177,6 @@ sal_Bool Line::Intersection( const Rectangle& rRect, Line& rIntersection ) const
// ------------------------------------------------------------------------
Point Line::NearestPoint( const Point& rPoint ) const
{
Point aRetPt;
if ( maStart != maEnd )
{
const double fDistX = maEnd.X() - maStart.X();
const double fDistY = maStart.Y() - maEnd.Y();
const double fTau = ( ( maStart.Y() - rPoint.Y() ) * fDistY -
( maStart.X() - rPoint.X() ) * fDistX ) /
( fDistX * fDistX + fDistY * fDistY );
if( fTau < 0.0 )
aRetPt = maStart;
else if( fTau <= 1.0 )
{
aRetPt.X() = FRound( maStart.X() + fTau * fDistX );
aRetPt.Y() = FRound( maStart.Y() - fTau * fDistY );
}
else
aRetPt = maEnd;
}
else
aRetPt = maStart;
return aRetPt;
}
// ------------------------------------------------------------------------
double Line::GetDistance( const double& rPtX, const double& rPtY ) const
{
double fDist;
@@ -244,121 +214,4 @@ double Line::GetDistance( const double& rPtX, const double& rPtY ) const
return fDist;
}
// ------------------------------------------------------------------------
void Line::Enum( const Link& rEnumLink )
{
DBG_ASSERT( rEnumLink.IsSet(), "This call doesn't make any sense with !rEnumLink.IsSet()" );
Point aEnum;
long nX;
long nY;
if( maStart.X() == maEnd.X() )
{
const long nEndY = maEnd.Y();
nX = maStart.X();
nY = maStart.Y();
if( nEndY > nY )
{
while( nY <= nEndY )
{
aEnum.X() = nX;
aEnum.Y() = nY++;
rEnumLink.Call( &aEnum );
}
}
else
{
while( nY >= nEndY )
{
aEnum.X() = nX;
aEnum.Y() = nY--;
rEnumLink.Call( &aEnum );
}
}
}
else if( maStart.Y() == maEnd.Y() )
{
const long nEndX = maEnd.X();
nX = maStart.X();
nY = maStart.Y();
if( nEndX > nX )
{
while( nX <= nEndX )
{
aEnum.X() = nX++;
aEnum.Y() = nY;
rEnumLink.Call( &aEnum );
}
}
else
{
while( nX >= nEndX )
{
aEnum.X() = nX--;
aEnum.Y() = nY;
rEnumLink.Call( &aEnum );
}
}
}
else
{
const long nDX = labs( maEnd.X() - maStart.X() );
const long nDY = labs( maEnd.Y() - maStart.Y() );
const long nStartX = maStart.X();
const long nStartY = maStart.Y();
const long nEndX = maEnd.X();
const long nEndY = maEnd.Y();
const long nXInc = ( nStartX < nEndX ) ? 1L : -1L;
const long nYInc = ( nStartY < nEndY ) ? 1L : -1L;
if( nDX >= nDY )
{
const long nDYX = ( nDY - nDX ) << 1;
const long nDY2 = nDY << 1;
long nD = nDY2 - nDX;
for( nX = nStartX, nY = nStartY; nX != nEndX; nX += nXInc )
{
aEnum.X() = nX;
aEnum.Y() = nY;
rEnumLink.Call( &aEnum );
if( nD < 0L )
nD += nDY2;
else
nD += nDYX, nY += nYInc;
}
}
else
{
const long nDYX = ( nDX - nDY ) << 1;
const long nDY2 = nDX << 1;
long nD = nDY2 - nDY;
for( nX = nStartX, nY = nStartY; nY != nEndY; nY += nYInc )
{
aEnum.X() = nX;
aEnum.Y() = nY;
rEnumLink.Call( &aEnum );
if( nD < 0L )
nD += nDY2;
else
nD += nDYX, nX += nXInc;
}
}
// last point
aEnum.X() = nEndX;
aEnum.Y() = nEndY;
rEnumLink.Call( &aEnum );
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

15
unusedcode.easy
View File

@@ -58,7 +58,6 @@ CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int con
Color::IncreaseContrast(unsigned char)
CurrencyField::ImplLoadRes(ResId const&)
CustomToolBarImportHelper::showToolbar(rtl::OUString const&)
DateTime::MakeDateTimeFromSec(Date const&, unsigned long)
DdeGetPutItem::DdeGetPutItem(DdeItem const&)
DdeService::AddFormat(unsigned long)
DdeService::AddTopic(DdeTopic const&)
@@ -71,9 +70,6 @@ DirEntry::GetDevice() const
EditView::GetSelectionMode() const
EditView::SetCursor(Cursor const&)
EditView::SetPointer(Pointer const&)
ElementCollector::isAbleToNotify() const
ElementCollector::setSecurityId(int)
ExtraKernInfo::HasKernPairs() const
FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const&)
FileList::GetFormat()
@@ -104,8 +100,6 @@ HTMLControls::Remove(HTMLControl const*&, unsigned short)
HTMLControls::Remove(unsigned short, unsigned short)
Hatch::SetStyle(HatchStyle)
ImageButton::ImageButton(unsigned short)
ImageList::AddImage(unsigned short, Image const&)
ImageList::ReplaceImage(unsigned short, unsigned short)
ImageMap::GetBoundRect() const
ImpSvMEdit::SetInsertMode(unsigned char)
ImpSvtData::~ImpSvtData()
@@ -119,9 +113,6 @@ InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
ItemList::FindAttrib(unsigned short)
KeyboardSettings::CopyData()
Line::Enum(Link const&)
Line::NearestPoint(Point const&) const
LineInfo::isDashDotOrFatLineUsed() const
LineListBox::GetEntryDistance(unsigned short) const
LineListBox::GetEntryLine1(unsigned short) const
LineListBox::GetEntryLine2(unsigned short) const
@@ -163,7 +154,6 @@ NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const&, short) c
NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const&)
NfCurrencyEntry::NfCurrencyEntry()
NotificationSettings::CopyData()
NotifyBrokenPackage::isAborted()
NumberFormatCodeWrapper::getDefault(short, short) const
NumericBox::GetValue(unsigned short) const
NumericBox::GetValuePos(long) const
@@ -256,9 +246,7 @@ ScDPFieldControlBase::SetSelectedField(unsigned long)
ScDdeLink::ResetValue()
ScDocRowHeightUpdater::TabRanges::TabRanges()
ScDocument::SetAllTabRangeNames(std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&)
ScDocument::ValidNewTabName(std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) const
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ScFormulaCell::IsRangeNameInUse(unsigned short) const
ScFormulaCell::ScFormulaCell()
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
@@ -270,12 +258,10 @@ ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(
ScHorizontalValueIterator::GetCurNumFmtInfo(short&, unsigned long&)
ScLeftFooterEditPage::GetRanges()
ScLeftHeaderEditPage::GetRanges()
ScMatrix::CalcOffset(unsigned long, unsigned long) const
ScMyCellInfo::ScMyCellInfo()
ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
ScNameDefDlg::LinkStubEdModifyHdl(void*, void*)
ScNameDlg::CalcCurTableAssign(String&, ScRangeData*)
ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const&, formula::FormulaGrammar::Grammar)
ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
@@ -302,7 +288,6 @@ ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short
ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
ScValueCell::ScValueCell()
ScVbaChart::areIndicesValid(int, int)
ScVbaColorFormat::setColorFormat(short)
ScVbaCommandBarControl::ScVbaCommandBarControl(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, boost::shared_ptr<VbaCommandBarHelper>, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, rtl::OUString const&, int, unsigned char)
ScVbaCommentShape::ScVbaCommentShape(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::uno::Reference<ooo::vba::excel::XComment> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, int)

9
vcl/generic/glyphs/glyphcache.cxx
View File

@@ -438,15 +438,6 @@ ExtraKernInfo::ExtraKernInfo( sal_IntPtr nFontId )
//--------------------------------------------------------------------------
bool ExtraKernInfo::HasKernPairs() const
{
if( !mbInitialized )
Initialize();
return !maUnicodeKernPairs.empty();
}
//--------------------------------------------------------------------------
int ExtraKernInfo::GetUnscaledKernPairs( ImplKernPairData** ppKernPairs ) const
{
if( !mbInitialized )

1
vcl/inc/generic/glyphcache.hxx
View File

@@ -400,7 +400,6 @@ public:
ExtraKernInfo( sal_IntPtr nFontId );
virtual ~ExtraKernInfo() {}
bool HasKernPairs() const;
int GetUnscaledKernPairs( ImplKernPairData** ) const;
int GetUnscaledKernValue( sal_Unicode cLeft, sal_Unicode cRight ) const;

2
vcl/inc/vcl/image.hxx
View File

@@ -127,11 +127,9 @@ public:
sal_uInt16 GetImageCount() const;
Size GetImageSize() const;
void AddImage( sal_uInt16 nNewId, const Image& rImage );
void AddImage( const ::rtl::OUString& rImageName, const Image& rImage );
void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage );
void ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId );
void RemoveImage( sal_uInt16 nId );

3
vcl/inc/vcl/lineinfo.hxx
View File

@@ -118,9 +118,6 @@ public:
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo );
friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo );
// helper to check if line width or DashDot is used
bool isDashDotOrFatLineUsed() const;
// helper to get decomposed polygon data with the LineInfo applied. The source
// hairline polygon is given in io_rLinePolyPolygon. Both given polygons may
// contain results; e.g. when no fat line but DasDot is defined, the resut will

35
vcl/source/gdi/image.cxx
View File

@@ -582,23 +582,6 @@ sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const
// -----------------------------------------------------------------------
void ImageList::AddImage( sal_uInt16 nId, const Image& rImage )
{
DBG_CHKTHIS( ImageList, NULL );
DBG_CHKOBJ( &rImage, Image, NULL );
DBG_ASSERT( nId, "ImageList::AddImage(): ImageId == 0" );
DBG_ASSERT( GetImagePos( nId ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageId already exists" );
DBG_ASSERT( rImage.mpImplData, "ImageList::AddImage(): Wrong Size" );
DBG_ASSERT( !mpImplData || (rImage.GetSizePixel() == mpImplData->maImageSize), "ImageList::AddImage(): Wrong Size" );
if( !mpImplData )
ImplInit( 0, rImage.GetSizePixel() );
mpImplData->AddImage( rtl::OUString(), nId, rImage.GetBitmapEx());
}
// -----------------------------------------------------------------------
void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage )
{
DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" );
@@ -628,24 +611,6 @@ void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rI
// -----------------------------------------------------------------------
void ImageList::ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId )
{
DBG_CHKTHIS( ImageList, NULL );
DBG_ASSERT( GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND, "ImageList::ReplaceImage(): Unknown nId" );
DBG_ASSERT( GetImagePos( nReplaceId ) != IMAGELIST_IMAGE_NOTFOUND, "ImageList::ReplaceImage(): Unknown nReplaceId" );
sal_uLong nPosDest = GetImagePos( nId );
sal_uLong nPosSrc = GetImagePos( nReplaceId );
if( nPosDest != IMAGELIST_IMAGE_NOTFOUND &&
nPosSrc != IMAGELIST_IMAGE_NOTFOUND )
{
ImplMakeUnique();
mpImplData->maImages[nPosDest] = mpImplData->maImages[nPosSrc];
}
}
// -----------------------------------------------------------------------
void ImageList::RemoveImage( sal_uInt16 nId )
{
DBG_CHKTHIS( ImageList, NULL );

7
vcl/source/gdi/lineinfo.cxx
View File

@@ -294,13 +294,6 @@ SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo )
// -----------------------------------------------------------------------
bool LineInfo::isDashDotOrFatLineUsed() const
{
return (LINE_DASH == GetStyle() || GetWidth() > 1);
}
// -----------------------------------------------------------------------
void LineInfo::applyToB2DPolyPolygon(
basegfx::B2DPolyPolygon& io_rLinePolyPolygon,
basegfx::B2DPolyPolygon& o_rFillPolyPolygon) const

32
xmlsecurity/source/framework/elementcollector.cxx
View File

@@ -126,11 +126,6 @@ void ElementCollector::notifyListener()
doNotify();
}
bool ElementCollector::isAbleToNotify() const
{
return m_bAbleToNotify;
}
void ElementCollector::setReferenceResolvedListener(
const cssu::Reference< cssxc::sax::XReferenceResolvedListener >& xReferenceResolvedListener)
/****** ElementCollector/setReferenceResolvedListener *************************
@@ -160,33 +155,6 @@ void ElementCollector::setReferenceResolvedListener(
doNotify();
}
void ElementCollector::setSecurityId(sal_Int32 nSecurityId)
/****** ElementCollector/setSecurityId ****************************************
*
* NAME
* setSecurityId -- configures the security Id of the buffer node
*
* SYNOPSIS
* setSecurityId(nSecurityId);
*
* FUNCTION
* configures the security Id and try to notify then
*
* INPUTS
* nSecurityId - the security Id
*
* RESULT
* empty
*
* AUTHOR
* Michael Mi
* Email: michael.mi@sun.com
******************************************************************************/
{
m_nSecurityId = nSecurityId;
doNotify();
}
void ElementCollector::doNotify()
/****** ElementCollector/doNotify *********************************************
*

2
xmlsecurity/source/framework/elementcollector.hxx
View File

@@ -89,12 +89,10 @@ public:
com::sun::star::xml::crypto::sax::ElementMarkPriority getPriority() const;
bool getModify() const;
void notifyListener();
bool isAbleToNotify() const;
void setReferenceResolvedListener(
const com::sun::star::uno::Reference<
com::sun::star::xml::crypto::sax::XReferenceResolvedListener >&
referenceResolvedListener);
void setSecurityId(sal_Int32 nSecurityId);
void doNotify();
ElementCollector* clone(
sal_Int32 nId,