summaryrefslogtreecommitdiff
path: root/forms/source/component
diff options
context:
space:
mode:
Diffstat (limited to 'forms/source/component')
-rw-r--r--forms/source/component/ComboBox.cxx4
-rw-r--r--forms/source/component/DatabaseForm.cxx20
-rw-r--r--forms/source/component/Filter.cxx2
-rw-r--r--forms/source/component/FormComponent.cxx8
-rw-r--r--forms/source/component/ImageControl.cxx6
-rw-r--r--forms/source/component/ListBox.cxx4
6 files changed, 22 insertions, 22 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 4e59c99ed503..d43903bfea35 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -584,7 +584,7 @@ void OComboBoxModel::loadData( bool _bForce )
}
catch(const SQLException& eSQL)
{
- onError(eSQL, FRM_RES_STRING(RID_BASELISTBOX_ERROR_FILLLIST));
+ onError(eSQL, ResourceManager::loadString(RID_BASELISTBOX_ERROR_FILLLIST));
return;
}
catch( const Exception& )
@@ -652,7 +652,7 @@ void OComboBoxModel::loadData( bool _bForce )
}
catch(const SQLException& eSQL)
{
- onError(eSQL, FRM_RES_STRING(RID_BASELISTBOX_ERROR_FILLLIST));
+ onError(eSQL, ResourceManager::loadString(RID_BASELISTBOX_ERROR_FILLLIST));
return;
}
catch( const Exception& )
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 5319b9ef05c0..60b35a8b5959 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1151,7 +1151,7 @@ bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifie
if (!m_sCurrentErrorContext.isEmpty())
onError(eDb, m_sCurrentErrorContext);
else
- onError(eDb, FRM_RES_STRING(RID_STR_READERROR));
+ onError(eDb, ResourceManager::loadString(RID_STR_READERROR));
_rClearForNotifies.reset();
restoreInsertOnlyState( );
@@ -1193,7 +1193,7 @@ bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifie
if (!m_sCurrentErrorContext.isEmpty())
onError(eDB, m_sCurrentErrorContext);
else
- onError(eDB, FRM_RES_STRING(RID_STR_READERROR));
+ onError(eDB, ResourceManager::loadString(RID_STR_READERROR));
_rClearForNotifies.reset();
bSuccess = false;
}
@@ -2795,7 +2795,7 @@ bool ODatabaseForm::implEnsureConnection()
}
catch(const SQLException& eDB)
{
- onError(eDB, FRM_RES_STRING(RID_STR_CONNECTERROR));
+ onError(eDB, ResourceManager::loadString(RID_STR_CONNECTERROR));
}
catch(const Exception&)
{
@@ -2836,7 +2836,7 @@ void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const
bool bSuccess = false;
if (bExecute)
{
- m_sCurrentErrorContext = FRM_RES_STRING(RID_ERR_LOADING_FORM);
+ m_sCurrentErrorContext = ResourceManager::loadString(RID_ERR_LOADING_FORM);
bSuccess = executeRowSet(aGuard, bMoveToFirst, _rxCompletionHandler);
}
@@ -2937,7 +2937,7 @@ void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteraction
bool bSuccess = true;
try
{
- m_sCurrentErrorContext = FRM_RES_STRING(RID_ERR_REFRESHING_FORM);
+ m_sCurrentErrorContext = ResourceManager::loadString(RID_ERR_REFRESHING_FORM);
bSuccess = executeRowSet(aGuard, bMoveToFirst, _rxCompletionHandler);
}
catch(const SQLException&)
@@ -3432,7 +3432,7 @@ void SAL_CALL ODatabaseForm::insertRow()
}
catch(const SQLException& eDb)
{
- onError(eDb, FRM_RES_STRING(RID_STR_ERR_INSERTRECORD));
+ onError(eDb, ResourceManager::loadString(RID_STR_ERR_INSERTRECORD));
throw;
}
}
@@ -3452,7 +3452,7 @@ void SAL_CALL ODatabaseForm::updateRow()
}
catch(const SQLException& eDb)
{
- onError(eDb, FRM_RES_STRING(RID_STR_ERR_UPDATERECORD));
+ onError(eDb, ResourceManager::loadString(RID_STR_ERR_UPDATERECORD));
throw;
}
}
@@ -3472,7 +3472,7 @@ void SAL_CALL ODatabaseForm::deleteRow()
}
catch(const SQLException& eDb)
{
- onError(eDb, FRM_RES_STRING(RID_STR_ERR_DELETERECORD));
+ onError(eDb, ResourceManager::loadString(RID_STR_ERR_DELETERECORD));
throw;
}
}
@@ -3492,7 +3492,7 @@ void SAL_CALL ODatabaseForm::cancelRowUpdates()
}
catch(const SQLException& eDb)
{
- onError(eDb, FRM_RES_STRING(RID_STR_ERR_INSERTRECORD));
+ onError(eDb, ResourceManager::loadString(RID_STR_ERR_INSERTRECORD));
throw;
}
}
@@ -3556,7 +3556,7 @@ Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows
}
catch(const SQLException& eDb)
{
- onError(eDb, FRM_RES_STRING(RID_STR_ERR_DELETERECORDS));
+ onError(eDb, ResourceManager::loadString(RID_STR_ERR_DELETERECORDS));
throw;
}
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index ce137f3bb1ca..7fc70280e696 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -522,7 +522,7 @@ namespace frm
{
// display the error and outta here
SQLContext aError;
- aError.Message = FRM_RES_STRING( RID_STR_SYNTAXERROR );
+ aError.Message = ResourceManager::loadString(RID_STR_SYNTAXERROR);
aError.Details = sErrorMessage;
displayException( aError );
return false;
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 6ebd8ff6a468..d9aa7941b007 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -743,7 +743,7 @@ void SAL_CALL OControlModel::write(const Reference<css::io::XObjectOutputStream>
if ( !xMark.is() )
{
throw IOException(
- FRM_RES_STRING( RID_STR_INVALIDSTREAM ),
+ ResourceManager::loadString(RID_STR_INVALIDSTREAM),
static_cast< ::cppu::OWeakObject* >( this )
);
}
@@ -786,7 +786,7 @@ void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream)
if ( !xMark.is() )
{
throw IOException(
- FRM_RES_STRING( RID_STR_INVALIDSTREAM ),
+ ResourceManager::loadString(RID_STR_INVALIDSTREAM),
static_cast< ::cppu::OWeakObject* >( this )
);
}
@@ -2471,7 +2471,7 @@ void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBindin
if ( _rxBinding.is() && !impl_approveValueBinding_nolock( _rxBinding ) )
{
throw IncompatibleTypesException(
- FRM_RES_STRING( RID_STR_INCOMPATIBLE_TYPES ),
+ ResourceManager::loadString(RID_STR_INCOMPATIBLE_TYPES),
*this
);
}
@@ -2690,7 +2690,7 @@ void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _
if ( m_xValidator.is() && ( m_xValidator == m_xExternalBinding ) )
throw VetoException(
- FRM_RES_STRING( RID_STR_INVALID_VALIDATOR ),
+ ResourceManager::loadString(RID_STR_INVALID_VALIDATOR),
*this
);
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 08276d84bba6..af4c1e32f979 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -775,7 +775,7 @@ bool OImageControlControl::implInsertGraphics()
if ( !xSet.is() )
return false;
- OUString sTitle = FRM_RES_STRING(RID_STR_IMPORT_GRAPHIC);
+ OUString sTitle = ResourceManager::loadString(RID_STR_IMPORT_GRAPHIC);
// build some arguments for the upcoming dialog
try
{
@@ -878,8 +878,8 @@ void OImageControlControl::mousePressed(const css::awt::MouseEvent& e)
if ( xMenu.is() && xWindowPeer.is() )
{
- xMenu->insertItem( ID_OPEN_GRAPHICS, FRM_RES_STRING( RID_STR_OPEN_GRAPHICS ), 0, 0 );
- xMenu->insertItem( ID_CLEAR_GRAPHICS, FRM_RES_STRING( RID_STR_CLEAR_GRAPHICS ), 0, 1 );
+ xMenu->insertItem( ID_OPEN_GRAPHICS, ResourceManager::loadString(RID_STR_OPEN_GRAPHICS), 0, 0 );
+ xMenu->insertItem( ID_CLEAR_GRAPHICS, ResourceManager::loadString(RID_STR_CLEAR_GRAPHICS), 0, 1 );
// check if the ImageURL is empty
if ( impl_isEmptyGraphics_nothrow() )
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 851add9092a5..1e9bcf2fc544 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -859,7 +859,7 @@ namespace frm
}
catch(const SQLException& eSQL)
{
- onError(eSQL, FRM_RES_STRING(RID_BASELISTBOX_ERROR_FILLLIST));
+ onError(eSQL, ResourceManager::loadString(RID_BASELISTBOX_ERROR_FILLLIST));
return;
}
catch(const Exception&)
@@ -988,7 +988,7 @@ namespace frm
}
catch(const SQLException& eSQL)
{
- onError(eSQL, FRM_RES_STRING(RID_BASELISTBOX_ERROR_FILLLIST));
+ onError(eSQL, ResourceManager::loadString(RID_BASELISTBOX_ERROR_FILLLIST));
return;
}
catch( const Exception& )
generated by cgit (git 2.34.1) at 2024-07-01 23:26:12 +0000