diff options
Diffstat (limited to 'framework/source')
3 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 6732eaaf5116..27cb2974cf8d 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1579,7 +1579,7 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt try { Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( - UIELEMENTTYPENAMES[i], ElementModes::READWRITE )); + OUString(UIELEMENTTYPENAMES[i]), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; if ( rElementType.bModified && xElementTypeStorage.is() ) diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 498279eb40bc..e97cd33bb6c9 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -635,7 +635,7 @@ void UIConfigurationManager::impl_Initialize() Reference< XStorage > xElementTypeStorage; try { - xElementTypeStorage = m_xDocConfigStorage->openStorageElement( UIELEMENTTYPENAMES[i], nModes ); + xElementTypeStorage = m_xDocConfigStorage->openStorageElement( OUString(UIELEMENTTYPENAMES[i]), nModes ); } catch ( const css::container::NoSuchElementException& ) { @@ -1307,7 +1307,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage try { Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( - UIELEMENTTYPENAMES[i], ElementModes::READWRITE )); + OUString(UIELEMENTTYPENAMES[i]), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[i]; if ( rElementType.bModified && xElementTypeStorage.is() ) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 8741b3d872b0..fb5362307068 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -175,7 +175,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) OString sIdent = OString(aCommands[i]).copy(5); sal_uInt16 nId = pPopupMenu->GetItemId(sIdent); if (m_bShowMenuImages) - pPopupMenu->SetItemImage(nId, Image(StockImage::Yes, aImgIds[i])); + pPopupMenu->SetItemImage(nId, Image(StockImage::Yes, OUString(aImgIds[i]))); else pPopupMenu->SetItemImage(nId, Image()); } |