diff options
| -rw-r--r-- | cui/source/tabpages/textattr.cxx | 2 | ||||
| -rw-r--r-- | include/svx/sdasitm.hxx | 4 | ||||
| -rw-r--r-- | include/svx/svddef.hxx | 3 | ||||
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdattr.cxx | 2 |
5 files changed, 5 insertions, 12 deletions
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 1e92b6c4cdb6..29e6325f69ea 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -44,7 +44,7 @@ const sal_uInt16 SvxTextAttrPage::pRanges[] = SDRATTR_MISC_FIRST , SDRATTR_TEXT_HORZADJUST , SDRATTR_TEXT_WORDWRAP - , SDRATTR_TEXT_AUTOGROWSIZE + , SDRATTR_TEXT_WORDWRAP , 0 }; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index a927467a475c..6e19e3f59160 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -96,10 +96,6 @@ inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) { return SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ); } -inline SdrOnOffItem makeSdrTextAutoGrowSizeItem( bool bAuto ) { - return SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) ; -} - // some useful inline methods inline size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index 5b3e5e9b2945..733e6b0a103e 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -111,8 +111,7 @@ #define SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +23) /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */ #define SDRATTR_TEXT_USEFIXEDCELLHEIGHT (SDRATTR_MISC_FIRST +24) /* 1121 */ /* 1121 */ /* 1104 */ /* Pool V2 */ #define SDRATTR_TEXT_WORDWRAP (SDRATTR_MISC_FIRST +25) /* 1122 */ /* 1122 */ /* 1105 */ /* Pool V2 */ -#define SDRATTR_TEXT_AUTOGROWSIZE (SDRATTR_MISC_FIRST +26) /* 1123 */ /* 1123 */ /* 1106 */ /* Pool V2 */ -#define SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST + 27) /* 1124 */ /* 11124 */ +#define SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST +26) /* 1123 */ /* 1123 */ /* 1106 */ /* Pool V2 */ #define SDRATTR_MISC_LAST (SDRATTR_TEXT_CHAINNEXTNAME) /* 1125 */ /* 1125 */ /* 1108 */ /* Pool V1: 1056 */ #define SDRATTR_EDGE_FIRST (SDRATTR_MISC_LAST + 1) /* 1127 */ /* Pool V4 */ diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 22e306097e31..2202ee28334d 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -231,7 +231,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, @@ -260,7 +260,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, EE_PARA_START, EE_CHAR_END, @@ -297,7 +297,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_CONTOURFRAME, - SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE, + SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST, SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST, diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 65b1b124b49d..31d09dd06516 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -163,7 +163,6 @@ SdrItemPool::SdrItemPool( mppLocalPoolDefaults[SDRATTR_TEXT_CHAINNEXTNAME -SDRATTR_START]=new SfxStringItem(SDRATTR_TEXT_CHAINNEXTNAME, ""); mppLocalPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new SdrTextFixedCellHeightItem; mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP -SDRATTR_START]=new SdrOnOffItem(SDRATTR_TEXT_WORDWRAP, true); - mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWSIZE -SDRATTR_START]=new SdrOnOffItem(SDRATTR_TEXT_AUTOGROWSIZE, false); mppLocalPoolDefaults[SDRATTR_EDGEKIND -SDRATTR_START]=new SdrEdgeKindItem; mppLocalPoolDefaults[SDRATTR_EDGENODE1HORZDIST-SDRATTR_START]=new SdrEdgeNode1HorzDistItem(nDefEdgeDist); mppLocalPoolDefaults[SDRATTR_EDGENODE1VERTDIST-SDRATTR_START]=new SdrEdgeNode1VertDistItem(nDefEdgeDist); @@ -499,7 +498,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) case SDRATTR_TEXT_USEFIXEDCELLHEIGHT: nResId = SIP_SA_TEXT_USEFIXEDCELLHEIGHT;break; case SDRATTR_TEXT_WORDWRAP : nResId = SIP_SA_WORDWRAP;break; case SDRATTR_TEXT_CHAINNEXTNAME : nResId = SIP_SA_CHAINNEXTNAME;break; - case SDRATTR_TEXT_AUTOGROWSIZE : nResId = SIP_SA_AUTOGROWSIZE;break; case SDRATTR_EDGEKIND : nResId = SIP_SA_EDGEKIND;break; case SDRATTR_EDGENODE1HORZDIST : nResId = SIP_SA_EDGENODE1HORZDIST;break; |