summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-02 18:20:24 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-03 08:20:19 +0200
commitd59fe933fe3ecabdc80737b72683923fc5bcae0e (patch)
tree76b999e90359655cf78861ad61eed2040931fbc3
parentb6f4658003c91e8a76738d1ec9436c89fcb08f09 (diff)
Use boost::noncopyable
Change-Id: I1cd2ad1284f2fb9f6847cdb9175a5872a66726cd
-rw-r--r--shell/Library_recentfile.mk1
-rw-r--r--shell/source/unix/sysshell/recently_used_file_handler.cxx8
2 files changed, 5 insertions, 4 deletions
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index 6ba88de6f2df..41b402260374 100644
--- a/shell/Library_recentfile.mk
+++ b/shell/Library_recentfile.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_Library_set_include,recentfile,\
))
$(eval $(call gb_Library_use_externals,recentfile,\
+ boost_headers \
expat \
))
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index e6f7fad0193b..a2f7f0c81a3f 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include "boost/noncopyable.hpp"
#include "osl/process.h"
#include "rtl/ustring.hxx"
#include "rtl/string.hxx"
@@ -207,7 +209,8 @@ namespace /* private */ {
// thrown if we encounter xml tags that we do not know
class unknown_xml_format_exception {};
- class recently_used_file_filter : public i_xml_parser_event_handler
+ class recently_used_file_filter:
+ public i_xml_parser_event_handler, private boost::noncopyable
{
public:
recently_used_file_filter(recently_used_item_list_t& item_list) :
@@ -278,9 +281,6 @@ namespace /* private */ {
std::map<string_t, SET_COMMAND> named_command_map_;
string_t current_element_;
recently_used_item_list_t& item_list_;
- private:
- recently_used_file_filter(const recently_used_file_filter&);
- recently_used_file_filter& operator=(const recently_used_file_filter&);
};