diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-28 17:30:38 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-28 17:36:20 +0100 |
| commit | 98bb5d242ad8360ec02fd0f4dbb4d19dec59dedd (patch) | |
| tree | 3e2c7fcbe532f18024c08ecd6992a7001e9d193f /sw | |
| parent | fdo#38838 Some removal/replacement of the String/UniString with OUString (diff) | |
| download | core-98bb5d242ad8360ec02fd0f4dbb4d19dec59dedd.tar.gz core-98bb5d242ad8360ec02fd0f4dbb4d19dec59dedd.zip | |
fix previous string conversion:
- SdrAngleItem::GetPresentation missing space
- SwFmtFrmSize::GetPresentation spurious s
- crstrvl.cxx build breaker
Change-Id: I4f1ce51943dff002ce250aff6f37f090c727bb00
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/utlui/attrdesc.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 040e99871437..749381525d71 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1467,7 +1467,7 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt, { if( !IsInvalidItem( pItem )) { - String aStr; + OUString aStr; GetDoc()->GetAttrPool().GetPresentation( *pItem, SFX_ITEM_PRESENTATION_COMPLETE, SFX_MAPUNIT_CM, aStr ); diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index ee858b41763e..11d745521ed7 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -380,7 +380,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation { const sal_uInt16 nId = ATT_FIX_SIZE == eFrmHeightType ? STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT; - rText = rText + ", " + SW_RESSTR( nId ) + " s"; + rText = rText + ", " + SW_RESSTR( nId ) + " "; if ( GetHeightPercent() ) { rText = rText + OUString::valueOf(GetHeightPercent()) + "%"; |