summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-07 21:32:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-07 21:32:41 +0200
commit02041335d89cfb23b59218c9201ff16baf423b81 (patch)
treeea6d39d518f2e2d655ca3c2a5aeeabcee3bdb17a /framework
parentb24937c11477af44789c3c80d1d79a966895dc44 (diff)
vector::clear is just fine
Change-Id: I5d8ec98d437913861b584cf3077618a2d6b0a0be
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/filtercachedata.hxx12
-rw-r--r--framework/inc/stdtypes.h6
2 files changed, 6 insertions, 12 deletions
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 928ce9998203..e16b73a57a3f 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -86,8 +86,8 @@ struct FileType
sClipboardFormat.clear();
nDocumentIconID = 0;
lUINames.clear();
- framework::free(lURLPattern);
- framework::free(lExtensions);
+ lURLPattern.clear();
+ lExtensions.clear();
}
inline FileType& impl_copy( const FileType& rCopy )
@@ -148,7 +148,7 @@ struct Filter
nFileFormatVersion = 0;
sTemplateName.clear();
lUINames.clear();
- framework::free(lUserData);
+ lUserData.clear();
}
inline Filter& impl_copy( const Filter& rCopy )
@@ -205,7 +205,7 @@ struct Detector
inline void impl_clear()
{
sName.clear();
- framework::free(lTypes);
+ lTypes.clear();
}
inline Detector& impl_copy( const Detector& rCopy )
@@ -245,7 +245,7 @@ struct Loader
{
sName.clear();
lUINames.clear();
- framework::free(lTypes);
+ lTypes.clear();
}
inline Loader& impl_copy( const Loader& rCopy )
@@ -285,7 +285,7 @@ struct ContentHandler
inline void impl_clear()
{
sName.clear();
- framework::free(lTypes);
+ lTypes.clear();
}
inline ContentHandler& impl_copy( const ContentHandler& rCopy )
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index b87247e85b83..c58c2b71bd4a 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -81,12 +81,6 @@ struct KeyEventEqualsFunc
typedef ::std::vector< OUString > OUStringList;
-template <class T>
-void free(std::vector<T>& vec)
-{
- OUStringList().swap(vec);
-}
-
/**
Basic OUString hash.
Key and values are OUStrings.