diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-02-02 14:05:24 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-02-02 14:05:24 +0100 |
| commit | 8e5ce7a3a0703fb3af27da7ffea023830a340b04 (patch) | |
| tree | 3e17eecaad95ac5f470399b0158a9ca95c90d9bf /sw | |
| parent | f23ef949effa020f452172c25e363e388739fd73 (diff) | |
cbosdo02: #i107658# fixing build breakers
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/uiview/viewling.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index fee4da44a57b..cb651de2f29d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -312,7 +312,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr) if ( pFieldmark != NULL ) { uno::Sequence< ::rtl::OUString > vListEntries(aFormula.maListEntries.size()); - copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), ::comphelper::stl_begin(vListEntries)); + ::std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), ::comphelper::stl_begin(vListEntries)); (*pFieldmark->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY)] = uno::makeAny(vListEntries); sal_Int32 nIndex = aFormula.fDropdownIndex < aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0; (*pFieldmark->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_RESULT)] = uno::makeAny(nIndex); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 25b11bca016a..aa2ed3d167a5 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -95,7 +95,7 @@ #include "ww8par2.hxx" #include "writerhelper.hxx" #include "fields.hxx" -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <algorithm> // #i24377# diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 5b46f15946e5..b6eb60360eb8 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -1062,7 +1062,7 @@ BOOL SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM ) aFldDlg.SetPosPixel(pEditWin->OutputToScreenPixel(aPixPos)); /*short ret=*/aFldDlg.Execute(); - int selection=aFldDlg.getSelection(); + sal_Int32 selection=aFldDlg.getSelection(); if (selection>=0) { (*fieldBM->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_RESULT)] = makeAny(selection); } |