diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2021-11-07 23:07:18 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2021-11-08 07:04:47 +0100 |
commit | 01878ce321dbbffbc877fbe9eb399dec95f99755 (patch) | |
tree | 01aa6282c02401d767e7b523254ac6374cf3c7e3 /forms/source/runtime | |
parent | 6b4730f5649c9d028b140168f92f1fc12c2fb2cb (diff) |
Replace some macros in forms part 17
Remove FRM_RES_STRING + PROP + PROPERTY_FLAGS
Change-Id: I11befedbe83ad9d7c3f3f4d689230ffe422c0770
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124830
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'forms/source/runtime')
-rw-r--r-- | forms/source/runtime/formoperations.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index d82c87d050af..e7c7d135f61a 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -435,7 +435,7 @@ namespace frm // TODO: shouldn't this be done with an interaction handler? std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr, VclMessageType::Question, VclButtonsType::YesNo, - FRM_RES_STRING(RID_STR_QUERY_SAVE_MODIFIED_ROW))); + ResourceManager::loadString(RID_STR_QUERY_SAVE_MODIFIED_ROW))); xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL); xQueryBox->set_default_response(RET_YES); @@ -776,7 +776,7 @@ namespace frm pErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS; else if ( !lcl_isExecutableFeature( _nFeature ) ) pErrorResourceId = RID_STR_FEATURE_NOT_EXECUTABLE; - throw IllegalArgumentException( FRM_RES_STRING( pErrorResourceId ), *this, 1 ); + throw IllegalArgumentException( ResourceManager::loadString(pErrorResourceId), *this, 1 ); } } // switch } @@ -804,7 +804,7 @@ namespace frm // at the moment we have only one feature which supports execution parameters if ( !lcl_isExecutableFeature( _nFeature ) ) - throw IllegalArgumentException( FRM_RES_STRING( RID_STR_FEATURE_NOT_EXECUTABLE ), *this, 1 ); + throw IllegalArgumentException( ResourceManager::loadString(RID_STR_FEATURE_NOT_EXECUTABLE), *this, 1 ); switch ( _nFeature ) { @@ -843,7 +843,7 @@ namespace frm } break; default: - throw IllegalArgumentException( FRM_RES_STRING( RID_STR_FEATURE_UNKNOWN ), *this, 1 ); + throw IllegalArgumentException( ResourceManager::loadString(RID_STR_FEATURE_UNKNOWN), *this, 1 ); } // switch } @@ -1742,7 +1742,7 @@ namespace frm throw; SQLExceptionInfo aInfo( ::cppu::getCaughtException() ); - OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) ); + OUString sAdditionalError( ResourceManager::loadString(pErrorResourceId) ); aInfo.prepend( sAdditionalError ); aInfo.doThrow(); } @@ -1750,7 +1750,7 @@ namespace frm catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) ); + OUString sAdditionalError( ResourceManager::loadString(pErrorResourceId) ); throw WrappedTargetException( sAdditionalError, *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } } |