diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-12 14:13:22 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-06-12 14:37:36 +0200 |
| commit | e364ae3891415bbf0bca588f975b282b9822aca2 (patch) | |
| tree | f7852ae9162b3685bfed9849818447791c756c6c | |
| parent | 1f68d8f644e5b961cd44c549b2dd18176bec6ccd (diff) | |
fix invalid vector.push_back(vector.back())
The vector::back() does not return a value but a reference, hence this
is invalid.
Change-Id: I8624b649deb8fb4de0d1d8af1288068acc80cef2
| -rw-r--r-- | sdext/source/pdfimport/test/tests.cxx | 3 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/DomExport.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/text/txtlists.cxx | 9 |
4 files changed, 12 insertions, 6 deletions
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 0fd470e26c44..e6d8fbabac5e 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -162,7 +162,8 @@ namespace virtual void pushState() { - m_aGCStack.push_back( m_aGCStack.back() ); + GraphicsContextStack::value_type const a(m_aGCStack.back()); + m_aGCStack.push_back(a); } virtual void popState() diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index a800643d4f23..e96ce3d6b308 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -116,7 +116,8 @@ void PDFIProcessor::setPageNum( sal_Int32 nPages ) void PDFIProcessor::pushState() { - m_aGCStack.push_back( m_aGCStack.back() ); + GraphicsContextStack::value_type const a(m_aGCStack.back()); + m_aGCStack.push_back(a); } void PDFIProcessor::popState() diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index cb9a4c9848e7..c7cb7ff7fc24 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -196,7 +196,8 @@ DomExport::~DomExport() void DomExport::pushNamespace() { - maNamespaces.push_back( maNamespaces.back() ); + SvXMLNamespaceMap const aMap(maNamespaces.back()); + maNamespaces.push_back(aMap); } void DomExport::popNamespace() diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index b615933e22a1..fa1c45b2eba8 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -412,12 +412,15 @@ XMLTextListsHelper::EnsureNumberedParagraph( if (static_cast<sal_uInt16>(io_rLevel) + 1U > rNPList.size()) { // new level: need to enlarge for (size_t i = rNPList.size(); - i < static_cast<size_t>(io_rLevel); ++i) { - rNPList.push_back(rNPList.back()); + i < static_cast<size_t>(io_rLevel); ++i) + { + NumParaList_t::value_type const rule(rNPList.back()); + rNPList.push_back(rule); } + NumParaList_t::value_type const rule(rNPList.back()); rNPList.push_back(xNumRules.is() ? ::std::make_pair(i_StyleName, xNumRules) - : rNPList.back()); + : rule); } else { // old level: no need to enlarge; possibly shrink if (xNumRules.is()) { |