tdf#94306 replace boost::noncopyable in d...
dbaccess, desktop and drawinglayer. Replace with C++11 delete copy-constructur and copy-assignment. Nothing special, only one unused include in dbaccess/source/filter/xml/xmlfilter.cxx. Change-Id: Iebabbc658215162450d4caf08d4fb2f116c456d9 Reviewed-on: https://gerrit.libreoffice.org/23918 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
committed by
David Tardon
parent
25934decf8
commit
922ee9a9da
@@ -21,7 +21,6 @@
|
|||||||
#include "apitools.hxx"
|
#include "apitools.hxx"
|
||||||
#include "dbastrings.hrc"
|
#include "dbastrings.hrc"
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <tools/debug.hxx>
|
#include <tools/debug.hxx>
|
||||||
#include <osl/diagnose.h>
|
#include <osl/diagnose.h>
|
||||||
#include <comphelper/sequence.hxx>
|
#include <comphelper/sequence.hxx>
|
||||||
@@ -41,14 +40,15 @@ namespace dbaccess
|
|||||||
|
|
||||||
/// helper class for column property change events which holds the OComponentDefinition weak
|
/// helper class for column property change events which holds the OComponentDefinition weak
|
||||||
class OColumnPropertyListener:
|
class OColumnPropertyListener:
|
||||||
public ::cppu::WeakImplHelper< XPropertyChangeListener >,
|
public ::cppu::WeakImplHelper< XPropertyChangeListener >
|
||||||
private boost::noncopyable
|
|
||||||
{
|
{
|
||||||
OComponentDefinition* m_pComponent;
|
OComponentDefinition* m_pComponent;
|
||||||
protected:
|
protected:
|
||||||
virtual ~OColumnPropertyListener(){}
|
virtual ~OColumnPropertyListener(){}
|
||||||
public:
|
public:
|
||||||
explicit OColumnPropertyListener(OComponentDefinition* _pComponent) : m_pComponent(_pComponent){}
|
explicit OColumnPropertyListener(OComponentDefinition* _pComponent) : m_pComponent(_pComponent){}
|
||||||
|
OColumnPropertyListener(const OColumnPropertyListener&) = delete;
|
||||||
|
const OColumnPropertyListener& operator=(const OColumnPropertyListener&) = delete;
|
||||||
// XPropertyChangeListener
|
// XPropertyChangeListener
|
||||||
virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) override
|
virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) override
|
||||||
{
|
{
|
||||||
|
@@ -59,8 +59,6 @@
|
|||||||
#include <cppuhelper/implbase3.hxx>
|
#include <cppuhelper/implbase3.hxx>
|
||||||
#include <rtl/ref.hxx>
|
#include <rtl/ref.hxx>
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
|
|
||||||
namespace comphelper {
|
namespace comphelper {
|
||||||
class NamedValueCollection;
|
class NamedValueCollection;
|
||||||
}
|
}
|
||||||
@@ -78,7 +76,7 @@ typedef ::std::vector< css::uno::Reference< css::frame::XController > > Contro
|
|||||||
/** helper class monitoring the views of a document, and firing appropriate events
|
/** helper class monitoring the views of a document, and firing appropriate events
|
||||||
when views are attached / detached
|
when views are attached / detached
|
||||||
*/
|
*/
|
||||||
class ViewMonitor : public boost::noncopyable
|
class ViewMonitor
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit ViewMonitor( DocumentEventNotifier& _rEventNotifier )
|
explicit ViewMonitor( DocumentEventNotifier& _rEventNotifier )
|
||||||
@@ -90,6 +88,9 @@ public:
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ViewMonitor(const ViewMonitor&) = delete;
|
||||||
|
const ViewMonitor& operator=(const ViewMonitor&) = delete;
|
||||||
|
|
||||||
void reset()
|
void reset()
|
||||||
{
|
{
|
||||||
m_bEverHadController = false;
|
m_bEverHadController = false;
|
||||||
|
@@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <o3tl/functional.hxx>
|
#include <o3tl/functional.hxx>
|
||||||
|
|
||||||
namespace dbaccess
|
namespace dbaccess
|
||||||
@@ -46,7 +45,7 @@ namespace dbaccess
|
|||||||
using ::com::sun::star::uno::Type;
|
using ::com::sun::star::uno::Type;
|
||||||
|
|
||||||
// DocumentEvents_Data
|
// DocumentEvents_Data
|
||||||
struct DocumentEvents_Data : public ::boost::noncopyable
|
struct DocumentEvents_Data
|
||||||
{
|
{
|
||||||
::cppu::OWeakObject& rParent;
|
::cppu::OWeakObject& rParent;
|
||||||
::osl::Mutex& rMutex;
|
::osl::Mutex& rMutex;
|
||||||
@@ -58,6 +57,8 @@ namespace dbaccess
|
|||||||
,rEventsData( _rEventsData )
|
,rEventsData( _rEventsData )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
DocumentEvents_Data(const DocumentEvents_Data&) = delete;
|
||||||
|
const DocumentEvents_Data& operator=(const DocumentEvents_Data&) = delete;
|
||||||
};
|
};
|
||||||
|
|
||||||
// helper
|
// helper
|
||||||
|
@@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
|
|
||||||
namespace dbaccess
|
namespace dbaccess
|
||||||
{
|
{
|
||||||
@@ -42,12 +41,14 @@ namespace dbaccess
|
|||||||
> DocumentEvents_Base;
|
> DocumentEvents_Base;
|
||||||
|
|
||||||
class DocumentEvents :public DocumentEvents_Base
|
class DocumentEvents :public DocumentEvents_Base
|
||||||
,public ::boost::noncopyable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData );
|
DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData );
|
||||||
virtual ~DocumentEvents();
|
virtual ~DocumentEvents();
|
||||||
|
|
||||||
|
DocumentEvents(const DocumentEvents&) = delete;
|
||||||
|
const DocumentEvents& operator=(const DocumentEvents&) = delete;
|
||||||
|
|
||||||
static bool needsSynchronousNotification( const OUString& _rEventName );
|
static bool needsSynchronousNotification( const OUString& _rEventName );
|
||||||
|
|
||||||
// XInterface
|
// XInterface
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
#include <sal/config.h>
|
#include <sal/config.h>
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <com/sun/star/util/MeasureUnit.hpp>
|
#include <com/sun/star/util/MeasureUnit.hpp>
|
||||||
#include <com/sun/star/packages/zip/ZipIOException.hpp>
|
#include <com/sun/star/packages/zip/ZipIOException.hpp>
|
||||||
#include <com/sun/star/embed/ElementModes.hpp>
|
#include <com/sun/star/embed/ElementModes.hpp>
|
||||||
|
@@ -34,7 +34,6 @@
|
|||||||
#include <cppuhelper/exc_hlp.hxx>
|
#include <cppuhelper/exc_hlp.hxx>
|
||||||
#include <rtl/ustrbuf.hxx>
|
#include <rtl/ustrbuf.hxx>
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
namespace sdbtools
|
namespace sdbtools
|
||||||
@@ -233,9 +232,11 @@ namespace sdbtools
|
|||||||
};
|
};
|
||||||
|
|
||||||
// NameCheckFactory
|
// NameCheckFactory
|
||||||
class NameCheckFactory: private boost::noncopyable
|
class NameCheckFactory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
NameCheckFactory(const NameCheckFactory&) = delete;
|
||||||
|
const NameCheckFactory& operator=(const NameCheckFactory&) = delete;
|
||||||
/** creates an INameValidation instance which can be used to check the existence of query or table names
|
/** creates an INameValidation instance which can be used to check the existence of query or table names
|
||||||
|
|
||||||
@param _rContext
|
@param _rContext
|
||||||
|
@@ -123,8 +123,6 @@
|
|||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
|
|
||||||
extern "C" void SAL_CALL createRegistryInfo_ODBApplication()
|
extern "C" void SAL_CALL createRegistryInfo_ODBApplication()
|
||||||
{
|
{
|
||||||
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
|
static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
|
||||||
@@ -184,7 +182,7 @@ Reference< XInterface > SAL_CALL OApplicationController::Create(const Reference<
|
|||||||
}
|
}
|
||||||
|
|
||||||
// OApplicationController
|
// OApplicationController
|
||||||
class SelectionNotifier : public ::boost::noncopyable
|
class SelectionNotifier
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
::comphelper::OInterfaceContainerHelper2 m_aSelectionListeners;
|
::comphelper::OInterfaceContainerHelper2 m_aSelectionListeners;
|
||||||
@@ -199,6 +197,9 @@ public:
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SelectionNotifier(const SelectionNotifier&) = delete;
|
||||||
|
const SelectionNotifier& operator=(const SelectionNotifier&) = delete;
|
||||||
|
|
||||||
void addListener( const Reference< XSelectionChangeListener >& _Listener )
|
void addListener( const Reference< XSelectionChangeListener >& _Listener )
|
||||||
{
|
{
|
||||||
m_aSelectionListeners.addInterface( _Listener );
|
m_aSelectionListeners.addInterface( _Listener );
|
||||||
@@ -248,7 +249,7 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class SelectionGuard : public ::boost::noncopyable
|
class SelectionGuard
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit SelectionGuard( SelectionNotifier& _rNotifier )
|
explicit SelectionGuard( SelectionNotifier& _rNotifier )
|
||||||
@@ -262,6 +263,9 @@ public:
|
|||||||
m_rNotifier.leaveSelection( SelectionNotifier::SelectionGuardAccess() );
|
m_rNotifier.leaveSelection( SelectionNotifier::SelectionGuardAccess() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SelectionGuard(const SelectionGuard&) = delete;
|
||||||
|
const SelectionGuard& operator=(const SelectionGuard&) = delete;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SelectionNotifier& m_rNotifier;
|
SelectionNotifier& m_rNotifier;
|
||||||
};
|
};
|
||||||
|
@@ -27,7 +27,6 @@
|
|||||||
#include <com/sun/star/sdbc/XConnection.hpp>
|
#include <com/sun/star/sdbc/XConnection.hpp>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
|
|
||||||
namespace dbaui
|
namespace dbaui
|
||||||
{
|
{
|
||||||
@@ -37,8 +36,7 @@ namespace dbaui
|
|||||||
/** class implementing the IObjectNameCheck interface, and checking given object names
|
/** class implementing the IObjectNameCheck interface, and checking given object names
|
||||||
against a hierarchical name container
|
against a hierarchical name container
|
||||||
*/
|
*/
|
||||||
class HierarchicalNameCheck :public ::boost::noncopyable
|
class HierarchicalNameCheck :public IObjectNameCheck
|
||||||
,public IObjectNameCheck
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::unique_ptr< HierarchicalNameCheck_Impl > m_pImpl;
|
std::unique_ptr< HierarchicalNameCheck_Impl > m_pImpl;
|
||||||
@@ -60,6 +58,9 @@ namespace dbaui
|
|||||||
|
|
||||||
virtual ~HierarchicalNameCheck();
|
virtual ~HierarchicalNameCheck();
|
||||||
|
|
||||||
|
HierarchicalNameCheck(const HierarchicalNameCheck&) = delete;
|
||||||
|
const HierarchicalNameCheck& operator=(const HierarchicalNameCheck&) = delete;
|
||||||
|
|
||||||
// IObjectNameCheck overridables
|
// IObjectNameCheck overridables
|
||||||
virtual bool isNameValid(
|
virtual bool isNameValid(
|
||||||
const OUString& _rObjectName,
|
const OUString& _rObjectName,
|
||||||
@@ -85,8 +86,7 @@ namespace dbaui
|
|||||||
@seealso dbtools::DatabaseMetaData::supportsSubqueriesInFrom
|
@seealso dbtools::DatabaseMetaData::supportsSubqueriesInFrom
|
||||||
@seealso css::sdb::tools::XObjectNames::checkNameForCreate
|
@seealso css::sdb::tools::XObjectNames::checkNameForCreate
|
||||||
*/
|
*/
|
||||||
class DynamicTableOrQueryNameCheck :public ::boost::noncopyable
|
class DynamicTableOrQueryNameCheck :public IObjectNameCheck
|
||||||
,public IObjectNameCheck
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::unique_ptr< DynamicTableOrQueryNameCheck_Impl > m_pImpl;
|
std::unique_ptr< DynamicTableOrQueryNameCheck_Impl > m_pImpl;
|
||||||
@@ -110,6 +110,9 @@ namespace dbaui
|
|||||||
|
|
||||||
virtual ~DynamicTableOrQueryNameCheck();
|
virtual ~DynamicTableOrQueryNameCheck();
|
||||||
|
|
||||||
|
DynamicTableOrQueryNameCheck(const DynamicTableOrQueryNameCheck&) = delete;
|
||||||
|
const DynamicTableOrQueryNameCheck& operator=(const DynamicTableOrQueryNameCheck&) = delete;
|
||||||
|
|
||||||
// IObjectNameCheck overridables
|
// IObjectNameCheck overridables
|
||||||
virtual bool isNameValid(
|
virtual bool isNameValid(
|
||||||
const OUString& _rObjectName,
|
const OUString& _rObjectName,
|
||||||
|
@@ -25,13 +25,12 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <rtl/ustring.hxx>
|
#include <rtl/ustring.hxx>
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <boost/optional.hpp>
|
#include <boost/optional.hpp>
|
||||||
|
|
||||||
namespace desktop
|
namespace desktop
|
||||||
{
|
{
|
||||||
|
|
||||||
class CommandLineArgs: private boost::noncopyable
|
class CommandLineArgs
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
struct Supplier
|
struct Supplier
|
||||||
@@ -53,6 +52,9 @@ class CommandLineArgs: private boost::noncopyable
|
|||||||
CommandLineArgs();
|
CommandLineArgs();
|
||||||
explicit CommandLineArgs( Supplier& supplier );
|
explicit CommandLineArgs( Supplier& supplier );
|
||||||
|
|
||||||
|
CommandLineArgs(const CommandLineArgs&) = delete;
|
||||||
|
const CommandLineArgs& operator=(const CommandLineArgs&) = delete;
|
||||||
|
|
||||||
boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; }
|
boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; }
|
||||||
|
|
||||||
// Access to bool parameters
|
// Access to bool parameters
|
||||||
|
@@ -36,7 +36,6 @@
|
|||||||
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
|
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
|
||||||
|
|
||||||
#include <boost/optional.hpp>
|
#include <boost/optional.hpp>
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include "license_dialog.hxx"
|
#include "license_dialog.hxx"
|
||||||
#include "dp_gui_dialog2.hxx"
|
#include "dp_gui_dialog2.hxx"
|
||||||
#include "dp_gui_extensioncmdqueue.hxx"
|
#include "dp_gui_extensioncmdqueue.hxx"
|
||||||
@@ -50,12 +49,15 @@ namespace sdecl = comphelper::service_decl;
|
|||||||
namespace dp_gui {
|
namespace dp_gui {
|
||||||
|
|
||||||
|
|
||||||
class MyApp : public Application, private boost::noncopyable
|
class MyApp : public Application
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MyApp();
|
MyApp();
|
||||||
virtual ~MyApp();
|
virtual ~MyApp();
|
||||||
|
|
||||||
|
MyApp(const MyApp&) = delete;
|
||||||
|
const MyApp& operator=(const MyApp&) = delete;
|
||||||
|
|
||||||
// Application
|
// Application
|
||||||
virtual int Main() override;
|
virtual int Main() override;
|
||||||
virtual void DeInit() override;
|
virtual void DeInit() override;
|
||||||
|
@@ -25,7 +25,6 @@
|
|||||||
#include <comphelper/sequence.hxx>
|
#include <comphelper/sequence.hxx>
|
||||||
#include <comphelper/seqstream.hxx>
|
#include <comphelper/seqstream.hxx>
|
||||||
#include <comphelper/processfactory.hxx>
|
#include <comphelper/processfactory.hxx>
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <boost/optional.hpp>
|
#include <boost/optional.hpp>
|
||||||
#include <com/sun/star/configuration/theDefaultProvider.hpp>
|
#include <com/sun/star/configuration/theDefaultProvider.hpp>
|
||||||
#include <com/sun/star/container/XNameAccess.hpp>
|
#include <com/sun/star/container/XNameAccess.hpp>
|
||||||
@@ -58,14 +57,16 @@ namespace {
|
|||||||
using css::uno::Reference;
|
using css::uno::Reference;
|
||||||
|
|
||||||
class EmptyNodeList:
|
class EmptyNodeList:
|
||||||
public cppu::WeakImplHelper<css::xml::dom::XNodeList>,
|
public cppu::WeakImplHelper<css::xml::dom::XNodeList>
|
||||||
private boost::noncopyable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
EmptyNodeList();
|
EmptyNodeList();
|
||||||
|
|
||||||
virtual ~EmptyNodeList();
|
virtual ~EmptyNodeList();
|
||||||
|
|
||||||
|
EmptyNodeList(const EmptyNodeList&) = delete;
|
||||||
|
const EmptyNodeList& operator=(const EmptyNodeList&) = delete;
|
||||||
|
|
||||||
virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
|
virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
|
||||||
|
|
||||||
virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
|
virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
|
||||||
|
@@ -27,7 +27,6 @@
|
|||||||
#include <rtl/bootstrap.hxx>
|
#include <rtl/bootstrap.hxx>
|
||||||
#include <sal/types.h>
|
#include <sal/types.h>
|
||||||
#include <sal/config.h>
|
#include <sal/config.h>
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <com/sun/star/lang/XServiceInfo.hpp>
|
#include <com/sun/star/lang/XServiceInfo.hpp>
|
||||||
#include <com/sun/star/lang/XInitialization.hpp>
|
#include <com/sun/star/lang/XInitialization.hpp>
|
||||||
#include <com/sun/star/lang/WrappedTargetException.hpp>
|
#include <com/sun/star/lang/WrappedTargetException.hpp>
|
||||||
@@ -58,12 +57,14 @@ using namespace com::sun::star::configuration::backend;
|
|||||||
namespace migration
|
namespace migration
|
||||||
{
|
{
|
||||||
|
|
||||||
class CJavaInfo: private boost::noncopyable
|
class CJavaInfo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
JavaInfo* pData;
|
JavaInfo* pData;
|
||||||
CJavaInfo();
|
CJavaInfo();
|
||||||
~CJavaInfo();
|
~CJavaInfo();
|
||||||
|
CJavaInfo(const CJavaInfo&) = delete;
|
||||||
|
const CJavaInfo& operator=(const CJavaInfo&) = delete;
|
||||||
operator JavaInfo* () const { return pData;}
|
operator JavaInfo* () const { return pData;}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -21,7 +21,6 @@
|
|||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <com/sun/star/awt/MessageBoxButtons.hpp>
|
#include <com/sun/star/awt/MessageBoxButtons.hpp>
|
||||||
#include <com/sun/star/awt/Rectangle.hpp>
|
#include <com/sun/star/awt/Rectangle.hpp>
|
||||||
#include <com/sun/star/awt/Toolkit.hpp>
|
#include <com/sun/star/awt/Toolkit.hpp>
|
||||||
@@ -60,10 +59,12 @@ namespace {
|
|||||||
|
|
||||||
class Provider:
|
class Provider:
|
||||||
public cppu::WeakImplHelper2<
|
public cppu::WeakImplHelper2<
|
||||||
css::lang::XServiceInfo, css::frame::XDispatchProvider >,
|
css::lang::XServiceInfo, css::frame::XDispatchProvider >
|
||||||
private boost::noncopyable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
Provider(const Provider&) = delete;
|
||||||
|
const Provider& operator=(const Provider&) = delete;
|
||||||
|
|
||||||
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
||||||
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
||||||
{ return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
|
{ return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
|
||||||
@@ -151,10 +152,12 @@ Provider::queryDispatches(
|
|||||||
|
|
||||||
class Dispatch:
|
class Dispatch:
|
||||||
public cppu::WeakImplHelper2<
|
public cppu::WeakImplHelper2<
|
||||||
css::lang::XServiceInfo, css::frame::XDispatch >,
|
css::lang::XServiceInfo, css::frame::XDispatch >
|
||||||
private boost::noncopyable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
Dispatch(const Dispatch&) = delete;
|
||||||
|
const Dispatch& operator=(const Dispatch&) = delete;
|
||||||
|
|
||||||
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
||||||
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
||||||
{ return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
|
{ return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
|
||||||
|
@@ -21,7 +21,6 @@
|
|||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <com/sun/star/awt/MessageBoxButtons.hpp>
|
#include <com/sun/star/awt/MessageBoxButtons.hpp>
|
||||||
#include <com/sun/star/awt/Rectangle.hpp>
|
#include <com/sun/star/awt/Rectangle.hpp>
|
||||||
#include <com/sun/star/awt/Toolkit.hpp>
|
#include <com/sun/star/awt/Toolkit.hpp>
|
||||||
@@ -57,10 +56,12 @@ namespace {
|
|||||||
|
|
||||||
class Provider:
|
class Provider:
|
||||||
public cppu::WeakImplHelper2<
|
public cppu::WeakImplHelper2<
|
||||||
css::lang::XServiceInfo, css::frame::XDispatchProvider >,
|
css::lang::XServiceInfo, css::frame::XDispatchProvider >
|
||||||
private boost::noncopyable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
Provider(const Provider&) = delete;
|
||||||
|
const Provider& operator=(const Provider&) = delete;
|
||||||
|
|
||||||
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
||||||
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
||||||
{ return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
|
{ return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
|
||||||
@@ -148,10 +149,12 @@ Provider::queryDispatches(
|
|||||||
|
|
||||||
class Dispatch:
|
class Dispatch:
|
||||||
public cppu::WeakImplHelper2<
|
public cppu::WeakImplHelper2<
|
||||||
css::lang::XServiceInfo, css::frame::XDispatch >,
|
css::lang::XServiceInfo, css::frame::XDispatch >
|
||||||
private boost::noncopyable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
Dispatch(const Dispatch&) = delete;
|
||||||
|
const Dispatch& operator=(const Dispatch&) = delete;
|
||||||
|
|
||||||
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
|
||||||
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
css::uno::Reference< css::uno::XComponentContext > const & xContext)
|
||||||
{ return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
|
{ return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
#include <sal/config.h>
|
#include <sal/config.h>
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <com/sun/star/graphic/XPrimitive2DRenderer.hpp>
|
#include <com/sun/star/graphic/XPrimitive2DRenderer.hpp>
|
||||||
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
||||||
#include <com/sun/star/lang/XServiceInfo.hpp>
|
#include <com/sun/star/lang/XServiceInfo.hpp>
|
||||||
@@ -49,13 +48,15 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
class XPrimitive2DRenderer:
|
class XPrimitive2DRenderer:
|
||||||
public cppu::WeakAggImplHelper2<
|
public cppu::WeakAggImplHelper2<
|
||||||
css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>,
|
css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>
|
||||||
private boost::noncopyable
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
XPrimitive2DRenderer();
|
XPrimitive2DRenderer();
|
||||||
virtual ~XPrimitive2DRenderer();
|
virtual ~XPrimitive2DRenderer();
|
||||||
|
|
||||||
|
XPrimitive2DRenderer(const XPrimitive2DRenderer&) = delete;
|
||||||
|
const XPrimitive2DRenderer& operator=(const XPrimitive2DRenderer&) = delete;
|
||||||
|
|
||||||
// XPrimitive2DRenderer
|
// XPrimitive2DRenderer
|
||||||
virtual uno::Reference< rendering::XBitmap > SAL_CALL rasterize(
|
virtual uno::Reference< rendering::XBitmap > SAL_CALL rasterize(
|
||||||
const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& Primitive2DSequence,
|
const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& Primitive2DSequence,
|
||||||
|
@@ -17,7 +17,6 @@
|
|||||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <boost/noncopyable.hpp>
|
|
||||||
#include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx>
|
#include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx>
|
||||||
#include <drawinglayer/attribute/materialattribute3d.hxx>
|
#include <drawinglayer/attribute/materialattribute3d.hxx>
|
||||||
#include <basegfx/matrix/b3dhommatrix.hxx>
|
#include <basegfx/matrix/b3dhommatrix.hxx>
|
||||||
@@ -35,7 +34,7 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
namespace // anonymous namespace
|
namespace // anonymous namespace
|
||||||
{
|
{
|
||||||
class TubeBuffer : private boost::noncopyable
|
class TubeBuffer
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
// data for buffered tube primitives
|
// data for buffered tube primitives
|
||||||
@@ -49,6 +48,9 @@ namespace drawinglayer
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TubeBuffer(const TubeBuffer&) = delete;
|
||||||
|
const TubeBuffer& operator=(const TubeBuffer&) = delete;
|
||||||
|
|
||||||
Primitive3DContainer getLineTubeSegments(
|
Primitive3DContainer getLineTubeSegments(
|
||||||
sal_uInt32 nSegments,
|
sal_uInt32 nSegments,
|
||||||
const attribute::MaterialAttribute3D& rMaterial)
|
const attribute::MaterialAttribute3D& rMaterial)
|
||||||
@@ -117,7 +119,7 @@ namespace drawinglayer
|
|||||||
return rTheBuffer.getLineTubeSegments(nSegments, rMaterial);
|
return rTheBuffer.getLineTubeSegments(nSegments, rMaterial);
|
||||||
}
|
}
|
||||||
|
|
||||||
class CapBuffer : private boost::noncopyable
|
class CapBuffer
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
// data for buffered cap primitives
|
// data for buffered cap primitives
|
||||||
@@ -130,6 +132,9 @@ namespace drawinglayer
|
|||||||
: m_nLineCapSegments(0)
|
: m_nLineCapSegments(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
CapBuffer(const CapBuffer&) = delete;
|
||||||
|
const CapBuffer& operator=(const CapBuffer&) = delete;
|
||||||
|
|
||||||
Primitive3DContainer getLineCapSegments(
|
Primitive3DContainer getLineCapSegments(
|
||||||
sal_uInt32 nSegments,
|
sal_uInt32 nSegments,
|
||||||
const attribute::MaterialAttribute3D& rMaterial)
|
const attribute::MaterialAttribute3D& rMaterial)
|
||||||
@@ -192,7 +197,7 @@ namespace drawinglayer
|
|||||||
return rTheBuffer.getLineCapSegments(nSegments, rMaterial);
|
return rTheBuffer.getLineCapSegments(nSegments, rMaterial);
|
||||||
}
|
}
|
||||||
|
|
||||||
class CapRoundBuffer : private boost::noncopyable
|
class CapRoundBuffer
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
// data for buffered capround primitives
|
// data for buffered capround primitives
|
||||||
@@ -205,6 +210,9 @@ namespace drawinglayer
|
|||||||
: m_nLineCapRoundSegments(0)
|
: m_nLineCapRoundSegments(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
CapRoundBuffer(const CapRoundBuffer&) = delete;
|
||||||
|
const CapRoundBuffer& operator=(const CapRoundBuffer&) = delete;
|
||||||
|
|
||||||
Primitive3DContainer getLineCapRoundSegments(
|
Primitive3DContainer getLineCapRoundSegments(
|
||||||
sal_uInt32 nSegments,
|
sal_uInt32 nSegments,
|
||||||
const attribute::MaterialAttribute3D& rMaterial)
|
const attribute::MaterialAttribute3D& rMaterial)
|
||||||
|
Reference in New Issue
Block a user