diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-03-26 14:30:29 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-03-26 16:21:40 -0400 |
| commit | 1b7bfb7b36964116138d2abd4e2b6aa07b6ef1e2 (patch) | |
| tree | e0c633c2eda51bb415e841d4355d5133835ab91d /cui | |
| parent | 98add982f5fe7e30855b5ecf5495ecfa31533852 (diff) | |
UniString to rtl::OUString.
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/cuitabline.hxx | 3 | ||||
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 7d0793a5c331..82df291a5d5c 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -140,9 +140,8 @@ private: FixedText aSymbolHeightFT; MetricField aSymbolHeightMF; CheckBox aSymbolRatioCB; - std::vector<String> aGrfNames; + std::vector<rtl::OUString> aGrfNames; SvxBmpItemInfoList aGrfBrushItems; - String sNumCharFmtName; sal_Bool bLastWidthModified; Size aSymbolLastSize; Graphic aSymbolGraphic; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index bbedaa840de2..1c133584baf1 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1462,19 +1462,17 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); PopupMenu* pPopup = new PopupMenu; - String aEmptyStr; - const String *pUIName = NULL; + rtl::OUString aEmptyStr; + const rtl::OUString *pUIName = NULL; sal_uInt32 i = 0; - for(std::vector<String>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) + for(std::vector<rtl::OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) { pUIName = &(*it); // convert URL encodings to UI characters (eg %20 for spaces) - String aPhysicalName; - rtl::OUString sTmp; - if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( *it, sTmp )) + rtl::OUString aPhysicalName; + if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it, aPhysicalName)) { - aPhysicalName = sTmp; pUIName = &aPhysicalName; } @@ -1536,7 +1534,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) pView->ShowSdrPage(pPage); PopupMenu* pPopup = new PopupMenu; - String aEmptyStr; + rtl::OUString aEmptyStr; // Generate invisible square to give all symbols a // bitmap size, which is indepedent from specific glyph |