diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-03 09:27:49 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-03 11:04:48 +0000 |
commit | b105ad5bafa847f5dd53aee8107a7c77cebcfdfc (patch) | |
tree | 39a55a5706856e3b4d43e3a7697b50694fa9cb11 /sc | |
parent | d52ac7508ca87f5acb16dc0539d1814915847925 (diff) |
callcatcher: shave off some more
Change-Id: I8ed7028f865bd4a6425859ab3b57ed8e928a78e4
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/attrib.hxx | 1 | ||||
-rw-r--r-- | sc/inc/defaultsoptions.hxx | 1 | ||||
-rw-r--r-- | sc/inc/docoptio.hxx | 1 | ||||
-rw-r--r-- | sc/inc/formulaopt.hxx | 1 | ||||
-rw-r--r-- | sc/inc/printopt.hxx | 1 | ||||
-rw-r--r-- | sc/inc/viewopti.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/attrib.cxx | 7 | ||||
-rw-r--r-- | sc/source/core/tool/defaultsoptions.cxx | 5 | ||||
-rw-r--r-- | sc/source/core/tool/docoptio.cxx | 5 | ||||
-rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 5 | ||||
-rw-r--r-- | sc/source/core/tool/printopt.cxx | 5 | ||||
-rw-r--r-- | sc/source/core/tool/viewopti.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/app/uiitems.cxx | 25 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 50 | ||||
-rw-r--r-- | sc/source/ui/inc/impex.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/uiitems.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh9.cxx | 5 |
20 files changed, 0 insertions, 134 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 284384193b18..cfcff754ab25 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -281,7 +281,6 @@ public: virtual ~ScViewObjectModeItem(); virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 21673e10624c..8e69e76775f6 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -51,7 +51,6 @@ public: ScTpDefaultsItem( const ScTpDefaultsItem& rItem ); virtual ~ScTpDefaultsItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 30f3ec1a4523..3a23fa0104b4 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -151,7 +151,6 @@ public: ScTpCalcItem( const ScTpCalcItem& rItem ); virtual ~ScTpCalcItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 95ab0c888ea8..e19de2d89e97 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -87,7 +87,6 @@ public: ScTpFormulaItem( const ScTpFormulaItem& rItem ); virtual ~ScTpFormulaItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 78aee0aa28a7..ff4f6edba3c9 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -61,7 +61,6 @@ public: ScTpPrintItem( const ScTpPrintItem& rItem ); virtual ~ScTpPrintItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 1dc47a1d1f1e..c4104de139a2 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -120,7 +120,6 @@ public: ScTpViewItem( const ScTpViewItem& rItem ); virtual ~ScTpViewItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index e2af6e1bf42e..c3885dabe1bd 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -868,13 +868,6 @@ bool ScViewObjectModeItem::GetPresentation return false; } -OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const -{ - OSL_ENSURE( nVal <= VOBJ_MODE_HIDE, "enum overflow!" ); - - return ScGlobal::GetRscString( STR_VOBJ_MODE_SHOW + (nVal % 2)); -} - sal_uInt16 ScViewObjectModeItem::GetValueCount() const { return 2; diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 8ba6dc752cac..c21eef3edf60 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -77,11 +77,6 @@ ScTpDefaultsItem::~ScTpDefaultsItem() { } -OUString ScTpDefaultsItem::GetValueText() const -{ - return OUString("ScTpDefaultsItem"); -} - bool ScTpDefaultsItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index dc61de005ce9..f5fa545f5884 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -116,11 +116,6 @@ ScTpCalcItem::~ScTpCalcItem() { } -OUString ScTpCalcItem::GetValueText() const -{ - return OUString("ScTpCalcItem"); -} - bool ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 5038055cbe73..cd12d0a7c2ad 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -170,11 +170,6 @@ ScTpFormulaItem::~ScTpFormulaItem() { } -OUString ScTpFormulaItem::GetValueText() const -{ - return OUString("ScTpFormulaItem"); -} - bool ScTpFormulaItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 2b60712c612f..6d02ed918d2b 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -88,11 +88,6 @@ ScTpPrintItem::~ScTpPrintItem() { } -OUString ScTpPrintItem::GetValueText() const -{ - return OUString("ScTpPrintItem"); -} - bool ScTpPrintItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 3d9432a23d8f..32f6223c8976 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -210,11 +210,6 @@ ScTpViewItem::~ScTpViewItem() { } -OUString ScTpViewItem::GetValueText() const -{ - return OUString("ScTpViewItem"); -} - bool ScTpViewItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index bc48b219cbe3..08144fc4e857 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -162,11 +162,6 @@ ScSortItem::~ScSortItem() { } -OUString ScSortItem::GetValueText() const -{ - return OUString("SortItem"); -} - bool ScSortItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); @@ -302,11 +297,6 @@ ScSubTotalItem::~ScSubTotalItem() { } -OUString ScSubTotalItem::GetValueText() const -{ - return OUString("SubTotalItem"); -} - bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); @@ -352,11 +342,6 @@ ScUserListItem::~ScUserListItem() delete pUserList; } -OUString ScUserListItem::GetValueText() const -{ - return OUString("ScUserListItem"); -} - bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); @@ -484,11 +469,6 @@ ScSolveItem::~ScSolveItem() { } -OUString ScSolveItem::GetValueText() const -{ - return OUString("ScSolveItem"); -} - bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); @@ -523,11 +503,6 @@ ScTabOpItem::~ScTabOpItem() { } -OUString ScTabOpItem::GetValueText() const -{ - return OUString("ScTabOpItem"); -} - bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const { assert(SfxPoolItem::operator==(rItem)); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 8ca7598589ec..7ba8487d058c 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -125,49 +125,6 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) aRange.aEnd.SetTab( aRange.aStart.Tab() ); } -// Evaluate input string - either range, cell or the whole document (when error) -// If a View exists, the TabNo of the view will be used. -ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos ) - : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), - nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), - bFormulas( false ), bIncludeFiltered( true ), - bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ), - bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ), - mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ), - mExportTextOptions() -{ - pUndoDoc = NULL; - pExtOptions = NULL; - - SCTAB nTab = ScDocShell::GetCurTab(); - aRange.aStart.SetTab( nTab ); - OUString aPos( rPos ); - // Named range? - ScRangeName* pRange = pDoc->GetRangeName(); - if (pRange) - { - const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->uppercase(aPos)); - if (pData) - { - if( pData->HasType( RT_REFAREA ) - || pData->HasType( RT_ABSAREA ) - || pData->HasType( RT_ABSPOS ) ) - { - pData->GetSymbol(aPos); - } - } - } - formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - // Range? - if (aRange.Parse(aPos, pDoc, eConv) & SCA_VALID) - bSingle = false; - // Cell? - else if (aRange.aStart.Parse(aPos, pDoc, eConv) & SCA_VALID) - aRange.aEnd = aRange.aStart; - else - bAll = true; -} - ScImportExport::~ScImportExport() { delete pUndoDoc; @@ -254,13 +211,6 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } -bool ScImportExport::ImportData( const OUString& /* rMimeType */, - const ::com::sun::star::uno::Any & /* rValue */ ) -{ - OSL_ENSURE( false, "Implementation is missing" ); - return false; -} - bool ScImportExport::ExportData( const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ) { diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index f5b7b8c1bc11..256c224a4846 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -90,7 +90,6 @@ class ScImportExport public: ScImportExport( ScDocument* ); // the whole document - ScImportExport( ScDocument*, const OUString& ); // Range/cell input ScImportExport( ScDocument*, const ScAddress& ); ScImportExport( ScDocument*, const ScRange& ); ~ScImportExport(); @@ -142,8 +141,6 @@ public: bool ImportStream( SvStream&, const OUString& rBaseURL, sal_uLong=FORMAT_STRING ); bool ExportStream( SvStream&, const OUString& rBaseURL, sal_uLong=FORMAT_STRING ); - bool ImportData( const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ); bool ExportData( const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 38572d28d0f3..e8b942cec7f2 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -68,8 +68,6 @@ protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; - OUString GetDescription() const; - virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 344ca1d4ca88..07d477201427 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -214,7 +214,6 @@ protected: virtual OUString GetSelectionText( bool bWholeWord ) SAL_OVERRIDE; virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; - OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index ac51bae02f6f..8bd28c67a3da 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -152,7 +152,6 @@ public: ScSortItem( const ScSortItem& rItem ); virtual ~ScSortItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -205,7 +204,6 @@ public: ScSubTotalItem( const ScSubTotalItem& rItem ); virtual ~ScSubTotalItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; @@ -226,7 +224,6 @@ public: ScUserListItem( const ScUserListItem& rItem ); virtual ~ScUserListItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -286,7 +283,6 @@ public: ScSolveItem( const ScSolveItem& rItem ); virtual ~ScSolveItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; @@ -305,7 +301,6 @@ public: ScTabOpItem( const ScTabOpItem& rItem ); virtual ~ScTabOpItem(); - OUString GetValueText() const; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 462c534d5467..6793f201de75 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -210,11 +210,6 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) pPreview->SetPageNo( pPreview->GetFirstPage(nTab) ); } -OUString ScPreviewShell::GetDescription() const -{ - return OUString(" ** Test ** "); -} - void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) { Size aOutSize( rSize ); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 07dd2e13c3d5..05c25855b56d 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -88,11 +88,6 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) } } -OUString ScTabViewShell::GetDescription() const -{ - return OUString(" ** Test ** "); -} - void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) { sal_uInt16 nSlot = rReq.GetSlot(); |