[Libreoffice-commits] core.git: sc/inc sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Nov 24 09:13:17 UTC 2017
sc/inc/attrib.hxx | 25 -------
sc/inc/scitems.hxx | 77 ++++++++++--------------
sc/source/core/data/attrib.cxx | 101 --------------------------------
sc/source/core/data/docpool.cxx | 12 ---
sc/source/core/tool/defaultsoptions.cxx | 4 -
sc/source/ui/docshell/docsh4.cxx | 2
6 files changed, 33 insertions(+), 188 deletions(-)
New commits:
commit 7b355976ab65d059073978e4ab334c94a7dd450e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Nov 24 09:38:53 2017 +0200
drop unused ATTR items
the table autoformat stuff does not use these values at all, it just
writes the internal details of PoolItems in a pre-determined order
Change-Id: Id6d8ae7508a8d19f5fd1e70f9a428d324082d3bf
Reviewed-on: https://gerrit.libreoffice.org/45199
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 5cc9198f88e1..ea9ee09b2291 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -190,31 +190,6 @@ inline ScRangeItem& ScRangeItem::operator=( const ScRangeItem &rCpy )
return *this;
}
-// ScTableListItem: manages a list of tables
-
-class ScTableListItem : public SfxPoolItem
-{
-public:
- ScTableListItem();
- ScTableListItem( const ScTableListItem& rCpy );
- virtual ~ScTableListItem() override;
-
- ScTableListItem& operator=( const ScTableListItem &rCpy );
-
- // "pure virtual methods" from SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool GetPresentation( SfxItemPresentation ePres,
- MapUnit eCoreMetric,
- MapUnit ePresMetric,
- OUString &rText,
- const IntlWrapper& rIntl ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-
-public:
- sal_uInt16 nCount;
- std::unique_ptr<SCTAB[]> pTabArr;
-};
-
// page format item: contents of header and footer
#define SC_HF_LEFTAREA 1
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index c1c60561b050..adc6c564c6a6 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -116,46 +116,39 @@
#define ATTR_LRSPACE TypedWhichId<SvxLRSpaceItem>(157) // editor: PageDesc-TabPage
#define ATTR_ULSPACE TypedWhichId<SvxULSpaceItem>(158)
#define ATTR_PAGE TypedWhichId<SvxPageItem>(159)
-#define ATTR_PAGE_PAPERTRAY (160)
-#define ATTR_PAGE_PAPERBIN TypedWhichId<SvxPaperBinItem>(161)
-#define ATTR_PAGE_SIZE TypedWhichId<SvxSizeItem>(162)
-#define ATTR_PAGE_MAXSIZE (163)
-#define ATTR_PAGE_HORCENTER TypedWhichId<SfxBoolItem>(164)
-#define ATTR_PAGE_VERCENTER TypedWhichId<SfxBoolItem>(165)
-
-#define ATTR_PAGE_ON TypedWhichId<SfxBoolItem>(166) // editor: header/footer-page
-#define ATTR_PAGE_DYNAMIC TypedWhichId<SfxBoolItem>(167)
-#define ATTR_PAGE_SHARED TypedWhichId<SfxBoolItem>(168)
-
-#define ATTR_PAGE_NOTES TypedWhichId<SfxBoolItem>(169) // editor: table
-#define ATTR_PAGE_GRID TypedWhichId<SfxBoolItem>(170)
-#define ATTR_PAGE_HEADERS TypedWhichId<SfxBoolItem>(171)
-#define ATTR_PAGE_CHARTS TypedWhichId<ScViewObjectModeItem>(172)
-#define ATTR_PAGE_OBJECTS TypedWhichId<ScViewObjectModeItem>(173)
-#define ATTR_PAGE_DRAWINGS TypedWhichId<ScViewObjectModeItem>(174)
-#define ATTR_PAGE_TOPDOWN TypedWhichId<SfxBoolItem>(175)
-#define ATTR_PAGE_SCALE TypedWhichId<SfxUInt16Item>(176)
-#define ATTR_PAGE_SCALETOPAGES TypedWhichId<SfxUInt16Item>(177)
-#define ATTR_PAGE_FIRSTPAGENO TypedWhichId<SfxUInt16Item>(178)
-
-#define ATTR_PAGE_PRINTAREA (179) // editor: print areas
-#define ATTR_PAGE_REPEATROW (180)
-#define ATTR_PAGE_REPEATCOL (181)
-#define ATTR_PAGE_PRINTTABLES (182)
-
-#define ATTR_PAGE_HEADERLEFT TypedWhichId<ScPageHFItem>(183) // contents of header/
-#define ATTR_PAGE_FOOTERLEFT TypedWhichId<ScPageHFItem>(184) // footer (left)
-#define ATTR_PAGE_HEADERRIGHT TypedWhichId<ScPageHFItem>(185) // contents of header/
-#define ATTR_PAGE_FOOTERRIGHT TypedWhichId<ScPageHFItem>(186) // footer (right)
-#define ATTR_PAGE_HEADERSET TypedWhichId<SvxSetItem>(187) // the corresponding sets
-#define ATTR_PAGE_FOOTERSET TypedWhichId<SvxSetItem>(188)
-
-#define ATTR_PAGE_FORMULAS TypedWhichId<SfxBoolItem>(189)
-#define ATTR_PAGE_NULLVALS TypedWhichId<SfxBoolItem>(190)
-
-#define ATTR_PAGE_SCALETO TypedWhichId<ScPageScaleToItem>(191) // #i8868# scale printout to width/height
-
-#define ATTR_HIDDEN TypedWhichId<SfxBoolItem>(192)
+#define ATTR_PAGE_PAPERBIN TypedWhichId<SvxPaperBinItem>(160)
+#define ATTR_PAGE_SIZE TypedWhichId<SvxSizeItem>(161)
+#define ATTR_PAGE_HORCENTER TypedWhichId<SfxBoolItem>(162)
+#define ATTR_PAGE_VERCENTER TypedWhichId<SfxBoolItem>(163)
+
+#define ATTR_PAGE_ON TypedWhichId<SfxBoolItem>(164) // editor: header/footer-page
+#define ATTR_PAGE_DYNAMIC TypedWhichId<SfxBoolItem>(165)
+#define ATTR_PAGE_SHARED TypedWhichId<SfxBoolItem>(166)
+
+#define ATTR_PAGE_NOTES TypedWhichId<SfxBoolItem>(167) // editor: table
+#define ATTR_PAGE_GRID TypedWhichId<SfxBoolItem>(168)
+#define ATTR_PAGE_HEADERS TypedWhichId<SfxBoolItem>(169)
+#define ATTR_PAGE_CHARTS TypedWhichId<ScViewObjectModeItem>(170)
+#define ATTR_PAGE_OBJECTS TypedWhichId<ScViewObjectModeItem>(171)
+#define ATTR_PAGE_DRAWINGS TypedWhichId<ScViewObjectModeItem>(172)
+#define ATTR_PAGE_TOPDOWN TypedWhichId<SfxBoolItem>(173)
+#define ATTR_PAGE_SCALE TypedWhichId<SfxUInt16Item>(174)
+#define ATTR_PAGE_SCALETOPAGES TypedWhichId<SfxUInt16Item>(175)
+#define ATTR_PAGE_FIRSTPAGENO TypedWhichId<SfxUInt16Item>(176)
+
+#define ATTR_PAGE_HEADERLEFT TypedWhichId<ScPageHFItem>(177) // contents of header/
+#define ATTR_PAGE_FOOTERLEFT TypedWhichId<ScPageHFItem>(178) // footer (left)
+#define ATTR_PAGE_HEADERRIGHT TypedWhichId<ScPageHFItem>(179) // contents of header/
+#define ATTR_PAGE_FOOTERRIGHT TypedWhichId<ScPageHFItem>(180) // footer (right)
+#define ATTR_PAGE_HEADERSET TypedWhichId<SvxSetItem>(181) // the corresponding sets
+#define ATTR_PAGE_FOOTERSET TypedWhichId<SvxSetItem>(182)
+
+#define ATTR_PAGE_FORMULAS TypedWhichId<SfxBoolItem>(183)
+#define ATTR_PAGE_NULLVALS TypedWhichId<SfxBoolItem>(184)
+
+#define ATTR_PAGE_SCALETO TypedWhichId<ScPageScaleToItem>(185) // #i8868# scale printout to width/height
+
+#define ATTR_HIDDEN TypedWhichId<SfxBoolItem>(186)
#define ATTR_ENDINDEX ATTR_HIDDEN // end of pool-range
@@ -171,10 +164,6 @@
#define SID_SCATTR_PAGE_SCALE ATTR_PAGE_SCALE
#define SID_SCATTR_PAGE_SCALETOPAGES ATTR_PAGE_SCALETOPAGES
#define SID_SCATTR_PAGE_FIRSTPAGENO ATTR_PAGE_FIRSTPAGENO
-#define SID_SCATTR_PAGE_PRINTAREA ATTR_PAGE_PRINTAREA
-#define SID_SCATTR_PAGE_REPEATROW ATTR_PAGE_REPEATROW
-#define SID_SCATTR_PAGE_REPEATCOL ATTR_PAGE_REPEATCOL
-#define SID_SCATTR_PAGE_PRINTTABLES ATTR_PAGE_PRINTTABLES
#define SID_SCATTR_PAGE_HEADERLEFT ATTR_PAGE_HEADERLEFT
#define SID_SCATTR_PAGE_FOOTERLEFT ATTR_PAGE_FOOTERLEFT
#define SID_SCATTR_PAGE_HEADERRIGHT ATTR_PAGE_HEADERRIGHT
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index da80e4453457..5d0440ea7955 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -421,107 +421,6 @@ bool ScRangeItem::GetPresentation
}
/**
- * ScTableListItem - List from Tables (-numbers)
- */
-ScTableListItem::ScTableListItem( const ScTableListItem& rCpy )
- : SfxPoolItem ( rCpy.Which() ),
- nCount ( rCpy.nCount )
-{
- if ( nCount > 0 )
- {
- pTabArr.reset( new SCTAB [nCount] );
-
- for ( sal_uInt16 i=0; i<nCount; i++ )
- pTabArr[i] = rCpy.pTabArr[i];
- }
-}
-
-ScTableListItem::~ScTableListItem()
-{
-}
-
-ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy )
-{
- if ( rCpy.nCount > 0 )
- {
- pTabArr.reset( new SCTAB [rCpy.nCount] );
- for ( sal_uInt16 i=0; i<rCpy.nCount; i++ )
- pTabArr[i] = rCpy.pTabArr[i];
- }
- else
- pTabArr.reset();
-
- nCount = rCpy.nCount;
-
- return *this;
-}
-
-bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const
-{
- assert(SfxPoolItem::operator==(rAttr));
-
- const ScTableListItem& rCmp = static_cast<const ScTableListItem&>(rAttr);
- bool bEqual = (nCount == rCmp.nCount);
-
- if ( nCount > 0 )
- {
- sal_uInt16 i=0;
-
- bEqual = ( pTabArr && rCmp.pTabArr );
-
- while ( bEqual && i<nCount )
- {
- bEqual = ( pTabArr[i] == rCmp.pTabArr[i] );
- i++;
- }
- }
- return bEqual;
-}
-
-SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const
-{
- return new ScTableListItem( *this );
-}
-
-bool ScTableListItem::GetPresentation
- (
- SfxItemPresentation ePres,
- MapUnit /* eCoreUnit */,
- MapUnit /* ePresUnit */,
- OUString& rText,
- const IntlWrapper& /* rIntl */
- ) const
-{
- switch ( ePres )
- {
- case SfxItemPresentation::Nameless:
- {
- rText = "(";
- if ( nCount>0 && pTabArr )
- for ( sal_uInt16 i=0; i<nCount; i++ )
- {
- rText += OUString::number( pTabArr[i] );
- if ( i<(nCount-1) )
- rText += ",";
- }
- rText += ")";
- }
- return true;
-
- case SfxItemPresentation::Complete:
- rText.clear();
- return false;
-
- default:
- {
- // added to avoid warnings
- }
- }
-
- return false;
-}
-
-/**
* ScPageHFItem - Dates from the Head and Foot lines
*/
ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP )
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 27fc2341eaee..740d3409a4b6 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -138,10 +138,8 @@ static SfxItemInfo const aItemInfos[] =
{ SID_ATTR_LRSPACE, true }, // ATTR_LRSPACE
{ SID_ATTR_ULSPACE, true }, // ATTR_ULSPACE
{ SID_ATTR_PAGE, true }, // ATTR_PAGE
- { 0, true }, // ATTR_PAGE_PAPERTRAY, since 303 just a dummy
{ SID_ATTR_PAGE_PAPERBIN, true }, // ATTR_PAGE_PAPERBIN
{ SID_ATTR_PAGE_SIZE, true }, // ATTR_PAGE_SIZE
- { SID_ATTR_PAGE_MAXSIZE, true }, // ATTR_PAGE_MAXSIZE
{ SID_ATTR_PAGE_EXT1, true }, // ATTR_PAGE_HORCENTER
{ SID_ATTR_PAGE_EXT2, true }, // ATTR_PAGE_VERCENTER
{ SID_ATTR_PAGE_ON, true }, // ATTR_PAGE_ON
@@ -157,10 +155,6 @@ static SfxItemInfo const aItemInfos[] =
{ SID_SCATTR_PAGE_SCALE, true }, // ATTR_PAGE_SCALE
{ SID_SCATTR_PAGE_SCALETOPAGES, true }, // ATTR_PAGE_SCALETOPAGES
{ SID_SCATTR_PAGE_FIRSTPAGENO, true }, // ATTR_PAGE_FIRSTPAGENO
- { SID_SCATTR_PAGE_PRINTAREA, true }, // ATTR_PAGE_PRINTAREA
- { SID_SCATTR_PAGE_REPEATROW, true }, // ATTR_PAGE_REPEATROW
- { SID_SCATTR_PAGE_REPEATCOL, true }, // ATTR_PAGE_REPEATCOL
- { SID_SCATTR_PAGE_PRINTTABLES, true }, // ATTR_PAGE_PRINTTABLES
{ SID_SCATTR_PAGE_HEADERLEFT, true }, // ATTR_PAGE_HEADERLEFT
{ SID_SCATTR_PAGE_FOOTERLEFT, true }, // ATTR_PAGE_FOOTERLEFT
{ SID_SCATTR_PAGE_HEADERRIGHT, true }, // ATTR_PAGE_HEADERRIGHT
@@ -284,10 +278,8 @@ ScDocumentPool::ScDocumentPool()
rPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE );
rPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE );
rPoolDefaults[ ATTR_PAGE - ATTR_STARTINDEX ] = new SvxPageItem( ATTR_PAGE );
- rPoolDefaults[ ATTR_PAGE_PAPERTRAY - ATTR_STARTINDEX ] = new SfxAllEnumItem( ATTR_PAGE_PAPERTRAY );
rPoolDefaults[ ATTR_PAGE_PAPERBIN - ATTR_STARTINDEX ] = new SvxPaperBinItem( ATTR_PAGE_PAPERBIN );
rPoolDefaults[ ATTR_PAGE_SIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_SIZE );
- rPoolDefaults[ ATTR_PAGE_MAXSIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_MAXSIZE );
rPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER );
rPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER );
rPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, true );
@@ -303,10 +295,6 @@ ScDocumentPool::ScDocumentPool()
rPoolDefaults[ ATTR_PAGE_SCALE - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALE, 100 );
rPoolDefaults[ ATTR_PAGE_SCALETOPAGES-ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 1 );
rPoolDefaults[ ATTR_PAGE_FIRSTPAGENO- ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 );
- rPoolDefaults[ ATTR_PAGE_PRINTAREA - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_PRINTAREA );
- rPoolDefaults[ ATTR_PAGE_REPEATROW - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATROW );
- rPoolDefaults[ ATTR_PAGE_REPEATCOL - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATCOL );
- rPoolDefaults[ ATTR_PAGE_PRINTTABLES- ATTR_STARTINDEX ] = new ScTableListItem;
rPoolDefaults[ ATTR_PAGE_HEADERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERLEFT );
rPoolDefaults[ ATTR_PAGE_FOOTERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERLEFT );
rPoolDefaults[ ATTR_PAGE_HEADERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT );
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 88bcc743068e..9e826009fb8a 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -57,10 +57,6 @@ bool ScDefaultsOptions::operator==( const ScDefaultsOptions& rOpt ) const
&& rOpt.aInitTabPrefix == aInitTabPrefix;
}
-ScTableListItem::ScTableListItem()
- : SfxPoolItem(ATTR_PAGE_PRINTTABLES), nCount(0), pTabArr(nullptr)
-{}
-
ScTpDefaultsItem::ScTpDefaultsItem( const ScDefaultsOptions& rOpt ) :
SfxPoolItem ( SID_SCDEFAULTSOPTIONS ),
theOptions ( rOpt )
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index f70909e4e24e..4647f2675f3a 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1694,8 +1694,6 @@ void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller,
rReq.Done();
}
pDlg.disposeAndClear();
-
- rStyleSet.ClearItem( ATTR_PAGE_PAPERTRAY );
}
}
}
More information about the Libreoffice-commits
mailing list