summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/labelcfg.hxx
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2014-09-23 15:40:34 +0900
committerCaolán McNamara <caolanm@redhat.com>2014-09-24 19:59:56 +0000
commitf8ac4e2c436505304df7020a86dfc202851a9cab (patch)
tree3e5ce62ac2a5b674e351f57b5ef1ed7b59da9d1a /sw/source/uibase/inc/labelcfg.hxx
parente16c8534f446a7cc311d6d5026aae5457e4f8e6c (diff)
fdo#75757: remove inheritance to std::vector
from SwLabRecs, by typedef'ing it as boost::ptr_vector<SwLabRec>. This is also a supposed fix for possible memory leaks in SwLabDlg::_ReplaceGroup(), since erasing elements did not delete pointers in the original code. Change-Id: I1c8a0393cb5bdcfca3408e9c8dc770d306f6d334 Reviewed-on: https://gerrit.libreoffice.org/11597 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/inc/labelcfg.hxx')
-rw-r--r--sw/source/uibase/inc/labelcfg.hxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx
index 40bd8cea6192..0a8a162e077a 100644
--- a/sw/source/uibase/inc/labelcfg.hxx
+++ b/sw/source/uibase/inc/labelcfg.hxx
@@ -21,13 +21,11 @@
#include <unotools/configitem.hxx>
#include "swdllapi.h"
+#include "labrec.hxx"
#include <map>
#include <vector>
-class SwLabRecs;
-class SwLabRec;
-
struct SwLabelMeasure
{
OUString m_aMeasure; // string contains the label dimensions