diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-16 09:58:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-17 09:05:49 +0200 |
| commit | e8ecf30ea61625c3397a635c5c409bbc004685bc (patch) | |
| tree | 36052ce7f57e3c39f5c96f9aaeaaf6cc469290ea /framework/source/fwe | |
| parent | 1591130dc2b62e5fdec45274b1b06d63df0051b3 (diff) | |
convert FRAMEWORK module from String to OUString
Change-Id: Iafa6b5f213d37093e7e46065c9264c7bb7fae377
Diffstat (limited to 'framework/source/fwe')
| -rw-r--r-- | framework/source/fwe/classes/addonmenu.cxx | 4 | ||||
| -rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 9a7af5c23e43..51b96ef1c09f 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -151,10 +151,10 @@ sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos ) } -static sal_uInt16 FindMenuId( Menu* pMenu, const String aCommand ) +static sal_uInt16 FindMenuId( Menu* pMenu, const OUString aCommand ) { sal_uInt16 nPos = 0; - String aCmd; + OUString aCmd; for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { sal_uInt16 nId = pMenu->GetItemId( nPos ); diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 2a503b03eed8..d8bfdbbfa4f8 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1548,7 +1548,7 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL) Graphic aGraphic; GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); - rGF.ImportGraphic( aGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ); + rGF.ImportGraphic( aGraphic, OUString(), *pStream, GRFILTER_FORMAT_DONTKNOW ); BitmapEx aBitmapEx = aGraphic.GetBitmapEx(); |