diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/txtftn.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlexpit.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/misc/num.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/shells/annotsh.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/drwtxtsh.cxx | 5 |
7 files changed, 11 insertions, 12 deletions
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index ef6636794351..471acd112998 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -20,6 +20,7 @@ #define _TXTFTN_HXX #include <txatbase.hxx> +#include <tools/string.hxx> class SwNodeIndex; class SwTxtNode; diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 9cf92e038205..f92c675e33f3 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -989,7 +989,7 @@ bool SvXMLExportItemMapper::QueryXMLValue( if( pBrush->GetGraphicPos() != GPOS_NONE && pBrush->GetGraphicFilter() ) { - aOut.append( pBrush->GetGraphicFilter()->GetBuffer() ); + aOut.append( *pBrush->GetGraphicFilter() ); bOk = true; } break; diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 8944b2a34af6..a6277f98ced6 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -476,7 +476,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) case TP_PAGE_STD: if(0 == (nHtmlMode & HTMLMODE_ON )) { - std::vector<String> aList; + std::vector<OUString> aList; String aNew; SwStyleNameMapper::FillUIName( RES_POOLCOLL_TEXT, aNew ); aList.push_back( aNew ); @@ -526,7 +526,7 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell(); ::FillCharStyleListBox(rCharFmtLB, pDocShell); - std::vector<String> aList; + std::vector<OUString> aList; for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++) aList.push_back( rCharFmtLB.GetEntry(j) ); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 02335fd19f53..b7eb336788c9 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -967,9 +967,9 @@ void SwSvxNumBulletTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SwDocShell* pDocShell = rWrtSh.GetView().GetDocShell(); ::FillCharStyleListBox(rCharFmtLB, pDocShell); - std::vector<String> aList; + std::vector<OUString> aList; for(sal_uInt16 j = 0; j < rCharFmtLB.GetEntryCount(); j++) - aList.push_back( String(rCharFmtLB.GetEntry(j))); + aList.push_back( rCharFmtLB.GetEntry(j) ); aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ; diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 1fd0bf98a3d2..6df810809cd6 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -1567,12 +1567,11 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet) fnGetComment = &::svl::IUndoManager::GetRedoActionComment; } - String sList; + OUString sList; if( nCount ) { for( sal_uInt16 n = 0; n < nCount; ++n ) - ( sList += (pUndoManager->*fnGetComment)( n, ::svl::IUndoManager::TopLevel ) ) - += '\n'; + sList += (pUndoManager->*fnGetComment)( n, ::svl::IUndoManager::TopLevel ) + "\n"; } SfxStringListItem aItem( nWhich ); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 05ce67dd1543..dc54ec35ffaf 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2652,7 +2652,7 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet ) { int nSel = rSh.GetSelectionType(); SfxStringListItem aLst( nWhich ); - std::vector<String> &rLst = aLst.GetList(); + std::vector<OUString> &rLst = aLst.GetList(); nParagraphPos = nGraphicPos = nOlePos = nFramePos = nTablePos = nTableRowPos = nTableCellPos = nPagePos = nHeaderPos = nFooterPos = 0; diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index cda38033ae93..935011b6fe25 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -587,10 +587,9 @@ void SwDrawTextShell::StateUndo(SfxItemSet &rSet) } if( nCount ) { - String sList; + OUString sList; for( sal_uInt16 n = 0; n < nCount; ++n ) - ( sList += (pUndoManager->*fnGetComment)( n, ::svl::IUndoManager::TopLevel ) ) - += '\n'; + sList += (pUndoManager->*fnGetComment)( n, ::svl::IUndoManager::TopLevel ) + "\n"; SfxStringListItem aItem( nWhich ); aItem.SetString( sList ); |