[Libreoffice-commits] core.git: 2 commits - filter/source include/svx offapi/com sc/source sd/source svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Thu Jul 31 07:00:41 PDT 2014
filter/source/msfilter/msdffimp.cxx | 4 +-
filter/source/msfilter/svdfppt.cxx | 4 +-
include/svx/sdtmfitm.hxx | 38 ++++++++--------------------
offapi/com/sun/star/style/XStyleLoader2.idl | 2 +
sc/source/core/data/postit.cxx | 8 ++---
sd/source/core/sdpage.cxx | 8 ++---
sd/source/filter/ppt/pptin.cxx | 2 -
sd/source/ui/func/fuconrec.cxx | 4 +-
sd/source/ui/func/futext.cxx | 20 +++++++-------
svx/source/svdraw/svdattr.cxx | 8 ++---
svx/source/svdraw/svdoashp.cxx | 8 ++---
svx/source/svdraw/svdotext.cxx | 12 ++++----
sw/source/filter/html/htmldrawreader.cxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 4 +-
14 files changed, 55 insertions(+), 69 deletions(-)
New commits:
commit 68969cc61adecac481ae9656978ef952f435b310
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jul 31 15:57:12 2014 +0200
Consistency around SdrMetricItem
...where some instances of SDRATTR_TEXT_MINFRAMEHEIGHT etc. where SdrMetricItem
while others where of trivial derived classes SdrTextMinFrameHeightItem etc.,
that appear to only existed for better-named constructors.
Change-Id: If0af79fbb803275ed09fc7b950868c5de7d61615
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 0956d12..0fe240b 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5122,9 +5122,9 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
if (GetPropertyValue(DFF_Prop_FitTextToShape) & 2)
{
aSet.Put( SdrTextAutoGrowHeightItem( true ) );
- aSet.Put( SdrTextMinFrameHeightItem(
+ aSet.Put( makeSdrTextMinFrameHeightItem(
aNewRect.Bottom() - aNewRect.Top() ) );
- aSet.Put( SdrTextMinFrameWidthItem(
+ aSet.Put( makeSdrTextMinFrameWidthItem(
aNewRect.Right() - aNewRect.Left() ) );
bFitText = true;
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 1426da8..4757135 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1088,12 +1088,12 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
if ( nMinFrameHeight < 0 )
nMinFrameHeight = 0;
if ( !pTObj->ISA( SdrObjCustomShape ) )
- pTObj->SetMergedItem( SdrTextMinFrameHeightItem( nMinFrameHeight ) );
+ pTObj->SetMergedItem( makeSdrTextMinFrameHeightItem( nMinFrameHeight ) );
if ( nMinFrameWidth < 0 )
nMinFrameWidth = 0;
if ( !pTObj->ISA( SdrObjCustomShape ) )
- pTObj->SetMergedItem( SdrTextMinFrameWidthItem( nMinFrameWidth ) );
+ pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) );
// set margins at the borders of the textbox
pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) );
diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx
index 00a84d1..a590dde 100644
--- a/include/svx/sdtmfitm.hxx
+++ b/include/svx/sdtmfitm.hxx
@@ -22,37 +22,21 @@
#include <svx/sdmetitm.hxx>
#include <svx/svddef.hxx>
+inline SdrMetricItem makeSdrTextMinFrameHeightItem(long nHgt) {
+ return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, nHgt);
+}
-// class SdrTextMinFrameHeighItem
+inline SdrMetricItem makeSdrTextMaxFrameHeightItem(long nHgt) {
+ return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, nHgt);
+}
-class SdrTextMinFrameHeightItem: public SdrMetricItem {
-public:
- SdrTextMinFrameHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT,nHgt) {}
+inline SdrMetricItem makeSdrTextMinFrameWidthItem(long nWdt) {
+ return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, nWdt);
};
-
-// class SdrTextMaxFrameHeightItem
-
-class SdrTextMaxFrameHeightItem: public SdrMetricItem {
-public:
- SdrTextMaxFrameHeightItem(long nHgt=0): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT,nHgt) {}
-};
-
-
-// class SdrTextMinFrameWidthItem
-
-class SdrTextMinFrameWidthItem: public SdrMetricItem {
-public:
- SdrTextMinFrameWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH,nWdt) {}
-};
-
-
-// class SdrTextMaxFrameWidthItem
-
-class SdrTextMaxFrameWidthItem: public SdrMetricItem {
-public:
- SdrTextMaxFrameWidthItem(long nWdt=0): SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH,nWdt) {}
-};
+inline SdrMetricItem makeSdrTextMaxFrameWidthItem(long nWdt) {
+ return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, nWdt);
+}
#endif
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index b89c22b..b573afe 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -646,8 +646,8 @@ void ScPostIt::CreateCaptionFromInitData( const ScAddress& rPos ) const
if( rInitData.mbDefaultPosSize )
{
// set other items and fit caption size to text
- maNoteData.mpCaption->SetMergedItem( SdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) );
- maNoteData.mpCaption->SetMergedItem( SdrTextMaxFrameWidthItem( SC_NOTECAPTION_MAXWIDTH_TEMP ) );
+ maNoteData.mpCaption->SetMergedItem( makeSdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) );
+ maNoteData.mpCaption->SetMergedItem( makeSdrTextMaxFrameWidthItem( SC_NOTECAPTION_MAXWIDTH_TEMP ) );
maNoteData.mpCaption->AdjustTextFrameWidthAndHeight();
aCreator.AutoPlaceCaption();
}
@@ -795,8 +795,8 @@ SdrCaptionObj* ScNoteUtil::CreateTempCaption(
// adjust caption size to text size
long nMaxWidth = ::std::min< long >( aVisRect.GetWidth() * 2 / 3, SC_NOTECAPTION_MAXWIDTH_TEMP );
pCaption->SetMergedItem( SdrTextAutoGrowWidthItem( true ) );
- pCaption->SetMergedItem( SdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) );
- pCaption->SetMergedItem( SdrTextMaxFrameWidthItem( nMaxWidth ) );
+ pCaption->SetMergedItem( makeSdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) );
+ pCaption->SetMergedItem( makeSdrTextMaxFrameWidthItem( nMaxWidth ) );
pCaption->SetMergedItem( SdrTextAutoGrowHeightItem( true ) );
pCaption->AdjustTextFrameWidthAndHeight();
}
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index a33bdcc..351f544 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -415,9 +415,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rec
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
if( bVertical )
- aTempAttr.Put( SdrTextMinFrameWidthItem( rRect.GetSize().Width() ) );
+ aTempAttr.Put( makeSdrTextMinFrameWidthItem( rRect.GetSize().Width() ) );
else
- aTempAttr.Put( SdrTextMinFrameHeightItem( rRect.GetSize().Height() ) );
+ aTempAttr.Put( makeSdrTextMinFrameHeightItem( rRect.GetSize().Height() ) );
if (mbMaster)
{
@@ -2238,7 +2238,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
{
// switch off AutoGrowHeight, set new MinHeight
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
- SdrTextMinFrameHeightItem aMinHeight( aRect.GetSize().Height() );
+ SdrMetricItem aMinHeight( makeSdrTextMinFrameHeightItem(aRect.GetSize().Height()) );
aTempAttr.Put( aMinHeight );
aTempAttr.Put( SdrTextAutoGrowHeightItem(false) );
pTextObject->SetMergedItemSet(aTempAttr);
@@ -2255,7 +2255,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
{
// switch off AutoGrowWidth , set new MinWidth
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
- SdrTextMinFrameWidthItem aMinWidth( aRect.GetSize().Width() );
+ SdrMetricItem aMinWidth( makeSdrTextMinFrameWidthItem(aRect.GetSize().Width()) );
aTempAttr.Put( aMinWidth );
aTempAttr.Put( SdrTextAutoGrowWidthItem(false) );
pTextObject->SetMergedItemSet(aTempAttr);
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index e5e6377..d8263b5 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2274,7 +2274,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
SfxItemSet aTempAttr( mpDoc->GetPool() );
- SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() );
+ SdrMetricItem aMinHeight( makeSdrTextMinFrameHeightItem(pText->GetLogicRect().GetSize().Height()) );
aTempAttr.Put( aMinHeight );
SdrTextAutoGrowHeightItem aAutoGrowHeight( false );
aTempAttr.Put( aAutoGrowHeight );
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 6b87758..3758ba2 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -470,8 +470,8 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
{
// legend object
Size aSize(pObj->GetLogicRect().GetSize());
- rAttr.Put( SdrTextMinFrameHeightItem( aSize.Height() ) );
- rAttr.Put( SdrTextMinFrameWidthItem( aSize.Width() ) );
+ rAttr.Put( makeSdrTextMinFrameHeightItem( aSize.Height() ) );
+ rAttr.Put( makeSdrTextMinFrameWidthItem( aSize.Width() ) );
rAttr.Put( SdrTextAutoGrowHeightItem( true ) );
rAttr.Put( SdrTextAutoGrowWidthItem( true ) );
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index e426808..d7075e4 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -480,18 +480,18 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
We get the correct height during the subsequent creation of the
object, otherwise we draw to much */
SfxItemSet aSet(mpViewShell->GetPool());
- aSet.Put(SdrTextMinFrameHeightItem(0));
+ aSet.Put(makeSdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextAutoGrowWidthItem(false));
aSet.Put(SdrTextAutoGrowHeightItem(true));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
- aSet.Put(SdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
+ aSet.Put(makeSdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
pTxtObj->SetMergedItemSet(aSet);
}
else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
{
SfxItemSet aSet(mpViewShell->GetPool());
- aSet.Put(SdrTextMinFrameWidthItem(0));
+ aSet.Put(makeSdrTextMinFrameWidthItem(0));
aSet.Put(SdrTextAutoGrowWidthItem(true));
aSet.Put(SdrTextAutoGrowHeightItem(false));
@@ -499,7 +499,7 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
- aSet.Put(SdrTextMaxFrameWidthItem(pTxtObj->GetLogicRect().GetSize().Width()));
+ aSet.Put(makeSdrTextMaxFrameWidthItem(pTxtObj->GetLogicRect().GetSize().Width()));
pTxtObj->SetMergedItemSet(aSet);
}
}
@@ -558,8 +558,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
{
// Impress text object (rescales to line height)
SfxItemSet aSet(mpViewShell->GetPool());
- aSet.Put(SdrTextMinFrameHeightItem(0));
- aSet.Put(SdrTextMaxFrameHeightItem(0));
+ aSet.Put(makeSdrTextMinFrameHeightItem(0));
+ aSet.Put(makeSdrTextMaxFrameHeightItem(0));
aSet.Put(SdrTextAutoGrowHeightItem(true));
aSet.Put(SdrTextAutoGrowWidthItem(false));
pTxtObj->SetMergedItemSet(aSet);
@@ -567,8 +567,8 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
{
SfxItemSet aSet(mpViewShell->GetPool());
- aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextMaxFrameWidthItem(0));
+ aSet.Put(makeSdrTextMinFrameWidthItem(0));
+ aSet.Put(makeSdrTextMaxFrameWidthItem(0));
aSet.Put(SdrTextAutoGrowWidthItem(true));
aSet.Put(SdrTextAutoGrowHeightItem(false));
pTxtObj->SetMergedItemSet(aSet);
@@ -787,8 +787,8 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
if(mxTextObj.is())
{
SfxItemSet aSet(mpViewShell->GetPool());
- aSet.Put(SdrTextMinFrameHeightItem(0));
- aSet.Put(SdrTextMinFrameWidthItem(0));
+ aSet.Put(makeSdrTextMinFrameHeightItem(0));
+ aSet.Put(makeSdrTextMinFrameWidthItem(0));
aSet.Put(SdrTextAutoGrowHeightItem(true));
aSet.Put(SdrTextAutoGrowWidthItem(true));
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 0d6ade2..cf4c6f5 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -146,7 +146,7 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_CAPTIONLINELEN -SDRATTR_START]=new SdrCaptionLineLenItem ;
mppLocalPoolDefaults[SDRATTR_CAPTIONFITLINELEN-SDRATTR_START]=new SdrCaptionFitLineLenItem;
mppLocalPoolDefaults[SDRATTR_ECKENRADIUS -SDRATTR_START]=new SdrEckenradiusItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT -SDRATTR_START]=new SdrTextMinFrameHeightItem;
+ 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;
@@ -154,9 +154,9 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_TEXT_UPPERDIST -SDRATTR_START]=new SdrTextUpperDistItem;
mppLocalPoolDefaults[SDRATTR_TEXT_LOWERDIST -SDRATTR_START]=new SdrTextLowerDistItem;
mppLocalPoolDefaults[SDRATTR_TEXT_VERTADJUST -SDRATTR_START]=new SdrTextVertAdjustItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEHEIGHT -SDRATTR_START]=new SdrTextMaxFrameHeightItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEWIDTH -SDRATTR_START]=new SdrTextMinFrameWidthItem;
- mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEWIDTH -SDRATTR_START]=new SdrTextMaxFrameWidthItem;
+ mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEHEIGHT -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, 0);
+ mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEWIDTH -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, 0);
+ mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEWIDTH -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, 0);
mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWWIDTH -SDRATTR_START]=new SdrTextAutoGrowWidthItem;
mppLocalPoolDefaults[SDRATTR_TEXT_HORZADJUST -SDRATTR_START]=new SdrTextHorzAdjustItem;
mppLocalPoolDefaults[SDRATTR_TEXT_ANIKIND -SDRATTR_START]=new SdrTextAniKindItem;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index c2257f2..f6fab13 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1457,8 +1457,8 @@ void SdrObjCustomShape::AdaptTextMinSize()
{
// always reset MinWidthHeight to zero to only rely on text size and frame size
// to allow resizing being completely dependent on text size only
- aSet.Put(SdrTextMinFrameWidthItem(0));
- aSet.Put(SdrTextMinFrameHeightItem(0));
+ aSet.Put(makeSdrTextMinFrameWidthItem(0));
+ aSet.Put(makeSdrTextMinFrameHeightItem(0));
bChanged = true;
}
else
@@ -1473,8 +1473,8 @@ void SdrObjCustomShape::AdaptTextMinSize()
const long nTWdt(std::max(long(0), (long)(aTextBound.GetWidth() - 1 - nHDist)));
const long nTHgt(std::max(long(0), (long)(aTextBound.GetHeight() - 1 - nVDist)));
- aSet.Put(SdrTextMinFrameWidthItem(nTWdt));
- aSet.Put(SdrTextMinFrameHeightItem(nTHgt));
+ aSet.Put(makeSdrTextMinFrameWidthItem(nTWdt));
+ aSet.Put(makeSdrTextMinFrameHeightItem(nTHgt));
bChanged = true;
}
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 973ac5f..a69e188 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -566,7 +566,7 @@ void SdrTextObj::AdaptTextMinSize()
const long nDist(GetTextLeftDistance() + GetTextRightDistance());
const long nW(std::max(long(0), (long)(aRect.GetWidth() - 1 - nDist)));
- aSet.Put(SdrTextMinFrameWidthItem(nW));
+ aSet.Put(makeSdrTextMinFrameWidthItem(nW));
if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
@@ -580,7 +580,7 @@ void SdrTextObj::AdaptTextMinSize()
const long nDist(GetTextUpperDistance() + GetTextLowerDistance());
const long nH(std::max(long(0), (long)(aRect.GetHeight() - 1 - nDist)));
- aSet.Put(SdrTextMinFrameHeightItem(nH));
+ aSet.Put(makeSdrTextMinFrameHeightItem(nH));
if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
@@ -1761,22 +1761,22 @@ long SdrTextObj::GetEckenradius() const
long SdrTextObj::GetMinTextFrameHeight() const
{
- return ((SdrTextMinFrameHeightItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEHEIGHT))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEHEIGHT))).GetValue();
}
long SdrTextObj::GetMaxTextFrameHeight() const
{
- return ((SdrTextMaxFrameHeightItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEHEIGHT))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEHEIGHT))).GetValue();
}
long SdrTextObj::GetMinTextFrameWidth() const
{
- return ((SdrTextMinFrameWidthItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEWIDTH))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEWIDTH))).GetValue();
}
long SdrTextObj::GetMaxTextFrameWidth() const
{
- return ((SdrTextMaxFrameWidthItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEWIDTH))).GetValue();
+ return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEWIDTH))).GetValue();
}
bool SdrTextObj::IsFontwork() const
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 5f2c9af..7f9ee9e 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -516,7 +516,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// Die Hoehe ist nur eine Mindest-Hoehe
if( aTwipSz.Height() < MINFLY )
aTwipSz.Height() = MINFLY;
- aItemSet.Put( SdrTextMinFrameHeightItem( aTwipSz.Height() ) );
+ aItemSet.Put( makeSdrTextMinFrameHeightItem( aTwipSz.Height() ) );
pMarquee->SetMergedItemSetAndBroadcast(aItemSet);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 70c2f79..8545c52 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -836,9 +836,9 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
if (GetPropertyValue(DFF_Prop_FitTextToShape) & 2)
{
aSet.Put( SdrTextAutoGrowHeightItem( true ) );
- aSet.Put( SdrTextMinFrameHeightItem(
+ aSet.Put( makeSdrTextMinFrameHeightItem(
aNewRect.Bottom() - aNewRect.Top() ) );
- aSet.Put( SdrTextMinFrameWidthItem(
+ aSet.Put( makeSdrTextMinFrameWidthItem(
aNewRect.Right() - aNewRect.Left() ) );
}
else
commit 8b91280386f478f2e972e2aa71080f106783d762
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jul 31 15:51:55 2014 +0200
Missing @since tag
Change-Id: I6195dce9cea9a4fed4a48449e655271db68d95c2
diff --git a/offapi/com/sun/star/style/XStyleLoader2.idl b/offapi/com/sun/star/style/XStyleLoader2.idl
index f55760a..819ea9b 100644
--- a/offapi/com/sun/star/style/XStyleLoader2.idl
+++ b/offapi/com/sun/star/style/XStyleLoader2.idl
@@ -20,6 +20,8 @@ module com { module sun { module star { module style {
/** extends XStyleLoader interface to import styles from an already opened calc or writer component.
@see com::sun::star::style::XStyleLoader
+
+ @since LibreOffice 4.4
*/
interface XStyleLoader2: com::sun::star::style::XStyleLoader
{
More information about the Libreoffice-commits
mailing list