Kaydet (Commit) e99c70d2 authored tarafından Elton Chung's avatar Elton Chung Kaydeden (comit) Ivan Timofeev

Remove unused code

üst ba5a460b
...@@ -475,7 +475,6 @@ public: ...@@ -475,7 +475,6 @@ public:
bool bSTotal = false, bool bSTotal = false,
bool bTextAsZero = false ); bool bTextAsZero = false );
~ScHorizontalValueIterator(); ~ScHorizontalValueIterator();
void GetCurNumFmtInfo( short& nType, sal_uLong& nIndex );
/// Does NOT reset rValue if no value found! /// Does NOT reset rValue if no value found!
bool GetNext( double& rValue, sal_uInt16& rErr ); bool GetNext( double& rValue, sal_uInt16& rErr );
}; };
......
...@@ -87,7 +87,6 @@ public: ...@@ -87,7 +87,6 @@ public:
* returned. * returned.
*/ */
sal_uLong CheckSourceRange() const; sal_uLong CheckSourceRange() const;
long GetCacheId() const;
private: private:
mutable ScRange maSourceRange; mutable ScRange maSourceRange;
......
...@@ -1908,33 +1908,6 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr ) ...@@ -1908,33 +1908,6 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr )
return bFound; return bFound;
} }
void ScHorizontalValueIterator::GetCurNumFmtInfo( short& nType, sal_uLong& nIndex )
{
if (!bNumValid)
{
const ScColumn* pCol = &(pDoc->maTabs[nCurTab])->aCol[nCurCol];
nNumFmtIndex = pCol->GetNumberFormat( nCurRow );
if ( (nNumFmtIndex % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
{
const ScBaseCell* pCell;
SCSIZE nCurIndex;
if ( pCol->Search( nCurRow, nCurIndex ) )
pCell = pCol->maItems[nCurIndex].pCell;
else
pCell = NULL;
if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA )
((const ScFormulaCell*)pCell)->GetFormatInfo( nNumFmtType, nNumFmtIndex );
else
nNumFmtType = pDoc->GetFormatTable()->GetType( nNumFmtIndex );
}
else
nNumFmtType = pDoc->GetFormatTable()->GetType( nNumFmtIndex );
bNumValid = true;
}
nType = nNumFmtType;
nIndex = nNumFmtIndex;
}
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable,
......
...@@ -325,11 +325,6 @@ const ScDPCache* ScSheetSourceDesc::CreateCache() const ...@@ -325,11 +325,6 @@ const ScDPCache* ScSheetSourceDesc::CreateCache() const
return rCaches.getCache(GetSourceRange()); return rCaches.getCache(GetSourceRange());
} }
long ScSheetSourceDesc::GetCacheId() const
{
return -1;
}
sal_uLong ScSheetSourceDesc::CheckSourceRange() const sal_uLong ScSheetSourceDesc::CheckSourceRange() const
{ {
if (!mpDoc) if (!mpDoc)
......
...@@ -215,22 +215,6 @@ void ScMyStyleRanges::SetStylesToRanges(const list<ScRange>& rRanges, ...@@ -215,22 +215,6 @@ void ScMyStyleRanges::SetStylesToRanges(const list<ScRange>& rRanges,
rImport.SetStyleToRange(*itr, pStyleName, nCellType, pCurrency); rImport.SetStyleToRange(*itr, pStyleName, nCellType, pCurrency);
} }
void ScMyStyleRanges::SetStylesToRanges(ScRangeList* pList,
const rtl::OUString* pStyleName, const sal_Int16 nCellType,
const rtl::OUString* pCurrency, ScXMLImport& rImport)
{
for ( size_t i = 0, nCount = pList->size(); i < nCount; ++i)
rImport.SetStyleToRange( *(*pList)[i], pStyleName, nCellType, pCurrency );
}
void ScMyStyleRanges::SetStylesToRanges(ScRangeListRef xList,
const rtl::OUString* pStyleName, const sal_Int16 nCellType,
const rtl::OUString* pCurrency, ScXMLImport& rImport)
{
for (size_t i = 0, nCount = xList->size(); i < nCount; ++i)
rImport.SetStyleToRange( *(*xList)[i], pStyleName, nCellType, pCurrency );
}
void ScMyStyleRanges::SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport) void ScMyStyleRanges::SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport)
{ {
if (mpNumberList) if (mpNumberList)
......
...@@ -108,12 +108,6 @@ class ScMyStyleRanges : public SvRefBase ...@@ -108,12 +108,6 @@ class ScMyStyleRanges : public SvRefBase
void SetStylesToRanges(const ::std::list<ScRange>& rList, void SetStylesToRanges(const ::std::list<ScRange>& rList,
const rtl::OUString* pStyleName, const sal_Int16 nCellType, const rtl::OUString* pStyleName, const sal_Int16 nCellType,
const rtl::OUString* pCurrency, ScXMLImport& rImport); const rtl::OUString* pCurrency, ScXMLImport& rImport);
void SetStylesToRanges(ScRangeList* pList,
const rtl::OUString* pStyleName, const sal_Int16 nCellType,
const rtl::OUString* pCurrency, ScXMLImport& rImport);
void SetStylesToRanges(ScRangeListRef xList,
const rtl::OUString* pStyleName, const sal_Int16 nCellType,
const rtl::OUString* pCurrency, ScXMLImport& rImport);
public: public:
ScMyStyleRanges(); ScMyStyleRanges();
~ScMyStyleRanges(); ~ScMyStyleRanges();
......
...@@ -607,18 +607,6 @@ ScSubTotalDescriptorBase::~ScSubTotalDescriptorBase() ...@@ -607,18 +607,6 @@ ScSubTotalDescriptorBase::~ScSubTotalDescriptorBase()
{ {
} }
// GetData/PutData hier nur wegen NewInstance-Krempel implementiert...
void ScSubTotalDescriptorBase::GetData( ScSubTotalParam& /* rParam */ ) const
{
OSL_FAIL("ScSubTotalDescriptorBase::GetData soll nicht gerufen werden");
}
void ScSubTotalDescriptorBase::PutData( const ScSubTotalParam& /* rParam */ )
{
OSL_FAIL("ScSubTotalDescriptorBase::PutData soll nicht gerufen werden");
}
// XSubTotalDesctiptor // XSubTotalDesctiptor
ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(sal_uInt16 nIndex) ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(sal_uInt16 nIndex)
......
...@@ -75,8 +75,6 @@ private: ...@@ -75,8 +75,6 @@ private:
public: public:
ScrollableWindow( Window* pParent, WinBits nBits = 0, ScrollableWindow( Window* pParent, WinBits nBits = 0,
ScrollableWindowFlags = SCRWIN_DEFAULT ); ScrollableWindowFlags = SCRWIN_DEFAULT );
ScrollableWindow( Window* pParent, const ResId& rId,
ScrollableWindowFlags = SCRWIN_DEFAULT );
virtual void Resize(); virtual void Resize();
virtual void Command( const CommandEvent& rCEvt ); virtual void Command( const CommandEvent& rCEvt );
...@@ -92,16 +90,11 @@ public: ...@@ -92,16 +90,11 @@ public:
void SetTotalSize( const Size& rNewSize ); void SetTotalSize( const Size& rNewSize );
Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } Size GetTotalSize() { return PixelToLogic( aTotPixSz ); }
void SetVisibleSize( const Size& rNewSize ); sal_Bool MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy = sal_False );
sal_Bool MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy = sal_False );
Rectangle GetVisibleArea() const; Rectangle GetVisibleArea() const;
void SetLineSize( sal_uLong nHorz, sal_uLong nVert );
using Window::Scroll; using Window::Scroll;
virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 );
void ScrollLines( long nLinesX, long nLinesY );
void ScrollPages( long nPagesX, sal_uLong nOverlapX,
long nPagesY, sal_uLong nOverlapY );
private: private:
SVT_DLLPRIVATE Size GetOutputSizePixel() const; SVT_DLLPRIVATE Size GetOutputSizePixel() const;
......
...@@ -60,18 +60,6 @@ ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits, ...@@ -60,18 +60,6 @@ ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits,
ImpInitialize( nFlags ); ImpInitialize( nFlags );
} }
//-------------------------------------------------------------------
ScrollableWindow::ScrollableWindow( Window* pParent, const ResId& rId,
ScrollableWindowFlags nFlags ) :
Window( pParent, rId ),
aVScroll( this, WinBits(WB_VSCROLL | WB_DRAG) ),
aHScroll( this, WinBits(WB_HSCROLL | WB_DRAG) ),
aCornerWin( this )
{
ImpInitialize( nFlags );
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void ScrollableWindow::Command( const CommandEvent& rCEvt ) void ScrollableWindow::Command( const CommandEvent& rCEvt )
...@@ -341,37 +329,6 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize ) ...@@ -341,37 +329,6 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize )
//------------------------------------------------------------------- //-------------------------------------------------------------------
void ScrollableWindow::SetVisibleSize( const Size& rNewSize )
{
// get the rectangle, we wish to view
Rectangle aWish( Point(0, 0), LogicToPixel(rNewSize) );
// get maximum rectangle for us from our parent-window (subst our border!)
Rectangle aMax( Point(0, 0), GetParent()->GetOutputSizePixel() );
aMax.Left() -= ( Window::GetSizePixel().Width() -
Window::GetOutputSizePixel().Width() );
aMax.Bottom() -= (Window::GetSizePixel().Height() -
Window::GetOutputSizePixel().Height());
Size aWill( aWish.GetIntersection(aMax).GetSize() );
sal_Bool bHScroll = sal_False;
const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize();
if ( aWill.Width() < aWish.GetSize().Width() )
{ bHScroll = sal_True;
aWill.Height() =
Min( aWill.Height()+nScrSize, aMax.GetSize().Height() );
}
if ( aWill.Height() < aWish.GetSize().Height() )
aWill.Width() =
Min( aWill.Width()+nScrSize, aMax.GetSize().Width() );
if ( !bHScroll && (aWill.Width() < aWish.GetSize().Width()) )
aWill.Height() =
Min( aWill.Height()+nScrSize, aMax.GetSize().Height() );
Window::SetOutputSizePixel( aWill );
}
//-------------------------------------------------------------------
sal_Bool ScrollableWindow::MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy ) sal_Bool ScrollableWindow::MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy )
{ {
Rectangle aTarget; Rectangle aTarget;
...@@ -464,17 +421,6 @@ Rectangle ScrollableWindow::GetVisibleArea() const ...@@ -464,17 +421,6 @@ Rectangle ScrollableWindow::GetVisibleArea() const
//------------------------------------------------------------------- //-------------------------------------------------------------------
void ScrollableWindow::SetLineSize( sal_uLong nHorz, sal_uLong nVert )
{
Size aPixSz( LogicToPixel( Size(nHorz, nVert) ) );
nColumnPixW = aPixSz.Width();
nLinePixH = aPixSz.Height();
aVScroll.SetLineSize( nLinePixH );
aHScroll.SetLineSize( nColumnPixW );
}
//-------------------------------------------------------------------
void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 ) void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
{ {
if ( !bScrolling ) if ( !bScrolling )
...@@ -550,23 +496,5 @@ void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 ) ...@@ -550,23 +496,5 @@ void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
} }
} }
//-------------------------------------------------------------------
void ScrollableWindow::ScrollLines( long nLinesX, long nLinesY )
{
Size aDelta( PixelToLogic( Size( nColumnPixW, nLinePixH ) ) );
Scroll( aDelta.Width()*nLinesX, aDelta.Height()*nLinesY );
}
//-------------------------------------------------------------------
void ScrollableWindow::ScrollPages( long nPagesX, sal_uLong nOverlapX,
long nPagesY, sal_uLong nOverlapY )
{
Size aOutSz( GetVisibleArea().GetSize() );
Scroll( nPagesX * aOutSz.Width() + (nPagesX>0 ? 1 : -1) * nOverlapX,
nPagesY * aOutSz.Height() + (nPagesY>0 ? 1 : -1) * nOverlapY );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -168,10 +168,7 @@ ScHTMLColOffset::Remove(unsigned long const&, unsigned short) ...@@ -168,10 +168,7 @@ ScHTMLColOffset::Remove(unsigned long const&, unsigned short)
ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short) ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short)
ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short) ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*) ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
ScHorizontalValueIterator::GetCurNumFmtInfo(short&, unsigned long&)
ScMyCellInfo::ScMyCellInfo() 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*) ScNameDefDlg::LinkStubEdModifyHdl(void*, void*)
ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>) ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
...@@ -183,11 +180,8 @@ ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short) ...@@ -183,11 +180,8 @@ ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short) ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*) ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
ScRangeData::ScRangeData(unsigned short) ScRangeData::ScRangeData(unsigned short)
ScSheetSourceDesc::GetCacheId() const
ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
ScStringCell::ScStringCell() ScStringCell::ScStringCell()
ScSubTotalDescriptorBase::GetData(ScSubTotalParam&) const
ScSubTotalDescriptorBase::PutData(ScSubTotalParam const&)
ScUserList::end() ScUserList::end()
ScUserList::end() const ScUserList::end() const
ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&) ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
...@@ -196,22 +190,15 @@ ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short ...@@ -196,22 +190,15 @@ ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short
ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short) ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
ScValidationEntries_Impl::Remove(unsigned short, unsigned short) ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
ScValueCell::ScValueCell() ScValueCell::ScValueCell()
ScVbaColorFormat::setColorFormat(short)
ScVbaFormat<ooo::vba::excel::XRange>::getXServiceInfo() ScVbaFormat<ooo::vba::excel::XRange>::getXServiceInfo()
ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo() ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
ScVbaLineFormat::calculateArrowheadSize() const
ScaList::Insert(void*, unsigned int) ScaList::Insert(void*, unsigned int)
ScrollBarBox::ScrollBarBox(Window*, ResId const&) ScrollBarBox::ScrollBarBox(Window*, ResId const&)
ScrollableWindow::MakeVisible(Rectangle const&, unsigned char) ScrollableWindow::MakeVisible(Rectangle const&, unsigned char)
ScrollableWindow::ScrollLines(long, long)
ScrollableWindow::ScrollPages(long, unsigned long, long, unsigned long)
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<com::sun::star::lang::XMultiServiceFactory> const&) SdFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
SectReprArr::Insert(SectRepr* const&, unsigned short&) SectReprArr::Insert(SectRepr* const&, unsigned short&)
SectReprArr::Insert(SectRepr* const*, unsigned short) SectReprArr::Insert(SectRepr* const*, unsigned short)
......
...@@ -63,12 +63,6 @@ ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xP ...@@ -63,12 +63,6 @@ ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xP
} }
} }
void
ScVbaColorFormat::setColorFormat( sal_Int16 _ntype )
{
m_nColorFormatType = _ntype;
}
// Attribute // Attribute
sal_Int32 SAL_CALL sal_Int32 SAL_CALL
ScVbaColorFormat::getRGB() throw (uno::RuntimeException) ScVbaColorFormat::getRGB() throw (uno::RuntimeException)
......
...@@ -111,7 +111,6 @@ private: ...@@ -111,7 +111,6 @@ private:
protected: protected:
virtual rtl::OUString& getServiceImplName(); virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames(); virtual css::uno::Sequence<rtl::OUString> getServiceNames();
void setColorFormat( sal_Int16 nType );
public: public:
ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType ); ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType );
......
...@@ -44,12 +44,6 @@ ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& ...@@ -44,12 +44,6 @@ ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >&
m_nLineWeight = 1; m_nLineWeight = 1;
} }
sal_Int32
ScVbaLineFormat::calculateArrowheadSize() const
{
return 0;
}
sal_Int32 sal_Int32
ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName ) ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName )
{ {
......
...@@ -47,7 +47,6 @@ protected: ...@@ -47,7 +47,6 @@ protected:
virtual css::uno::Sequence<rtl::OUString> getServiceNames(); virtual css::uno::Sequence<rtl::OUString> getServiceNames();
sal_Int32 convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName ); sal_Int32 convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName );
rtl::OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException); rtl::OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException);
sal_Int32 calculateArrowheadSize() const;
public: public:
ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape ); ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment