Kaydet (Commit) d3293105 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) David Tardon

fdo#75757: remove inheritance to std::map

Typedef'ing AcceptorMap in appinit.cxx is enough.

Change-Id: Ia26e119562c87b11d8dd81f49b72d825739162b2
Reviewed-on: https://gerrit.libreoffice.org/10555Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 8ec04703
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#ifndef INCLUDED_DESKTOP_INC_APP_HXX #ifndef INCLUDED_DESKTOP_INC_APP_HXX
#define INCLUDED_DESKTOP_INC_APP_HXX #define INCLUDED_DESKTOP_INC_APP_HXX
// stl includes first
#include <map>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
...@@ -29,7 +27,6 @@ ...@@ -29,7 +27,6 @@
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <tools/resmgr.hxx> #include <tools/resmgr.hxx>
#include <unotools/bootstrap.hxx> #include <unotools/bootstrap.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
...@@ -46,7 +43,6 @@ namespace desktop ...@@ -46,7 +43,6 @@ namespace desktop
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
class CommandLineArgs; class CommandLineArgs;
class Lockfile; class Lockfile;
class AcceptorMap : public std::map< OUString, css::uno::Reference<css::lang::XInitialization> > {};
struct ConvertData; struct ConvertData;
class Desktop : public Application class Desktop : public Application
{ {
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include <unotools/tempfile.hxx> #include <unotools/tempfile.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <unotools/pathoptions.hxx> #include <unotools/pathoptions.hxx>
#include <map>
using namespace desktop; using namespace desktop;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
...@@ -154,6 +155,8 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context) ...@@ -154,6 +155,8 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context)
} }
} }
typedef std::map< OUString, css::uno::Reference<css::lang::XInitialization> > AcceptorMap;
namespace namespace
{ {
struct acceptorMap : public rtl::Static< AcceptorMap, acceptorMap > {}; struct acceptorMap : public rtl::Static< AcceptorMap, acceptorMap > {};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment