diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-08 11:32:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-09 13:03:06 +0100 |
| commit | 3912e47044f753f82c63ac11e803be5fb756c14f (patch) | |
| tree | 87d9bb88027876ef0528218d712de5305e651f55 /extensions/source/dbpilots | |
| parent | 52c5eb20fd96d63e17cb9cd18912030131bcc787 (diff) | |
Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab
Diffstat (limited to 'extensions/source/dbpilots')
| -rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index dcb73bb3260b..1309f1eb51a3 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -17,10 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + +#include <vector> + #include "gridwizard.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <comphelper/stl_types.hxx> #include <tools/string.hxx> #include <com/sun/star/form/XGridColumnFactory.hpp> #include <com/sun/star/awt/MouseWheelBehavior.hpp> @@ -107,10 +110,9 @@ namespace dbp static const ::rtl::OUString s_sEmptyString; // collect "descriptors" for the to-be-created (grid)columns - DECLARE_STL_VECTOR( ::rtl::OUString, OUStringArray ); - OUStringArray aColumnServiceNames; // service names to be used with the XGridColumnFactory - OUStringArray aColumnLabelPostfixes; // postfixes to append to the column labels - OUStringArray aFormFieldNames; // data field names + std::vector< OUString > aColumnServiceNames; // service names to be used with the XGridColumnFactory + std::vector< OUString > aColumnLabelPostfixes; // postfixes to append to the column labels + std::vector< OUString > aFormFieldNames; // data field names aColumnServiceNames.reserve(getSettings().aSelectedFields.getLength()); aColumnLabelPostfixes.reserve(getSettings().aSelectedFields.getLength()); @@ -185,10 +187,10 @@ namespace dbp { Reference< XNameAccess > xExistenceChecker(xColumnContainer.get()); - ConstOUStringArrayIterator pColumnServiceName = aColumnServiceNames.begin(); - ConstOUStringArrayIterator pColumnLabelPostfix = aColumnLabelPostfixes.begin(); - ConstOUStringArrayIterator pFormFieldName = aFormFieldNames.begin(); - ConstOUStringArrayIterator pColumnServiceNameEnd = aColumnServiceNames.end(); + std::vector< OUString >::const_iterator pColumnServiceName = aColumnServiceNames.begin(); + std::vector< OUString >::const_iterator pColumnLabelPostfix = aColumnLabelPostfixes.begin(); + std::vector< OUString >::const_iterator pFormFieldName = aFormFieldNames.begin(); + std::vector< OUString >::const_iterator pColumnServiceNameEnd = aColumnServiceNames.end(); for (;pColumnServiceName < pColumnServiceNameEnd; ++pColumnServiceName, ++pColumnLabelPostfix, ++pFormFieldName) { |