diff options
-rw-r--r-- | basic/inc/basic/sbxcore.hxx | 1 | ||||
-rw-r--r-- | basic/source/sbx/sbxbase.cxx | 7 | ||||
-rw-r--r-- | sc/inc/column.hxx | 4 | ||||
-rw-r--r-- | sc/inc/externalrefmgr.hxx | 6 | ||||
-rw-r--r-- | sc/source/core/data/column.cxx | 13 | ||||
-rw-r--r-- | sc/source/core/data/column2.cxx | 26 | ||||
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 28 | ||||
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/inc/docfunc.hxx | 11 | ||||
-rw-r--r-- | unusedcode.easy | 54 |
10 files changed, 43 insertions, 117 deletions
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx index fa3c576d6dff..3d425353e482 100644 --- a/basic/inc/basic/sbxcore.hxx +++ b/basic/inc/basic/sbxcore.hxx @@ -135,7 +135,6 @@ public: static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX ); static SbxObject* CreateObject( const String& ); // Sbx solution as replacement for SfxBroadcaster::Enable() - static void StaticEnableBroadcasting( sal_Bool bEnable ); static sal_Bool StaticIsEnabledBroadcasting( void ); }; diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 79c593e1c48e..718fa0eaafce 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -248,18 +248,11 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass ) static sal_Bool bStaticEnableBroadcasting = sal_True; -// Sbx-Solution in exchange for SfxBroadcaster::Enable() -void SbxBase::StaticEnableBroadcasting( sal_Bool bEnable ) -{ - bStaticEnableBroadcasting = bEnable; -} - sal_Bool SbxBase::StaticIsEnabledBroadcasting( void ) { return bStaticEnableBroadcasting; } - SbxBase* SbxBase::Load( SvStream& rStrm ) { sal_uInt16 nSbxId, nFlags, nVer; diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 7e21ba884740..5daecd57ad48 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -300,7 +300,6 @@ public: void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); void SetTabNo(SCTAB nNewTab); - bool IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const; void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const; void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap ); @@ -375,9 +374,6 @@ public: double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart ); -private: - long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev, - bool bWidth ); public: /// Including current, may return -1 diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 7de8232f0958..15d5b924b5c2 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -529,12 +529,6 @@ public: void setAllCacheTableReferencedStati( bool bReferenced ); /** - * Set a table as permanently referenced, to be called if not in - * mark-during-store-to-file cycle. - */ - void setCacheTableReferencedPermanently( sal_uInt16 nFileId, const ::rtl::OUString& rTabName, size_t nSheets ); - - /** * @returns <TRUE/> if setAllCacheTableReferencedStati(false) was called, * <FALSE/> if setAllCacheTableReferencedStati(true) was called. */ diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index fc1178f4a622..df3276b1aa4f 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1852,19 +1852,6 @@ void ScColumn::SetTabNo(SCTAB nNewTab) } } - -bool ScColumn::IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const -{ - bool bInUse = false; - if (pItems) - for (SCSIZE i = 0; !bInUse && (i < nCount); i++) - if ((pItems[i].nRow >= nRow1) && - (pItems[i].nRow <= nRow2) && - (pItems[i].pCell->GetCellType() == CELLTYPE_FORMULA)) - bInUse = ((ScFormulaCell*)pItems[i].pCell)->IsRangeNameInUse(nIndex); - return bInUse; -} - void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const { if (pItems) diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 83ecd3cc1036..ccd73db32a37 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -524,32 +524,6 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, return nValue; } -long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev, - bool bWidth ) -{ - long nValue=0; - if ( nIndex < nCount ) - { - SCROW nRow = pItems[nIndex].nRow; - const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow ); - ScBaseCell* pCell = pItems[nIndex].pCell; - String aValStr; - Color* pColor; - SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); - sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter ); - ScCellFormat::GetString( pCell, nFormat, aValStr, &pColor, - *pFormatter, true, false, ftCheck ); - if ( aValStr.Len() ) - { - if ( bWidth ) - nValue = pDev->GetTextWidth( aValStr ); - else - nValue = pDev->GetTextHeight(); - } - } - return nValue; -} - sal_uInt16 ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, bool bFormula, sal_uInt16 nOldWidth, diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index f218b8b0ac21..e8be035e8699 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -4481,34 +4481,6 @@ bool ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, SCTAB nTab ) return SetNewRangeNames( new ScRangeName(rNewRanges), true, nTab ); } -void ScDocFunc::ModifyAllRangeNames( const ScRangeName* pGlobal, const ScRangeName::TabNameCopyMap& rTabs ) -{ - ScDocShellModificator aModificator(rDocShell); - ScDocument* pDoc = rDocShell.GetDocument(); - - if (pDoc->IsUndoEnabled()) - { - ScRangeName* pOldGlobal = pDoc->GetRangeName(); - ScRangeName::TabNameCopyMap aOldLocals; - pDoc->GetAllTabRangeNames(aOldLocals); - rDocShell.GetUndoManager()->AddUndoAction( - new ScUndoAllRangeNames(&rDocShell, pOldGlobal, pGlobal, aOldLocals, rTabs)); - } - - pDoc->CompileNameFormula(true); - - // global names - pDoc->SetRangeName(new ScRangeName(*pGlobal)); - - // sheet-local names - pDoc->SetAllTabRangeNames(rTabs); - - pDoc->CompileNameFormula(false); - - aModificator.SetDocumentModified(); - SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED)); -} - bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc, SCTAB nTab ) // takes ownership of pNewRanges { ScDocShellModificator aModificator( rDocShell ); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 408feb6d6fb5..6f6e64e58dd0 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1637,16 +1637,6 @@ bool ScExternalRefManager::setCacheTableReferenced( sal_uInt16 nFileId, const OU return maRefCache.setCacheTableReferenced( nFileId, rTabName, nSheets, false); } -void ScExternalRefManager::setCacheTableReferencedPermanently( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets ) -{ - if (isInReferenceMarking()) - // Do all maintenance work. - maRefCache.setCacheTableReferenced( nFileId, rTabName, nSheets, true); - else - // Set only the permanent flag. - maRefCache.setCacheTableReferencedPermanently( nFileId, rTabName, nSheets); -} - void ScExternalRefManager::setAllCacheTableReferencedStati( bool bReferenced ) { mbInReferenceMarking = !bReferenced; diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index ec5925afd172..972ed945b988 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -185,17 +185,6 @@ public: bool SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc = true, SCTAB nTab = -1 ); // takes ownership of pNewRanges //nTab = -1 for local range names bool ModifyRangeNames( const ScRangeName& rNewRanges, SCTAB nTab = -1 ); - /** - * Modify all range names, global scope names as well as sheet local ones, - * in one go. Note that this method will <b>not</b> destroy the instances - * passed as arguments (it creates copies); the caller is responsible for - * destroying them. - * - * @param pGlobal global scope range names. - * @param rTabs sheet local range names. - */ - void ModifyAllRangeNames( const ScRangeName* pGlobal, const ScRangeName::TabNameCopyMap& rTabs ); - sal_Bool CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi, SCTAB nTab = -1 ); // -1 for global range names sal_Bool InsertNameList( const ScAddress& rStartPos, sal_Bool bApi ); diff --git a/unusedcode.easy b/unusedcode.easy index c041ca09f861..50f9025678ad 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -7,11 +7,51 @@ AtomPubSession::~AtomPubSession() BufferNode::childAt(int) const ByteString::Assign(char const*, unsigned short) ByteString::Assign(char) +CAT::Apply(float*, float const*) const CAT::Inverse() const CAT::makeChromaticAdaptationTag() const -CLUT::Iterate(IIccCLUTExec*) -CLUT::adaptedXYZToMeasuredXYZ(float*, float const*, float const*, float, CAT const*) -CLUT::makeAToBxTag(unsigned int, float const*, float const*, float const*, CAT const*, float, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, float const*, bool) +CIccCLUT::Interp3dTetra(float*, float const*) +CIccCLUT::Iterate(IIccCLUTExec*) +CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*) +CIccIO::ReadLine(void*, int) +CIccInfo::GetSpotShapeName(icSpotShape) +CIccMBB::Init(unsigned char, unsigned char) +CIccMBB::NewCLUT(unsigned char*, unsigned char) +CIccMBB::NewCLUT(unsigned char, unsigned char) +CIccMemIO::Alloc(unsigned int, bool) +CIccMpeCLUT::SetCLUT(CIccCLUT*) +CIccMpeCreator::DoGetElementSigName(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, icElemTypeSignature) +CIccMpeCurveSet::SetCurve(int, CIccCurveSetCurve*) +CIccProfile::DeleteTag(unsigned int) +CIccProfile::Detach() +CIccProfile::GetSpaceSamples() const +CIccProfileIdDesc::CIccProfileIdDesc(CIccProfile&) +CIccProfileIdDesc::CIccProfileIdDesc(icProfileID, CIccTagMultiLocalizedUnicode) +CIccSegmentedCurve::Insert(CIccCurveSegment*) +CIccTagCurve::SetGamma(float) +CIccTagFixedNum<int, (icTagTypeSignature)1936077618>::GetSize() const +CIccTagFixedNum<unsigned int, (icTagTypeSignature)1969632050>::GetSize() const +CIccTagMultiLocalizedUnicode::SetText(unsigned short const*, unsigned short, unsigned short) +CIccTagMultiProcessElement::GetElement(int) +CIccTagNamedColor2::FindColor(char const*) +CIccTagNamedColor2::FindDeviceColor(float*) +CIccTagNamedColor2::FindPCSColor(float*, float) +CIccTagNamedColor2::FindRootColor(char const*) +CIccTagNamedColor2::GetColorName(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, int) +CIccTagNamedColor2::Lab4ToLab2(float*, float const*) +CIccTagNamedColor2::NegClip(float) +CIccTagNum<unsigned char, (icTagTypeSignature)1969827896>::GetSize() const +CIccTagNum<unsigned int, (icTagTypeSignature)1969828658>::GetSize() const +CIccTagNum<unsigned long, (icTagTypeSignature)1969829428>::GetSize() const +CIccTagNum<unsigned short, (icTagTypeSignature)1969828150>::GetSize() const +CIccTagProfileSequenceId::AddProfileDescription(CIccProfileIdDesc const&) +CIccTagProfileSequenceId::GetFirst() +CIccTagProfileSequenceId::GetLast() +CIccTagProfileSequenceId::ParseMem(unsigned char*, unsigned int) +CIccTagResponseCurveSet16::GetFirstCurves() +CIccTagResponseCurveSet16::GetNextCurves() +CIccTagResponseCurveSet16::NewResponseCurves(icMeasurementUnitSig) +CIccTagResponseCurveSet16::SetNumChannels(unsigned short) CNames::Insert(CNames const*, unsigned short, unsigned short) CNames::Insert(ControlItem const*&, unsigned short&) CNames::Insert(ControlItem const**, unsigned short) @@ -364,7 +404,6 @@ ScAreaLinkSaveCollection::clear() ScAttrArray::HasLines(int, int, Rectangle&, unsigned char, unsigned char) const ScCellMergeOption::ScCellMergeOption() ScChangeActionContent::SetNewValue(String const&, ScDocument*) -ScColumn::GetSimpleTextNeededSize(unsigned long, OutputDevice*, bool) ScCompressedArray<int, unsigned char>::GetEntryCount() const ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long) ScCompressedArray<int, unsigned short>::GetValue(int) const @@ -394,13 +433,8 @@ ScDPItemData::CreateTypeString() ScDPItemData::GetNumFormat() const ScDPSaveData::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&) ScDdeLink::ResetValue() -ScDocFunc::ModifyAllRangeNames(ScRangeName const*, std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&) ScDocRowHeightUpdater::TabRanges::TabRanges() -ScDocument::HasControl(short, Rectangle const&) -ScDocument::InvalidateControls(Window*, short, Rectangle const&) -ScDocument::IsLoadingMedium() const ScDocument::ValidNewTabName(std::__debug::vector<String, std::allocator<String> > const&) const -ScExternalRefManager::setCacheTableReferencedPermanently(unsigned short, rtl::OUString const&, unsigned long) ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) ScFiltersTest::testPassword() ScFormulaCell::ScFormulaCell() @@ -1349,8 +1383,6 @@ _ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSor avmedia::priv::MediaWindowBaseImpl::getStopTime() const avmedia::priv::MediaWindowBaseImpl::setRate(double) avmedia::priv::MediaWindowBaseImpl::setStopTime(double) -basebmp::BitmapDevice::getPaletteEntryCount() const -basebmp::BitmapDevice::getPixelData(basegfx::B2IPoint const&) basebmp::BitmapDevice::setDamageTracker(boost::shared_ptr<basebmp::IBitmapDeviceDamageTracker> const&) basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&) basegfx::B1DRange::B1DRange(basegfx::B1IRange const&) |