From 74929bba736cc6cceed3c088e13f5952abb1bd2b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 29 Aug 2013 20:44:22 +0100 Subject: Related: fdo#38838 remove UniString::ToUpperAscii things got a little out of hand and I ended up converting quite a bit of calc to OUString Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216 --- sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sc/source/ui/StatisticsDialogs/SamplingDialog.cxx') diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 841f3fc51663..20608bbb6e24 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -101,9 +101,8 @@ void ScSamplingDialog::Init() void ScSamplingDialog::GetRangeFromSelection() { - OUString aCurrentString; mViewData->GetSimpleArea(mInputRange); - mInputRange.Format(aCurrentString, SCR_ABS_3D, mDocument, mAddressDetails); + OUString aCurrentString(mInputRange.Format(SCR_ABS_3D, mDocument, mAddressDetails)); mpInputRangeEdit->SetText(aCurrentString); } @@ -142,7 +141,7 @@ void ScSamplingDialog::SetReference( const ScRange& rReferenceRange, ScDocument* if ( mpActiveEdit == mpInputRangeEdit ) { mInputRange = rReferenceRange; - mInputRange.Format( aReferenceString, SCR_ABS_3D, pDocument, mAddressDetails ); + aReferenceString = mInputRange.Format(SCR_ABS_3D, pDocument, mAddressDetails); mpInputRangeEdit->SetRefString( aReferenceString ); } else if ( mpActiveEdit == mpOutputRangeEdit ) @@ -150,7 +149,7 @@ void ScSamplingDialog::SetReference( const ScRange& rReferenceRange, ScDocument* mOutputAddress = rReferenceRange.aStart; sal_uInt16 nFormat = ( mOutputAddress.Tab() == mCurrentAddress.Tab() ) ? SCA_ABS : SCA_ABS_3D; - mOutputAddress.Format( aReferenceString, nFormat, pDocument, pDocument->GetAddressConvention() ); + aReferenceString = mOutputAddress.Format(nFormat, pDocument, pDocument->GetAddressConvention()); mpOutputRangeEdit->SetRefString( aReferenceString ); // Change sampling size according to output range selection -- cgit