diff options
Diffstat (limited to 'basctl/source/basicide/localizationmgr.cxx')
-rw-r--r-- | basctl/source/basicide/localizationmgr.cxx | 103 |
1 files changed, 36 insertions, 67 deletions
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index 6dd07a021d32..4d311741b4bb 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -37,7 +37,9 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <tools/debug.hxx> +#include <utility> #include <osl/diagnose.h> +#include <o3tl/string_view.hxx> namespace basctl { @@ -51,22 +53,22 @@ using namespace ::com::sun::star::resource; namespace { -constexpr OUStringLiteral aDot(u"."); -constexpr OUStringLiteral aEsc(u"&"); -constexpr OUStringLiteral aSemi(u";"); +constexpr OUString aDot(u"."_ustr); +constexpr OUString aEsc(u"&"_ustr); +constexpr OUString aSemi(u";"_ustr); } // namespace LocalizationMgr::LocalizationMgr( Shell* pShell, - ScriptDocument const& rDocument, - OUString const& aLibName, + ScriptDocument aDocument, + OUString aLibName, Reference<XStringResourceManager> const& xStringResourceManager ) : m_xStringResourceManager(xStringResourceManager), m_pShell(pShell), - m_aDocument(rDocument), - m_aLibName(aLibName) + m_aDocument(std::move(aDocument)), + m_aLibName(std::move(aLibName)) { } bool LocalizationMgr::isLibraryLocalized () @@ -78,10 +80,10 @@ bool LocalizationMgr::isLibraryLocalized () void LocalizationMgr::handleTranslationbar () { - static constexpr OUStringLiteral aToolBarResName = u"private:resource/toolbar/translationbar"; + static constexpr OUString aToolBarResName = u"private:resource/toolbar/translationbar"_ustr; Reference< beans::XPropertySet > xFrameProps - ( m_pShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); + ( m_pShell->GetViewFrame().GetFrame().GetFrameInterface(), uno::UNO_QUERY ); if ( !xFrameProps.is() ) return; @@ -106,7 +108,7 @@ void LocalizationMgr::handleTranslationbar () // TODO: -> export from toolkit -static bool isLanguageDependentProperty( const OUString& aName ) +static bool isLanguageDependentProperty( std::u16string_view aName ) { static struct Prop { @@ -125,7 +127,7 @@ static bool isLanguageDependentProperty( const OUString& aName ) }; for (Prop const* pProp = vProp; pProp->sName; ++pProp) - if (aName.equalsAsciiL(pProp->sName, pProp->nNameLength)) + if (o3tl::equalsAscii(aName, std::string_view(pProp->sName, pProp->nNameLength))) return true; return false; } @@ -432,8 +434,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties xStringResourceManager->setStringForLocale( aPureIdStr, aPropStr, rLocale ); } - OUString aPropIdStr = aEsc + aPureIdStr; - pIdStrings[i] = aPropIdStr; + pIdStrings[i] = aEsc + aPureIdStr; } xPropertySet->setPropertyValue( aPropName, Any(aIdStrings) ); } @@ -529,8 +530,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties {} } - OUString aPropIdStr = aEsc + aPureIdStr; - pIdStrings[i] = aPropIdStr; + pIdStrings[i] = aEsc + aPureIdStr; } xPropertySet->setPropertyValue( aPropName, Any(aIdStrings) ); } @@ -578,8 +578,7 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties xStringResourceManager->setStringForLocale( aPureIdStr, aResStr, rLocale ); } - OUString aPropIdStr = aEsc + aPureIdStr; - pIdStrings[i] = aPropIdStr; + pIdStrings[i] = aEsc + aPureIdStr; } xPropertySet->setPropertyValue( aPropName, Any(aIdStrings) ); } @@ -924,15 +923,10 @@ void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument, xDummyStringResolver, RENAME_DIALOG_IDS ); // Handle all controls - Sequence< OUString > aNames = xDialogModel->getElementNames(); - const OUString* pNames = aNames.getConstArray(); - sal_Int32 nCtrls = aNames.getLength(); - for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) - { - OUString aCtrlName( pNames[i] ); - Any aCtrl = xDialogModel->getByName( aCtrlName ); + for(const auto& rCtrlName : xDialogModel->getElementNames()) { + Any aCtrl = xDialogModel->getByName( rCtrlName ); implHandleControlResourceProperties( aCtrl, aDlgName, - aCtrlName, xStringResourceManager, + rCtrlName, xStringResourceManager, xDummyStringResolver, RENAME_DIALOG_IDS ); } } @@ -955,15 +949,10 @@ void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument, xDummyStringResolver, REMOVE_IDS_FROM_RESOURCE ); // Handle all controls - Sequence< OUString > aNames = xDialogModel->getElementNames(); - const OUString* pNames = aNames.getConstArray(); - sal_Int32 nCtrls = aNames.getLength(); - for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) - { - OUString aCtrlName( pNames[i] ); - Any aCtrl = xDialogModel->getByName( aCtrlName ); + for(const auto& rCtrlName : xDialogModel->getElementNames()) { + Any aCtrl = xDialogModel->getByName( rCtrlName ); implHandleControlResourceProperties( aCtrl, aDlgName, - aCtrlName, xStringResourceManager, + rCtrlName, xStringResourceManager, xDummyStringResolver, REMOVE_IDS_FROM_RESOURCE ); } } @@ -975,7 +964,7 @@ void LocalizationMgr::resetResourceForDialog( const Reference< container::XNameC return; // Dialog as control - OUString aDummyName; + std::u16string_view aDummyName; Any aDialogCtrl; aDialogCtrl <<= xDialogModel; Reference< XStringResourceResolver > xDummyStringResolver; @@ -983,15 +972,10 @@ void LocalizationMgr::resetResourceForDialog( const Reference< container::XNameC aDummyName, xStringResourceManager, xDummyStringResolver, RESET_IDS ); // Handle all controls - Sequence< OUString > aNames = xDialogModel->getElementNames(); - const OUString* pNames = aNames.getConstArray(); - sal_Int32 nCtrls = aNames.getLength(); - for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) - { - OUString aCtrlName( pNames[i] ); - Any aCtrl = xDialogModel->getByName( aCtrlName ); + for(const auto& rCtrlName : xDialogModel->getElementNames()){ + Any aCtrl = xDialogModel->getByName( rCtrlName ); implHandleControlResourceProperties( aCtrl, aDummyName, - aCtrlName, xStringResourceManager, xDummyStringResolver, RESET_IDS ); + rCtrlName, xStringResourceManager, xDummyStringResolver, RESET_IDS ); } } @@ -1002,7 +986,7 @@ void LocalizationMgr::setResourceIDsForDialog( const Reference< container::XName return; // Dialog as control - OUString aDummyName; + std::u16string_view aDummyName; Any aDialogCtrl; aDialogCtrl <<= xDialogModel; Reference< XStringResourceResolver > xDummyStringResolver; @@ -1010,15 +994,10 @@ void LocalizationMgr::setResourceIDsForDialog( const Reference< container::XName aDummyName, xStringResourceManager, xDummyStringResolver, SET_IDS ); // Handle all controls - Sequence< OUString > aNames = xDialogModel->getElementNames(); - const OUString* pNames = aNames.getConstArray(); - sal_Int32 nCtrls = aNames.getLength(); - for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) - { - OUString aCtrlName( pNames[i] ); - Any aCtrl = xDialogModel->getByName( aCtrlName ); + for(const auto& rCtrlName : xDialogModel->getElementNames()) { + Any aCtrl = xDialogModel->getByName( rCtrlName ); implHandleControlResourceProperties( aCtrl, aDummyName, - aCtrlName, xStringResourceManager, xDummyStringResolver, SET_IDS ); + rCtrlName, xStringResourceManager, xDummyStringResolver, SET_IDS ); } } @@ -1064,15 +1043,10 @@ void LocalizationMgr::copyResourceForDroppedDialog( const Reference< container:: std::u16string_view(), xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES ); // Handle all controls - Sequence< OUString > aNames = xDialogModel->getElementNames(); - const OUString* pNames = aNames.getConstArray(); - sal_Int32 nCtrls = aNames.getLength(); - for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) - { - OUString aCtrlName( pNames[i] ); - Any aCtrl = xDialogModel->getByName( aCtrlName ); + for(const auto& rCtrlName : xDialogModel->getElementNames()) { + Any aCtrl = xDialogModel->getByName( rCtrlName ); implHandleControlResourceProperties( aCtrl, aDialogName, - aCtrlName, xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES ); + rCtrlName, xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES ); } } @@ -1084,7 +1058,7 @@ void LocalizationMgr::copyResourceForDialog( if( !xDialogModel.is() || !xSourceStringResolver.is() || !xTargetStringResourceManager.is() ) return; - OUString aDummyName; + std::u16string_view aDummyName; Any aDialogCtrl; aDialogCtrl <<= xDialogModel; implHandleControlResourceProperties @@ -1092,13 +1066,8 @@ void LocalizationMgr::copyResourceForDialog( xSourceStringResolver, COPY_RESOURCES ); // Handle all controls - Sequence< OUString > aNames = xDialogModel->getElementNames(); - const OUString* pNames = aNames.getConstArray(); - sal_Int32 nCtrls = aNames.getLength(); - for( sal_Int32 i = 0 ; i < nCtrls ; ++i ) - { - OUString aCtrlName( pNames[i] ); - Any aCtrl = xDialogModel->getByName( aCtrlName ); + for(const auto& rCtrlName : xDialogModel->getElementNames()) { + Any aCtrl = xDialogModel->getByName( rCtrlName ); implHandleControlResourceProperties( aCtrl, aDummyName, aDummyName, xTargetStringResourceManager, xSourceStringResolver, COPY_RESOURCES ); } |