summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/misc/UITools.cxx
diff options
context:
space:
mode:
authorIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
committerIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
commit8b35f0adebc482200cc5ff6622f81c9cc4067035 (patch)
tree3db8f52e1af776a06fe97549877caa0ace10e406 /dbaccess/source/ui/misc/UITools.cxx
parentf720ab73332799d3a19fd5f077ca05c93c0ebcf7 (diff)
parentb1708ffb49872b51c2b7d82380efeb1282d73b1c (diff)
chart52: merge with DEV300_m100
Diffstat (limited to 'dbaccess/source/ui/misc/UITools.cxx')
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 77180a01ac05..0b555662116e 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1643,7 +1643,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
return pTypeInfo;
}
// -----------------------------------------------------------------------------
-sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Bool _bAll,const ::rtl::OUString& _sName)
+sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName)
{
vos::OGuard aGuard( Application::GetSolarMutex() );
String aMsg = String(ModuleRes(_nText));