diff options
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/basides1.cxx | 8 | ||||
-rw-r--r-- | basctl/source/basicide/localizationmgr.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlged.cxx | 4 | ||||
-rw-r--r-- | basctl/source/dlged/propbrw.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 7d931a70bad4..8942d87f4ae0 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1209,11 +1209,11 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe void Shell::ManageToolbars() { - static const OUStringLiteral aMacroBarResName = u"private:resource/toolbar/macrobar"; - static const OUStringLiteral aDialogBarResName = u"private:resource/toolbar/dialogbar"; - static const OUStringLiteral aInsertControlsBarResName + static constexpr OUStringLiteral aMacroBarResName = u"private:resource/toolbar/macrobar"; + static constexpr OUStringLiteral aDialogBarResName = u"private:resource/toolbar/dialogbar"; + static constexpr OUStringLiteral aInsertControlsBarResName = u"private:resource/toolbar/insertcontrolsbar"; - static const OUStringLiteral aFormControlsBarResName + static constexpr OUStringLiteral aFormControlsBarResName = u"private:resource/toolbar/formcontrolsbar"; if( !pCurWin ) diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index 806b3d8aacae..6dd07a021d32 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -78,7 +78,7 @@ bool LocalizationMgr::isLibraryLocalized () void LocalizationMgr::handleTranslationbar () { - static const OUStringLiteral aToolBarResName = u"private:resource/toolbar/translationbar"; + static constexpr OUStringLiteral aToolBarResName = u"private:resource/toolbar/translationbar"; Reference< beans::XPropertySet > xFrameProps ( m_pShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index ced23c5474bc..f99dab40d4c3 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -57,8 +57,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; -const OUStringLiteral aResourceResolverPropName = u"ResourceResolver"; -const OUStringLiteral aDecorationPropName = u"Decoration"; +constexpr OUStringLiteral aResourceResolverPropName = u"ResourceResolver"; +constexpr OUStringLiteral aDecorationPropName = u"Decoration"; // DlgEdHint diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 73e90e2827ac..084395ad2536 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -141,7 +141,7 @@ void PropBrw::ImplReCreateController() // create a property browser controller Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_SET_THROW ); - static const OUStringLiteral s_sControllerServiceName = u"com.sun.star.awt.PropertyBrowserController"; + static constexpr OUStringLiteral s_sControllerServiceName = u"com.sun.star.awt.PropertyBrowserController"; m_xBrowserController.set( xFactory->createInstanceWithContext( s_sControllerServiceName, xInspectorContext ), UNO_QUERY ); if ( !m_xBrowserController.is() ) { |