summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorRicardo Montania <ricardo@linuxafundo.com.br>2012-11-30 18:01:26 -0200
committerOlivier Hallot <olivier.hallot@alta.org.br>2012-12-01 14:35:59 +0000
commitdd4edd93696140b7fae61268511886845d777645 (patch)
tree3b22a2384ddf728480fa5fa2739ff9a4174d2566 /dbaccess
parentcca017e1e00f5029dcc261c7c9cc9017f514c108 (diff)
fdo##38838 UniString Removal in dbaccess
Change-Id: I6c4f8e9834fdd78851f5274ce2b141cfb49e6458 Reviewed-on: https://gerrit.libreoffice.org/1208 Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br> Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx16
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx4
-rw-r--r--dbaccess/source/ui/inc/paramdialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/sqlmessage.hxx6
4 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 1453c8434291..694cdeaef318 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -110,7 +110,7 @@ DBG_NAME(OParameterDialog)
if (!pValues->Value.hasValue())
// it won't have a value, 'cause it's default constructed. But may be later we support
// initializing this dialog with values
- pValues->Value = makeAny(::rtl::OUString());
+ pValues->Value = makeAny( OUString() );
// default the values to an empty string
m_aVisitedParams.push_back(0);
@@ -182,14 +182,14 @@ DBG_NAME(OParameterDialog)
}
// transform the current string according to the param field type
- ::rtl::OUString sTransformedText(m_aParam.GetText());
+ OUString sTransformedText(m_aParam.GetText());
Reference< XPropertySet > xParamAsSet;
m_xParams->getByIndex(m_nCurrentlySelected) >>= xParamAsSet;
if (xParamAsSet.is())
{
if (m_xConnection.is() && m_xFormatter.is())
{
- ::rtl::OUString sParamValue( m_aParam.GetText() );
+ OUString sParamValue( m_aParam.GetText() );
sal_Bool bValid = m_aPredicateInput.normalizePredicateString( sParamValue, xParamAsSet );
m_aParam.SetText( sParamValue );
if ( bValid )
@@ -205,7 +205,7 @@ DBG_NAME(OParameterDialog)
m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified
- ::rtl::OUString sName;
+ OUString sName;
try
{
sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME));
@@ -220,7 +220,7 @@ DBG_NAME(OParameterDialog)
LocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG);
sMessage = String(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
}
- sMessage.SearchAndReplaceAll(rtl::OUString("$name$"), sName);
+ sMessage.SearchAndReplaceAll( OUString("$name$"), sName );
ErrorBox(NULL, WB_OK, sMessage).Execute();
m_aParam.GrabFocus();
return 1L;
@@ -265,9 +265,9 @@ DBG_NAME(OParameterDialog)
Reference< XPropertySet > xParamAsSet;
m_xParams->getByIndex(i) >>= xParamAsSet;
- ::rtl::OUString sValue;
+ OUString sValue;
pValues->Value >>= sValue;
- pValues->Value <<= ::rtl::OUString( m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, sal_False ) );
+ pValues->Value <<= OUString( m_aPredicateInput.getPredicateValue( sValue, xParamAsSet, sal_False ) );
}
}
catch(Exception&)
@@ -324,7 +324,7 @@ DBG_NAME(OParameterDialog)
return 1L;
}
- m_aFinalValues[m_nCurrentlySelected].Value <<= ::rtl::OUString(m_aParam.GetText());
+ m_aFinalValues[m_nCurrentlySelected].Value <<= OUString(m_aParam.GetText());
}
// initialize the controls with the new values
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 210d5e6b8f58..9c3ecc89c51f 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -716,7 +716,7 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rExcep
}
//------------------------------------------------------------------------------
-OSQLMessageBox::OSQLMessageBox( Window* _pParent, const UniString& _rTitle, const UniString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
+OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
:ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG )
,m_aInfoImage( this )
,m_aTitle( this, WB_WORDBREAK | WB_LEFT )
@@ -749,7 +749,7 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ )
//==================================================================
// OSQLWarningBox
//==================================================================
-OSQLWarningBox::OSQLWarningBox( Window* _pParent, const UniString& _rMessage, WinBits _nStyle,
+OSQLWarningBox::OSQLWarningBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle,
const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo )
:OSQLMessageBox( _pParent, String( ModuleRes( STR_STAT_WARNING ) ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo )
{
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 45596df04ebb..b53887770420 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -98,7 +98,7 @@ namespace dbaui
protected:
void Construct();
- ::connectivity::OSQLParseNode* implPredicateTree(::rtl::OUString& _rErrorMessage, const UniString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField);
+ ::connectivity::OSQLParseNode* implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField);
private:
DECL_LINK(OnVisitedTimeout, Timer*);
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index d783a6515727..da36617be5d3 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -87,8 +87,8 @@ public:
@param _eType determines the image to use. AUTO is disallowed in this constructor version
*/
OSQLMessageBox(Window* pParent,
- const UniString& rTitle,
- const UniString& rMessage,
+ const OUString& rTitle,
+ const OUString& rMessage,
WinBits nStyle = WB_OK | WB_DEF_OK,
MessageType _eType = Info,
const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL );
@@ -114,7 +114,7 @@ class OSQLWarningBox : public OSQLMessageBox
{
public:
OSQLWarningBox( Window* _pParent,
- const UniString& _rMessage,
+ const OUString& _rMessage,
WinBits _nStyle = WB_OK | WB_DEF_OK,
const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL );
};