diff options
Diffstat (limited to 'sw/source/ui/dialog')
| -rw-r--r-- | sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx index 93d590c44c2d..59bb7ed34764 100644 --- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx @@ -166,8 +166,7 @@ SwSpellDialogChildWindow::SwSpellDialogChildWindow ( _pParent, nId, pBindings, pInfo), m_pSpellState(new SpellState) { - - String aPropName( String::CreateFromAscii(UPN_IS_GRAMMAR_INTERACTIVE ) ); + rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); SvtLinguConfig().GetProperty( aPropName ) >>= m_bIsGrammarCheckingOn; } @@ -503,7 +502,7 @@ void SwSpellDialogChildWindow::SetGrammarChecking(bool bOn) uno::Any aVal; aVal <<= bOn; m_bIsGrammarCheckingOn = bOn; - String aPropName( C2S(UPN_IS_GRAMMAR_INTERACTIVE ) ); + rtl::OUString aPropName(UPN_IS_GRAMMAR_INTERACTIVE); SvtLinguConfig().SetProperty( aPropName, aVal ); // set current spell position to the start of the current sentence to // continue with this sentence after grammar checking state has been changed diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index d6ca4072e6d9..8c9fdcb9cbd6 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -86,10 +86,10 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, SwAsciiOptions aOpt; { - const String& rFindNm = String::CreateFromAscii( + const rtl::OUString sFindNm = rtl::OUString::createFromAscii( pStream ? sDialogImpExtraData : sDialogExpExtraData); - sal_uInt16 nEnd, nStt = GetExtraData().Search( rFindNm ); + sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); if( STRING_NOTFOUND != nStt ) { nStt += nDialogExtraDataLen; @@ -319,10 +319,10 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) rOptions.WriteUserData( sData ); if( sData.Len() ) { - const String& rFindNm = String::CreateFromAscii( + const rtl::OUString sFindNm = rtl::OUString::createFromAscii( aFontLB.IsVisible() ? sDialogImpExtraData : sDialogExpExtraData); - sal_uInt16 nEnd, nStt = GetExtraData().Search( rFindNm ); + sal_uInt16 nEnd, nStt = GetExtraData().Search( sFindNm ); if( STRING_NOTFOUND != nStt ) { // called twice, so remove "old" settings @@ -332,7 +332,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) GetExtraData().Erase( nStt, nEnd - nStt + 1 ); } String sTmp(GetExtraData()); - sTmp += rFindNm; + sTmp += sFindNm; sTmp += sData; sTmp += cDialogExtraDataClose; GetExtraData() = sTmp; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 08962f044d4f..20040c9429f7 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1104,7 +1104,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl) Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = - new ::sfx2::DocumentInserter( String::CreateFromAscii("swriter") ); + new ::sfx2::DocumentInserter( rtl::OUString("swriter") ); m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) ); return 0; } @@ -1854,7 +1854,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl) Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = new ::sfx2::DocumentInserter( - String::CreateFromAscii("swriter") ); + rtl::OUString("swriter") ); m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); return 0; } |