summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-07-31 15:57:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-07-31 15:57:12 +0200
commit68969cc61adecac481ae9656978ef952f435b310 (patch)
tree823f5a951bd5ebf9e465fae8297ddc220cb6a2d5 /sc
parent8b91280386f478f2e972e2aa71080f106783d762 (diff)
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
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/postit.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index b89c22b80ad9..b573afeb70f5 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();
}