[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/qa sd/source svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Mon Aug 4 02:32:04 PDT 2014
cui/source/tabpages/textattr.cxx | 16 ++++++------
filter/source/msfilter/msdffimp.cxx | 16 ++++++------
filter/source/msfilter/svdfppt.cxx | 18 ++++++-------
include/svx/sdtditm.hxx | 35 +++++++++------------------
sc/source/core/data/postit.cxx | 8 +++---
sc/source/core/tool/detfunc.cxx | 8 +++---
sc/source/filter/excel/xiescher.cxx | 8 +++---
sd/qa/unit/export-tests.cxx | 8 +++---
sd/qa/unit/import-tests.cxx | 8 +++---
sd/source/core/drawdoc4.cxx | 16 ++++++------
sd/source/filter/ppt/pptin.cxx | 8 +++---
sd/source/ui/func/fuconrec.cxx | 8 +++---
sd/source/ui/view/drviews3.cxx | 4 +--
svx/source/sdr/properties/textproperties.cxx | 18 ++++++-------
svx/source/svdraw/svdattr.cxx | 8 +++---
svx/source/svdraw/svdfmtf.cxx | 8 +++---
svx/source/svdraw/svdotext.cxx | 8 +++---
svx/source/table/cell.cxx | 8 +++---
svx/source/table/tablecontroller.cxx | 16 ++++++------
sw/source/filter/ww8/ww8graf.cxx | 16 ++++++------
sw/source/filter/ww8/ww8par.cxx | 8 +++---
21 files changed, 120 insertions(+), 131 deletions(-)
New commits:
commit 768d32cf5b7dc35ab1b93e898e1bb5beab43c27c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 4 11:29:51 2014 +0200
Consistency around SdrMetricItem in svx/sdtditm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."
Change-Id: Ib0234883d441be668700df5ccd0e855973dc5426
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 6b96c27..0253342 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -124,7 +124,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LEFTDIST );
if( pItem )
{
- long nValue = ( ( const SdrTextLeftDistItem* )pItem )->GetValue();
+ long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
SetMetricValue( *m_pMtrFldLeft, nValue, eUnit );
}
else
@@ -136,7 +136,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_RIGHTDIST );
if( pItem )
{
- long nValue = ( ( const SdrTextRightDistItem* )pItem )->GetValue();
+ long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
SetMetricValue( *m_pMtrFldRight, nValue, eUnit );
}
else
@@ -148,7 +148,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_UPPERDIST );
if( pItem )
{
- long nValue = ( ( const SdrTextUpperDistItem* )pItem )->GetValue();
+ long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
SetMetricValue( *m_pMtrFldTop, nValue, eUnit );
}
else
@@ -160,7 +160,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LOWERDIST );
if( pItem )
{
- long nValue = ( ( const SdrTextLowerDistItem* )pItem )->GetValue();
+ long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
SetMetricValue( *m_pMtrFldBottom, nValue, eUnit );
}
else
@@ -334,25 +334,25 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
if( m_pMtrFldLeft->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldLeft, eUnit );
- rAttrs->Put( SdrTextLeftDistItem( nValue ) );
+ rAttrs->Put( makeSdrTextLeftDistItem( nValue ) );
}
if( m_pMtrFldRight->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldRight, eUnit );
- rAttrs->Put( SdrTextRightDistItem( nValue ) );
+ rAttrs->Put( makeSdrTextRightDistItem( nValue ) );
}
if( m_pMtrFldTop->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldTop, eUnit );
- rAttrs->Put( SdrTextUpperDistItem( nValue ) );
+ rAttrs->Put( makeSdrTextUpperDistItem( nValue ) );
}
if( m_pMtrFldBottom->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldBottom, eUnit );
- rAttrs->Put( SdrTextLowerDistItem( nValue ) );
+ rAttrs->Put( makeSdrTextLowerDistItem( nValue ) );
}
eState = m_pTsbAutoGrowHeight->GetState();
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 0fe240b..c5bdd59 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1496,10 +1496,10 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const
rSet.Put( SdrTextVertAdjustItem( eTVA ) );
rSet.Put( SdrTextHorzAdjustItem( eTHA ) );
- rSet.Put( SdrTextLeftDistItem( nTextLeft ) );
- rSet.Put( SdrTextRightDistItem( nTextRight ) );
- rSet.Put( SdrTextUpperDistItem( nTextTop ) );
- rSet.Put( SdrTextLowerDistItem( nTextBottom ) );
+ rSet.Put( makeSdrTextLeftDistItem( nTextLeft ) );
+ rSet.Put( makeSdrTextRightDistItem( nTextRight ) );
+ rSet.Put( makeSdrTextUpperDistItem( nTextTop ) );
+ rSet.Put( makeSdrTextLowerDistItem( nTextBottom ) );
rSet.Put( SdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? sal_True : sal_False ) );
rSet.Put( SdrTextAutoGrowHeightItem( ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0 ) );
@@ -5152,10 +5152,10 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
}
// set margins at the border of the textbox
- aSet.Put( SdrTextLeftDistItem( nTextLeft ) );
- aSet.Put( SdrTextRightDistItem( nTextRight ) );
- aSet.Put( SdrTextUpperDistItem( nTextTop ) );
- aSet.Put( SdrTextLowerDistItem( nTextBottom ) );
+ aSet.Put( makeSdrTextLeftDistItem( nTextLeft ) );
+ aSet.Put( makeSdrTextRightDistItem( nTextRight ) );
+ aSet.Put( makeSdrTextUpperDistItem( nTextTop ) );
+ aSet.Put( makeSdrTextLowerDistItem( nTextBottom ) );
pTextImpRec->nDxTextLeft = nTextLeft;
pTextImpRec->nDyTextTop = nTextTop;
pTextImpRec->nDxTextRight = nTextRight;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 4757135..bd869b2 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1096,10 +1096,10 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) );
// set margins at the borders of the textbox
- pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) );
- pTObj->SetMergedItem( SdrTextRightDistItem( nTextRight ) );
- pTObj->SetMergedItem( SdrTextUpperDistItem( nTextTop ) );
- pTObj->SetMergedItem( SdrTextLowerDistItem( nTextBottom ) );
+ pTObj->SetMergedItem( makeSdrTextLeftDistItem( nTextLeft ) );
+ pTObj->SetMergedItem( makeSdrTextRightDistItem( nTextRight ) );
+ pTObj->SetMergedItem( makeSdrTextUpperDistItem( nTextTop ) );
+ pTObj->SetMergedItem( makeSdrTextLowerDistItem( nTextBottom ) );
pTObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) );
if ( !pTObj->ISA( SdrObjCustomShape ) )
@@ -7234,10 +7234,10 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
{
Reference< XPropertySet > xPropSet( xCell, UNO_QUERY_THROW );
- const sal_Int32 nLeftDist(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST)).GetValue());
- const sal_Int32 nRightDist(((const SdrTextRightDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
- const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
- const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
+ const sal_Int32 nLeftDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST)).GetValue());
+ const sal_Int32 nRightDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
+ const sal_Int32 nUpperDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
+ const sal_Int32 nLowerDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
static const OUString sTopBorder( "TextUpperDistance" );
static const OUString sBottomBorder( "TextLowerDistance" );
static const OUString sLeftBorder( "TextLeftDistance" );
@@ -7257,7 +7257,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) );
//set textHorizontalAdjust and TextWritingMode attr
- const sal_Int32 eHA(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
+ const sal_Int32 eHA(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
static const OUString sHorizontalAdjust( "TextHorizontalAdjust" );
static const OUString sWritingMode( "TextWritingMode" );
diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx
index 223fa30..ed57c86 100644
--- a/include/svx/sdtditm.hxx
+++ b/include/svx/sdtditm.hxx
@@ -22,32 +22,21 @@
#include <svx/sdmetitm.hxx>
#include <svx/svddef.hxx>
+inline SdrMetricItem makeSdrTextLeftDistItem(long nHgt) {
+ return SdrMetricItem(SDRATTR_TEXT_LEFTDIST, nHgt);
+}
-// class SdrTextLeft/Right/Upper/LowerDistItem
+inline SdrMetricItem makeSdrTextRightDistItem(long nHgt) {
+ return SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, nHgt);
+}
-class SdrTextLeftDistItem: public SdrMetricItem {
-public:
- SdrTextLeftDistItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_LEFTDIST,nHgt) {}
- SdrTextLeftDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_LEFTDIST,rIn) {}
-};
+inline SdrMetricItem makeSdrTextUpperDistItem(long nHgt) {
+ return SdrMetricItem(SDRATTR_TEXT_UPPERDIST, nHgt);
+}
-class SdrTextRightDistItem: public SdrMetricItem {
-public:
- SdrTextRightDistItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_RIGHTDIST,nHgt) {}
- SdrTextRightDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_RIGHTDIST,rIn) {}
-};
-
-class SdrTextUpperDistItem: public SdrMetricItem {
-public:
- SdrTextUpperDistItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_UPPERDIST,nHgt) {}
- SdrTextUpperDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_UPPERDIST,rIn) {}
-};
-
-class SdrTextLowerDistItem: public SdrMetricItem {
-public:
- SdrTextLowerDistItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_LOWERDIST,nHgt) {}
- SdrTextLowerDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_TEXT_LOWERDIST,rIn) {}
-};
+inline SdrMetricItem makeSdrTextLowerDistItem(long nHgt) {
+ return SdrMetricItem(SDRATTR_TEXT_LOWERDIST, nHgt);
+}
#endif
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index b573afe..fbc95ef 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -128,10 +128,10 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc )
aItemSet.Put( SdrShadowYDistItem( 100 ) );
// text attributes
- aItemSet.Put( SdrTextLeftDistItem( 100 ) );
- aItemSet.Put( SdrTextRightDistItem( 100 ) );
- aItemSet.Put( SdrTextUpperDistItem( 100 ) );
- aItemSet.Put( SdrTextLowerDistItem( 100 ) );
+ aItemSet.Put( makeSdrTextLeftDistItem( 100 ) );
+ aItemSet.Put( makeSdrTextRightDistItem( 100 ) );
+ aItemSet.Put( makeSdrTextUpperDistItem( 100 ) );
+ aItemSet.Put( makeSdrTextLowerDistItem( 100 ) );
aItemSet.Put( SdrTextAutoGrowWidthItem( false ) );
aItemSet.Put( SdrTextAutoGrowHeightItem( true ) );
// use the default cell style to be able to modify the caption font
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index a4ac8cb..5051a2a 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -219,10 +219,10 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
aCaptionSet.Put( SdrShadowYDistItem( 100 ) );
// text attributes
- aCaptionSet.Put( SdrTextLeftDistItem( 100 ) );
- aCaptionSet.Put( SdrTextRightDistItem( 100 ) );
- aCaptionSet.Put( SdrTextUpperDistItem( 100 ) );
- aCaptionSet.Put( SdrTextLowerDistItem( 100 ) );
+ aCaptionSet.Put( makeSdrTextLeftDistItem( 100 ) );
+ aCaptionSet.Put( makeSdrTextRightDistItem( 100 ) );
+ aCaptionSet.Put( makeSdrTextUpperDistItem( 100 ) );
+ aCaptionSet.Put( makeSdrTextLowerDistItem( 100 ) );
aCaptionSet.Put( SdrTextAutoGrowWidthItem( false ) );
aCaptionSet.Put( SdrTextAutoGrowHeightItem( true ) );
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index e9366ff..6a75aa3 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -549,10 +549,10 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb
if( mbAutoMargin )
{
sal_Int32 nMargin = rDffConv.GetDefaultTextMargin();
- rSdrObj.SetMergedItem( SdrTextLeftDistItem( nMargin ) );
- rSdrObj.SetMergedItem( SdrTextRightDistItem( nMargin ) );
- rSdrObj.SetMergedItem( SdrTextUpperDistItem( nMargin ) );
- rSdrObj.SetMergedItem( SdrTextLowerDistItem( nMargin ) );
+ rSdrObj.SetMergedItem( makeSdrTextLeftDistItem( nMargin ) );
+ rSdrObj.SetMergedItem( makeSdrTextRightDistItem( nMargin ) );
+ rSdrObj.SetMergedItem( makeSdrTextUpperDistItem( nMargin ) );
+ rSdrObj.SetMergedItem( makeSdrTextLowerDistItem( nMargin ) );
}
// macro and hyperlink
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 3a939d7..0492710 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -412,10 +412,10 @@ void SdFiltersTest::testBnc862510_5()
// Same as testBnc870237, but here we check the horizontal spacing
const SdrObject* pObj = dynamic_cast<SdrObject*>( pPage->GetObj( 1 ) );
CPPUNIT_ASSERT_MESSAGE( "no object", pObj != NULL);
- CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrTextUpperDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST))).GetValue());
- CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrTextLowerDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST))).GetValue());
- CPPUNIT_ASSERT_EQUAL( sal_Int32(7510), (static_cast< const SdrTextRightDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST))).GetValue());
- CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrTextLeftDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(7510), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST))).GetValue());
xDocShRef->DoClose();
}
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index d1ae4e8..20c770e 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -545,10 +545,10 @@ void SdFiltersTest::testBnc870237()
// Simulate a:ext inside dsp:txXfrm with changing the lower distance
const SdrObjGroup* pObj = dynamic_cast<SdrObjGroup*>( pPage->GetObj( 0 ) );
CPPUNIT_ASSERT_MESSAGE( "no object", pObj != NULL);
- CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrTextUpperDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST))).GetValue());
- CPPUNIT_ASSERT_EQUAL( sal_Int32(9919), (static_cast< const SdrTextLowerDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST))).GetValue());
- CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrTextRightDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST))).GetValue());
- CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrTextLeftDistItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(9919), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST))).GetValue());
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(0), (static_cast< const SdrMetricItem& >(pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST))).GetValue());
xDocShRef->DoClose();
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 11a20a1..f15d1e5 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -223,10 +223,10 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE));
rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE));
- rISet.Put( SdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default
- rISet.Put( SdrTextRightDistItem( 250 ) );
- rISet.Put( SdrTextUpperDistItem( 125 ) );
- rISet.Put( SdrTextLowerDistItem( 125 ) );
+ rISet.Put( makeSdrTextLeftDistItem( 250 ) ); // sj: (i33745) using text frame distances seems to be a better default
+ rISet.Put( makeSdrTextRightDistItem( 250 ) );
+ rISet.Put( makeSdrTextUpperDistItem( 125 ) );
+ rISet.Put( makeSdrTextLowerDistItem( 125 ) );
rISet.Put( SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL ) );
@@ -587,10 +587,10 @@ void SdDrawDocument::CreateDefaultCellStyles()
rISet.Put(SvxLRSpaceItem(EE_PARA_LRSPACE));
rISet.Put(SvxULSpaceItem(EE_PARA_ULSPACE));
- rISet.Put( SdrTextLeftDistItem( 250 ) );
- rISet.Put( SdrTextRightDistItem( 250 ) );
- rISet.Put( SdrTextUpperDistItem( 130 ) );
- rISet.Put( SdrTextLowerDistItem( 130 ) );
+ rISet.Put( makeSdrTextLeftDistItem( 250 ) );
+ rISet.Put( makeSdrTextRightDistItem( 250 ) );
+ rISet.Put( makeSdrTextUpperDistItem( 130 ) );
+ rISet.Put( makeSdrTextLowerDistItem( 130 ) );
rISet.Put( SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL ) );
rISet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index d8263b5..a84e29d 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2258,10 +2258,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
if ( pSheet2 )
{
SfxItemSet& rItemSet = pSheet2->GetItemSet();
- rItemSet.Put( (SdrTextLeftDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LEFTDIST ) );
- rItemSet.Put( (SdrTextRightDistItem&)pText->GetMergedItem( SDRATTR_TEXT_RIGHTDIST ) );
- rItemSet.Put( (SdrTextUpperDistItem&)pText->GetMergedItem( SDRATTR_TEXT_UPPERDIST ) );
- rItemSet.Put( (SdrTextLowerDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LOWERDIST ) );
+ rItemSet.Put( (SdrMetricItem&)pText->GetMergedItem( SDRATTR_TEXT_LEFTDIST ) );
+ rItemSet.Put( (SdrMetricItem&)pText->GetMergedItem( SDRATTR_TEXT_RIGHTDIST ) );
+ rItemSet.Put( (SdrMetricItem&)pText->GetMergedItem( SDRATTR_TEXT_UPPERDIST ) );
+ rItemSet.Put( (SdrMetricItem&)pText->GetMergedItem( SDRATTR_TEXT_LOWERDIST ) );
rItemSet.Put( (SdrTextVertAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_VERTADJUST ) );
rItemSet.Put( (SdrTextHorzAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_HORZADJUST ) );
if ( pTextObj->GetInstance() == TSS_TYPE_TITLE
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 3758ba2..a92d4bd 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -482,10 +482,10 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
rAttr.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_BLOCK ) );
rAttr.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
- rAttr.Put( SdrTextLeftDistItem( 100 ) );
- rAttr.Put( SdrTextRightDistItem( 100 ) );
- rAttr.Put( SdrTextUpperDistItem( 100 ) );
- rAttr.Put( SdrTextLowerDistItem( 100 ) );
+ rAttr.Put( makeSdrTextLeftDistItem( 100 ) );
+ rAttr.Put( makeSdrTextRightDistItem( 100 ) );
+ rAttr.Put( makeSdrTextUpperDistItem( 100 ) );
+ rAttr.Put( makeSdrTextLowerDistItem( 100 ) );
}
else if (nSlotId == SID_DRAW_MEASURELINE)
{
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index d973def..eb8a0e8 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -934,7 +934,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
if ( aEditAttr.GetItemState( SDRATTR_TEXT_LEFTDIST ) == SFX_ITEM_ON )
{
- const SdrTextLeftDistItem& rTLDItem = (const SdrTextLeftDistItem&)
+ const SdrMetricItem& rTLDItem = (const SdrMetricItem&)
aEditAttr.Get( SDRATTR_TEXT_LEFTDIST );
long nLD = rTLDItem.GetValue();
aPos.X() += nLD;
@@ -946,7 +946,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
if ( aEditAttr.GetItemState( SDRATTR_TEXT_LEFTDIST ) == SFX_ITEM_ON )
{
- const SdrTextLeftDistItem& rTLDItem = (const SdrTextLeftDistItem&)
+ const SdrMetricItem& rTLDItem = (const SdrMetricItem&)
aEditAttr.Get( SDRATTR_TEXT_LEFTDIST );
long nLD = rTLDItem.GetValue();
aLRSpace.SetLeft( aLRSpace.GetLeft() + nLD );
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index c81fe2d..6ab12ed 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -211,15 +211,15 @@ namespace sdr
if(bLineVisible)
{
- const sal_Int32 nLeftDist(((const SdrTextLeftDistItem&)GetItem(SDRATTR_TEXT_LEFTDIST)).GetValue());
- const sal_Int32 nRightDist(((const SdrTextRightDistItem&)GetItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
- const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)GetItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
- const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)GetItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
-
- SetObjectItemDirect(SdrTextLeftDistItem(nLeftDist + nDifference));
- SetObjectItemDirect(SdrTextRightDistItem(nRightDist + nDifference));
- SetObjectItemDirect(SdrTextUpperDistItem(nUpperDist + nDifference));
- SetObjectItemDirect(SdrTextLowerDistItem(nLowerDist + nDifference));
+ const sal_Int32 nLeftDist(((const SdrMetricItem&)GetItem(SDRATTR_TEXT_LEFTDIST)).GetValue());
+ const sal_Int32 nRightDist(((const SdrMetricItem&)GetItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
+ const sal_Int32 nUpperDist(((const SdrMetricItem&)GetItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
+ const sal_Int32 nLowerDist(((const SdrMetricItem&)GetItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
+
+ SetObjectItemDirect(makeSdrTextLeftDistItem(nLeftDist + nDifference));
+ SetObjectItemDirect(makeSdrTextRightDistItem(nRightDist + nDifference));
+ SetObjectItemDirect(makeSdrTextUpperDistItem(nUpperDist + nDifference));
+ SetObjectItemDirect(makeSdrTextLowerDistItem(nLowerDist + nDifference));
}
}
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index cf4c6f5..3118a31 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -149,10 +149,10 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, 0);
mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWHEIGHT -SDRATTR_START]=new SdrTextAutoGrowHeightItem;
mppLocalPoolDefaults[SDRATTR_TEXT_FITTOSIZE -SDRATTR_START]=new SdrTextFitToSizeTypeItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_LEFTDIST -SDRATTR_START]=new SdrTextLeftDistItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_RIGHTDIST -SDRATTR_START]=new SdrTextRightDistItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_UPPERDIST -SDRATTR_START]=new SdrTextUpperDistItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_LOWERDIST -SDRATTR_START]=new SdrTextLowerDistItem;
+ mppLocalPoolDefaults[SDRATTR_TEXT_LEFTDIST -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_LEFTDIST, 0);
+ mppLocalPoolDefaults[SDRATTR_TEXT_RIGHTDIST -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, 0);
+ mppLocalPoolDefaults[SDRATTR_TEXT_UPPERDIST -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_UPPERDIST, 0);
+ mppLocalPoolDefaults[SDRATTR_TEXT_LOWERDIST -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_LOWERDIST, 0);
mppLocalPoolDefaults[SDRATTR_TEXT_VERTADJUST -SDRATTR_START]=new SdrTextVertAdjustItem;
mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEHEIGHT -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, 0);
mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEWIDTH -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, 0);
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index b0ef005..e7e28d6 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1020,10 +1020,10 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
Rectangle aTextRect( aPos, aSize );
SdrRectObj* pText =new SdrRectObj( OBJ_TEXT, aTextRect );
- pText->SetMergedItem ( SdrTextUpperDistItem (0));
- pText->SetMergedItem ( SdrTextLowerDistItem (0));
- pText->SetMergedItem ( SdrTextRightDistItem (0));
- pText->SetMergedItem ( SdrTextLeftDistItem (0));
+ pText->SetMergedItem ( makeSdrTextUpperDistItem (0));
+ pText->SetMergedItem ( makeSdrTextLowerDistItem (0));
+ pText->SetMergedItem ( makeSdrTextRightDistItem (0));
+ pText->SetMergedItem ( makeSdrTextLeftDistItem (0));
if ( aFnt.GetWidth() || ( rAct.GetType() == META_STRETCHTEXT_ACTION ) )
{
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a69e188..f08a017 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1799,22 +1799,22 @@ bool SdrTextObj::IsContourTextFrame() const
long SdrTextObj::GetTextLeftDistance() const
{
- return ((SdrTextLeftDistItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_LEFTDIST))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_LEFTDIST))).GetValue();
}
long SdrTextObj::GetTextRightDistance() const
{
- return ((SdrTextRightDistItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_RIGHTDIST))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_RIGHTDIST))).GetValue();
}
long SdrTextObj::GetTextUpperDistance() const
{
- return ((SdrTextUpperDistItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_UPPERDIST))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_UPPERDIST))).GetValue();
}
long SdrTextObj::GetTextLowerDistance() const
{
- return ((SdrTextLowerDistItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_LOWERDIST))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_LOWERDIST))).GetValue();
}
SdrTextAniKind SdrTextObj::GetTextAniKind() const
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index a4a37a9..cf182d3 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -718,28 +718,28 @@ sal_Int32 Cell::getMinimumHeight()
long Cell::GetTextLeftDistance() const
{
- return ((SdrTextLeftDistItem&)(GetItemSet().Get(SDRATTR_TEXT_LEFTDIST))).GetValue();
+ return ((SdrMetricItem&)(GetItemSet().Get(SDRATTR_TEXT_LEFTDIST))).GetValue();
}
long Cell::GetTextRightDistance() const
{
- return ((SdrTextRightDistItem&)(GetItemSet().Get(SDRATTR_TEXT_RIGHTDIST))).GetValue();
+ return ((SdrMetricItem&)(GetItemSet().Get(SDRATTR_TEXT_RIGHTDIST))).GetValue();
}
long Cell::GetTextUpperDistance() const
{
- return ((SdrTextUpperDistItem&)(GetItemSet().Get(SDRATTR_TEXT_UPPERDIST))).GetValue();
+ return ((SdrMetricItem&)(GetItemSet().Get(SDRATTR_TEXT_UPPERDIST))).GetValue();
}
long Cell::GetTextLowerDistance() const
{
- return ((SdrTextLowerDistItem&)(GetItemSet().Get(SDRATTR_TEXT_LOWERDIST))).GetValue();
+ return ((SdrMetricItem&)(GetItemSet().Get(SDRATTR_TEXT_LOWERDIST))).GetValue();
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 4404c47..2902607 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -730,10 +730,10 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
// merge drawing layer text distance items into SvxBoxItem used by the dialog
SvxBoxItem aBoxItem( static_cast< const SvxBoxItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER ) ) );
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrMetricItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrMetricItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrMetricItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrMetricItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
SvxBoxInfoItem aBoxInfoItem( static_cast< const SvxBoxInfoItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) );
@@ -753,16 +753,16 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
SvxBoxItem aNewBoxItem( static_cast< const SvxBoxItem& >( aNewSet.Get( SDRATTR_TABLE_BORDER ) ) );
if( aNewBoxItem.GetDistance( BOX_LINE_LEFT ) != aBoxItem.GetDistance( BOX_LINE_LEFT ) )
- aNewSet.Put(SdrTextLeftDistItem( aNewBoxItem.GetDistance( BOX_LINE_LEFT ) ) );
+ aNewSet.Put(SdrMetricItem( aNewBoxItem.GetDistance( BOX_LINE_LEFT ) ) );
if( aNewBoxItem.GetDistance( BOX_LINE_RIGHT ) != aBoxItem.GetDistance( BOX_LINE_RIGHT ) )
- aNewSet.Put(SdrTextRightDistItem( aNewBoxItem.GetDistance( BOX_LINE_RIGHT ) ) );
+ aNewSet.Put(makeSdrTextRightDistItem( aNewBoxItem.GetDistance( BOX_LINE_RIGHT ) ) );
if( aNewBoxItem.GetDistance( BOX_LINE_TOP ) != aBoxItem.GetDistance( BOX_LINE_TOP ) )
- aNewSet.Put(SdrTextUpperDistItem( aNewBoxItem.GetDistance( BOX_LINE_TOP ) ) );
+ aNewSet.Put(makeSdrTextUpperDistItem( aNewBoxItem.GetDistance( BOX_LINE_TOP ) ) );
if( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) != aBoxItem.GetDistance( BOX_LINE_BOTTOM ) )
- aNewSet.Put(SdrTextLowerDistItem( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) );
+ aNewSet.Put(makeSdrTextLowerDistItem( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) );
SetAttrToSelectedCells(aNewSet, false);
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 2af7e71..c8af5bf 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1201,10 +1201,10 @@ SdrObject* SwWW8ImplReader::ReadTxtBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
rSet.Put( SdrTextFitToSizeTypeItem( SDRTEXTFIT_NONE ) );
rSet.Put( SdrTextAutoGrowWidthItem(false));
rSet.Put( SdrTextAutoGrowHeightItem(false));
- rSet.Put( SdrTextLeftDistItem( MIN_BORDER_DIST*2 ) );
- rSet.Put( SdrTextRightDistItem( MIN_BORDER_DIST*2 ) );
- rSet.Put( SdrTextUpperDistItem( MIN_BORDER_DIST ) );
- rSet.Put( SdrTextLowerDistItem( MIN_BORDER_DIST ) );
+ rSet.Put( makeSdrTextLeftDistItem( MIN_BORDER_DIST*2 ) );
+ rSet.Put( makeSdrTextRightDistItem( MIN_BORDER_DIST*2 ) );
+ rSet.Put( makeSdrTextUpperDistItem( MIN_BORDER_DIST ) );
+ rSet.Put( makeSdrTextLowerDistItem( MIN_BORDER_DIST ) );
return pObj;
}
@@ -2800,10 +2800,10 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
// ww8-default Randabstand einsetzen
SfxItemSet aItemSet(pDrawModel->GetItemPool(),
SDRATTR_TEXT_LEFTDIST, SDRATTR_TEXT_LOWERDIST);
- aItemSet.Put( SdrTextLeftDistItem( pRecord->nDxTextLeft ) );
- aItemSet.Put( SdrTextRightDistItem( pRecord->nDxTextRight ) );
- aItemSet.Put( SdrTextUpperDistItem( pRecord->nDyTextTop ) );
- aItemSet.Put( SdrTextLowerDistItem( pRecord->nDyTextBottom ) );
+ aItemSet.Put( makeSdrTextLeftDistItem( pRecord->nDxTextLeft ) );
+ aItemSet.Put( makeSdrTextRightDistItem( pRecord->nDxTextRight ) );
+ aItemSet.Put( makeSdrTextUpperDistItem( pRecord->nDyTextTop ) );
+ aItemSet.Put( makeSdrTextLowerDistItem( pRecord->nDyTextBottom ) );
pSdrTextObj->SetMergedItemSetAndBroadcast(aItemSet);
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8545c52..75241b7 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -862,10 +862,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
}
// Set distances on Textbox's margins
- aSet.Put( SdrTextLeftDistItem( nTextLeft ) );
- aSet.Put( SdrTextRightDistItem( nTextRight ) );
- aSet.Put( SdrTextUpperDistItem( nTextTop ) );
- aSet.Put( SdrTextLowerDistItem( nTextBottom ) );
+ aSet.Put( makeSdrTextLeftDistItem( nTextLeft ) );
+ aSet.Put( makeSdrTextRightDistItem( nTextRight ) );
+ aSet.Put( makeSdrTextUpperDistItem( nTextTop ) );
+ aSet.Put( makeSdrTextLowerDistItem( nTextBottom ) );
pImpRec->nDxTextLeft = nTextLeft;
pImpRec->nDyTextTop = nTextTop;
pImpRec->nDxTextRight = nTextRight;
More information about the Libreoffice-commits
mailing list