diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-16 11:18:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-18 09:59:25 +0200 |
| commit | 8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 (patch) | |
| tree | bc2d6c98c3161c4530a6e97bf0b3aa65b6284185 /sw/source/ui | |
| parent | b4d116ef8f0b405fd9b12967766b138c21605489 (diff) | |
converting remaining usage of String in SW to OUString
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
Diffstat (limited to 'sw/source/ui')
71 files changed, 279 insertions, 280 deletions
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index bc72468d4434..76a37ca4cb97 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -112,7 +112,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFldMgr& rFldMgr, const OUString& r if (nCnt >= 3) { ::ReplacePoint(sDBName, true); - SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0, &rSh ); + SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0, &rSh ); rFldMgr.InsertFld( aData ); sRet = sDBName; bField = true; diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 6423a7940023..3980e43c540d 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -144,7 +144,7 @@ static const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rIte if( (!rItem.bSynchron || !(nCol|nRow)) && !(sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).isEmpty() && !bLast ) { sDBName = comphelper::string::setToken(sDBName, 3, DB_DELIM, "True"); - SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyStr, 0, &rSh ); + SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyOUStr, 0, &rSh ); rFldMgr.InsertFld( aData ); } diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 617e2e9ad779..cec89922bc82 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -297,7 +297,7 @@ sal_Bool SwDocShell::Save() case SFX_CREATE_MODE_ORGANIZER: { WriterRef xWrt; - ::GetXMLWriter( aEmptyStr, GetMedium()->GetBaseURL( true ), xWrt ); + ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt ); xWrt->SetOrganizerMode( sal_True ); SwWriter aWrt( *GetMedium(), *pDoc ); nErr = aWrt.Write( xWrt ); @@ -326,7 +326,7 @@ sal_Bool SwDocShell::Save() pWrtShell->EndAllTblBoxEdit(); WriterRef xWrt; - ::GetXMLWriter( aEmptyStr, GetMedium()->GetBaseURL( true ), xWrt ); + ::GetXMLWriter( aEmptyOUStr, GetMedium()->GetBaseURL( true ), xWrt ); sal_Bool bLockedView(sal_False); if ( pWrtShell ) @@ -449,7 +449,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) SFX_CREATE_MODE_EMBEDDED == GetCreateMode() ); WriterRef xWrt; - ::GetXMLWriter( aEmptyStr, rMedium.GetBaseURL( true ), xWrt ); + ::GetXMLWriter( aEmptyOUStr, rMedium.GetBaseURL( true ), xWrt ); sal_Bool bLockedView(sal_False); if ( pWrtShell ) @@ -881,7 +881,7 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates ) OSL_ENSURE( GetWrtShell(), "No SwWrtShell, no information" ); if ( GetWrtShell() ) { - SwFieldType* pType = GetWrtShell()->GetFldType( RES_POSTITFLD, aEmptyStr ); + SwFieldType* pType = GetWrtShell()->GetFldType( RES_POSTITFLD, aEmptyOUStr ); SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); SwFmtFld* pFirst = aIter.First(); while( pFirst ) diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 25140295dbeb..a04194a6a72b 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -641,7 +641,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aTempFile.EnableKillingFile(); pSrcView->SaveContent(aTempFile.GetURL()); bDone = sal_True; - SvxMacro aMac(aEmptyStr, aEmptyStr, STARBASIC); + SvxMacro aMac(aEmptyOUStr, aEmptyOUStr, STARBASIC); SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_OPENDOC ), aMac, this); SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEDOC ), aMac, this); SfxEventConfiguration::ConfigureEvent(GlobalEventConfig::GetEventName( STR_EVENT_ACTIVATEDOC ), aMac, this); @@ -698,7 +698,7 @@ void SwDocShell::Execute(SfxRequest& rReq) { WriterRef xWrt; // mba: looks as if relative URLs don't make sense here - ::GetRTFWriter( aEmptyStr, OUString(), xWrt ); + ::GetRTFWriter( aEmptyOUStr, OUString(), xWrt ); SvMemoryStream *pStrm = new SvMemoryStream(); pStrm->SetBufferSize( 16348 ); SwWriter aWrt( *pStrm, *pSmryDoc ); @@ -1054,7 +1054,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( bDone ) { SfxStringItem aName( SID_FILE_NAME, aFileName ); - SfxStringItem aReferer( SID_REFERER, aEmptyStr ); + SfxStringItem aReferer( SID_REFERER, aEmptyOUStr ); SfxViewShell* pViewShell = SfxViewShell::GetFirst(); while(pViewShell) { diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index fa6cba6a62b3..ce96cc86a2df 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -183,7 +183,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) } pFontItem = new SvxFontItem(aFont.GetFamily(), aFont.GetName(), - aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich); + aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich); } else { @@ -200,7 +200,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) eLanguage, DEFAULTFONT_FLAGS_ONLYONE ); pFontItem = new SvxFontItem(aLangDefFont.GetFamily(), aLangDefFont.GetName(), - aEmptyStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich); + aEmptyOUStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich); } pDoc->SetDefault(*pFontItem); if( !bHTMLTemplSet ) @@ -268,7 +268,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) nFontWhich, sal_False ) ) { pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(), - aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); + aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } } sal_Int32 nFontHeight = pStdFont->GetFontHeight( static_cast< sal_Int8 >(aFontIdPoolId[nIdx]), 0, eLanguage ); @@ -495,7 +495,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium ) if( ReadXML ) { ReadXML->SetOrganizerMode( sal_True ); - SwReader aRdr( rMedium, aEmptyStr, pDoc ); + SwReader aRdr( rMedium, aEmptyOUStr, pDoc ); nErr = aRdr.Read( *ReadXML ); ReadXML->SetOrganizerMode( sal_False ); } @@ -520,7 +520,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium ) { // set Doc's DocInfo at DocShell-Medium SAL_INFO( "sw.ui", "before ReadDocInfo" ); - SwReader aRdr( rMedium, aEmptyStr, pDoc ); + SwReader aRdr( rMedium, aEmptyOUStr, pDoc ); SAL_INFO( "sw.ui", "before Read" ); nErr = aRdr.Read( *pReader ); SAL_INFO( "sw.ui", "after Read" ); @@ -586,7 +586,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium ) if( ReadXML ) { ReadXML->SetOrganizerMode( sal_True ); - SwReader aRdr( rMedium, aEmptyStr, pDoc ); + SwReader aRdr( rMedium, aEmptyOUStr, pDoc ); nErr = aRdr.Read( *ReadXML ); ReadXML->SetOrganizerMode( sal_False ); } diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 5d74c1c49919..d24c85aac1c7 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -442,7 +442,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) switch(nSlot) { case SID_STYLE_EDIT: - nRet = Edit(aParam, aEmptyStr, nFamily, nMask, sal_False, OString(), pActShell ); + nRet = Edit(aParam, aEmptyOUStr, nFamily, nMask, sal_False, OString(), pActShell ); break; case SID_STYLE_DELETE: nRet = Delete(aParam, nFamily); @@ -641,7 +641,7 @@ sal_uInt16 SwDocShell::Edit( respectively "".*/ if( pColl->IsAssignedToListLevelOfOutlineStyle()) { - SwNumRuleItem aItem(aEmptyStr); + SwNumRuleItem aItem(aEmptyOUStr); pDStyle->GetCollection()->SetFmtAttr( aItem ); pDStyle->GetCollection()->SetAttrOutlineLevel( 0 ); } @@ -1249,7 +1249,7 @@ void SwDocShell::FormatPage( const OString& rPageId, SwWrtShell& rActShell ) { - Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, rPageId, &rActShell); + Edit( rPage, aEmptyOUStr, SFX_STYLE_FAMILY_PAGE, 0, sal_False, rPageId, &rActShell); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index f2c31ec6f975..4759a0ed7bcc 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -138,7 +138,7 @@ static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc, if( p && !p->IsDefault() ) pStyle->PresetParent( p->GetName() ); else - pStyle->PresetParent( aEmptyStr ); + pStyle->PresetParent( aEmptyOUStr ); } else pStyle->SetPhysical(sal_False); @@ -174,7 +174,7 @@ static SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc, if( pColl->DerivedFrom() && !pColl->DerivedFrom()->IsDefault() ) pStyle->PresetParent( pColl->DerivedFrom()->GetName() ); else - pStyle->PresetParent( aEmptyStr ); + pStyle->PresetParent( aEmptyOUStr ); SwTxtFmtColl& rNext = pColl->GetNextTxtFmtColl(); pStyle->PresetFollow(rNext.GetName()); @@ -246,7 +246,7 @@ static const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc, if(pDesc->GetFollow()) pStyle->PresetFollow(pDesc->GetFollow()->GetName()); else - pStyle->PresetParent( aEmptyStr ); + pStyle->PresetParent( aEmptyOUStr ); } else pStyle->SetPhysical(sal_False); @@ -277,7 +277,7 @@ static const SwNumRule* lcl_FindNumRule( SwDoc& rDoc, if(pRule) { pStyle->SetPhysical(sal_True); - pStyle->PresetParent( aEmptyStr ); + pStyle->PresetParent( aEmptyOUStr ); } else pStyle->SetPhysical(sal_False); @@ -2036,7 +2036,7 @@ void SwDocStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) // methods for DocStyleSheetPool SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, sal_Bool bOrg ) : SfxStyleSheetBasePool( rDocument.GetAttrPool() ) -, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) ) +, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyOUStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) ) , rDoc( rDocument ) { bOrganizer = bOrg; @@ -2061,8 +2061,8 @@ SfxStyleSheetBase& SwDocStyleSheetPool::Make( const OUString& rName, sal_uInt16 _nMask) { mxStyleSheet->PresetName(rName); - mxStyleSheet->PresetParent(aEmptyStr); - mxStyleSheet->PresetFollow(aEmptyStr); + mxStyleSheet->PresetParent(aEmptyOUStr); + mxStyleSheet->PresetFollow(aEmptyOUStr); mxStyleSheet->SetMask(_nMask) ; mxStyleSheet->SetFamily(eFam); mxStyleSheet->SetPhysical(sal_True); @@ -2389,8 +2389,8 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const OUString& rName, SwStyleSheetIterator::SwStyleSheetIterator( SwDocStyleSheetPool* pBase, SfxStyleFamily eFam, sal_uInt16 n ) : SfxStyleSheetIterator( pBase, eFam, n ), - mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ), - mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ) + mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyOUStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ), + mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyOUStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ) { bFirstCalled = sal_False; nLastPos = 0; diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index c3e9bc0ca303..3b9d182b2f74 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -185,7 +185,7 @@ void SwDropCapsPict::InitPrinter( void ) ****************************************************************************/ -String GetDefaultString(sal_uInt16 nChars) +OUString GetDefaultString(sal_uInt16 nChars) { OUString aStr; for (sal_uInt16 i = 0; i < nChars; i++) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 1b1bf46569c9..62be5df055ea 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -726,11 +726,11 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) pOpt->UseCaption() = m_pCheckLB->IsChecked((sal_uInt16)m_pCheckLB->GetModel()->GetAbsPos(pEntry)); OUString aName( m_pCategoryBox->GetText() ); if (aName == m_sNone) - pOpt->SetCategory(aEmptyStr); + pOpt->SetCategory(aEmptyOUStr); else pOpt->SetCategory(comphelper::string::strip(aName, ' ')); pOpt->SetNumType((sal_uInt16)(sal_uLong)m_pFormatBox->GetEntryData(m_pFormatBox->GetSelectEntryPos())); - pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString(aEmptyStr) ); + pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString(aEmptyOUStr) ); pOpt->SetPos(m_pPosBox->GetSelectEntryPos()); sal_uInt16 nPos = m_pLbLevel->GetSelectEntryPos(); sal_uInt16 nLevel = ( nPos > 0 && nPos != LISTBOX_ENTRY_NOTFOUND ) ? nPos - 1 : MAXLEVEL; @@ -738,7 +738,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) pOpt->SetSeparator(m_pEdDelim->GetText()); pOpt->SetNumSeparator( m_pNumberingSeparatorED->GetText()); if(!m_pCharStyleLB->GetSelectEntryPos()) - pOpt->SetCharacterStyle(aEmptyStr); + pOpt->SetCharacterStyle(aEmptyOUStr); else pOpt->SetCharacterStyle(m_pCharStyleLB->GetSelectEntry()); pOpt->CopyAttributes() = m_pApplyBorderCB->IsChecked(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 784a9b533b3a..7cdca6a5c1a9 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -600,7 +600,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, aFont = pPrt->GetFontMetric( aFont ); SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(nType); pColl->SetFmtAttr(SvxFontItem(aFont.GetFamily(), aFont.GetName(), - aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); + aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); } static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, @@ -678,7 +678,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) if( pPrinter ) aFont = pPrinter->GetFontMetric( aFont ); pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(), aFont.GetName(), - aEmptyStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); + aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich)); SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_STANDARD); pColl->ResetFmtAttr(nFontWhich); bMod = true; diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index ab31828fd496..39230e634044 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -525,7 +525,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt } sTable = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); if(sTable == pThis->m_sConnecting) - pThis->m_pListLB->SetEntryText(String(), pSelect, ITEMID_TABLE - 1); + pThis->m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1); } pThis->m_pEditPB->Enable(pUserData && !pUserData->sURL.isEmpty() && SWUnoHelper::UCB_IsFile( pUserData->sURL ) && //#i97577# @@ -619,7 +619,7 @@ void SwAddressListDialog::DetectTablesAndQueries( if( pUserData->xColumnsSupplier.is() ) m_pListLB->SetEntryText(m_aDBData.sCommand, pSelect, ITEMID_TABLE - 1); else - m_pListLB->SetEntryText(String(), pSelect, ITEMID_TABLE - 1); + m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1); } OUString sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); m_pOK->Enable(pSelect && !sCommand.isEmpty()); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index cd8d8688b984..2a3d397a4226 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1230,7 +1230,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale(); SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh. GetFldType( 0, RES_DBNEXTSETFLD ), - OUString("1"), aEmptyStr, aDBData ); + OUString("1"), aEmptyOUStr, aDBData ); bool bSetCrsr = true; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index a9466e648545..5d8a8df461d4 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -874,7 +874,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, SfxMedium* pOrig = pSourceShell->GetView().GetDocShell()->GetMedium(); OUString sSourceDocumentURL(pOrig->GetURLObject().GetMainURL( INetURLObject::NO_DECODE )); const SfxFilter* pSfxFlt = SwIoSystem::GetFileFilter( - sSourceDocumentURL, ::aEmptyStr ); + sSourceDocumentURL, ::aEmptyOUStr ); const SfxFilter* pStoreToFilter = pSfxFlt; SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer(); const OUString* pStoreToFilterOptions = 0; @@ -956,7 +956,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, aPrtMonDlg.Show(); // Progress, to prohibit KeyInputs - SfxProgress aProgress(pSourrceDocSh, ::aEmptyStr, 1); + SfxProgress aProgress(pSourrceDocSh, ::aEmptyOUStr, 1); // lock all dispatchers SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst(pSourrceDocSh); diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 7164f0f6317d..9f1bbb53791c 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -506,7 +506,7 @@ void SwSendMailDialog::SendMails() uno::Reference< mail::XSmtpService > xSmtpServer = SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem, m_pImpl->xConnectedInMailService, - aEmptyStr, aEmptyStr, this ); + aEmptyOUStr, aEmptyOUStr, this ); bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected(); LeaveWait(); if(!bIsLoggedIn) diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 13dfa038d541..a2b04213c2b6 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -382,13 +382,13 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( } else { - SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sExpression, aEmptyStr, 0, &rShell ); + SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sExpression, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } } else { - SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyStr, 0, &rShell ); + SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } } @@ -400,7 +400,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( { if(bHideEmptyParagraphs) { - SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyStr, 0, &rShell ); + SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } sHideParagraphsExpression = ""; @@ -410,7 +410,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( } if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty()) { - SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyStr, 0, &rShell ); + SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } } @@ -571,12 +571,12 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig if(bHideEmptyParagraphs && !sHideParagraphsExpression.isEmpty()) { OUString sComplete = "(" + sCondition + ") OR (" + sHideParagraphsExpression + ")"; - SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, aEmptyStr, 0, &rShell ); + SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sComplete, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } else { - SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, aEmptyStr, 0, &rShell ); + SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sCondition, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } //now the text has to be inserted @@ -604,7 +604,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig } } sDB += sConvertedColumn; - SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyStr, 0, &rShell ); + SwInsertFld_Data aData(TYP_DBFLD, 0, sDB, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } else diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index a3f3d95c6439..673f0189b8fb 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -416,7 +416,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) bRet = sal_False; if (aPasswdDlg.Execute()) { - String sNewPasswd( aPasswdDlg.GetPassword() ); + OUString sNewPasswd( aPasswdDlg.GetPassword() ); ::com::sun::star::uno::Sequence <sal_Int8 > aNewPasswd; SvPasswordHelper::GetHashPassword( aNewPasswd, sNewPasswd ); if (SvPasswordHelper::CompareHashPassword( @@ -591,7 +591,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) bool bHidden = true; bool bProtect = true; - String sCondition; + OUString sCondition; bool bFirst = true; bool bFileValid = true; bool bFile = true; @@ -614,7 +614,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) } else { - String sTemp(rData.GetCondition()); + OUString sTemp(rData.GetCondition()); if(sCondition != sTemp) bConditionValid = sal_False; bHiddenValid = (bHidden == rData.IsHidden()); @@ -687,11 +687,11 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) m_pCurName->SetText(pBox->GetEntryText(pEntry)); m_pCurName->Enable(); m_pDismiss->Enable(); - String aFile = pRepr->GetFile(); - String sSub = pRepr->GetSubRegion(); + OUString aFile = pRepr->GetFile(); + OUString sSub = pRepr->GetSubRegion(); m_bSubRegionsFilled = false; m_pSubRegionED->Clear(); - if(aFile.Len()||sSub.Len()) + if( !aFile.isEmpty() || !sSub.isEmpty() ) { m_pFileCB->Check(true); m_pFileNameED->SetText(aFile); @@ -997,9 +997,9 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) pSectRepr->SetContent(sal_False); else { - pSectRepr->SetFile(aEmptyStr); - pSectRepr->SetSubRegion(aEmptyStr); - pSectRepr->GetSectionData().SetLinkFilePassword(aEmptyStr); + pSectRepr->SetFile(aEmptyOUStr); + pSectRepr->SetSubRegion(aEmptyOUStr); + pSectRepr->GetSectionData().SetLinkFilePassword(aEmptyOUStr); } pEntry = m_pTree->NextSelected(pEntry); @@ -1179,8 +1179,8 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) } else { - String sTmp(pEdit->GetText()); - if(sTmp.Len()) + OUString sTmp(pEdit->GetText()); + if(!sTmp.isEmpty()) { SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium(); INetURLObject aAbs; @@ -1190,7 +1190,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) aAbs, sTmp, URIHelper::GetMaybeFileHdl() ); } pSectRepr->SetFile( sTmp ); - pSectRepr->GetSectionData().SetLinkFilePassword( aEmptyStr ); + pSectRepr->GetSectionData().SetLinkFilePassword( aEmptyOUStr ); } } else @@ -1272,7 +1272,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM); if(RET_OK == aPasswdDlg.Execute()) { - String sNewPasswd( aPasswdDlg.GetPassword() ); + OUString sNewPasswd( aPasswdDlg.GetPassword() ); if( aPasswdDlg.GetConfirm() == sNewPasswd ) { SvPasswordHelper::GetHashPassword( pRepr->GetTempPasswd(), sNewPasswd ); @@ -1344,7 +1344,7 @@ IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit *, pEdit ) IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) { - String sFileName, sFilterName, sPassword; + OUString sFileName, sFilterName, sPassword; if ( _pFileDlg->GetError() == ERRCODE_NONE ) { SfxMedium* pMedium = m_pDocInserter->CreateMedium(); @@ -1521,10 +1521,10 @@ short SwInsertSectionTabDialog::Ok() aRequest.AppendItem(SfxBoolItem( FN_PARAM_REGION_EDIT_IN_READONLY, m_pSectionData->IsEditInReadonlyFlag())); - String sLinkFileName( m_pSectionData->GetLinkFileName() ); - aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.GetToken( 0, sfx2::cTokenSeparator ))); - aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.GetToken( 1, sfx2::cTokenSeparator ))); - aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, sfx2::cTokenSeparator ))); + OUString sLinkFileName( m_pSectionData->GetLinkFileName() ); + aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.getToken( 0, sfx2::cTokenSeparator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.getToken( 1, sfx2::cTokenSeparator ))); + aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.getToken( 2, sfx2::cTokenSeparator ))); aRequest.Done(); } return nRet; @@ -1628,10 +1628,10 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) { aSection.SetPassword(m_aNewPasswd); } - String sFileName = m_pFileNameED->GetText(); - String sSubRegion = m_pSubRegionED->GetText(); + OUString sFileName = m_pFileNameED->GetText(); + OUString sSubRegion = m_pSubRegionED->GetText(); sal_Bool bDDe = m_pDDECB->IsChecked(); - if(m_pFileCB->IsChecked() && (sFileName.Len() || sSubRegion.Len() || bDDe)) + if(m_pFileCB->IsChecked() && (!sFileName.isEmpty() || !sSubRegion.isEmpty() || bDDe)) { OUString aLinkFile; if( bDDe ) @@ -1646,7 +1646,7 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) } else { - if(sFileName.Len()) + if(!sFileName.isEmpty()) { SfxMedium* pMedium = m_pWrtSh->GetView().GetDocShell()->GetMedium(); INetURLObject aAbs; @@ -1716,7 +1716,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM); if(RET_OK == aPasswdDlg.Execute()) { - String sNewPasswd( aPasswdDlg.GetPassword() ); + OUString sNewPasswd( aPasswdDlg.GetPassword() ); if( aPasswdDlg.GetConfirm() == sNewPasswd ) { SvPasswordHelper::GetHashPassword( m_aNewPasswd, sNewPasswd ); @@ -1737,8 +1737,8 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) IMPL_LINK_NOARG_INLINE_START(SwInsertSectionTabPage, NameEditHdl) { - String aName=m_pCurName->GetText(); - GetTabDialog()->GetOKButton().Enable(aName.Len() && m_pCurName->GetEntryPos( aName ) == USHRT_MAX); + OUString aName = m_pCurName->GetText(); + GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() && m_pCurName->GetEntryPos( aName ) == USHRT_MAX); return 0; } IMPL_LINK_NOARG_INLINE_END(SwInsertSectionTabPage, NameEditHdl) @@ -1830,7 +1830,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil } } else - m_sFilterName = m_sFilePasswd = aEmptyStr; + m_sFilterName = m_sFilePasswd = aEmptyOUStr; Application::SetDefDialogParent( m_pOldDefDlgParent ); return 0; diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index d69d31be79d7..257be043a101 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -501,8 +501,8 @@ sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName, } else { - SvxMacro aStartMacro(aEmptyStr, aEmptyStr, STARBASIC); - SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC); + SvxMacro aStartMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); + SvxMacro aEndMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); GetMacros( aShortName, aStartMacro, aEndMacro, pGlossary ); // StartAction must not be before HasSelection and DelRight, @@ -546,8 +546,8 @@ bool SwGlossaryHdl::InsertGlossary(const OUString &rName) if (!pGlos) return false; - SvxMacro aStartMacro(aEmptyStr, aEmptyStr, STARBASIC); - SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC); + SvxMacro aStartMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); + SvxMacro aEndMacro(aEmptyOUStr, aEmptyOUStr, STARBASIC); GetMacros( rName, aStartMacro, aEndMacro, pGlos ); // StartAction must not be before HasSelection and DelRight, diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 8b94fdf255f8..d3344b2ad09a 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -145,7 +145,7 @@ using namespace nsTransferBufferType; class SwTrnsfrDdeLink : public ::sfx2::SvBaseLink { - String sName; + OUString sName; ::sfx2::SvLinkSourceRef refObj; SwTransferable& rTrnsfr; SwDocShell* pDocShell; @@ -471,9 +471,9 @@ sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor ) if( rURL.GetMap() ) pImageMap = new ImageMap( *rURL.GetMap() ); else if( !rURL.GetURL().isEmpty() ) - pTargetURL = new INetImage( aEmptyStr, rURL.GetURL(), + pTargetURL = new INetImage( aEmptyOUStr, rURL.GetURL(), rURL.GetTargetFrameName(), - aEmptyStr, Size() ); + aEmptyOUStr, Size() ); } } @@ -662,7 +662,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, // write document storage pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, sal_False ); // mba: no BaseURL for clipboard - SfxMedium aMedium( xWorkStore, String() ); + SfxMedium aMedium( xWorkStore, OUString() ); bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False ); pEmbObj->DoSaveCompleted(); @@ -706,15 +706,15 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, break; case SWTRANSFER_OBJECTTYPE_HTML: - GetHTMLWriter( aEmptyStr, String(), xWrt ); + GetHTMLWriter( aEmptyOUStr, OUString(), xWrt ); break; case SWTRANSFER_OBJECTTYPE_RTF: - GetRTFWriter( aEmptyStr, String(), xWrt ); + GetRTFWriter( aEmptyOUStr, OUString(), xWrt ); break; case SWTRANSFER_OBJECTTYPE_STRING: - GetASCWriter( aEmptyStr, String(), xWrt ); + GetASCWriter( aEmptyOUStr, OUString(), xWrt ); if( xWrt.Is() ) { SwAsciiOptions aAOpt; @@ -978,7 +978,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut ) { pTargetURL = new INetImage( sGrfNm, rURL.GetURL(), rURL.GetTargetFrameName(), - aEmptyStr, Size() ); + aEmptyOUStr, Size() ); AddFormat( SOT_FORMATSTR_ID_INET_IMAGE ); } } @@ -1667,7 +1667,7 @@ int SwTransferable::_PasteFileContent( TransferableDataHelper& rData, rSh.SetChgLnk( Link() ); const SwPosition& rInsPos = *rSh.GetCrsr()->Start(); - SwReader aReader( *pStream, aEmptyStr, String(), *rSh.GetCrsr() ); + SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() ); rSh.SaveTblBoxCntnt( &rInsPos ); if( IsError( aReader.Read( *pRead )) ) nResId = ERR_CLPBRD_READ; @@ -1753,7 +1753,7 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, if( pRead ) { SwPaM &rPAM = *rSh.GetCrsr(); - SwReader aReader( xStore, aEmptyStr, rPAM ); + SwReader aReader( xStore, aEmptyOUStr, rPAM ); if( !IsError( aReader.Read( *pRead )) ) nRet = 1; else if( bMsg ) @@ -1919,7 +1919,7 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, //!!! check at FileSystem - only then it make sense to test graphics !!! Graphic aGraphic; GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter(); - nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyStr, aGraphic, &rFlt ); + nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyOUStr, aGraphic, &rFlt ); if( nRet ) { @@ -1930,29 +1930,29 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData, { case SW_PASTESDR_INSERT: SwTransferable::SetSelInShell( rSh, sal_False, pPt ); - rSh.Insert( sURL, aEmptyStr, aGraphic ); + rSh.Insert( sURL, aEmptyOUStr, aGraphic ); break; case SW_PASTESDR_REPLACE: if( rSh.IsObjSelected() ) { - rSh.ReplaceSdrObj( sURL, aEmptyStr, &aGraphic ); + rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic ); Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() ); SwTransferable::SetSelInShell( rSh, sal_True, &aPt ); } else - rSh.ReRead( sURL, aEmptyStr, &aGraphic ); + rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); break; case SW_PASTESDR_SETATTR: if( rSh.IsObjSelected() ) rSh.Paste( aGraphic ); else if( OBJCNT_GRF == rSh.GetObjCntTypeOfSelection() ) - rSh.ReRead( sURL, aEmptyStr, &aGraphic ); + rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); else { SwTransferable::SetSelInShell( rSh, sal_False, pPt ); - rSh.Insert( sURL, aEmptyStr, aGraphic ); + rSh.Insert( sURL, aEmptyOUStr, aGraphic ); } break; default: @@ -2064,7 +2064,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, SwFieldType* pTyp = 0; sal_uInt16 i = 1,j; - String aName; + OUString aName; sal_Bool bAlreadyThere = sal_False, bDoublePaste = sal_False; sal_uInt16 nSize = rWrtShell.GetFldTypeCount(); const ::utl::TransliterationWrapper& rColl = ::GetAppCmpStrIgnore(); @@ -2077,7 +2077,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, pTyp = rWrtShell.GetFldType( j ); if( RES_DDEFLD == pTyp->Which() ) { - String sTmp( ((SwDDEFieldType*)pTyp)->GetCmd() ); + OUString sTmp( ((SwDDEFieldType*)pTyp)->GetCmd() ); if( rColl.isEqual( sTmp, aCmd ) && sfx2::LINKUPDATE_ALWAYS == ((SwDDEFieldType*)pTyp)->GetType() ) { @@ -2120,11 +2120,11 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, ( 1 < comphelper::string::getTokenCount(aExpand, '\n') || comphelper::string::getTokenCount(aExpand, '\t') ) ) { - String sTmp( aExpand ); + OUString sTmp( aExpand ); xub_StrLen nRows = comphelper::string::getTokenCount(sTmp, '\n'); if( nRows ) --nRows; - sTmp = sTmp.GetToken( 0, '\n' ); + sTmp = sTmp.getToken( 0, '\n' ); xub_StrLen nCols = comphelper::string::getTokenCount(sTmp, '\t'); // at least one column & row must be there @@ -2274,7 +2274,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, { //!!! check at FileSystem - only then it makes sense to test the graphics !!! GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter(); - nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyStr, + nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyOUStr, aGraphic, &rFlt ); if( !nRet && SW_PASTESDR_SETATTR == nAction && @@ -2302,7 +2302,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, //Check and Perform rotation if needed lclCheckAndPerformRotation(aGraphic); - String sURL; + OUString sURL; if( rSh.GetView().GetDocShell()->ISA(SwWebDocShell) ) sURL = aBkmk.GetURL(); @@ -2310,18 +2310,18 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, { case SW_PASTESDR_INSERT: SwTransferable::SetSelInShell( rSh, sal_False, pPt ); - rSh.Insert( sURL, aEmptyStr, aGraphic ); + rSh.Insert( sURL, aEmptyOUStr, aGraphic ); break; case SW_PASTESDR_REPLACE: if( rSh.IsObjSelected() ) { - rSh.ReplaceSdrObj( sURL, aEmptyStr, &aGraphic ); + rSh.ReplaceSdrObj( sURL, aEmptyOUStr, &aGraphic ); Point aPt( pPt ? *pPt : rSh.GetCrsrDocPos() ); SwTransferable::SetSelInShell( rSh, sal_True, &aPt ); } else - rSh.ReRead( sURL, aEmptyStr, &aGraphic ); + rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); break; case SW_PASTESDR_SETATTR: @@ -2340,11 +2340,11 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, else if( rSh.IsObjSelected() ) rSh.Paste( aGraphic ); else if( OBJCNT_GRF == rSh.GetObjCntTypeOfSelection() ) - rSh.ReRead( sURL, aEmptyStr, &aGraphic ); + rSh.ReRead( sURL, aEmptyOUStr, &aGraphic ); else { SwTransferable::SetSelInShell( rSh, sal_False, pPt ); - rSh.Insert( aBkmk.GetURL(), aEmptyStr, aGraphic ); + rSh.Insert( aBkmk.GetURL(), aEmptyOUStr, aGraphic ); } break; default: @@ -2374,7 +2374,7 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, if( pStream != NULL && !pStream->GetError() && // mba: no BaseURL for clipboard functionality - aMap.Read( *pStream, IMAP_FORMAT_DETECT, String() ) == IMAP_ERR_OK && + aMap.Read( *pStream, IMAP_FORMAT_DETECT, OUString() ) == IMAP_ERR_OK && aMap.GetIMapObjectCount() ) { SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL ); @@ -2476,7 +2476,7 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData, INetURLObject aMediaURL; aMediaURL.SetSmartURL( sFile ); - const String aMediaURLStr( aMediaURL.GetMainURL( INetURLObject::NO_DECODE ) ); + const OUString aMediaURLStr( aMediaURL.GetMainURL( INetURLObject::NO_DECODE ) ); if( ::avmedia::MediaWindow::isMediaURL( aMediaURLStr ) ) { @@ -2490,10 +2490,10 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData, sal_Bool bIsURLFile = SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc ); //Own FileFormat? --> insert, not for StarWriter/Web - String sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link(), false ); + OUString sFileURL = URIHelper::SmartRel2Abs(INetURLObject(), sFile, Link(), false ); const SfxFilter* pFlt = SW_PASTESDR_SETATTR == nAction ? 0 : SwIoSystem::GetFileFilter( - sFileURL, aEmptyStr ); + sFileURL, aEmptyOUStr ); if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell) ) { // and then pull up the insert-region-dialog by PostUser event @@ -2662,7 +2662,7 @@ int SwTransferable::_PasteFileList( TransferableDataHelper& rData, aFileList.Count() ) { sal_uInt16 nAct = bLink ? SW_PASTESDR_SETATTR : SW_PASTESDR_INSERT; - String sFlyNm; + OUString sFlyNm; // iterate over the filelist for( sal_uLong n = 0, nEnd = aFileList.Count(); n < nEnd; ++n ) { @@ -2681,7 +2681,7 @@ int SwTransferable::_PasteFileList( TransferableDataHelper& rData, nRet = 1; } } - if( sFlyNm.Len() ) + if( !sFlyNm.isEmpty() ) rSh.GotoFly( sFlyNm ); } else if( bMsg ) @@ -2850,7 +2850,7 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData } pDlg->SetObjName( pClipboard->aObjDesc.maClassName, SW_RES( nResId ) ); - pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyStr ); + pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyOUStr ); } } else @@ -2860,9 +2860,9 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aDesc ); if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_EMBED_SOURCE, nDest )) - pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyStr ); + pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyOUStr ); if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK_SOURCE, nDest )) - pDlg->Insert( SOT_FORMATSTR_ID_LINK_SOURCE, aEmptyStr ); + pDlg->Insert( SOT_FORMATSTR_ID_LINK_SOURCE, aEmptyOUStr ); } if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK, nDest )) @@ -2870,7 +2870,7 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData for( sal_uInt16* pIds = aPasteSpecialIds; *pIds; ++pIds ) if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest )) - pDlg->Insert( *pIds, aEmptyStr ); + pDlg->Insert( *pIds, aEmptyOUStr ); sal_uLong nFormat = pDlg->GetFormat( rData.GetTransferable() ); @@ -2934,7 +2934,7 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh, for( sal_uInt16* pIds = aPasteSpecialIds; *pIds; ++pIds ) if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest )) - rToFill.AddClipbrdFormat( *pIds, aEmptyStr ); + rToFill.AddClipbrdFormat( *pIds, aEmptyOUStr ); } void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) @@ -3068,7 +3068,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) { pTargetURL = new INetImage( sGrfNm, rURL.GetURL(), rURL.GetTargetFrameName(), - aEmptyStr, Size() ); + aEmptyOUStr, Size() ); AddFormat( SOT_FORMATSTR_ID_INET_IMAGE ); } } @@ -3564,11 +3564,11 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ) rSh.ResetModified(); } else - sName.Erase(); + sName = ""; rSh.DoUndo( bUndo ); } - if( sName.Len() && + if( !sName.isEmpty() && 0 != ( pDocShell = rSh.GetDoc()->GetDocShell() ) ) { // then we create our "server" and connect to it @@ -3577,7 +3577,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh ) { refObj->AddConnectAdvise( this ); refObj->AddDataAdvise( this, - aEmptyStr, + aEmptyOUStr, ADVISEMODE_NODATA | ADVISEMODE_ONLYONCE ); nOldTimeOut = refObj->GetUpdateTimeout(); refObj->SetUpdateTimeout( 0 ); diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index ef6ad1fe2b4b..9ee999d5f63d 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -1113,7 +1113,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons void SwPostItMgr::AddPostIts(bool bCheckExistance, bool bFocus) { bool bEmpty = mvPostItFlds.empty(); - SwFieldType* pType = mpView->GetDocShell()->GetDoc()->GetFldType(RES_POSTITFLD, aEmptyStr,false); + SwFieldType* pType = mpView->GetDocShell()->GetDoc()->GetFldType(RES_POSTITFLD, aEmptyOUStr,false); SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); SwFmtFld* pSwFmtFld = aIter.First(); while(pSwFmtFld) diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 0dd867e8f1b4..6bc42f15ebc6 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -3715,7 +3715,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) rBnd.Invalidate(SID_ATTR_POSITION); } rBnd.Invalidate(SID_ATTR_SIZE); - const SfxStringItem aCell( SID_TABLE_CELL, aEmptyStr ); + const SfxStringItem aCell( SID_TABLE_CELL, aEmptyOUStr ); rBnd.SetState( aCell ); } } diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index b421d92bb4ad..41de9e189674 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -63,7 +63,7 @@ SW_DLLPUBLIC OUString MakeSender() if (sToken == "COMPANY") { xub_StrLen nOldLen = sRet.getLength(); - sRet += (String)rUserOpt.GetCompany(); + sRet += rUserOpt.GetCompany(); bLastLength = sRet.getLength() != nOldLen; } else if (sToken == "CR") @@ -73,19 +73,19 @@ SW_DLLPUBLIC OUString MakeSender() bLastLength = true; } else if (sToken == "FIRSTNAME") - sRet += (String)rUserOpt.GetFirstName(); + sRet += rUserOpt.GetFirstName(); else if (sToken == "LASTNAME") - sRet += (String)rUserOpt.GetLastName(); + sRet += rUserOpt.GetLastName(); else if (sToken == "ADDRESS") - sRet += (String)rUserOpt.GetStreet(); + sRet += rUserOpt.GetStreet(); else if (sToken == "COUNTRY") - sRet += (String)rUserOpt.GetCountry(); + sRet += rUserOpt.GetCountry(); else if (sToken == "POSTALCODE") - sRet += (String)rUserOpt.GetZip(); + sRet += rUserOpt.GetZip(); else if (sToken == "CITY") - sRet += (String)rUserOpt.GetCity(); + sRet += rUserOpt.GetCity(); else if (sToken == "STATEPROV") - sRet += (String)rUserOpt.GetState(); + sRet += rUserOpt.GetState(); else if (!sToken.isEmpty()) //spaces sRet += sToken; } @@ -95,7 +95,7 @@ SW_DLLPUBLIC OUString MakeSender() SwEnvItem::SwEnvItem() : SfxPoolItem(FN_ENVELOP) { - aAddrText = aEmptyStr; + aAddrText = aEmptyOUStr; bSend = sal_True; aSendText = MakeSender(); lSendFromLeft = 566; // 1 cm diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 8a384ed13fd4..5d41c5085ed2 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -113,7 +113,7 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl) SvTreeListEntry* pSel = m_pAutoTextLB->FirstSelected(); OUString sEntry; if( pSel ) - sEntry = *(String*)pSel->GetUserData(); + sEntry = *(OUString*)pSel->GetUserData(); uno::Reference< text::XTextCursor > & xCrsr = pExampleFrame->GetTextCursor(); OUString uEntry(sEntry); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index d53463bd8f76..4115bc6f12be 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -97,7 +97,7 @@ void SwChangeDBDlg::FillDBPopup() const SwDBData& rDBData = pSh->GetDBData(); OUString sDBName(rDBData.sDataSource); OUString sTableName(rDBData.sCommand); - m_pAvailDBTLB->Select(sDBName, sTableName, aEmptyStr); + m_pAvailDBTLB->Select(sDBName, sTableName, aEmptyOUStr); std::vector<OUString> aAllDBNames; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index c359e716a126..863a71522326 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -141,7 +141,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) if(pSh) { SwDBData aTmp(pSh->GetDBData()); - m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, aEmptyStr); + m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, aEmptyOUStr); } } } @@ -368,11 +368,11 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) if (!IsFldEdit()) { - m_pValueED->SetText(aEmptyStr); + m_pValueED->SetText(aEmptyOUStr); if (bCond) m_pConditionED->SetText(OUString("TRUE")); else - m_pConditionED->SetText(aEmptyStr); + m_pConditionED->SetText(aEmptyOUStr); } CheckInsert(); @@ -499,7 +499,7 @@ void SwFldDBPage::ActivateMailMergeAddress() m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos( (const void*) nData )); m_pTypeLB->GetSelectHdl().Call(m_pTypeLB); const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource(); - m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyStr); + m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyOUStr); } void SwFldDBPage::SetWrtShell(SwWrtShell& rSh) diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 2dfcb30c4ba9..cc7c14d67810 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -444,7 +444,7 @@ sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) nOldFormat != nFormat || m_pFixedCB->GetState() != m_pFixedCB->GetSavedValue() || (DI_CUSTOM == nSubType && !aName.equals( m_sOldCustomFieldName ))) { - InsertFld(nTypeId, nSubType, aName, aEmptyStr, nFormat, + InsertFld(nTypeId, nSubType, aName, aEmptyOUStr, nFormat, ' ', m_pFormatLB->IsAutomaticLanguage()); } diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index b40f0d7f8290..464542d17ed5 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) m_pValueED->SetText( OUString::number(nOff + 1) ); else - m_pValueED->SetText(aEmptyStr); + m_pValueED->SetText(aEmptyOUStr); } else m_pValueED->SetText(((SwPageNumberField*)GetCurField())->GetUserString()); @@ -532,7 +532,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl) m_pValueFT->SetText( sNewTxt ); if (sOldTxt != m_pValueFT->GetText()) - m_pValueED->SetText( aEmptyStr ); + m_pValueED->SetText( aEmptyOUStr ); } return 0; @@ -624,7 +624,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) m_pLevelED->GetText() != m_pLevelED->GetSavedValue() || m_pDateOffsetED->GetText() != m_pDateOffsetED->GetSavedValue()) { - InsertFld( nTypeId, nSubType, aEmptyStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() ); + InsertFld( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() ); } return sal_False; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 99bc62da0813..8785f6ed03c1 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -265,8 +265,8 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) } else { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } if(bDropDown) ListEnableHdl(0); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index e7b7c4423e44..f349fefaa68a 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -845,7 +845,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) case TYP_POSTITFLD: { SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD); - pFld = new SwPostItField(pType, rData.sPar1, rData.sPar2, aEmptyStr, aEmptyStr, DateTime( DateTime::SYSTEM )); + pFld = new SwPostItField(pType, rData.sPar1, rData.sPar2, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM )); break; } case TYP_SCRIPTFLD: @@ -1202,7 +1202,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) if(pTyp) { SwSetExpField* pExpFld = - new SwSetExpField(pTyp, aEmptyStr, nFormatId); + new SwSetExpField(pTyp, aEmptyOUStr, nFormatId); // Don't change type of SwSetExpFieldType: sal_uInt16 nOldSubType = pExpFld->GetSubType(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 5b5ea20e4e25..7777b975606f 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -359,8 +359,8 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl) if ( ( !IsFldEdit() || m_pSelectionLB->GetEntryCount() ) && nOld != LISTBOX_ENTRY_NOTFOUND ) { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } switch (nTypeId) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 06267bc62907..162b83a50afc 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -199,8 +199,8 @@ IMPL_LINK_NOARG(SwFldVarPage, TypeHdl) bInit = sal_True; if (nOld != LISTBOX_ENTRY_NOTFOUND) { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } m_pValueED->SetDropEnable(false); @@ -275,8 +275,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (pBox) // only when interacting via mouse { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } } bValue = bName = bNumFmt = bInvisible = sal_True; @@ -348,8 +348,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (!IsFldEdit()) { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } if (nSelPos != LISTBOX_ENTRY_NOTFOUND) @@ -497,7 +497,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) m_pValueFT->SetText( SW_RESSTR( STR_OFFSET )); if (IsFldEdit() || pBox) // only when interacting via mouse - m_pNameED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -509,8 +509,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) break; case TYP_GETREFPAGEFLD: - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); break; } @@ -696,7 +696,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) if (!bSpecialFmt) { m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat()); - sOldNumSel = aEmptyStr; + sOldNumSel = aEmptyOUStr; } else if (nTypeId == TYP_GETFLD || nTypeId == TYP_FORMELFLD) diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 04f639db7498..5dcbd0dd14a2 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -167,13 +167,13 @@ void SwJavaEditDialog::CheckTravel() sURL = aINetURL.PathToFileName(); } m_pUrlED->SetText(sURL); - m_pEditED->SetText(aEmptyStr); + m_pEditED->SetText(aEmptyOUStr); m_pUrlRB->Check(); } else { m_pEditED->SetText(pFld->GetPar2()); - m_pUrlED->SetText(aEmptyStr); + m_pUrlED->SetText(aEmptyOUStr); m_pEditRB->Check(); } m_pTypeED->SetText(pFld->GetPar1()); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 8f826deae88c..d9b16fe4a764 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -1182,17 +1182,17 @@ void SwColumnPage::Update() } else { - aEd3.SetText(aEmptyStr); - aDistEd2.SetText(aEmptyStr); + aEd3.SetText(aEmptyOUStr); + aDistEd2.SetText(aEmptyOUStr); } } else { - aEd1.SetText(aEmptyStr); - aEd2.SetText(aEmptyStr); - aEd3.SetText(aEmptyStr); - aDistEd1.SetText(aEmptyStr); - aDistEd2.SetText(aEmptyStr); + aEd1.SetText(aEmptyOUStr); + aEd2.SetText(aEmptyOUStr); + aEd3.SetText(aEmptyOUStr); + aDistEd1.SetText(aEmptyOUStr); + aDistEd2.SetText(aEmptyOUStr); } UpdateColMgr(0); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 33dd37cd00ed..85f710539468 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -188,7 +188,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : m_pCategoryBox->SetText( sString ); else m_pCategoryBox->SetText( - SwStyleNameMapper::GetUIName( nPoolId, aEmptyStr )); + SwStyleNameMapper::GetUIName( nPoolId, aEmptyOUStr )); } // aFormatBox @@ -250,8 +250,8 @@ void SwCaptionDialog::Apply() OUString aName( m_pCategoryBox->GetText() ); if ( aName == m_sNone ) { - aOpt.SetCategory( aEmptyStr ); - aOpt.SetNumSeparator( aEmptyStr ); + aOpt.SetCategory( aEmptyOUStr ); + aOpt.SetNumSeparator( aEmptyOUStr ); } else { @@ -273,7 +273,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton ) { OUString sFldTypeName = m_pCategoryBox->GetText(); if(sFldTypeName == m_sNone) - sFldTypeName = aEmptyStr; + sFldTypeName = aEmptyOUStr; SwSequenceOptionDialog aDlg( pButton, rView, sFldTypeName ); aDlg.SetApplyBorderAndShadow(bCopyAttributes); aDlg.SetCharacterStyle( sCharacterStyle ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index f4777778d767..ca224be6e09f 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2548,7 +2548,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) m_pBmpWin->MirrorVert(sal_False); Graphic aGraphic; - GraphicFilter::LoadGraphic( pGrfDlg->GetPath(), aEmptyStr, aGraphic ); + GraphicFilter::LoadGraphic( pGrfDlg->GetPath(), aEmptyOUStr, aGraphic ); m_pBmpWin->SetGraphic(aGraphic); sal_Bool bEnable = GRAPHIC_BITMAP == aGraphic.GetType() || diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 4f164076a79d..61d9f2d86f4c 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -286,7 +286,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet if(TOX_AUTHORITIES == eCurrentTOXType.eType) { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - rSh.GetFldType(RES_AUTHORITY, aEmptyStr); + rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr); if(pFType) { OUString sBrackets; @@ -432,7 +432,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType) if(TOX_AUTHORITIES == eType.eType) { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - rSh.GetFldType(RES_AUTHORITY, aEmptyStr); + rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr); if(pFType) { OUString sBrackets(pFType->GetPrefix()); @@ -1011,7 +1011,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription() if(rDesc.GetTitle()) m_pTitleED->SetText(*rDesc.GetTitle()); else - m_pTitleED->SetText(aEmptyStr); + m_pTitleED->SetText(aEmptyOUStr); m_pTitleED->SaveValue(); } @@ -1165,7 +1165,7 @@ void SwTOXSelectTabPage::FillTOXDescription() if(m_pFromFileCB->IsChecked()) rDesc.SetAutoMarkURL(sAutoMarkURL); else - rDesc.SetAutoMarkURL(aEmptyStr); + rDesc.SetAutoMarkURL(aEmptyOUStr); } break; case TOX_ILLUSTRATIONS: @@ -1193,7 +1193,7 @@ void SwTOXSelectTabPage::FillTOXDescription() if(m_pBracketLB->GetSelectEntryPos()) rDesc.SetAuthBrackets(m_pBracketLB->GetSelectEntry()); else - rDesc.SetAuthBrackets(aEmptyStr); + rDesc.SetAuthBrackets(aEmptyOUStr); rDesc.SetAuthSequence(m_pSequenceCB->IsChecked()); } break; @@ -1983,7 +1983,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { SwWrtShell& rSh = pTOXDlg->GetWrtShell(); const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - rSh.GetFldType(RES_AUTHORITY, aEmptyStr); + rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr); if(pFType) { if(pFType->IsSortByDocument()) @@ -2546,7 +2546,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) } } m_pMainEntryStyleLB->SelectEntry( SwStyleNameMapper::GetUIName( - RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyStr )); + RES_POOLCHR_IDX_MAIN_ENTRY, aEmptyOUStr )); } OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const @@ -2676,7 +2676,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) { bLastWasText = true; SwFormToken aTemp(TOKEN_TEXT); - Control* pCtrl = InsertItem(aEmptyStr, aTemp); + Control* pCtrl = InsertItem(aEmptyOUStr, aTemp); if(!pSetActiveControl) pSetActiveControl = pCtrl; } @@ -2706,7 +2706,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) { bLastWasText = true; SwFormToken aTemp(TOKEN_TEXT); - Control* pCtrl = InsertItem(aEmptyStr, aTemp); + Control* pCtrl = InsertItem(aEmptyOUStr, aTemp); if(!pSetActiveControl) pSetActiveControl = pCtrl; } @@ -3598,7 +3598,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl) m_pLevelLB->RemoveEntry(nPos); m_pLevelLB->InsertEntry(aStr, nPos); m_pLevelLB->SelectEntry(aStr); - m_pCurrentForm->SetTemplate(nPos, aEmptyStr); + m_pCurrentForm->SetTemplate(nPos, aEmptyOUStr); Modify(); } return 0; diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index ee266a549b33..e3d9c951ea04 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -345,7 +345,7 @@ void SwIndexMarkPane::UpdateLanguageDependenciesForPhoneticReading() OUString SwIndexMarkPane::GetDefaultPhoneticReading( const OUString& rText ) { if( !bIsPhoneticReadingEnabled ) - return aEmptyStr; + return aEmptyOUStr; return xExtendedIndexEntrySupplier->getPhoneticCandidate(rText, LanguageTag::convertToLocale( nLangForPhoneticReading )); } @@ -716,7 +716,7 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox ) bool bHasText = (!m_pEntryED->GetText().isEmpty()); if(!bHasText) { - m_pPhoneticED0->SetText(aEmptyStr); + m_pPhoneticED0->SetText(aEmptyOUStr); bPhoneticED0_ChangedByUser = sal_False; } else if(!bPhoneticED0_ChangedByUser) @@ -917,9 +917,9 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox ) sal_Bool bEnable = !pBox->GetText().isEmpty(); if(!bEnable) { - m_pKey2DCB->SetText(aEmptyStr); - m_pPhoneticED1->SetText(aEmptyStr); - m_pPhoneticED2->SetText(aEmptyStr); + m_pKey2DCB->SetText(aEmptyOUStr); + m_pPhoneticED1->SetText(aEmptyOUStr); + m_pPhoneticED2->SetText(aEmptyOUStr); bPhoneticED1_ChangedByUser = sal_False; bPhoneticED2_ChangedByUser = sal_False; } @@ -940,7 +940,7 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox ) { if(pBox->GetText().isEmpty()) { - m_pPhoneticED2->SetText(aEmptyStr); + m_pPhoneticED2->SetText(aEmptyOUStr); bPhoneticED2_ChangedByUser = sal_False; } else @@ -1211,7 +1211,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox) if(!sEntry.isEmpty()) { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - pSh->GetFldType(RES_AUTHORITY, aEmptyStr); + pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr); const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0; for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++) m_sFields[i] = pEntry ? @@ -1221,7 +1221,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox) if (pBox->GetSelectEntry().isEmpty()) { for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++) - m_sFields[i] = aEmptyStr; + m_sFields[i] = aEmptyOUStr; } m_pAuthorFI->SetText(m_sFields[AUTH_FIELD_AUTHOR]); m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]); @@ -1238,7 +1238,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl) OSL_ENSURE(!m_sFields[AUTH_FIELD_AUTHORITY_TYPE].isEmpty() , "No authority type is set!"); //check if the entry already exists with different content const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - pSh->GetFldType(RES_AUTHORITY, aEmptyStr); + pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr); const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier( m_sFields[AUTH_FIELD_IDENTIFIER]) : 0; @@ -1270,12 +1270,12 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl) aNewData.SetAuthorField((ToxAuthorityField)i, m_sFields[i]); pSh->ChangeAuthorityData(&aNewData); } - SwInsertFld_Data aData(TYP_AUTHORITY, 0, sFields, aEmptyStr, 0 ); + SwInsertFld_Data aData(TYP_AUTHORITY, 0, sFields, aEmptyOUStr, 0 ); aMgr.InsertFld( aData ); } else if(aMgr.GetCurFld()) { - aMgr.UpdateCurFld(0, sFields, aEmptyStr); + aMgr.UpdateCurFld(0, sFields, aEmptyOUStr); } } if(!bNewEntry) @@ -1374,7 +1374,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton) else { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - pSh->GetFldType(RES_AUTHORITY, aEmptyStr); + pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr); if(pFType) { std::vector<OUString> aIds; @@ -1415,7 +1415,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit) else if(bIsFromComponent) { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - pSh->GetFldType(RES_AUTHORITY, aEmptyStr); + pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr); bAllowed = !pFType || !pFType->GetEntryByIdentifier(sEntry); } else @@ -1521,7 +1521,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - rSh.GetFldType(RES_AUTHORITY, aEmptyStr); + rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr); if(pFType) { std::vector<OUString> aIds; @@ -1610,7 +1610,7 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox*, pBox) { const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*) - rWrtSh.GetFldType(RES_AUTHORITY, aEmptyStr); + rWrtSh.GetFldType(RES_AUTHORITY, aEmptyOUStr); if(pFType) { const SwAuthEntry* pEntry = pFType->GetEntryByIdentifier( diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index 9343a954142d..f0223022dcac 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -153,7 +153,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) if(rDesc.GetPhoneticReadingOfPrimKey()) pCurTOXMark->SetPrimaryKeyReading( *rDesc.GetPhoneticReadingOfPrimKey() ); else - pCurTOXMark->SetPrimaryKeyReading( aEmptyStr ); + pCurTOXMark->SetPrimaryKeyReading( aEmptyOUStr ); if( rDesc.GetSecKey() && !rDesc.GetSecKey()->isEmpty() ) { @@ -161,25 +161,25 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) if(rDesc.GetPhoneticReadingOfSecKey()) pCurTOXMark->SetSecondaryKeyReading( *rDesc.GetPhoneticReadingOfSecKey() ); else - pCurTOXMark->SetSecondaryKeyReading( aEmptyStr ); + pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr ); } else { - pCurTOXMark->SetSecondaryKey( aEmptyStr ); - pCurTOXMark->SetSecondaryKeyReading( aEmptyStr ); + pCurTOXMark->SetSecondaryKey( aEmptyOUStr ); + pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr ); } } else { - pCurTOXMark->SetPrimaryKey( aEmptyStr ); - pCurTOXMark->SetPrimaryKeyReading( aEmptyStr ); - pCurTOXMark->SetSecondaryKey( aEmptyStr ); - pCurTOXMark->SetSecondaryKeyReading( aEmptyStr ); + pCurTOXMark->SetPrimaryKey( aEmptyOUStr ); + pCurTOXMark->SetPrimaryKeyReading( aEmptyOUStr ); + pCurTOXMark->SetSecondaryKey( aEmptyOUStr ); + pCurTOXMark->SetSecondaryKeyReading( aEmptyOUStr ); } if(rDesc.GetPhoneticReadingOfAltStr()) pCurTOXMark->SetTextReading( *rDesc.GetPhoneticReadingOfAltStr() ); else - pCurTOXMark->SetTextReading( aEmptyStr ); + pCurTOXMark->SetTextReading( aEmptyOUStr ); pCurTOXMark->SetMainEntry(rDesc.IsMainEntry()); } else @@ -358,7 +358,7 @@ sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc, if(TOX_AUTHORITIES == eCurTOXType) { SwAuthorityFieldType* pFType = (SwAuthorityFieldType*) - pSh->GetFldType(RES_AUTHORITY, aEmptyStr); + pSh->GetFldType(RES_AUTHORITY, aEmptyOUStr); if (!pFType) { SwAuthorityFieldType const type(pSh->GetDoc()); diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 138ca4623bdf..45378966c308 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -775,7 +775,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) { uno::Reference< linguistic2::XDictionary > xDictionary( SvxGetIgnoreAllList(), uno::UNO_QUERY ); linguistic::AddEntryToDic( xDictionary, - xSpellAlt->getWord(), sal_False, aEmptyStr, LANGUAGE_NONE ); + xSpellAlt->getWord(), sal_False, aEmptyOUStr, LANGUAGE_NONE ); } else if ((MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END) || nId == MN_ADD_TO_DIC_SINGLE) { @@ -797,7 +797,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) if (xDic.is()) { - sal_Int16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, sal_False, aEmptyStr, LANGUAGE_NONE ); + sal_Int16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, sal_False, aEmptyOUStr, LANGUAGE_NONE ); // save modified user-dictionary if it is persistent uno::Reference< frame::XStorable > xSavDic( xDic, uno::UNO_QUERY ); if (xSavDic.is()) diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 68106224af1f..d84684739dce 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -77,7 +77,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) for (sal_uInt16 i = m_pBookmarkBox->GetSelectEntryCount(); i; i-- ) m_pBookmarkBox->RemoveEntryAt(m_pBookmarkBox->GetSelectEntryPos(i - 1)); - m_pBookmarkBox->SetText(aEmptyStr); + m_pBookmarkBox->SetText(aEmptyOUStr); m_pDeleteBtn->Enable(sal_False); // no further entries there m_pOkBtn->Enable(); // the OK handler deletes @@ -111,7 +111,7 @@ void SwInsertBookmarkDlg::Apply() OUString sEntry(comphelper::string::remove(m_pBookmarkBox->GetText(), m_pBookmarkBox->GetMultiSelectionSeparator())); - rSh.SetBookmark( KeyCode(), sEntry, aEmptyStr ); + rSh.SetBookmark( KeyCode(), sEntry, aEmptyOUStr ); rReq.AppendItem( SfxStringItem( FN_INSERT_BOOKMARK, sEntry ) ); rReq.Done(); } diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 5026981f720f..38e544c61999 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -204,7 +204,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) // page for( i = RES_POOLPAGE_BEGIN; i < RES_POOLPAGE_END; ++i ) - m_pPageTemplBox->InsertEntry(SwStyleNameMapper::GetUIName( i, aEmptyStr )); + m_pPageTemplBox->InsertEntry(SwStyleNameMapper::GetUIName( i, aEmptyOUStr )); sal_uInt16 nCount = pSh->GetPageDescCnt(); for(i = 0; i < nCount; ++i) diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 6d5277536072..ddf69f7ef366 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -273,7 +273,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) if(!m_pGroupTLB->First()) pButton->Enable(sal_False); //the content must be deleted - otherwise the new handler would be called in Apply() - m_pNameED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); return 0; } @@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) for (OUVector_t::iterator it(m_InsertedArr.begin()); it != m_InsertedArr.end(); ++it) { - if (String(*it) == sEntry) + if (*it == sEntry) { m_InsertedArr.erase(it); m_InsertedArr.push_back(sNewName); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 9a2f7efc2623..b939e4ad409b 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -264,7 +264,7 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) ShowAutoText(::GetCurrGlosGroup(), m_pShortNameEdit->GetText()); } else - ShowAutoText(aEmptyStr, aEmptyStr); + ShowAutoText(aEmptyOUStr, aEmptyOUStr); // update controls NameModify(m_pShortNameEdit); if( SfxRequest::HasMacroRecorder( pSh->GetView().GetViewFrame() ) ) @@ -510,8 +510,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) { SfxItemSet aSet( pSh->GetAttrPool(), RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 ); - SvxMacro aStart(aEmptyStr, aEmptyStr, STARBASIC); - SvxMacro aEnd(aEmptyStr, aEmptyStr, STARBASIC); + SvxMacro aStart(aEmptyOUStr, aEmptyOUStr, STARBASIC); + SvxMacro aEnd(aEmptyOUStr, aEmptyOUStr, STARBASIC); pGlossaryHdl->GetMacros(m_pShortNameEdit->GetText(), aStart, aEnd ); SvxMacroItem aItem(RES_FRMMACRO); diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 5c8bc94c5b13..c7d43825ddb1 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -101,8 +101,8 @@ static sal_Bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName, const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); SwTextBlocks * pBlock = ::GetGlossaries()->GetGroupDoc( rGroupName ); - SvxMacro aStart(aEmptyStr, aEmptyStr); - SvxMacro aEnd(aEmptyStr, aEmptyStr); + SvxMacro aStart(aEmptyOUStr, aEmptyOUStr); + SvxMacro aEnd(aEmptyOUStr, aEmptyOUStr); SwGlossaryHdl* pGlosHdl; pGlosHdl = rSh.GetView().GetGlosHdl(); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index e017c689af51..db8ac851c63c 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -273,11 +273,11 @@ void SwNumPositionTabPage::InitControls() if(bSameDist) m_pDistNumMF->SetValue(m_pDistNumMF->Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP); else - m_pDistNumMF->SetText(aEmptyStr); + m_pDistNumMF->SetText(aEmptyOUStr); if(bSameIndent) m_pIndentMF->SetValue(m_pIndentMF->Normalize(-aNumFmtArr[nLvl]->GetFirstLineOffset()), FUNIT_TWIP); else - m_pIndentMF->SetText(aEmptyStr); + m_pIndentMF->SetText(aEmptyOUStr); if(bSameAdjust) { @@ -323,14 +323,14 @@ void SwNumPositionTabPage::InitControls() } else { - m_pListtabMF->SetText(aEmptyStr); + m_pListtabMF->SetText(aEmptyOUStr); } } else { m_pListtabFT->Enable( false ); m_pListtabMF->Enable( false ); - m_pListtabMF->SetText(aEmptyStr); + m_pListtabMF->SetText(aEmptyOUStr); } if ( bSameAlignAt ) @@ -342,7 +342,7 @@ void SwNumPositionTabPage::InitControls() } else { - m_pAlignedAtMF->SetText(aEmptyStr); + m_pAlignedAtMF->SetText(aEmptyOUStr); } if ( bSameIndentAt ) @@ -352,11 +352,11 @@ void SwNumPositionTabPage::InitControls() } else { - m_pIndentAtMF->SetText(aEmptyStr); + m_pIndentAtMF->SetText(aEmptyOUStr); } if(sal_True == bSetDistEmpty) - m_pDistBorderMF->SetText(aEmptyStr); + m_pDistBorderMF->SetText(aEmptyOUStr); bInInintControl = sal_False; } @@ -686,7 +686,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld ) SetModified(); if(!m_pDistBorderMF->IsEnabled()) - m_pDistBorderMF->SetText(aEmptyStr); + m_pDistBorderMF->SetText(aEmptyOUStr); return 0; } @@ -724,7 +724,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox ) if(bSetValue) m_pDistBorderMF->SetValue(m_pDistBorderMF->Normalize(nValue), FUNIT_TWIP); else - m_pDistBorderMF->SetText(aEmptyStr); + m_pDistBorderMF->SetText(aEmptyOUStr); m_pDistBorderMF->Enable(bOn || bSingleSelection||0 != pOutlineDlg); bLastRelative = bOn; return 0; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 1e997d135b63..6947ff451a10 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -478,15 +478,15 @@ void SwOutlineSettingsTabPage::Update() if(bSameStart) m_pStartEdit->SetValue(aNumFmtArr[0]->GetStart()); else - m_pStartEdit->SetText(aEmptyStr); + m_pStartEdit->SetText(aEmptyOUStr); if(bSamePrefix) m_pPrefixED->SetText(aNumFmtArr[0]->GetPrefix()); else - m_pPrefixED->SetText(aEmptyStr); + m_pPrefixED->SetText(aEmptyOUStr); if(bSameSuffix) m_pSuffixED->SetText(aNumFmtArr[0]->GetSuffix()); else - m_pSuffixED->SetText(aEmptyStr); + m_pSuffixED->SetText(aEmptyOUStr); if(bSameCharFmt) { @@ -507,7 +507,7 @@ void SwOutlineSettingsTabPage::Update() } else { - m_pAllLevelNF->SetText(aEmptyStr); + m_pAllLevelNF->SetText(aEmptyOUStr); } } else @@ -538,7 +538,7 @@ void SwOutlineSettingsTabPage::Update() } else { - m_pAllLevelNF->SetText(aEmptyStr); + m_pAllLevelNF->SetText(aEmptyOUStr); m_pAllLevelNF->Enable(sal_False); m_pAllLevelFT->Enable(sal_False); } @@ -600,14 +600,14 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox ) pCollNames[i] = aSaveCollNames[i]; if(aCollName == aNoFmtName) - pCollNames[nTmpLevel] = aEmptyStr; + pCollNames[nTmpLevel] = aEmptyOUStr; else { pCollNames[nTmpLevel] = aCollName; // template already in use? for( i = 0; i < MAXLEVEL; ++i) if(i != nTmpLevel && pCollNames[i] == aCollName ) - pCollNames[i] = aEmptyStr; + pCollNames[i] = aEmptyOUStr; } // search the oldname and put it into the current entries @@ -760,7 +760,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell) for( i = 0; i < MAXLEVEL; ++i ) { m_pCollBox->InsertEntry( SwStyleNameMapper::GetUIName( - static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i), aEmptyStr )); + static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i), aEmptyOUStr )); m_pLevelLB->InsertEntry( OUString::number(i + 1) ); } OUString sStr("1 - "); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 21b9272d80d5..298058b0de2b 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -793,7 +793,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, OUString::number(aRedlines.size())); - aTmpStr = aRewriter.Apply(String(SW_RES(STR_N_REDLINES))); + aTmpStr = aRewriter.Apply(OUString(SW_RES(STR_N_REDLINES))); } SwRewriter aRewriter; @@ -896,7 +896,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl) if (pFilterTP->IsAction()) sFilterAction = pFilterTP->GetLbAction()->GetSelectEntry(); else - sFilterAction = aEmptyStr; + sFilterAction = aEmptyOUStr; Init(); diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index 76f6a511f37e..1f08fbabb0a6 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -63,7 +63,7 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind ) pWrtShell(0), pView(0), pBindings(pBind), - aAktTableName(aEmptyStr) + aAktTableName(aEmptyOUStr) , m_bDoesUndo(true) , m_bResetUndo(false) , m_bCallUndo(false) diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index d01c5947dd8c..69916e6b1be7 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -894,8 +894,8 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( &rView.GetEditWin() ); - pDlg->Insert( SOT_FORMAT_STRING, aEmptyStr ); - pDlg->Insert( SOT_FORMAT_RTF, aEmptyStr ); + pDlg->Insert( SOT_FORMAT_STRING, aEmptyOUStr ); + pDlg->Insert( SOT_FORMAT_RTF, aEmptyOUStr ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) ); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index e4823c5d24c7..2926d96353cf 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -961,7 +961,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) const PolyPolygon aPoly( pDlg->GetPolyPolygon() ); rSh.SetGraphicPolygon( &aPoly ); if ( pDlg->IsGraphicChanged() ) - rSh.ReRead( aEmptyStr, aEmptyStr, &pDlg->GetGraphic()); + rSh.ReRead( aEmptyOUStr, aEmptyOUStr, &pDlg->GetGraphic()); rSh.EndAction(); } } diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 566ecd9bdfde..cf21daafd252 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -89,7 +89,7 @@ namespace virtual void Update( Graphic& aGraphic ) { - m_pShell->ReRead(aEmptyStr, aEmptyStr, (const Graphic*) &aGraphic); + m_pShell->ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic); } }; } @@ -160,7 +160,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) aCrop.SetBottom( MM100_TO_TWIP( aScaledCropedRectangle.Bottom() )); Graphic aCompressedGraphic( aDialog.GetCompressedGraphic() ); - rSh.ReRead(aEmptyStr, aEmptyStr, (const Graphic*) &aCompressedGraphic); + rSh.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aCompressedGraphic); rSh.SetAttr(aCrop); @@ -570,7 +570,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) GraphicObject aFilterObj( *pFilterObj ); if( SVX_GRAPHICFILTER_ERRCODE_NONE == SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj )) - GetShell().ReRead( aEmptyStr, aEmptyStr, + GetShell().ReRead( aEmptyOUStr, aEmptyOUStr, &aFilterObj.GetGraphic() ); } } @@ -786,7 +786,7 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq) Graphic aGraphic = *rShell.GetGraphic(); GraphicNativeTransform aTransform(aGraphic); aTransform.rotate(aRotation); - rShell.ReRead(aEmptyStr, aEmptyStr, (const Graphic*) &aGraphic); + rShell.ReRead(aEmptyOUStr, aEmptyOUStr, (const Graphic*) &aGraphic); SwFlyFrmAttrMgr aManager(false, &rShell, rShell.IsFrmSelected() ? FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF); Size aSize(aManager.GetSize().Height(), aManager.GetSize().Width()); diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index c027e9f26fab..0637abce40dc 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -356,7 +356,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) // --> suggestion has to be removed before GetView().GetEditWin().StopQuickHelp(); - SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyStr, 0); + SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyOUStr, 0); aFldMgr.InsertFld(aData, &aSaved); rSh.Push(); @@ -367,7 +367,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if (pPostIt) { - SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyStr,false); + SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyOUStr,false); SwIterator<SwFmtFld,SwFieldType> aIter( *pType ); SwFmtFld* pSwFmtFld = aIter.First(); while( pSwFmtFld ) @@ -586,7 +586,7 @@ FIELD_INSERT: if(!nInsertFormat) nInsertFormat = aFldMgr.GetDefaultFormat(nInsertType, bIsText, rSh.GetNumberFormatter()); SwInsertFld_Data aData(nInsertType, nInsertSubType, - aEmptyStr, aEmptyStr, nInsertFormat); + aEmptyOUStr, aEmptyOUStr, nInsertFormat); aFldMgr.InsertFld(aData); rReq.Done(); } diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index add6747cd2fd..d0b2fbce227e 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -266,11 +266,11 @@ static short lcl_AskRedlineMode(Window *pWin) BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON; - aQBox.AddButton(String(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags); + aQBox.AddButton(OUString(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags); aQBox.GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT); - aQBox.AddButton(String(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); + aQBox.AddButton(OUString(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT ); - aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0); + aQBox.AddButton(OUString(SW_RES(STR_REDLINE_EDIT)), 2, 0); aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG); aQBox.SetButtonHelpText( RET_OK, OUString() ); @@ -583,7 +583,7 @@ void SwTextShell::Execute(SfxRequest &rReq) if ( pItem ) { OUString sName = ((SfxStringItem*)pItem)->GetValue(); - rWrtSh.SetBookmark( KeyCode(), sName, aEmptyStr ); + rWrtSh.SetBookmark( KeyCode(), sName, aEmptyOUStr ); } else { @@ -760,7 +760,7 @@ void SwTextShell::Execute(SfxRequest &rReq) } if( !bDelSel && aFldMgr.GetCurFld() && TYP_FORMELFLD == aFldMgr.GetCurTypeId() ) - aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), aEmptyStr, sFormula ); + aFldMgr.UpdateCurFld( aFldMgr.GetCurFld()->GetFormat(), aEmptyOUStr, sFormula ); else if( !sFormula.isEmpty() ) { if( rWrtSh.IsCrsrInTbl() ) @@ -774,7 +774,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { SvNumberFormatter* pFormatter = rWrtSh.GetNumberFormatter(); sal_uLong nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM); - SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, aEmptyStr, sFormula, nSysNumFmt); + SwInsertFld_Data aData(TYP_FORMELFLD, nsSwGetSetExpType::GSE_FORMULA, aEmptyOUStr, sFormula, nSysNumFmt); aFldMgr.InsertFld(aData); } } diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 1b66e8d0bc4f..703e89bf9920 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -206,7 +206,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) sDBName += sColumnName; SwFldMgr aFldMgr(GetShellPtr()); - SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0); + SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyOUStr, 0); if(pConnectionItem) aData.aDBConnection = ((SfxUsrAnyItem*)pConnectionItem)->GetValue(); if(pColumnItem) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index b6b3df327957..41fa3dcec582 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -806,7 +806,7 @@ void SwTableColumnPage::Reset( const SfxItemSet& ) i = nNoOfVisibleCols; while( i < MET_FIELDS ) { - m_aFieldArr[i].SetText( aEmptyStr ); + m_aFieldArr[i].SetText( aEmptyOUStr ); m_pTextArr[i]->Disable(); i++; } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 47f4ff9ea8a5..96912e3280cf 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -493,7 +493,7 @@ IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl) AutoFmtPreview::AutoFmtPreview(Window* pParent) : Window ( pParent ), - aCurData ( aEmptyStr ), + aCurData ( aEmptyOUStr ), aVD ( *this ), aScriptedText ( aVD ), bFitWidth ( sal_False ), diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index a594d09160bd..3f39d51284f7 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1457,7 +1457,7 @@ IMPL_LINK( SwPagePreview, EndScrollHdl, SwScrollbar *, pScrollbar ) if( !pScrollbar->IsHoriScroll() ) // scroll vertically { if ( Help::IsQuickHelpEnabled() ) - Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0); + Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyOUStr, 0); if ( GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow() ) { // Scroll how many pages ?? diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index e775097cc320..9bf32b3c5420 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1708,7 +1708,7 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ ) if( !!aScanBmp ) { Graphic aGrf(aScanBmp); - m_pWrtShell->Insert( aEmptyStr, aEmptyStr, aGrf ); + m_pWrtShell->Insert( aEmptyOUStr, aEmptyOUStr, aGrf ); } } } diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 811b892cf09f..eae1397718ff 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -253,7 +253,7 @@ int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter, } else { - rShell.Insert( aEmptyStr, aEmptyStr, aGraphic, &aFrameManager ); + rShell.Insert( aEmptyOUStr, aEmptyOUStr, aGraphic, &aFrameManager ); } // it is too late after "EndAction" because the Shell can already be destroyed. @@ -431,7 +431,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq ) // format not equal to current filter (with autodetection) if( nError == GRFILTER_FORMATERROR ) - nError = InsertGraphic( aFileName, aEmptyStr, bAsLink, &GraphicFilter::GetGraphicFilter() ); + nError = InsertGraphic( aFileName, aEmptyOUStr, bAsLink, &GraphicFilter::GetGraphicFilter() ); if ( rSh.IsFrmSelected() ) { SwFrmFmt* pFmt = pDoc->FindFrmFmtByName( sGraphicFormat ); diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index e3108cdf6826..64fb3968a8af 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -423,7 +423,7 @@ void SwView::HyphenateDocument() return; } - SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, aEmptyStr, m_pEditWin, + SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, aEmptyOUStr, m_pEditWin, RID_SVXERRCTX, &DIALOG_MGR() ); Reference< XHyphenator > xHyph( ::GetHyphenator() ); @@ -546,7 +546,7 @@ void SwView::StartThesaurus() if (!IsValidSelectionForThesaurus()) return; - SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, aEmptyStr, m_pEditWin, + SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, aEmptyOUStr, m_pEditWin, RID_SVXERRCTX, &DIALOG_MGR() ); // Determine language diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index cc1a90143d87..4d2a58a3c23f 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -734,7 +734,7 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar ) if(nPgNum) { nPgNum = 0; - Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0); + Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyOUStr, 0); } Point aPos( m_aVisArea.TopLeft() ); bool bBorder = IsDocumentBorder(); diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 416e03cc7f7d..c92d90a78d50 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -735,7 +735,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() ); aSearchOpt.Locale = GetAppLanguageTag().getLocale(); if( !bDoReplace ) - aSearchOpt.replaceString = aEmptyStr; + aSearchOpt.replaceString = aEmptyOUStr; sal_uLong nFound; if( aSrchSet.Count() || ( pReplSet && pReplSet->Count() )) diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index dcb8ee93e45a..5ad584626976 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -407,7 +407,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const pGlosGroup->SetBaseURL( aTemp.GetMainURL(INetURLObject::NO_DECODE)); } else - pGlosGroup->SetBaseURL( aEmptyStr ); + pGlosGroup->SetBaseURL( aEmptyOUStr ); sal_uInt16 nRet; if( pOnlyTxt ) @@ -705,8 +705,8 @@ void SwXAutoTextGroup::removeVetoableChangeListener( void SwXAutoTextGroup::Invalidate() { pGlossaries = 0; - sName = aEmptyStr; - m_sGroupName = aEmptyStr; + sName = aEmptyOUStr; + m_sGroupName = aEmptyOUStr; } OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeException ) diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 17bbe74be71d..572e0584319d 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -184,7 +184,7 @@ SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres, case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { - rText = aEmptyStr; + rText = aEmptyOUStr; return ePres; } default:;//prevent warning diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index fed67deea916..cb60d4385b5e 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -262,7 +262,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksEnd(), &lcl_IsUiVisibleBookmark)); - sTypeToken = aEmptyStr; + sTypeToken = aEmptyOUStr; bEdit = true; } break; @@ -404,14 +404,14 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow) } } } - sTypeToken = aEmptyStr; + sTypeToken = aEmptyOUStr; bEdit = true; nOldMemberCount = nMemberCount; } break; case CONTENT_TYPE_DRAWOBJECT: { - sTypeToken = aEmptyStr; + sTypeToken = aEmptyOUStr; nMemberCount = 0; SdrModel* pModel = pWrtShell->getIDocumentDrawModelAccess()->GetDrawModel(); if(pModel) @@ -2509,7 +2509,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) } else { - Help::ShowQuickHelp( this, Rectangle(), aEmptyStr, 0 ); + Help::ShowQuickHelp( this, Rectangle(), aEmptyOUStr, 0 ); bCallBase = false; } } diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 9434d2a2a69f..a82f7d1a46f2 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -1297,9 +1297,8 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen OUString sFileName(pFileNames[nFile]); INetURLObject aFileUrl; aFileUrl.SetSmartURL( sFileName ); - OUString sSectionName(String(aFileUrl.GetLastName( - INetURLObject::DECODE_UNAMBIGUOUS)).GetToken(0, - sfx2::cTokenSeparator)); + OUString sSectionName(aFileUrl.GetLastName( + INetURLObject::DECODE_UNAMBIGUOUS).getToken(0, sfx2::cTokenSeparator)); sal_uInt16 nSectCount = rSh.GetSectionFmtCount(); OUString sTempSectionName(sSectionName); sal_uInt16 nAddNumber = 0; diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index a566448976db..3d0b3a1c213f 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -361,7 +361,7 @@ void SwGlossaryList::FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGlossaries) { SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(pGroup->sName); pGroup->nCount = pBlock ? pBlock->GetCount() : 0; - pGroup->sLongNames = pGroup->sShortNames = aEmptyStr; + pGroup->sLongNames = pGroup->sShortNames = aEmptyOUStr; if(pBlock) pGroup->sTitle = pBlock->GetName(); diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index ea045f2f14c2..d3f3f9697d01 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -220,7 +220,7 @@ ShellResource::ShellResource() aHyperlinkClick = aHyperlinkClick.replaceAll("%s", aModStr); for(sal_uInt16 i = 0; i < nCount; ++i) - aDocInfoLst.push_back(String(SW_RESSTR(FLD_DOCINFO_BEGIN + i))); + aDocInfoLst.push_back(OUString(SW_RESSTR(FLD_DOCINFO_BEGIN + i))); FreeResource(); } diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index cad7a92aeab1..8b6534cca4eb 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -1162,7 +1162,7 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData ) rData.HasFormat( nFmt = SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ) || rData.HasFormat( nFmt = SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR )) { - INetBookmark aBkmk( aEmptyStr, aEmptyStr ); + INetBookmark aBkmk( aEmptyOUStr, aEmptyOUStr ); rData.GetINetBookmark( nFmt, aBkmk ); sFileName = aBkmk.GetURL(); } diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 110cd439b316..26281cfe4c7e 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -436,7 +436,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) rSet.Put( aBoxInfo ); - SfxStringItem aFollow(SID_ATTR_PAGE_EXT1, aEmptyStr); + SfxStringItem aFollow(SID_ATTR_PAGE_EXT1, aEmptyOUStr); if(rPageDesc.GetFollow()) aFollow.SetValue(rPageDesc.GetFollow()->GetName()); rSet.Put(aFollow); diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index d64360aaab88..09b505e7e840 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -51,7 +51,7 @@ void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, } else { - sPreviewZoom = aEmptyStr; + sPreviewZoom = aEmptyOUStr; SvxZoomStatusBarControl::StateChanged(nSID, eState, pState); } } diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx index 041e5177df48..264806c63f2d 100644 --- a/sw/source/ui/wrtsh/wrtsh2.cxx +++ b/sw/source/ui/wrtsh/wrtsh2.cxx @@ -454,7 +454,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, if( EXCHG_IN_ACTION_MOVE == nAction && pIns ) { aSection = SwSectionData(*pIns); - aSection.SetLinkFileName( aEmptyStr ); + aSection.SetLinkFileName( aEmptyOUStr ); aSection.SetType( CONTENT_SECTION ); aSection.SetProtectFlag( false ); |