diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
| commit | 75a78c3224b3aa4b626381b8f4993019a2ea4036 (patch) | |
| tree | 9de4fc4a455e66d5d478dbfb97655e09fef3ec2c /sw/source/core/fields/flddropdown.cxx | |
| parent | 1cb177f424942549b547c2113129d607dec3c1e5 (diff) | |
| parent | ae9f68d1e73a973046deee6fd602a2a4c3eba2a3 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
starmath/source/symbol.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/draw/dview.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/layout/calcmove.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/ui/config/modcfg.cxx
sw/source/ui/dialog/docstdlg.cxx
sw/source/ui/dialog/docstdlg.src
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.hxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldvar.hxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/xfldui.cxx
sw/source/ui/inc/docstdlg.hxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/table/tabledlg.cxx
Diffstat (limited to 'sw/source/core/fields/flddropdown.cxx')
| -rw-r--r-- | sw/source/core/fields/flddropdown.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index eab65e4d1e..17c80d835c 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -171,7 +171,7 @@ const String & SwDropDownField::GetToolTip() const return aToolTip; } -BOOL SwDropDownField::SetSelectedItem(const String & rItem) +sal_Bool SwDropDownField::SetSelectedItem(const String & rItem) { vector<String>::const_iterator aIt = std::find(aValues.begin(), aValues.end(), rItem); @@ -199,7 +199,7 @@ void SwDropDownField::SetToolTip(const String & rToolTip) aToolTip = rToolTip; } -bool SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const +bool SwDropDownField::QueryValue(::uno::Any &rVal, sal_uInt16 nWhich) const { nWhich &= ~CONVERT_TWIPS; switch( nWhich ) @@ -228,7 +228,7 @@ bool SwDropDownField::QueryValue(::uno::Any &rVal, USHORT nWhich) const } bool SwDropDownField::PutValue(const uno::Any &rVal, - USHORT nWhich) + sal_uInt16 nWhich) { switch( nWhich ) { |