diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-12-15 18:23:04 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-12-17 09:35:25 +0000 |
commit | 68d421bdac59295bf91457def4cc041ea5c3d8d0 (patch) | |
tree | 543f5fef4389e223073e23ca04ff5685620c0ae0 | |
parent | 0d5644bbe90e87ccd646276bfc545c3201caa005 (diff) |
callcatcher: update unusedcode code list
Change-Id: I3ba30e0745c8f2adac29a6c4ff15a8156cee4baf
-rw-r--r-- | sc/inc/dpobject.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dpobject.cxx | 89 | ||||
-rw-r--r-- | sc/source/core/data/dptabsrc.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/formulabase.hxx | 10 | ||||
-rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/inc/checklistmenu.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewacc.cxx | 21 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewacc.hxx | 1 | ||||
-rwxr-xr-x | unusedcode.easy | 1 |
10 files changed, 1 insertions, 140 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index ea7fb3a5f1cd..b74db73e0266 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -193,8 +193,6 @@ public: void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); - void FillPageList( std::vector<rtl::OUString>& rStrings, long nField ); - void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); bool FillOldParam(ScPivotParam& rParam) const; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index e55a9c864422..3c433783b242 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1170,95 +1170,6 @@ long ScDPObject::GetDimCount() return nRet; } -void ScDPObject::FillPageList( std::vector<rtl::OUString>& rStrings, long nField ) -{ - //! merge members access with ToggleDetails? - - //! convert field index to dimension index? - - OSL_ENSURE( xSource.is(), "no source" ); - if ( !xSource.is() ) return; - - uno::Reference<container::XNamed> xDim; - uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions(); - uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName ); - long nIntCount = xIntDims->getCount(); - if ( nField < nIntCount ) - { - uno::Reference<uno::XInterface> xIntDim = ScUnoHelpFunctions::AnyToInterface( - xIntDims->getByIndex(nField) ); - xDim = uno::Reference<container::XNamed>( xIntDim, uno::UNO_QUERY ); - } - OSL_ENSURE( xDim.is(), "dimension not found" ); - if ( !xDim.is() ) return; - - uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY ); - long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_USEDHIERARCHY)) ); - long nLevel = 0; - - long nHierCount = 0; - uno::Reference<container::XIndexAccess> xHiers; - uno::Reference<sheet::XHierarchiesSupplier> xHierSupp( xDim, uno::UNO_QUERY ); - if ( xHierSupp.is() ) - { - uno::Reference<container::XNameAccess> xHiersName = xHierSupp->getHierarchies(); - xHiers = new ScNameToIndexAccess( xHiersName ); - nHierCount = xHiers->getCount(); - } - uno::Reference<uno::XInterface> xHier; - if ( nHierarchy < nHierCount ) - xHier = ScUnoHelpFunctions::AnyToInterface( xHiers->getByIndex(nHierarchy) ); - OSL_ENSURE( xHier.is(), "hierarchy not found" ); - if ( !xHier.is() ) return; - - long nLevCount = 0; - uno::Reference<container::XIndexAccess> xLevels; - uno::Reference<sheet::XLevelsSupplier> xLevSupp( xHier, uno::UNO_QUERY ); - if ( xLevSupp.is() ) - { - uno::Reference<container::XNameAccess> xLevsName = xLevSupp->getLevels(); - xLevels = new ScNameToIndexAccess( xLevsName ); - nLevCount = xLevels->getCount(); - } - uno::Reference<uno::XInterface> xLevel; - if ( nLevel < nLevCount ) - xLevel = ScUnoHelpFunctions::AnyToInterface( xLevels->getByIndex(nLevel) ); - OSL_ENSURE( xLevel.is(), "level not found" ); - if ( !xLevel.is() ) return; - - uno::Reference<container::XNameAccess> xMembers; - uno::Reference<sheet::XMembersSupplier> xMbrSupp( xLevel, uno::UNO_QUERY ); - if ( xMbrSupp.is() ) - xMembers = xMbrSupp->getMembers(); - OSL_ENSURE( xMembers.is(), "members not found" ); - if ( !xMembers.is() ) return; - - uno::Sequence<rtl::OUString> aNames = xMembers->getElementNames(); - long nNameCount = aNames.getLength(); - const rtl::OUString* pNameArr = aNames.getConstArray(); - for (long nPos = 0; nPos < nNameCount; ++nPos) - { - // Make sure to insert only visible members. - Reference<XPropertySet> xPropSet(xMembers->getByName(pNameArr[nPos]), UNO_QUERY); - sal_Bool bVisible = false; - if (xPropSet.is()) - { - Any any = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ISVISIBLE))); - any >>= bVisible; - } - - if (bVisible) - { - // use the order from getElementNames - rStrings.push_back(pNameArr[nPos]); - } - } - - // add "-all-" entry to the top (unsorted) - rStrings.insert(rStrings.begin(), SC_RESSTR(SCSTR_ALL)); -} - void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHeaderData& rData) { using namespace ::com::sun::star::sheet::DataPilotTablePositionType; diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index b2d9895a0c62..88d5fdb961a5 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1433,7 +1433,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData() { // find the named member to initialize pSelectedData from it, with name and value - long nLevel = 0; // same as in ScDPObject::FillPageList + long nLevel = 0; long nHierarchy = getUsedHierarchy(); if ( nHierarchy >= GetHierarchiesObject()->getCount() ) diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 342e5338791b..8fbe09d60679 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -653,16 +653,6 @@ public: const BinAddress& rAddress, bool bAbsolute ); - /** Generates a cell range string in A1:A1 notation from the passed binary - cell range address. - - @param rRange The cell range address containing column and row indexes. - @param bAbsolute True = adds dollar signs before columns and rows. - */ - static ::rtl::OUString generateRange2dString( - const BinRange& rRange, - bool bAbsolute ); - // ------------------------------------------------------------------------ /** Generates a string in Calc formula notation from the passed string. diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index e7060ce5a337..e9796f8bd68c 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -1430,14 +1430,6 @@ OUString FormulaProcessorBase::generateAddress2dString( const BinAddress& rAddre return aBuffer.makeStringAndClear(); } -OUString FormulaProcessorBase::generateRange2dString( const BinRange& rRange, bool bAbsolute ) -{ - OUStringBuffer aBuffer( generateAddress2dString( rRange.maFirst, bAbsolute ) ); - if( (rRange.getColCount() > 1) || (rRange.getRowCount() > 1) ) - aBuffer.append( sal_Unicode( ':' ) ).append( generateAddress2dString( rRange.maLast, bAbsolute ) ); - return aBuffer.makeStringAndClear(); -} - // ---------------------------------------------------------------------------- OUString FormulaProcessorBase::generateApiString( const OUString& rString ) diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index ccc47c029e64..b125c013e2cc 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1319,11 +1319,6 @@ void ScCheckListMenuWindow::setConfig(const Config& rConfig) maConfig = rConfig; } -const Size& ScCheckListMenuWindow::getWindowSize() const -{ - return maWndSize; -} - bool ScCheckListMenuWindow::isAllSelected() const { return maChkToggleAll.IsChecked(); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index cabddc553dc3..1a36ae54f540 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -244,8 +244,6 @@ public: void initMembers(); void setConfig(const Config& rConfig); - const Size& getWindowSize() const; - bool isAllSelected() const; void getResult(ResultType& rResult); void launch(const Rectangle& rRect); diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 8a7da2b37f71..ada8fbe4ae25 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -622,27 +622,6 @@ ThumbnailViewItemAcc::~ThumbnailViewItemAcc() { } -void ThumbnailViewItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) -{ - if( nEventId ) - { - ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > > aTmpListeners( mxEventListeners ); - ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aIter( aTmpListeners.begin() ); - accessibility::AccessibleEventObject aEvtObject; - - aEvtObject.EventId = nEventId; - aEvtObject.Source = static_cast<uno::XWeak*>(this); - aEvtObject.NewValue = rNewValue; - aEvtObject.OldValue = rOldValue; - - while( aIter != aTmpListeners.end() ) - { - (*aIter)->notifyEvent( aEvtObject ); - aIter++; - } - } -} - void ThumbnailViewItemAcc::ParentDestroyed() { const ::osl::MutexGuard aGuard( maMutex ); diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index bfa3b45673ba..612cf7dfcba6 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -189,7 +189,6 @@ public: void ParentDestroyed(); - void FireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ); sal_Bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } public: diff --git a/unusedcode.easy b/unusedcode.easy index cce5489eb45c..8b0f151d1e7e 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -10,7 +10,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) SfxDocumentTemplateDlg::SfxDocumentTemplateDlg(Window*, SfxDocumentTemplates*) TextEngine::GetLeftMargin() const -ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) TransitionScene::clear() UnoControl::UnoControl() VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&) |