desktop/inc/app.hxx | 4 ----
desktop/source/app/appinit.cxx | 3 +++
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit d3293105512a3c25c5a17799a3bab6e0c7ff929d
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Sat Jul 26 23:47:19 2014 +0900
fdo#75757: remove inheritance to std::map
Typedef'ing AcceptorMap in appinit.cxx is enough.
Change-Id: Ia26e119562c87b11d8dd81f49b72d825739162b2
Reviewed-on: https://gerrit.libreoffice.org/10555
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index b067ae6..33e7c0c 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_DESKTOP_INC_APP_HXX
#define INCLUDED_DESKTOP_INC_APP_HXX
-// stl includes first
-#include <map>
#include <boost/optional.hpp>
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -29,7 +27,6 @@
#include <vcl/timer.hxx>
#include <tools/resmgr.hxx>
#include <unotools/bootstrap.hxx>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/uno/Reference.h>
#include <osl/mutex.hxx>
@@ -46,7 +43,6 @@ namespace desktop
--------------------------------------------------------------------*/
class CommandLineArgs;
class Lockfile;
-class AcceptorMap : public std::map< OUString,
css::uno::Reference<css::lang::XInitialization> > {};
struct ConvertData;
class Desktop : public Application
{
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 221afef..02478a4 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -53,6 +53,7 @@
#include <unotools/tempfile.hxx>
#include <vcl/svapp.hxx>
#include <unotools/pathoptions.hxx>
+#include <map>
using namespace desktop;
using namespace ::com::sun::star::uno;
@@ -154,6 +155,8 @@ void Desktop::RegisterServices(Reference< XComponentContext
> const & context)
}
}
+typedef std::map< OUString, css::uno::Reference<css::lang::XInitialization> >
AcceptorMap;
+
namespace
{
struct acceptorMap : public rtl::Static< AcceptorMap, acceptorMap > {};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
