Kaydet (Commit) 86b9e14b authored tarafından Ivan Timofeev's avatar Ivan Timofeev

String -> OUString

Change-Id: I88873eec738a068152e7d7be0dc4ab86fcfe345a
üst 939d6400
......@@ -113,7 +113,7 @@ public:
void Paste();
void Delete();
void SelectAll();
void InsertText(const String &rText);
void InsertText(const OUString &rText);
void InsertCommand(sal_uInt16 nCommand);
void MarkError(const Point &rPos);
void SelNextMark();
......
......@@ -484,7 +484,7 @@ SmNodeList::iterator SmCursor::TakeSelectedNodesFromList(SmNodeList *pLineList,
}
//If we need to save the selected text
if(pSelectedNodes && len2 > 0) {
String str = aText.copy(start2, len2);
OUString str = aText.copy(start2, len2);
SmTextNode* pSeg2 = new SmTextNode(aToken, eFontDesc);
pSeg2->ChangeText(str);
pSelectedNodes->push_back(pSeg2);
......
......@@ -912,12 +912,12 @@ void SmEditWindow::Delete()
}
}
void SmEditWindow::InsertText(const String& Text)
void SmEditWindow::InsertText(const OUString& rText)
{
OSL_ENSURE( pEditView, "EditView missing" );
if (pEditView)
{
pEditView->InsertText(Text);
pEditView->InsertText(rText);
aModifyTimer.Start();
StartCursorMove();
}
......
......@@ -1466,8 +1466,6 @@ bool SmViewShell::Insert( SfxMedium& rMedium )
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Insert" );
SmDocShell *pDoc = GetDoc();
String aText( pDoc->GetText() );
String aTemp = aText;
bool bRet = false;
uno::Reference < embed::XStorage > xStorage = rMedium.GetStorage();
......@@ -1485,15 +1483,13 @@ bool SmViewShell::Insert( SfxMedium& rMedium )
if( bRet )
{
aText = pDoc->GetText();
OUString aText = pDoc->GetText();
SmEditWindow *pEditWin = GetEditWindow();
if (pEditWin)
pEditWin->InsertText( aText );
else
{
OSL_FAIL( "EditWindow missing" );
aTemp += aText;
aText = aTemp;
}
pDoc->Parse();
......@@ -1514,8 +1510,6 @@ bool SmViewShell::InsertFrom(SfxMedium &rMedium)
bool bSuccess = false;
SmDocShell *pDoc = GetDoc();
SvStream *pStream = rMedium.GetInStream();
String aText( pDoc->GetText() );
String aTemp = aText;
if (pStream)
{
......@@ -1530,15 +1524,13 @@ bool SmViewShell::InsertFrom(SfxMedium &rMedium)
if( bSuccess )
{
aText = pDoc->GetText();
OUString aText = pDoc->GetText();
SmEditWindow *pEditWin = GetEditWindow();
if (pEditWin)
pEditWin->InsertText( aText );
else
{
OSL_FAIL( "EditWindow missing" );
aTemp += aText;
aText = aTemp;
}
pDoc->Parse();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment