diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-04 23:58:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:56 +0100 |
commit | 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch) | |
tree | b8db79d2707ff5925ad01dba8a41bd8ab6d66847 /svx/source | |
parent | 1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff) |
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/core/extedit.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/ctredlin.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/fntctrl.cxx | 8 | ||||
-rw-r--r-- | svx/source/dialog/pagectrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/relfld.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 6 | ||||
-rw-r--r-- | svx/source/dialog/swframeexample.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmpgeimp.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmsrcimp.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmundo.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/formcontroller.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/navigatortree.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/navigatortreemodel.cxx | 4 |
14 files changed, 28 insertions, 28 deletions
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index fce702114089..29cabefa5c40 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -111,7 +111,7 @@ void ExternalToolEdit::Edit( GraphicObject* pGraphicObject ) osl::FileBase::createTempFile(0, &pHandle, &tempFileBase); // Move it to a file name with image extension properly set - tempFileName = tempFileBase + rtl::OUString(String('.')) + rtl::OUString(fExtension); + tempFileName = tempFileBase + rtl::OUString('.') + rtl::OUString(fExtension); osl::File::move(tempFileBase, tempFileName); //Write Graphic to the Temp File diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 5d7775e90d9f..620ce3949da4 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -564,7 +564,7 @@ void SvxTPView::Resize() void SvxTPView::InsertWriterHeader() { - String aStrTab(sal_Unicode('\t')); + rtl::OUString aStrTab('\t'); String aString(aTitle1); aString+=aStrTab; aString+=aTitle3; @@ -578,7 +578,7 @@ void SvxTPView::InsertWriterHeader() void SvxTPView::InsertCalcHeader() { - String aStrTab(sal_Unicode('\t')); + rtl::OUString aStrTab('\t'); String aString(aTitle1); aString+=aStrTab; aString+=aTitle2; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index c9137adb9e9b..247e199a1709 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -763,12 +763,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) long nTextWidth = 0; if(pImpl->cStartBracket) { - String sBracket(pImpl->cStartBracket); + rtl::OUString sBracket(pImpl->cStartBracket); nStartBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } if(pImpl->cEndBracket) { - String sBracket(pImpl->cEndBracket); + rtl::OUString sBracket(pImpl->cEndBracket); nEndBracketWidth = rFont.GetTxtSize( pPrinter, sBracket ).Width(); } nTextWidth = pImpl->CalcTextSize( this, pPrinter, aSmallFont ).Width(); @@ -785,7 +785,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cStartBracket) { - String sBracket(pImpl->cStartBracket); + rtl::OUString sBracket(pImpl->cStartBracket); rFont.DrawPrev( this, pPrinter, Point( _nX, nY - nOffset - 4), sBracket ); _nX += nStartBracketWidth; } @@ -799,7 +799,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if(pImpl->cEndBracket) { Point aTmpPoint( _nX + 1, nY - nOffset - 4); - String sBracket(pImpl->cEndBracket); + rtl::OUString sBracket(pImpl->cEndBracket); rFont.DrawPrev( this, pPrinter, aTmpPoint, sBracket ); } pImpl->aCJKFont.SetSize( aOldSize ); diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 7305b1664f0f..7eec077c837a 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -277,7 +277,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s String sText(rtl::OUString("ABC")); Point aMove(1, GetTextHeight()); sal_Unicode cArrow = 0x2193; - long nAWidth = GetTextWidth(String(sText.GetChar(0))); + long nAWidth = GetTextWidth(rtl::OUString(sText.GetChar(0))); switch(pImpl->nFrameDirection) { case FRMDIR_HORI_LEFT_TOP: @@ -307,7 +307,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s sText.Append(cArrow); for(sal_uInt16 i = 0; i < sText.Len(); i++) { - String sDraw(sText.GetChar(i)); + rtl::OUString sDraw(sText.GetChar(i)); long nHDiff = 0; long nCharWidth = GetTextWidth(sDraw); sal_Bool bHorizontal = 0 == aMove.Y(); diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 11fedaf94cfa..df3acee8de20 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -108,7 +108,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( String( sal_Unicode( '%' ) ) ); + SetCustomUnitText( rtl::OUString('%') ); SetUnit( FUNIT_CUSTOM ); } else diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 9ad1db82b843..b578b858b333 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -873,9 +873,9 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nSpace = ((nRightEnd - nLeftStart) - GetTextWidth(sOutputText)) / (nCount - 1); for(xub_StrLen i = 0; i < nCount; i++) { - sal_Unicode cChar = sOutputText.GetChar(i); - DrawText( Point( nLeftStart , nYOutput), cChar); - long nCharWidth = GetTextWidth(cChar); + rtl::OUString sChar(sOutputText.GetChar(i)); + DrawText( Point( nLeftStart , nYOutput), sChar); + long nCharWidth = GetTextWidth(sChar); nLeftStart += nCharWidth + nSpace; } break; diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 3ffdc0113a66..7825c6f019fc 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -176,7 +176,7 @@ void SvxSwFrameExample::InitAllRects_Impl() { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() / 2)); SetFont(aFont); - aAutoCharFrame.SetSize(Size(GetTextWidth('A'), GetTextHeight())); + aAutoCharFrame.SetSize(Size(GetTextWidth(rtl::OUString('A')), GetTextHeight())); aAutoCharFrame.SetPos(Point(aParaPrtArea.Left() + (aParaPrtArea.GetWidth() - aAutoCharFrame.GetWidth()) / 2, aParaPrtArea.Top() + (aParaPrtArea.GetHeight() - aAutoCharFrame.GetHeight()) / 2)); } @@ -674,7 +674,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) aPara.Bottom() -= nDiff; } if (nAnchor == TextContentAnchorType_AT_CHARACTER && bIgnoreWrap) - DrawText(aAutoCharFrame, 'A'); + DrawText(aAutoCharFrame, rtl::OUString('A')); } else { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 0ad52138a046..cdb9db5549c7 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -407,7 +407,7 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aRecordText.SetText(XubString(SVX_RES(RID_STR_REC_TEXT))); m_aRecordOf.SetText(XubString(SVX_RES(RID_STR_REC_FROM_TEXT))); - m_aRecordCount.SetText('?'); + m_aRecordCount.SetText(rtl::OUString('?')); m_nDefaultWidth = ArrangeControls(); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 33a3082a90ae..59affa5eaeea 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -447,7 +447,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pModel->BegUndo(aUndoStr); } @@ -531,7 +531,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pModel->BegUndo(aUndoStr); } diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index e59f6bd83700..f9d6a85f864a 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -1002,8 +1002,8 @@ void FmSearchEngine::SearchNextImpl() UniString aTmp(strSearchExpression); const rtl::OUString s_sStar("\\*"); const rtl::OUString s_sQuotation("\\?"); - aTmp.SearchAndReplaceAll('*', s_sStar); - aTmp.SearchAndReplaceAll('?', s_sQuotation); + aTmp.SearchAndReplaceAll(rtl::OUString('*'), s_sStar); + aTmp.SearchAndReplaceAll(rtl::OUString('?'), s_sQuotation); strSearchExpression = aTmp; switch (m_nPosition) diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index b951406a8336..b6fe4ca51b1a 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -1058,7 +1058,7 @@ rtl::OUString FmUndoPropertyAction::GetComment() const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::GetComment" ); String aStr(static_STR_UNDO_PROPERTY); - aStr.SearchAndReplace( '#', aPropertyName ); + aStr.SearchAndReplace( rtl::OUString('#'), aPropertyName ); return aStr; } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 73523525b3c0..4fea777be024 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3794,7 +3794,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent continue; String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) ); - sMessage.SearchAndReplace( '#', rColInfo.sName ); + sMessage.SearchAndReplace( rtl::OUString('#'), rColInfo.sName ); // the control to focus Reference< XControl > xControl( rColInfo.xFirstControlWithInputRequired ); @@ -4057,7 +4057,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th if ( nLength > 1 ) { sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS ); - sTitle.SearchAndReplace( '#', String::CreateFromInt32( nLength ) ); + sTitle.SearchAndReplace( rtl::OUString('#'), rtl::OUString::valueOf(nLength) ); } else sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 47603125f0c1..da67a6146b36 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -459,7 +459,7 @@ namespace svxform { XubString aStr(SVX_RES(RID_STR_FORM)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // der Slot war nur verfuegbar, wenn es genau einen selektierten Eintrag gibt und dieser die Root @@ -472,7 +472,7 @@ namespace svxform { XubString aStr(SVX_RES(RID_STR_CONTROL)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); // dieser Slot war guletig bei (genau) einem selektierten Formular @@ -1004,7 +1004,7 @@ namespace svxform { XubString aStr(SVX_RES(RID_STR_CONTROL)); XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); pFormModel->BegUndo(aUndoStr); } diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 1d7ca0fce7fa..01bf2243d338 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -316,7 +316,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } @@ -415,7 +415,7 @@ namespace svxform if( bUndo ) { XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE)); - aUndoStr.SearchAndReplace('#', aStr); + aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr); m_pFormModel->BegUndo(aUndoStr); } } |