diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-20 09:49:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:36 +0200 |
| commit | 9dc41e228dd60c60a4364d26270c9769d2939ded (patch) | |
| tree | 960bad38180b7cc8d185e392fc67df8975eecf00 /cui | |
| parent | fd8f8bdaadc6bac6cf57c335422482a6793211a2 (diff) | |
convert remnants of String in SVX to String
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/numpages.hxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 7dbc5bc9858f..b9cbbbf27922 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -213,7 +213,7 @@ class SvxBitmapPickTabPage : public SfxTabPage FixedText* m_pErrorText; SvxBmpNumValueSet* m_pExamplesVS; - std::vector<String> aGrfNames; + std::vector<OUString> aGrfNames; String sNumCharFmtName; SvxNumRule* pActNum; @@ -307,7 +307,7 @@ class SvxNumOptionsTabPage : public SfxTabPage sal_Bool bHTMLMode : 1; sal_Bool bMenuButtonInitialized : 1; - std::vector<String> aGrfNames; + std::vector<OUString> aGrfNames; Font aActBulletFont; sal_uInt8 nBullet; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 9353dcdfa0b6..8bf2cb5bcfcb 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -802,7 +802,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); sal_uInt16 i = 0; - for(std::vector<String>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) + for(std::vector<OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i) { m_pExamplesVS->InsertItem( i + 1, i); @@ -1972,8 +1972,8 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl) GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); Graphic aGraphic; - String sGrfName; - std::vector<String>::const_iterator it = aGrfNames.begin(); + OUString sGrfName; + std::vector<OUString>::const_iterator it = aGrfNames.begin(); for(sal_uInt16 i = 0; it != aGrfNames.end(); ++it, ++i) { sGrfName = *it; |