diff options
| author | Matthew Pottage <matthewpottage@invincitech.com> | 2014-10-28 16:50:02 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-06 23:06:58 +0100 |
| commit | 4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9 (patch) | |
| tree | d626505be68b47a1219d9838f9d5dc35c7271248 /fpicker | |
| parent | 90613f4e47e5e113e5fafb573d832bfcace314e5 (diff) | |
fdo#75757: Remove inheritance from std::vector
Deprecated comphelper/sequenceasvector.hxx.
Rewritten code using it. Using instead the functions containerToSequence and
sequenceToContainer, found in include/comphelper/sequence.hxx.
One class that inherits from it (in framework/inc/stdtypes.h), and
the code using that has been left.
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/TblStylePrHandler.hxx
writerfilter/source/dmapper/WrapPolygonHandler.hxx
Change-Id: Ice61c94ffb052e389281aebb7cdf185134221061
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.cxx | 10 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index f5f1fe2ddaff..6906d29ae07e 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include "filepickereventnotification.hxx" -#include <comphelper/sequenceasvector.hxx> +#include <comphelper/sequence.hxx> // namespace directives @@ -382,9 +382,9 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R if (c < 2) return lSource; - const OUString sPath = lSource[0]; - ::comphelper::SequenceAsVector< OUString > lTarget; - ::sal_Int32 i = 1; + const OUString sPath = lSource[0]; + ::std::vector< OUString > lTarget; + ::sal_Int32 i = 1; for (i=1; i<c; ++i) { const OUString sFile = lSource[i]; @@ -406,7 +406,7 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R } } - return lTarget.getAsConstList(); + return comphelper::containerToSequence(lTarget); } diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 9716c1e564ee..54f30690767a 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/beans/StringPair.hpp> -#include <comphelper/sequenceasvector.hxx> +#include <comphelper/sequence.hxx> #include <osl/file.hxx> #include <osl/mutex.hxx> #ifdef __MINGW32__ @@ -85,7 +85,7 @@ namespace vista{ static const ::sal_Int16 INVALID_CONTROL_ID = -1; static const ::sal_Int16 INVALID_CONTROL_ACTION = -1; -typedef ::comphelper::SequenceAsVector< OUString > TStringList; +typedef ::std::vector< OUString > TStringList; // Guids used for IFileDialog::SetClientGuid static const GUID CLIENTID_FILEDIALOG_SIMPLE = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83}; @@ -864,7 +864,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest) } } - rRequest->setArgument(PROP_SELECTED_FILES, lFiles.getAsConstList()); + rRequest->setArgument(PROP_SELECTED_FILES, comphelper::containerToSequence(lFiles)); } |