[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source basic/source binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk binaryurp/source comphelper/inc comphelper/source configmgr/CppunitTest_configmgr_unit.mk configmgr/inc configmgr/Library_configmgr.mk configmgr/source connectivity/source dbaccess/source filter/source framework/source include/basic include/canvas include/comphelper include/dbaccess include/editeng include/filter include/framework include/o3tl include/oox include/sax include/sfx2 include/svl include/svtools include/svx include/toolkit include/unotools include/vcl include/xmloff sal/qa sc/source sd/source sfx2/source svl/source svtools/source svx/source toolkit/source unotools/CppunitTest_unotools_fontdefs.mk unotools/inc unotools/Library_utl.mk unotools/source vcl/generic vcl/inc vcl/opengl vcl/source vcl/unx vcl/win vcl/workben xmloff/source
Caolán McNamara
caolanm at redhat.com
Mon Feb 16 04:55:23 PST 2015
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 6
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 6
accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx | 4
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx | 4
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx | 4
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 4
accessibility/source/extended/AccessibleBrowseBox.cxx | 54
accessibility/source/extended/AccessibleGridControl.cxx | 104 -
accessibility/source/extended/AccessibleToolPanelDeck.cxx | 42
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 54
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 60
basic/source/runtime/basrdll.cxx | 20
binaryurp/CppunitTest_binaryurp_test-cache.mk | 2
binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 2
binaryurp/Library_binaryurp.mk | 2
binaryurp/source/bridge.cxx | 15
binaryurp/source/bridge.hxx | 7
binaryurp/source/bridgefactory.hxx | 8
binaryurp/source/cache.hxx | 6
binaryurp/source/incomingreply.hxx | 8
binaryurp/source/incomingrequest.cxx | 1
binaryurp/source/incomingrequest.hxx | 6
binaryurp/source/marshal.cxx | 1
binaryurp/source/marshal.hxx | 6
binaryurp/source/outgoingrequests.hxx | 6
binaryurp/source/proxy.hxx | 6
binaryurp/source/reader.cxx | 3
binaryurp/source/readerstate.hxx | 11
binaryurp/source/unmarshal.cxx | 1
binaryurp/source/unmarshal.hxx | 6
binaryurp/source/writerstate.hxx | 7
comphelper/inc/pch/precompiled_comphelper.hxx | 1
comphelper/source/misc/asyncnotification.cxx | 42
comphelper/source/misc/storagehelper.cxx | 10
comphelper/source/property/ChainablePropertySet.cxx | 18
comphelper/source/property/MasterPropertySet.cxx | 48
configmgr/CppunitTest_configmgr_unit.mk | 1
configmgr/Library_configmgr.mk | 2
configmgr/inc/pch/precompiled_configmgr.hxx | 3
configmgr/source/access.hxx | 11
configmgr/source/broadcaster.hxx | 8
configmgr/source/childaccess.hxx | 7
configmgr/source/components.cxx | 2
configmgr/source/components.hxx | 10
configmgr/source/configurationprovider.cxx | 15
configmgr/source/configurationregistry.cxx | 13
configmgr/source/data.hxx | 6
configmgr/source/lock.cxx | 4
configmgr/source/lock.hxx | 4
configmgr/source/modifications.hxx | 10
configmgr/source/partial.hxx | 11
configmgr/source/readonlyaccess.cxx | 7
configmgr/source/readwriteaccess.cxx | 7
configmgr/source/rootaccess.hxx | 4
configmgr/source/update.cxx | 11
configmgr/source/valueparser.hxx | 6
configmgr/source/writemodfile.cxx | 6
connectivity/source/commontools/dbtools2.cxx | 2
dbaccess/source/ui/misc/dbaundomanager.cxx | 100 -
filter/source/msfilter/msdffimp.cxx | 28
framework/source/fwe/helper/documentundoguard.cxx | 6
framework/source/fwe/helper/undomanagerhelper.cxx | 54
include/basic/basrdll.hxx | 5
include/canvas/rendering/bitmap.hxx | 4
include/comphelper/asyncnotification.hxx | 8
include/comphelper/scoped_disposing_ptr.hxx | 17
include/comphelper/storagehelper.hxx | 6
include/comphelper/syntaxhighlight.hxx | 8
include/dbaccess/dbaundomanager.hxx | 4
include/editeng/Trie.hxx | 6
include/filter/msfilter/msdffimp.hxx | 7
include/framework/documentundoguard.hxx | 8
include/framework/undomanagerhelper.hxx | 4
include/o3tl/cow_wrapper.hxx | 4
include/oox/core/filterbase.hxx | 4
include/oox/core/xmlfilterbase.hxx | 2
include/oox/crypto/DocumentDecryption.hxx | 4
include/sax/fshelper.hxx | 6
include/sfx2/dispatch.hxx | 3
include/sfx2/itemconnect.hxx | 7
include/sfx2/taskpane.hxx | 5
include/svl/asiancfg.hxx | 4
include/svl/undo.hxx | 7
include/svtools/DocumentInfoPreview.hxx | 3
include/svtools/popupwindowcontroller.hxx | 3
include/svtools/ruler.hxx | 6
include/svtools/valueset.hxx | 6
include/svx/dialcontrol.hxx | 8
include/svx/framelinkarray.hxx | 10
include/svx/ruler.hxx | 22
include/svx/sidebar/Popup.hxx | 5
include/svx/svdomedia.hxx | 2
include/svx/svdpage.hxx | 11
include/svx/tbcontrl.hxx | 4
include/svx/zoomsliderctrl.hxx | 5
include/toolkit/awt/animatedimagespeer.hxx | 5
include/toolkit/controls/animatedimages.hxx | 9
include/toolkit/controls/unocontrols.hxx | 6
include/unotools/atom.hxx | 9
include/unotools/charclass.hxx | 6
include/unotools/closeveto.hxx | 7
include/unotools/configmgr.hxx | 7
include/unotools/localedatawrapper.hxx | 22
include/unotools/sharedunocomponent.hxx | 19
include/unotools/useroptions.hxx | 7
include/vcl/builder.hxx | 6
include/vcl/button.hxx | 4
include/vcl/opengl/OpenGLContext.hxx | 7
include/vcl/openglwin.hxx | 4
include/vcl/outdev.hxx | 10
include/vcl/pdfwriter.hxx | 4
include/vcl/region.hxx | 9
include/vcl/svapp.hxx | 4
include/vcl/svgdata.hxx | 11
include/xmloff/txtimp.hxx | 4
include/xmloff/txtparae.hxx | 4
include/xmloff/xmlcnimp.hxx | 4
sal/qa/osl/file/osl_File.cxx | 12
sc/source/ui/sidebar/CellLineStylePopup.cxx | 2
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 20
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 4
sfx2/source/control/dispatch.cxx | 506 +++---
sfx2/source/dialog/taskpane.cxx | 20
svl/source/items/style.cxx | 1
svl/source/undo/undo.cxx | 320 ++--
svtools/source/contnr/DocumentInfoPreview.cxx | 6
svtools/source/contnr/imivctl.hxx | 6
svtools/source/contnr/imivctl2.cxx | 24
svtools/source/control/ruler.cxx | 26
svtools/source/control/valueset.cxx | 48
svtools/source/uno/popupwindowcontroller.cxx | 6
svx/source/dialog/dialcontrol.cxx | 24
svx/source/dialog/svxruler.cxx | 780 +++++-----
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 8
svx/source/sidebar/line/LineWidthPopup.cxx | 13
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 10
svx/source/sidebar/text/TextUnderlinePopup.cxx | 8
svx/source/sidebar/tools/Popup.cxx | 73
svx/source/stbctrls/zoomsliderctrl.cxx | 150 -
svx/source/svdraw/svdomedia.cxx | 70
svx/source/svdraw/svdpage.cxx | 78 -
svx/source/tbxctrls/tbcontrl.cxx | 8
toolkit/source/awt/animatedimagespeer.cxx | 32
toolkit/source/controls/animatedimages.cxx | 26
toolkit/source/controls/unocontrols.cxx | 50
unotools/CppunitTest_unotools_fontdefs.mk | 2
unotools/Library_utl.mk | 2
unotools/inc/pch/precompiled_utl.hxx | 1
unotools/source/config/configmgr.cxx | 6
unotools/source/config/lingucfg.cxx | 6
unotools/source/config/searchopt.cxx | 6
unotools/source/config/useroptions.cxx | 22
unotools/source/i18n/localedatawrapper.cxx | 2
unotools/source/misc/atom.cxx | 8
unotools/source/misc/closeveto.cxx | 7
unotools/source/misc/componentresmodule.cxx | 7
unotools/source/misc/sharedunocomponent.cxx | 7
vcl/generic/fontmanager/fontconfig.cxx | 2
vcl/generic/print/bitmap_gfx.cxx | 40
vcl/generic/print/genprnpsp.cxx | 18
vcl/inc/impimagetree.hxx | 5
vcl/inc/pch/precompiled_vcl.hxx | 1
vcl/inc/unx/gtk/gtkinst.hxx | 6
vcl/inc/unx/gtk/gtkprn.hxx | 4
vcl/inc/unx/salgdi.h | 7
vcl/inc/unx/sm.hxx | 4
vcl/inc/win/salgdi.h | 4
vcl/inc/window.h | 6
vcl/opengl/x11/salvd.cxx | 2
vcl/source/app/dbggui.cxx | 5
vcl/source/app/session.cxx | 31
vcl/source/edit/textdoc.hxx | 6
vcl/source/edit/texteng.cxx | 6
vcl/source/edit/vclmedit.cxx | 3
vcl/source/filter/graphicfilter.cxx | 24
vcl/source/filter/wmf/winmtf.hxx | 3
vcl/source/gdi/bitmapex.cxx | 96 -
vcl/source/gdi/embeddedfontshelper.cxx | 6
vcl/source/gdi/gfxlink.cxx | 24
vcl/source/gdi/image.cxx | 5
vcl/source/gdi/impanmvw.cxx | 19
vcl/source/gdi/impgraph.cxx | 52
vcl/source/gdi/impvect.cxx | 41
vcl/source/gdi/pdfextoutdevdata.cxx | 8
vcl/source/gdi/pdfwriter.cxx | 168 +-
vcl/source/gdi/pdfwriter_impl2.cxx | 52
vcl/source/gdi/salgdilayout.cxx | 6
vcl/source/opengl/OpenGLContext.cxx | 26
vcl/source/outdev/gradient.cxx | 74
vcl/source/outdev/transparent.cxx | 84 -
vcl/source/window/openglwin.cxx | 12
vcl/unx/generic/app/sm.cxx | 32
vcl/unx/generic/gdi/gdiimpl.cxx | 6
vcl/unx/generic/gdi/salbmp.cxx | 28
vcl/unx/generic/gdi/salgdi.cxx | 70
vcl/unx/generic/gdi/salgdi2.cxx | 35
vcl/unx/generic/gdi/salgdi3.cxx | 36
vcl/unx/generic/gdi/salvd.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 10
vcl/unx/generic/printer/printerinfomanager.cxx | 2
vcl/unx/gtk/app/gtkinst.cxx | 8
vcl/unx/gtk/gdi/salprn-gtk.cxx | 84 -
vcl/unx/gtk/inc/gtkprintwrapper.hxx | 10
vcl/win/source/gdi/salnativewidgets-luna.cxx | 8
vcl/win/source/gdi/winlayout.cxx | 6
vcl/workben/vcldemo.cxx | 4
xmloff/source/chart/SchXMLExport.cxx | 8
xmloff/source/text/txtimp.cxx | 501 +++---
xmloff/source/text/txtparae.cxx | 6
209 files changed, 2659 insertions(+), 2753 deletions(-)
New commits:
commit 01a8bda416d1598f5486f95b6a57d61ff09873ed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 15 20:54:22 2015 +0000
boost::noncopyable->'= delete'
Change-Id: If0f898a1e912fcd2095d8ba88b2b8046596e16ea
diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
index 59191f3..91dea7b 100644
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
-$(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers))
-
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
sal \
$(gb_UWINAPI) \
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
index b4da09a..730b702 100644
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal))
-$(eval $(call gb_CppunitTest_use_external,binaryurp_test-unmarshal,boost_headers))
-
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
cppu \
cppuhelper \
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index 05f5470..fb7e594 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp)
$(eval $(call gb_Library_use_udk_api,binaryurp))
-$(eval $(call gb_Library_use_external,binaryurp,boost_headers))
-
$(eval $(call gb_Library_use_libraries,binaryurp,\
cppu \
cppuhelper \
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 876e6f1..1037fe2 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -26,7 +26,6 @@
#include <memory>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/bridge/InvalidProtocolChangeException.hpp"
#include "com/sun/star/bridge/XBridge.hpp"
#include "com/sun/star/bridge/XInstanceProvider.hpp"
@@ -99,7 +98,7 @@ bool isThread(salhelper::Thread * thread) {
return osl::Thread::getCurrentIdentifier() == thread->getIdentifier();
}
-class AttachThread: private boost::noncopyable {
+class AttachThread {
public:
explicit AttachThread(uno_ThreadPool threadPool);
@@ -108,6 +107,9 @@ public:
rtl::ByteSequence getTid() throw () { return tid_;}
private:
+ AttachThread(const AttachThread&) SAL_DELETED_FUNCTION;
+ AttachThread& operator=(const AttachThread&) SAL_DELETED_FUNCTION;
+
uno_ThreadPool threadPool_;
rtl::ByteSequence tid_;
};
@@ -125,7 +127,7 @@ AttachThread::~AttachThread() {
}
-class PopOutgoingRequest: private boost::noncopyable {
+class PopOutgoingRequest {
public:
PopOutgoingRequest(
OutgoingRequests & requests, rtl::ByteSequence const & tid,
@@ -136,6 +138,9 @@ public:
void clear();
private:
+ PopOutgoingRequest(const PopOutgoingRequest&) SAL_DELETED_FUNCTION;
+ PopOutgoingRequest& operator=(const PopOutgoingRequest&) SAL_DELETED_FUNCTION;
+
OutgoingRequests & requests_;
rtl::ByteSequence tid_;
bool cleared_;
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index e4d9c55..232b02b 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -27,7 +27,6 @@
#include <map>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/bridge/XBridge.hpp"
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -69,8 +68,7 @@ namespace binaryurp {
class Bridge:
public cppu::WeakImplHelper2<
- com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent >,
- private boost::noncopyable
+ com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent >
{
public:
Bridge(
@@ -171,6 +169,9 @@ public:
bool isCurrentContextMode();
private:
+ Bridge(const Bridge&) SAL_DELETED_FUNCTION;
+ Bridge& operator=(const Bridge&) SAL_DELETED_FUNCTION;
+
virtual ~Bridge();
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 2083eeb..27ec274 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -26,7 +26,6 @@
#include <list>
#include <map>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/bridge/XBridgeFactory2.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/uno/Exception.hpp"
@@ -55,9 +54,7 @@ typedef
com::sun::star::bridge::XBridgeFactory2 >
BridgeFactoryBase;
-class BridgeFactory:
- private cppu::BaseMutex, public BridgeFactoryBase,
- private boost::noncopyable
+class BridgeFactory : private cppu::BaseMutex, public BridgeFactoryBase
{
public:
static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
@@ -78,6 +75,9 @@ public:
using BridgeFactoryBase::release;
private:
+ BridgeFactory(const BridgeFactory&) SAL_DELETED_FUNCTION;
+ BridgeFactory& operator=(const BridgeFactory&) SAL_DELETED_FUNCTION;
+
explicit BridgeFactory(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context);
diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index 7cbb303..97e246e 100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -27,7 +27,6 @@
#include <map>
#include <list>
-#include "boost/noncopyable.hpp"
#include "sal/types.h"
namespace binaryurp {
@@ -38,7 +37,7 @@ enum { size = 256, ignore = 0xFFFF };
}
-template< typename T > class Cache : private boost::noncopyable {
+template< typename T > class Cache {
public:
typedef sal_uInt16 IdxType;
@@ -81,6 +80,9 @@ public:
}
private:
+ Cache(const Cache&) SAL_DELETED_FUNCTION;
+ Cache& operator=(const Cache&) SAL_DELETED_FUNCTION;
+
typedef std::list<T> LruList; // last recently used list
typedef typename LruList::iterator LruListIt;
struct CmpT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return (*rA<*rB);}};
diff --git a/binaryurp/source/incomingreply.hxx b/binaryurp/source/incomingreply.hxx
index 9e85c16..7584ded 100644
--- a/binaryurp/source/incomingreply.hxx
+++ b/binaryurp/source/incomingreply.hxx
@@ -24,13 +24,15 @@
#include <vector>
-#include "boost/noncopyable.hpp"
-
#include "binaryany.hxx"
namespace binaryurp {
-struct IncomingReply: private boost::noncopyable {
+struct IncomingReply {
+private:
+ IncomingReply(const IncomingReply&) SAL_DELETED_FUNCTION;
+ IncomingReply& operator=(const IncomingReply&) SAL_DELETED_FUNCTION;
+public:
IncomingReply(
bool theException, BinaryAny const & theReturnValue,
std::vector< BinaryAny > const & theOutArguments):
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index 30b876e..a239a09 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -22,7 +22,6 @@
#include <list>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/bridge/XInstanceProvider.hpp"
#include "cppuhelper/exc_hlp.hxx"
#include "rtl/byteseq.hxx"
diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx
index a14c295..0b8c4d1 100644
--- a/binaryurp/source/incomingrequest.hxx
+++ b/binaryurp/source/incomingrequest.hxx
@@ -24,7 +24,6 @@
#include <vector>
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
@@ -39,7 +38,10 @@ namespace binaryurp {
namespace binaryurp {
-class IncomingRequest: private boost::noncopyable {
+class IncomingRequest {
+private:
+ IncomingRequest(const IncomingRequest&) SAL_DELETED_FUNCTION;
+ IncomingRequest& operator=(const IncomingRequest&) SAL_DELETED_FUNCTION;
public:
IncomingRequest(
rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid,
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index ad5f2b8..5904557 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -22,7 +22,6 @@
#include <cassert>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx
index 953b3ff..da78a78 100644
--- a/binaryurp/source/marshal.hxx
+++ b/binaryurp/source/marshal.hxx
@@ -24,7 +24,6 @@
#include <vector>
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
@@ -39,7 +38,7 @@ namespace binaryurp {
namespace binaryurp {
-class Marshal: private boost::noncopyable {
+class Marshal {
public:
Marshal(rtl::Reference< Bridge > const & bridge, WriterState & state);
@@ -69,6 +68,9 @@ public:
std::vector< unsigned char > * buffer, rtl::ByteSequence const & tid);
private:
+ Marshal(const Marshal&) SAL_DELETED_FUNCTION;
+ Marshal& operator=(const Marshal&) SAL_DELETED_FUNCTION;
+
void writeValue(
std::vector< unsigned char > * buffer,
com::sun::star::uno::TypeDescription const & type, void const * value);
diff --git a/binaryurp/source/outgoingrequests.hxx b/binaryurp/source/outgoingrequests.hxx
index 5647572..e3c92bd 100644
--- a/binaryurp/source/outgoingrequests.hxx
+++ b/binaryurp/source/outgoingrequests.hxx
@@ -25,7 +25,6 @@
#include <map>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "osl/mutex.hxx"
namespace binaryurp { struct OutgoingRequest; }
@@ -33,7 +32,7 @@ namespace rtl { class ByteSequence; }
namespace binaryurp {
-class OutgoingRequests: private boost::noncopyable {
+class OutgoingRequests {
public:
OutgoingRequests();
@@ -46,6 +45,9 @@ public:
void pop(rtl::ByteSequence const & tid) throw ();
private:
+ OutgoingRequests(const OutgoingRequests&) SAL_DELETED_FUNCTION;
+ OutgoingRequests& operator=(const OutgoingRequests&) SAL_DELETED_FUNCTION;
+
typedef std::map< rtl::ByteSequence, std::vector< OutgoingRequest > > Map;
osl::Mutex mutex_;
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index b7491cb..7a758dd 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "osl/interlck.h"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
@@ -38,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace binaryurp {
-class Proxy: public uno_Interface, private boost::noncopyable {
+class Proxy: public uno_Interface {
public:
Proxy(
rtl::Reference< Bridge > const & bridge, OUString const & oid,
@@ -64,6 +63,9 @@ public:
OUString * oid);
private:
+ Proxy(const Proxy&) SAL_DELETED_FUNCTION;
+ Proxy& operator=(const Proxy&) SAL_DELETED_FUNCTION;
+
~Proxy();
void do_dispatch_throw(
diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx
index 21ba850..1ce1d5a 100644
--- a/binaryurp/source/readerstate.hxx
+++ b/binaryurp/source/readerstate.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ustring.hxx"
#include "typelib/typedescription.hxx"
@@ -31,11 +30,15 @@
namespace binaryurp {
-struct ReaderState: private boost::noncopyable {
- com::sun::star::uno::TypeDescription typeCache[cache::size];
+struct ReaderState {
+private:
+ ReaderState(const ReaderState&) SAL_DELETED_FUNCTION;
+ ReaderState& operator=(const ReaderState&) SAL_DELETED_FUNCTION;
+public:
+ ReaderState() {}
+ com::sun::star::uno::TypeDescription typeCache[cache::size];
OUString oidCache[cache::size];
-
rtl::ByteSequence tidCache[cache::size];
};
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index f34bfd3..ee996e1 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -24,7 +24,6 @@
#include <new>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/io/IOException.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 8494731..3c523aa 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -24,7 +24,6 @@
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "rtl/ref.hxx"
#include "sal/types.h"
@@ -41,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace binaryurp {
-class Unmarshal: private boost::noncopyable {
+class Unmarshal {
public:
Unmarshal(
rtl::Reference< Bridge > const & bridge, ReaderState & state,
@@ -66,6 +65,9 @@ public:
void done() const;
private:
+ Unmarshal(const Unmarshal&) SAL_DELETED_FUNCTION;
+ Unmarshal& operator=(const Unmarshal&) SAL_DELETED_FUNCTION;
+
void check(sal_Int32 size) const;
sal_uInt32 readCompressed();
diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx
index 859a092..7ae457c 100644
--- a/binaryurp/source/writerstate.hxx
+++ b/binaryurp/source/writerstate.hxx
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "rtl/byteseq.hxx"
#include "rtl/ustring.hxx"
#include "typelib/typedescription.hxx"
@@ -31,7 +30,11 @@
namespace binaryurp {
-struct WriterState: private boost::noncopyable {
+struct WriterState {
+private:
+ WriterState(const WriterState&) SAL_DELETED_FUNCTION;
+ WriterState& operator=(const WriterState&) SAL_DELETED_FUNCTION;
+public:
WriterState():
typeCache(cache::size), oidCache(cache::size), tidCache(cache::size) {}
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx
index 7b83f16..6349721 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -20,7 +20,6 @@
#include <boost/current_function.hpp>
#include <boost/noncopyable.hpp>
#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <cassert>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index 4c66d8c..af36f0c 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -23,7 +23,7 @@
#include <osl/diagnose.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::comphelper;
using namespace ::com::sun::star;
@@ -55,9 +55,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyN
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -73,9 +73,9 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyNa
throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -120,9 +120,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValues(const Sequence< OUString >
WrappedTargetException, RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
const sal_Int32 nCount = rPropertyNames.getLength();
@@ -154,9 +154,9 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues(const Sequence<
throw (RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
const sal_Int32 nCount = rPropertyNames.getLength();
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 5ba477a..8c5a220 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -26,28 +26,26 @@
#include <osl/diagnose.h>
-#include <boost/scoped_ptr.hpp>
-
-
+#include <memory>
class AutoOGuardArray
{
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > * mpGuardArray;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > * mpGuardArray;
public:
AutoOGuardArray( sal_Int32 nNumElements );
~AutoOGuardArray();
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > & operator[] ( sal_Int32 i ) { return mpGuardArray[i]; }
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > & operator[] ( sal_Int32 i ) { return mpGuardArray[i]; }
};
-AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : mpGuardArray(new boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > >[nNumElements])
+AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : mpGuardArray(new std::unique_ptr< osl::Guard< comphelper::SolarMutex > >[nNumElements])
{
}
AutoOGuardArray::~AutoOGuardArray()
{
- //!! release scoped_ptr's and thus the mutexes locks
+ //!! release unique_ptr's and thus the mutexes locks
delete [] mpGuardArray;
}
@@ -106,9 +104,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -126,9 +124,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName
ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard2;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard2;
if (pSlave->mpMutex)
- pMutexGuard2.reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpMutex) );
+ xMutexGuard2.reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpMutex) );
pSlave->_preSetValues();
pSlave->_setSingleValue( *((*aIter).second->mpInfo), rValue );
@@ -140,9 +138,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName
throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -161,9 +159,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName
ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard2;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard2;
if (pSlave->mpMutex)
- pMutexGuard2.reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpMutex) );
+ xMutexGuard2.reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpMutex) );
pSlave->_preGetValues();
pSlave->_getSingleValue( *((*aIter).second->mpInfo), aAny );
@@ -201,9 +199,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >&
throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
const sal_Int32 nCount = aPropertyNames.getLength();
@@ -218,9 +216,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >&
const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter;
- //!! have a scoped_ptr to an array of OGuards in order to have the
+ //!! have a unique_ptr to an array of OGuards in order to have the
//!! allocated memory properly freed (exception safe!).
- //!! Since the array itself has scoped_ptrs as members we have to use a
+ //!! Since the array itself has unique_ptrs as members we have to use a
//!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount );
@@ -267,9 +265,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O
throw(RuntimeException, std::exception)
{
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(mpMutex) );
const sal_Int32 nCount = aPropertyNames.getLength();
@@ -283,9 +281,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O
const OUString * pString = aPropertyNames.getConstArray();
PropertyDataHash::const_iterator aEnd = mpInfo->maMap.end(), aIter;
- //!! have an scoped_ptr to an array of OGuards in order to have the
+ //!! have an unique_ptr to an array of OGuards in order to have the
//!! allocated memory properly freed (exception safe!).
- //!! Since the array itself has scoped_ptrs as members we have to use a
+ //!! Since the array itself has unique_ptrs as members we have to use a
//!! helper class 'AutoOGuardArray' in order to have
//!! the acquired locks properly released.
AutoOGuardArray aOGuardArray( nCount );
@@ -368,9 +366,9 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& Prop
ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave;
// acquire mutex in c-tor and releases it in the d-tor (exception safe!).
- boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard;
+ std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
if (pSlave->mpMutex)
- pMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpMutex) );
+ xMutexGuard.reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpMutex) );
pSlave->_preGetPropertyState();
pSlave->_getPropertyState( *((*aIter).second->mpInfo), aState );
diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk
index 1672c9f..adec015 100644
--- a/configmgr/CppunitTest_configmgr_unit.mk
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -48,6 +48,5 @@ $(eval $(call gb_CppunitTest_use_components,configmgr_unit,\
))
$(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\
- boost_headers \
icu_headers \
))
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 528b150..bab1448 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -46,8 +46,6 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
configmgr/source/xmldata \
))
-$(eval $(call gb_Library_use_external,configmgr,boost_headers))
-
$(eval $(call gb_Library_use_sdk_api,configmgr))
$(eval $(call gb_Library_use_libraries,configmgr, \
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index a7204b9..bcc533e 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -15,7 +15,6 @@
*/
#include <algorithm>
-#include <boost/noncopyable.hpp>
#include <cassert>
#include <climits>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index dde2848..ba197b7 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -28,7 +28,6 @@
#include <vector>
#include "config_map.hxx"
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/PropertyVetoException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <com/sun/star/beans/XExactName.hpp>
@@ -109,8 +108,7 @@ class Access:
public com::sun::star::beans::XMultiHierarchicalPropertySet,
public com::sun::star::beans::XHierarchicalPropertySetInfo,
public com::sun::star::container::XNameContainer,
- public com::sun::star::lang::XSingleServiceFactory,
- private boost::noncopyable
+ public com::sun::star::lang::XSingleServiceFactory
{
public:
oslInterlockedCount acquireCounting();
@@ -476,6 +474,9 @@ protected:
bool isDisposed() const { return disposed_;}
private:
+ Access(const Access&) SAL_DELETED_FUNCTION;
+ Access& operator=(const Access&) SAL_DELETED_FUNCTION;
+
struct ModifiedChild {
rtl::Reference< ChildAccess > child;
bool directlyModified;
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index 9c7e282..46b7f64 100644
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
@@ -24,7 +24,6 @@
#include <vector>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/container/ContainerEvent.hpp>
#include <com/sun/star/lang/EventObject.hpp>
@@ -44,8 +43,10 @@ namespace com { namespace sun { namespace star {
namespace configmgr {
-class Broadcaster: private boost::noncopyable {
+class Broadcaster {
public:
+ Broadcaster() {}
+
void addDisposeNotification(
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
const & listener,
@@ -85,6 +86,9 @@ public:
void send();
private:
+ Broadcaster(const Broadcaster&) SAL_DELETED_FUNCTION;
+ Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION;
+
struct DisposeNotification {
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
listener;
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index a545914..6dd7d1d 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -23,9 +23,9 @@
#include <sal/config.h>
#include <map>
+#include <memory>
#include <set>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ref.hxx>
@@ -50,7 +50,7 @@ class Node;
class Partial;
class RootAccess;
-class Components: private boost::noncopyable {
+class Components {
public:
static Components & getSingleton(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
@@ -105,6 +105,9 @@ public:
getExternalValue(OUString const & descriptor);
private:
+ Components(const Components&) SAL_DELETED_FUNCTION;
+ Components& operator=(const Components&) SAL_DELETED_FUNCTION;
+
typedef void FileParser(
OUString const &, int, Data &, Partial const *, Modifications *,
Additions *);
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 31f6cff..51f1a0d 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -23,7 +23,6 @@
#include <memory>
#include <vector>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -89,7 +88,7 @@ typedef
ServiceBase;
class Service:
- private cppu::BaseMutex, public ServiceBase, private boost::noncopyable
+ private cppu::BaseMutex, public ServiceBase
{
public:
Service(
@@ -111,6 +110,9 @@ public:
}
private:
+ Service(const Service&) SAL_DELETED_FUNCTION;
+ Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
virtual ~Service() {}
virtual void SAL_CALL disposing() SAL_OVERRIDE { flushModifications(); }
@@ -368,13 +370,15 @@ void Service::flushModifications() const {
class Factory:
public cppu::WeakImplHelper2<
- css::lang::XSingleComponentFactory, css::lang::XServiceInfo >,
- private boost::noncopyable
+ css::lang::XSingleComponentFactory, css::lang::XServiceInfo >
{
public:
Factory() {}
private:
+ Factory(const Factory&) SAL_DELETED_FUNCTION;
+ Factory& operator=(const Factory&) SAL_DELETED_FUNCTION;
+
virtual ~Factory() {}
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 2df0b15..9a9ad9d 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -21,7 +21,6 @@
#include <cassert>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/XProperty.hpp>
@@ -71,13 +70,15 @@ namespace {
class Service:
public cppu::WeakImplHelper3<
css::lang::XServiceInfo, css::registry::XSimpleRegistry,
- css::util::XFlushable >,
- private boost::noncopyable
+ css::util::XFlushable >
{
public:
Service(css::uno::Reference< css::uno::XComponentContext > const & context);
private:
+ Service(const Service&) SAL_DELETED_FUNCTION;
+ Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
virtual ~Service() {}
virtual OUString SAL_CALL getImplementationName()
@@ -151,14 +152,16 @@ private:
};
class RegistryKey:
- public cppu::WeakImplHelper1< css::registry::XRegistryKey >,
- private boost::noncopyable
+ public cppu::WeakImplHelper1< css::registry::XRegistryKey >
{
public:
RegistryKey(Service & service, css::uno::Any const & value):
service_(service), value_(value) {}
private:
+ RegistryKey(const RegistryKey&) SAL_DELETED_FUNCTION;
+ RegistryKey& operator=(const RegistryKey&) SAL_DELETED_FUNCTION;
+
virtual ~RegistryKey() {}
virtual OUString SAL_CALL getKeyName()
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index 17a0e1d..681bf55 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -26,7 +26,6 @@
#include "config_map.hxx"
#include <vector>
-#include <boost/noncopyable.hpp>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -41,7 +40,7 @@ namespace configmgr {
class Node;
-struct Data: private boost::noncopyable {
+struct Data {
enum { NO_LAYER = INT_MAX };
struct ExtensionXcu: public salhelper::SimpleReferenceObject {
@@ -86,6 +85,9 @@ struct Data: private boost::noncopyable {
OUString const & url);
private:
+ Data(const Data&) SAL_DELETED_FUNCTION;
+ Data& operator=(const Data&) SAL_DELETED_FUNCTION;
+
typedef config_map< rtl::Reference< ExtensionXcu > >
ExtensionXcuAdditions;
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index 0521da5..7fac667 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -22,18 +22,17 @@
#include <sal/config.h>
-#include <boost/unordered_map.hpp>
-#include <boost/noncopyable.hpp>
+#include <unordered_map>
#include "path.hxx"
namespace configmgr {
-class Modifications: private boost::noncopyable {
+class Modifications {
public:
struct Node {
- typedef boost::unordered_map<OUString, Node, OUStringHash> Children;
+ typedef std::unordered_map<OUString, Node, OUStringHash> Children;
Children children;
};
@@ -49,6 +48,9 @@ public:
Node const & getRoot() const { return root_;}
private:
+ Modifications(const Modifications&) SAL_DELETED_FUNCTION;
+ Modifications& operator=(const Modifications&) SAL_DELETED_FUNCTION;
+
Node root_;
};
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index 75411ab..a9b10f9 100644
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
@@ -22,17 +22,15 @@
#include <sal/config.h>
-#include <boost/unordered_map.hpp>
#include <set>
-
-#include <boost/noncopyable.hpp>
+#include <unordered_map>
#include "path.hxx"
#include <rtl/ustring.hxx>
namespace configmgr {
-class Partial: private boost::noncopyable {
+class Partial {
public:
enum Containment { CONTAINS_NOT, CONTAINS_SUBNODES, CONTAINS_NODE };
@@ -45,8 +43,11 @@ public:
Containment contains(Path const & path) const;
private:
+ Partial(const Partial&) SAL_DELETED_FUNCTION;
+ Partial& operator=(const Partial&) SAL_DELETED_FUNCTION;
+
struct Node {
- typedef boost::unordered_map< OUString, Node, OUStringHash > Children;
+ typedef std::unordered_map< OUString, Node, OUStringHash > Children;
Node(): startInclude(false) {}
void clear() { startInclude=false; children.clear(); }
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 7b227ce..9989eac 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -9,7 +9,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -44,8 +43,7 @@ namespace {
class Service:
public cppu::WeakImplHelper3<
css::lang::XServiceInfo, css::lang::XInitialization,
- css::container::XHierarchicalNameAccess >,
- private boost::noncopyable
+ css::container::XHierarchicalNameAccess >
{
public:
explicit Service(
@@ -53,6 +51,9 @@ public:
context_(context) {}
private:
+ Service(const Service&) SAL_DELETED_FUNCTION;
+ Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
virtual ~Service() {}
virtual OUString SAL_CALL getImplementationName()
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 5d404df..e503d9d 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -9,7 +9,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/configuration/XReadWriteAccess.hpp>
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -46,8 +45,7 @@ namespace {
class Service:
public cppu::WeakImplHelper3<
css::lang::XServiceInfo, css::lang::XInitialization,
- css::configuration::XReadWriteAccess >,
- private boost::noncopyable
+ css::configuration::XReadWriteAccess >
{
public:
explicit Service(
@@ -55,6 +53,9 @@ public:
context_(context) {}
private:
+ Service(const Service&) SAL_DELETED_FUNCTION;
+ Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
virtual ~Service() {}
virtual OUString SAL_CALL getImplementationName()
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 7c6371b..6e5563e 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -23,7 +23,6 @@
#include <memory>
#include <set>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/configuration/XUpdate.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -58,8 +57,7 @@ std::set< OUString > seqToSet(
}
class Service:
- public cppu::WeakImplHelper1< css::configuration::XUpdate >,
- private boost::noncopyable
+ public cppu::WeakImplHelper1< css::configuration::XUpdate >
{
public:
Service(css::uno::Reference< css::uno::XComponentContext > const context):
@@ -70,6 +68,9 @@ public:
}
private:
+ Service(const Service&) SAL_DELETED_FUNCTION;
+ Service& operator=(const Service&) SAL_DELETED_FUNCTION;
+
virtual ~Service() {}
virtual void SAL_CALL insertExtensionXcsFile(
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index 1f0aef0..1a07518 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -25,7 +25,6 @@
#include <set>
#include <vector>
-#include <boost/noncopyable.hpp>
#include <rtl/ref.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
@@ -43,7 +42,7 @@ namespace configmgr {
class Node;
-class ValueParser: private boost::noncopyable {
+class ValueParser {
public:
ValueParser(int layer);
@@ -69,6 +68,9 @@ public:
OString separator_;
private:
+ ValueParser(const ValueParser&) SAL_DELETED_FUNCTION;
+ ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION;
+
template< typename T > com::sun::star::uno::Any convertItems();
enum State { STATE_TEXT, STATE_TEXT_UNICODE, STATE_IT, STATE_IT_UNICODE };
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 463ab07..e73753e 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -21,7 +21,6 @@
#include <cassert>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -74,7 +73,7 @@ OString convertToUtf8(
return s;
}
-struct TempFile: public boost::noncopyable {
+struct TempFile {
OUString url;
oslFileHandle handle;
bool closed;
@@ -82,6 +81,9 @@ struct TempFile: public boost::noncopyable {
TempFile(): handle(0), closed(false) {}
~TempFile();
+private:
+ TempFile(const TempFile&) SAL_DELETED_FUNCTION;
+ TempFile& operator=(const TempFile&) SAL_DELETED_FUNCTION;
};
TempFile::~TempFile() {
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index e35a423..06ec048 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -22,7 +22,6 @@
#ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX
#define INCLUDED_UNOTOOLS_CHARCLASS_HXX
-#include <boost/noncopyable.hpp>
#include <i18nlangtag/languagetag.hxx>
#include <com/sun/star/i18n/KCharacterType.hpp>
#include <com/sun/star/i18n/KParseTokens.hpp>
@@ -64,12 +63,15 @@ const sal_Int32 nCharClassNumericTypeMask =
::com::sun::star::i18n::KCharacterType::PRINTABLE |
::com::sun::star::i18n::KCharacterType::BASE_FORM;
-class UNOTOOLS_DLLPUBLIC CharClass : private boost::noncopyable
+class UNOTOOLS_DLLPUBLIC CharClass
{
LanguageTag maLanguageTag;
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > xCC;
mutable ::osl::Mutex aMutex;
+ CharClass(const CharClass&) SAL_DELETED_FUNCTION;
+ CharClass& operator=(const CharClass&) SAL_DELETED_FUNCTION;
+
public:
/// Preferred ctor with service manager specified
CharClass(
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index 4b63803..14a5abf 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -24,7 +24,6 @@
#include <list>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <sal/types.h>
#include <unotools/unotoolsdllapi.h>
@@ -36,7 +35,7 @@ namespace utl { class ConfigItem; }
namespace utl {
-class UNOTOOLS_DLLPUBLIC ConfigManager: private boost::noncopyable {
+class UNOTOOLS_DLLPUBLIC ConfigManager {
public:
static OUString getAboutBoxProductVersion();
@@ -75,6 +74,10 @@ public:
SAL_DLLPRIVATE void registerConfigItem(utl::ConfigItem * item);
private:
+
+ ConfigManager(const ConfigManager&) SAL_DELETED_FUNCTION;
+ ConfigManager& operator=(const ConfigManager&) SAL_DELETED_FUNCTION;
+
void doStoreConfigItems();
std::list< ConfigItem * > items_;
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 219d5eb..7c5d627 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
#define INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#include <boost/noncopyable.hpp>
#include <com/sun/star/i18n/XLocaleData4.hpp>
#include <com/sun/star/i18n/LocaleItem.hpp>
#include <com/sun/star/i18n/reservedWords.hpp>
@@ -50,7 +49,7 @@ enum MeasurementSystem {
MEASURE_US
};
-class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable
+class UNOTOOLS_DLLPUBLIC LocaleDataWrapper
{
static sal_uInt8 nLocaleDataChecking; // 0:=dontknow, 1:=yes, 2:=no
@@ -344,6 +343,9 @@ public:
static void outputCheckMessage( const OUString& rMsg );
static void outputCheckMessage( const char* pStr);
+ LocaleDataWrapper(const LocaleDataWrapper&) SAL_DELETED_FUNCTION;
+ LocaleDataWrapper& operator=(const LocaleDataWrapper&) SAL_DELETED_FUNCTION;
+
private:
const ::com::sun::star::lang::Locale & getMyLocale() const;
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index e75c005..eb7d722 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -36,6 +36,7 @@
#include <comphelper/servicehelper.hxx>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/utility.hpp>
#include <string.h>
diff --git a/unotools/CppunitTest_unotools_fontdefs.mk b/unotools/CppunitTest_unotools_fontdefs.mk
index c96385c..b5f08a0 100644
--- a/unotools/CppunitTest_unotools_fontdefs.mk
+++ b/unotools/CppunitTest_unotools_fontdefs.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_CppunitTest_CppunitTest,unotools_fontdefs))
-$(eval $(call gb_CppunitTest_use_external,unotools_fontdefs,boost_headers))
-
$(eval $(call gb_CppunitTest_use_api,unotools_fontdefs, \
offapi \
udkapi \
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 52f2eff..9067660 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -11,8 +11,6 @@
# utl is the name of the library as it is found in Repository.mk
$(eval $(call gb_Library_Library,utl))
-$(eval $(call gb_Library_use_external,utl,boost_headers))
-
$(eval $(call gb_Library_use_custom_headers,utl,\
officecfg/registry \
))
diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index 81f6495..14761a5 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -15,7 +15,6 @@
*/
#include <algorithm>
-#include <boost/noncopyable.hpp>
#include <cassert>
#include <com/sun/star/awt/XRequestCallback.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 0fa8f6f..c0a79eb 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -21,7 +21,6 @@
#include <list>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -39,7 +38,7 @@
namespace {
-class RegisterConfigItemHelper: private boost::noncopyable {
+class RegisterConfigItemHelper {
public:
RegisterConfigItemHelper(
utl::ConfigManager & manager, utl::ConfigItem & item):
@@ -59,6 +58,9 @@ public:
private:
utl::ConfigManager & manager_;
utl::ConfigItem * item_;
+
+ RegisterConfigItemHelper(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION;
+ RegisterConfigItemHelper& operator=(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION;
};
css::uno::Reference< css::lang::XMultiServiceFactory >
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 9194c83..881c818 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -142,7 +141,7 @@ SvtLinguOptions::SvtLinguOptions()
{
}
-class SvtLinguConfigItem: public utl::ConfigItem, private boost::noncopyable
+class SvtLinguConfigItem : public utl::ConfigItem
{
SvtLinguOptions aOpt;
@@ -151,6 +150,9 @@ class SvtLinguConfigItem: public utl::ConfigItem, private boost::noncopyable
bool LoadOptions( const uno::Sequence< OUString > &rProperyNames );
bool SaveOptions( const uno::Sequence< OUString > &rProperyNames );
+ SvtLinguConfigItem(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
+ SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION;
+
public:
SvtLinguConfigItem();
virtual ~SvtLinguConfigItem();
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index c4b0578..bca047c 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <unotools/searchopt.hxx>
#include <tools/debug.hxx>
#include <unotools/configitem.hxx>
@@ -36,11 +35,14 @@ using namespace com::sun::star::i18n;
#define MAX_FLAGS_OFFSET 27
-class SvtSearchOptions_Impl: public ConfigItem, private boost::noncopyable
+class SvtSearchOptions_Impl : public ConfigItem
{
sal_Int32 nFlags;
bool bModified;
+ SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
+ SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION;
+
protected:
bool IsModified() const { return bModified; }
using ConfigItem::SetModified;
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 5d6fc76..7b75a86 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -18,8 +18,6 @@
*/
#include <unotools/componentresmodule.hxx>
-
-#include <boost/noncopyable.hpp>
#include <tools/resmgr.hxx>
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
@@ -33,13 +31,16 @@ namespace utl
not threadsafe!
*/
- class OComponentResModuleImpl: private boost::noncopyable
+ class OComponentResModuleImpl
{
private:
ResMgr* m_pResources;
bool m_bInitialized;
OString m_sResFilePrefix;
+ OComponentResModuleImpl(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
+ OComponentResModuleImpl& operator=(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
+
public:
OComponentResModuleImpl( const OString& _rResFilePrefix )
:m_pResources( NULL )
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 393b0c3..7d78e06 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <osl/diagnose.h>
-#include <boost/noncopyable.hpp>
#include <unotools/sharedunocomponent.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/util/XCloseable.hpp>
@@ -67,12 +66,14 @@ namespace utl
typedef ::cppu::WeakImplHelper1 < XCloseListener
> CloseableComponentImpl_Base;
- class CloseableComponentImpl:
- public CloseableComponentImpl_Base, private boost::noncopyable
+ class CloseableComponentImpl : public CloseableComponentImpl_Base
{
private:
Reference< XCloseable > m_xCloseable;
+ CloseableComponentImpl(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
+ CloseableComponentImpl& operator=(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
+
public:
CloseableComponentImpl( const Reference< XInterface >& _rxComponent );
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 4a5e3a6..807c69c 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace container {
} } } }
class BitmapEx;
-class ImplImageTree: private boost::noncopyable {
+class ImplImageTree {
public:
ImplImageTree();
@@ -57,6 +57,9 @@ public:
css::uno::Reference< css::container::XNameAccess > getNameAccess();
private:
+ ImplImageTree(const ImplImageTree&) SAL_DELETED_FUNCTION;
+ ImplImageTree& operator=(const ImplImageTree&) SAL_DELETED_FUNCTION;
+
typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache;
typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index e14c1c5..92e94a2 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -22,7 +22,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weakref.hxx>
#include <list>
@@ -198,8 +197,11 @@ struct ImplAccessibleInfos
enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputDisabled =2 };
-class WindowImpl: private boost::noncopyable
+class WindowImpl
{
+private:
+ WindowImpl(const WindowImpl&) SAL_DELETED_FUNCTION;
+ WindowImpl& operator=(const WindowImpl&) SAL_DELETED_FUNCTION;
public:
WindowImpl( WindowType );
~WindowImpl();
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index f0d1ab3..80dd97c 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -23,12 +23,14 @@
#include <rtl/ustring.hxx>
#include <vcl/textdata.hxx>
#include <vcl/txtattr.hxx>
-#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-class TextCharAttribList : boost::noncopyable
+class TextCharAttribList
{
private:
+ TextCharAttribList(const TextCharAttribList&) SAL_DELETED_FUNCTION;
+ TextCharAttribList& operator=(const TextCharAttribList&) SAL_DELETED_FUNCTION;
+
typedef boost::ptr_vector<TextCharAttrib> TextCharAttribs;
TextCharAttribs maAttribs;
bool mbHasEmptyAttribs;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index c2ec2a0..3037fbf 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -20,8 +20,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <boost/noncopyable.hpp>
-
#include <comphelper/string.hxx>
#include "vcl/ppdparser.hxx"
#include "vcl/strhelper.hxx"
@@ -269,13 +267,17 @@ namespace
struct thePPDCache : public rtl::Static<PPDCache, thePPDCache> {};
}
-class PPDDecompressStream: private boost::noncopyable
+class PPDDecompressStream
{
+private:
+ PPDDecompressStream(const PPDDecompressStream&) SAL_DELETED_FUNCTION;
+ PPDDecompressStream& operator=(const PPDDecompressStream&) SAL_DELETED_FUNCTION;
+
SvFileStream* mpFileStream;
SvMemoryStream* mpMemStream;
OUString maFileName;
- public:
+public:
PPDDecompressStream( const OUString& rFile );
~PPDDecompressStream();
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
index dd92bfe..0099032 100644
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
@@ -10,8 +10,6 @@
#ifndef INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
#define INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
-#include <boost/noncopyable.hpp>
-
#include <gtk/gtk.h>
#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
@@ -23,9 +21,8 @@
#include <gtk/gtkprintunixdialog.h>
#endif
-#if !GTK_CHECK_VERSION(3,0,0)
#include <osl/module.hxx>
-#endif
+#include <sal/types.h>
#endif
@@ -34,8 +31,11 @@ namespace vcl
namespace unx
{
-class GtkPrintWrapper : private boost::noncopyable
+class GtkPrintWrapper
{
+private:
+ GtkPrintWrapper(const GtkPrintWrapper&) SAL_DELETED_FUNCTION;
+ GtkPrintWrapper& operator=(const GtkPrintWrapper&) SAL_DELETED_FUNCTION;
#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
public:
GtkPrintWrapper();
commit a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 15 20:41:33 2015 +0000
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 74a96ad..faef86e 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -22,11 +22,9 @@
#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
#include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
-#include <boost/scoped_ptr.hpp>
#include <cppuhelper/weakref.hxx>
#include <svtools/accessibletableprovider.hxx>
-
-
+#include <memory>
namespace accessibility {
@@ -185,7 +183,7 @@ protected:
private:
// members ----------------------------------------------------------------
- boost::scoped_ptr< AccessibleBrowseBoxImpl > m_pImpl;
+ std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl;
};
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 8d174d6..db50af9 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -22,11 +22,9 @@
#include <accessibility/extended/AccessibleGridControlBase.hxx>
#include <accessibility/extended/AccessibleGridControlTable.hxx>
-#include <boost/scoped_ptr.hpp>
#include <cppuhelper/weakref.hxx>
#include <svtools/accessibletable.hxx>
-
-
+#include <memory>
namespace accessibility {
@@ -173,7 +171,7 @@ protected:
private:
// members ----------------------------------------------------------------
- boost::scoped_ptr< AccessibleGridControl_Impl > m_pImpl;
+ std::unique_ptr< AccessibleGridControl_Impl > m_xImpl;
};
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index b627e9e..8c7df5f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -23,7 +23,7 @@
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svt
{
@@ -71,7 +71,7 @@ namespace accessibility
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) SAL_OVERRIDE;
private:
- ::boost::scoped_ptr< AccessibleToolPanelDeck_Impl > m_pImpl;
+ std::unique_ptr< AccessibleToolPanelDeck_Impl > m_xImpl;
};
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
index 5ea31e7..a1e74e0 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -23,7 +23,7 @@
#include <cppuhelper/implbase1.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svt
{
@@ -72,7 +72,7 @@ namespace accessibility
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) SAL_OVERRIDE;
private:
- ::boost::scoped_ptr< AccessibleToolPanelTabBar_Impl > m_pImpl;
+ std::unique_ptr< AccessibleToolPanelTabBar_Impl > m_xImpl;
};
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index 0174906..9124c70 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -23,7 +23,7 @@
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svt
{
@@ -87,7 +87,7 @@ namespace accessibility
virtual void SAL_CALL disposing() SAL_OVERRIDE;
protected:
- ::boost::scoped_ptr< AccessibleToolPanelDeckTabBarItem_Impl > m_pImpl;
+ std::unique_ptr< AccessibleToolPanelDeckTabBarItem_Impl > m_xImpl;
};
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 05c87f0..a24e8c9 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -53,7 +53,7 @@
#include <vcl/svapp.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <queue>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <unordered_map>
class TextEngine;
@@ -655,7 +655,7 @@ private:
// All the following members have valid values only after calling init:
- boost::scoped_ptr< Paragraphs > m_xParagraphs;
+ std::unique_ptr< Paragraphs > m_xParagraphs;
// m_nViewOffset is from the start of the document (0) to the start of the
// current view, and m_nViewHeight is the height of the view:
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index fbb8a02..03a5d34 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -67,8 +67,8 @@ AccessibleBrowseBox::AccessibleBrowseBox(
IAccessibleTableProvider& _rBrowseBox )
: AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,NULL, BBTYPE_BROWSEBOX )
{
- m_pImpl.reset( new AccessibleBrowseBoxImpl() );
- m_pImpl->m_aCreator = _rxCreator;
+ m_xImpl.reset( new AccessibleBrowseBoxImpl() );
+ m_xImpl->m_aCreator = _rxCreator;
m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance());
}
@@ -76,10 +76,10 @@ AccessibleBrowseBox::AccessibleBrowseBox(
void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator )
{
#if OSL_DEBUG_LEVEL > 0
- Reference< XAccessible > xCreator(m_pImpl->m_aCreator);
+ Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
OSL_ENSURE( !xCreator.is(), "accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!" );
#endif
- m_pImpl->m_aCreator = _rxCreator;
+ m_xImpl->m_aCreator = _rxCreator;
}
@@ -92,22 +92,22 @@ void SAL_CALL AccessibleBrowseBox::disposing()
{
::osl::MutexGuard aGuard( getOslMutex() );
- m_pImpl->m_pTable = NULL;
- m_pImpl->m_pColumnHeaderBar = NULL;
- m_pImpl->m_pRowHeaderBar = NULL;
- m_pImpl->m_aCreator.clear();
+ m_xImpl->m_pTable = NULL;
+ m_xImpl->m_pColumnHeaderBar = NULL;
+ m_xImpl->m_pRowHeaderBar = NULL;
+ m_xImpl->m_aCreator.clear();
- Reference< XAccessible > xTable = m_pImpl->mxTable;
+ Reference< XAccessible > xTable = m_xImpl->mxTable;
- Reference< XComponent > xComp( m_pImpl->mxTable, UNO_QUERY );
+ Reference< XComponent > xComp( m_xImpl->mxTable, UNO_QUERY );
if ( xComp.is() )
{
xComp->dispose();
}
-//! ::comphelper::disposeComponent(m_pImpl->mxTable);
- ::comphelper::disposeComponent(m_pImpl->mxRowHeaderBar);
- ::comphelper::disposeComponent(m_pImpl->mxColumnHeaderBar);
+//! ::comphelper::disposeComponent(m_xImpl->mxTable);
+ ::comphelper::disposeComponent(m_xImpl->mxRowHeaderBar);
+ ::comphelper::disposeComponent(m_xImpl->mxColumnHeaderBar);
AccessibleBrowseBoxBase::disposing();
}
@@ -224,13 +224,13 @@ Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
Reference< XAccessible > AccessibleBrowseBox::implGetTable()
{
- if( !m_pImpl->mxTable.is() )
+ if( !m_xImpl->mxTable.is() )
{
- m_pImpl->m_pTable = createAccessibleTable();
- m_pImpl->mxTable = m_pImpl->m_pTable;
+ m_xImpl->m_pTable = createAccessibleTable();
+ m_xImpl->mxTable = m_xImpl->m_pTable;
}
- return m_pImpl->mxTable;
+ return m_xImpl->mxTable;
}
@@ -241,21 +241,21 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
Reference< XAccessible >* pxMember = NULL;
if( eObjType == BBTYPE_ROWHEADERBAR )
- pxMember = &m_pImpl->mxRowHeaderBar;
+ pxMember = &m_xImpl->mxRowHeaderBar;
else if( eObjType == BBTYPE_COLUMNHEADERBAR )
- pxMember = &m_pImpl->mxColumnHeaderBar;
+ pxMember = &m_xImpl->mxColumnHeaderBar;
if( pxMember )
{
if( !pxMember->is() )
{
AccessibleBrowseBoxHeaderBar* pHeaderBar = new AccessibleBrowseBoxHeaderBar(
- m_pImpl->m_aCreator, *mpBrowseBox, eObjType );
+ m_xImpl->m_aCreator, *mpBrowseBox, eObjType );
if ( BBTYPE_COLUMNHEADERBAR == eObjType)
- m_pImpl->m_pColumnHeaderBar = pHeaderBar;
+ m_xImpl->m_pColumnHeaderBar = pHeaderBar;
else
- m_pImpl->m_pRowHeaderBar = pHeaderBar;
+ m_xImpl->m_pRowHeaderBar = pHeaderBar;
*pxMember = pHeaderBar;
}
@@ -286,16 +286,16 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable()
{
- Reference< XAccessible > xCreator(m_pImpl->m_aCreator);
+ Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" );
return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
}
void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue)
{
- if ( m_pImpl->mxTable.is() )
+ if ( m_xImpl->mxTable.is() )
{
- m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+ m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
}
}
@@ -303,8 +303,8 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId,
const Any& _rNewValue,
const Any& _rOldValue,bool _bColumnHeaderBar)
{
- Reference< XAccessible > xHeaderBar = _bColumnHeaderBar ? m_pImpl->mxColumnHeaderBar : m_pImpl->mxRowHeaderBar;
- AccessibleBrowseBoxHeaderBar* pHeaderBar = _bColumnHeaderBar ? m_pImpl->m_pColumnHeaderBar : m_pImpl->m_pRowHeaderBar;
+ Reference< XAccessible > xHeaderBar = _bColumnHeaderBar ? m_xImpl->mxColumnHeaderBar : m_xImpl->mxRowHeaderBar;
+ AccessibleBrowseBoxHeaderBar* pHeaderBar = _bColumnHeaderBar ? m_xImpl->m_pColumnHeaderBar : m_xImpl->m_pRowHeaderBar;
if ( xHeaderBar.is() )
pHeaderBar->commitEvent(_nEventId,_rNewValue,_rOldValue);
}
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 1f927ad..34ca1fb 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -75,8 +75,8 @@ AccessibleGridControl::AccessibleGridControl(
IAccessibleTable& _rTable )
: AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL )
{
- m_pImpl.reset( new AccessibleGridControl_Impl() );
- m_pImpl->m_aCreator = _rxCreator;
+ m_xImpl.reset( new AccessibleGridControl_Impl() );
+ m_xImpl->m_aCreator = _rxCreator;
}
@@ -89,29 +89,29 @@ void SAL_CALL AccessibleGridControl::disposing()
{
SolarMutexGuard g;
- m_pImpl->m_pTable = NULL;
- m_pImpl->m_pColumnHeaderBar = NULL;
- m_pImpl->m_pRowHeaderBar = NULL;
- m_pImpl->m_pCell = NULL;
- m_pImpl->m_aCreator.clear();
+ m_xImpl->m_pTable = NULL;
+ m_xImpl->m_pColumnHeaderBar = NULL;
+ m_xImpl->m_pRowHeaderBar = NULL;
+ m_xImpl->m_pCell = NULL;
+ m_xImpl->m_aCreator.clear();
- Reference< XAccessible > xTable = m_pImpl->m_xTable;
+ Reference< XAccessible > xTable = m_xImpl->m_xTable;
- Reference< XComponent > xComp( m_pImpl->m_xTable, UNO_QUERY );
+ Reference< XComponent > xComp( m_xImpl->m_xTable, UNO_QUERY );
if ( xComp.is() )
{
xComp->dispose();
}
- Reference< XAccessible > xCell = m_pImpl->m_xCell;
+ Reference< XAccessible > xCell = m_xImpl->m_xCell;
- Reference< XComponent > xCellComp( m_pImpl->m_xCell, UNO_QUERY );
+ Reference< XComponent > xCellComp( m_xImpl->m_xCell, UNO_QUERY );
if ( xCellComp.is() )
{
xCellComp->dispose();
}
- ::comphelper::disposeComponent(m_pImpl->m_xRowHeaderBar);
- ::comphelper::disposeComponent(m_pImpl->m_xColumnHeaderBar);
+ ::comphelper::disposeComponent(m_xImpl->m_xRowHeaderBar);
+ ::comphelper::disposeComponent(m_xImpl->m_xColumnHeaderBar);
AccessibleGridControlBase::disposing();
}
@@ -141,31 +141,31 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
{
if(nChildIndex == 0 && m_aTable.HasColHeader())
{
- if(!m_pImpl->m_xColumnHeaderBar.is())
+ if(!m_xImpl->m_xColumnHeaderBar.is())
{
- AccessibleGridControlHeader* pColHeaderBar = new AccessibleGridControlHeader(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_COLUMNHEADERBAR);
- m_pImpl->m_xColumnHeaderBar = pColHeaderBar;
+ AccessibleGridControlHeader* pColHeaderBar = new AccessibleGridControlHeader(m_xImpl->m_aCreator, m_aTable, svt::table::TCTYPE_COLUMNHEADERBAR);
+ m_xImpl->m_xColumnHeaderBar = pColHeaderBar;
}
- xChild = m_pImpl->m_xColumnHeaderBar;
+ xChild = m_xImpl->m_xColumnHeaderBar;
}
else if(m_aTable.HasRowHeader() && (nChildIndex == 1 || nChildIndex == 0))
{
- if(!m_pImpl->m_xRowHeaderBar.is())
+ if(!m_xImpl->m_xRowHeaderBar.is())
{
- AccessibleGridControlHeader* pRowHeaderBar = new AccessibleGridControlHeader(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_ROWHEADERBAR);
- m_pImpl->m_xRowHeaderBar = pRowHeaderBar;
+ AccessibleGridControlHeader* pRowHeaderBar = new AccessibleGridControlHeader(m_xImpl->m_aCreator, m_aTable, svt::table::TCTYPE_ROWHEADERBAR);
+ m_xImpl->m_xRowHeaderBar = pRowHeaderBar;
}
- xChild = m_pImpl->m_xRowHeaderBar;
+ xChild = m_xImpl->m_xRowHeaderBar;
}
else
{
- if(!m_pImpl->m_xTable.is())
+ if(!m_xImpl->m_xTable.is())
{
- AccessibleGridControlTable* pTable = new AccessibleGridControlTable(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_TABLE);
- m_pImpl->m_xTable = pTable;
- m_pImpl->m_pTable = pTable;
+ AccessibleGridControlTable* pTable = new AccessibleGridControlTable(m_xImpl->m_aCreator, m_aTable, svt::table::TCTYPE_TABLE);
+ m_xImpl->m_xTable = pTable;
+ m_xImpl->m_pTable = pTable;
}
- xChild = m_pImpl->m_xTable;
+ xChild = m_xImpl->m_xTable;
}
}
return xChild;
@@ -250,12 +250,12 @@ Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
Reference< XAccessible > AccessibleGridControl::implGetTable()
{
- if( !m_pImpl->m_xTable.is() )
+ if( !m_xImpl->m_xTable.is() )
{
- m_pImpl->m_pTable = createAccessibleTable();
- m_pImpl->m_xTable = m_pImpl->m_pTable;
+ m_xImpl->m_pTable = createAccessibleTable();
+ m_xImpl->m_xTable = m_xImpl->m_pTable;
}
- return m_pImpl->m_xTable;
+ return m_xImpl->m_xTable;
}
@@ -266,21 +266,21 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType
Reference< XAccessible >* pxMember = NULL;
if( eObjType == TCTYPE_ROWHEADERBAR )
- pxMember = &m_pImpl->m_xRowHeaderBar;
+ pxMember = &m_xImpl->m_xRowHeaderBar;
else if( eObjType == TCTYPE_COLUMNHEADERBAR )
- pxMember = &m_pImpl->m_xColumnHeaderBar;
+ pxMember = &m_xImpl->m_xColumnHeaderBar;
if( pxMember )
{
if( !pxMember->is() )
{
AccessibleGridControlHeader* pHeaderBar = new AccessibleGridControlHeader(
- m_pImpl->m_aCreator, m_aTable, eObjType );
+ m_xImpl->m_aCreator, m_aTable, eObjType );
if ( TCTYPE_COLUMNHEADERBAR == eObjType)
- m_pImpl->m_pColumnHeaderBar = pHeaderBar;
+ m_xImpl->m_pColumnHeaderBar = pHeaderBar;
else
- m_pImpl->m_pRowHeaderBar = pHeaderBar;
+ m_xImpl->m_pRowHeaderBar = pHeaderBar;
*pxMember = pHeaderBar;
}
@@ -310,7 +310,7 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
{
- Reference< XAccessible > xCreator(m_pImpl->m_aCreator);
+ Reference< XAccessible > xCreator(m_xImpl->m_aCreator);
OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGirdControl::createAccessibleTable: my creator died - how this?" );
return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
}
@@ -324,35 +324,35 @@ void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNew
{
Reference< XAccessible > xAccessible = getAccessibleChild(i);
com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessibleContext > xAccessibleChild = xAccessible->getAccessibleContext();
- if(m_pImpl->m_xTable == xAccessible)
+ if(m_xImpl->m_xTable == xAccessible)
{
std::vector< AccessibleGridControlTableCell* >& rCells =
- m_pImpl->m_pTable->getCellVector();
+ m_xImpl->m_pTable->getCellVector();
size_t nIndex = m_aTable.GetCurrentRow() * m_aTable.GetColumnCount()
+ m_aTable.GetCurrentColumn();
if (nIndex < rCells.size() && rCells[nIndex])
{
- m_pImpl->m_pCell = rCells[nIndex];
- m_pImpl->m_pCell->commitEvent( _nEventId, _rNewValue, _rOldValue );
+ m_xImpl->m_pCell = rCells[nIndex];
+ m_xImpl->m_pCell->commitEvent( _nEventId, _rNewValue, _rOldValue );
}
}
}
}
else
{
- if ( m_pImpl->m_xTable.is() )
- m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+ if ( m_xImpl->m_xTable.is() )
+ m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
}
}
void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue)
{
- if ( m_pImpl->m_xTable.is() )
+ if ( m_xImpl->m_xTable.is() )
{
if(_nEventId == AccessibleEventId::ACTIVE_DESCENDANT_CHANGED)
{
- Reference< XAccessible > xChild = m_pImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn());
- m_pImpl->m_pTable->commitEvent(_nEventId, makeAny(xChild),_rOldValue);
+ Reference< XAccessible > xChild = m_xImpl->m_pTable->getAccessibleChild(m_aTable.GetCurrentRow()*m_aTable.GetColumnCount()+m_aTable.GetCurrentColumn());
+ m_xImpl->m_pTable->commitEvent(_nEventId, makeAny(xChild),_rOldValue);
}
else if(_nEventId == AccessibleEventId::TABLE_MODEL_CHANGED)
{
@@ -362,33 +362,33 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe
if(aChange.Type == AccessibleTableModelChangeType::DELETE)
{
std::vector< AccessibleGridControlTableCell* >& rCells =
- m_pImpl->m_pTable->getCellVector();
+ m_xImpl->m_pTable->getCellVector();
std::vector< Reference< XAccessible > >& rAccCells =
- m_pImpl->m_pTable->getAccessibleCellVector();
+ m_xImpl->m_pTable->getAccessibleCellVector();
int nColCount = m_aTable.GetColumnCount();
// check valid index - entries are inserted lazily
size_t const nStart = nColCount * aChange.FirstRow;
size_t const nEnd = nColCount * aChange.LastRow;
if (nStart < rCells.size())
{
- m_pImpl->m_pTable->getCellVector().erase(
+ m_xImpl->m_pTable->getCellVector().erase(
rCells.begin() + nStart,
rCells.begin() + std::min(rCells.size(), nEnd));
}
if (nStart < rAccCells.size())
{
- m_pImpl->m_pTable->getAccessibleCellVector().erase(
+ m_xImpl->m_pTable->getAccessibleCellVector().erase(
rAccCells.begin() + nStart,
rAccCells.begin() + std::min(rAccCells.size(), nEnd));
}
- m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+ m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
}
else
- m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+ m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
}
}
else
- m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+ m_xImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
}
}
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index 78e093d..dfb8ede 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -229,7 +229,7 @@ namespace accessibility
AccessibleToolPanelDeck::AccessibleToolPanelDeck( const Reference< XAccessible >& i_rAccessibleParent,
::svt::ToolPanelDeck& i_rPanelDeck )
:AccessibleToolPanelDeck_Base( i_rPanelDeck.GetWindowPeer() )
- ,m_pImpl( new AccessibleToolPanelDeck_Impl( *this, i_rAccessibleParent, i_rPanelDeck ) )
+ ,m_xImpl( new AccessibleToolPanelDeck_Impl( *this, i_rAccessibleParent, i_rPanelDeck ) )
{
}
@@ -239,11 +239,11 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleToolPanelDeck::getAccessibleChildCount( ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
- sal_Int32 nChildCount( m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
+ sal_Int32 nChildCount( m_xImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
- ::boost::optional< size_t > aActivePanel( m_pImpl->m_pPanelDeck->GetActivePanel() );
+ ::boost::optional< size_t > aActivePanel( m_xImpl->m_pPanelDeck->GetActivePanel() );
if ( !!aActivePanel )
return ++nChildCount;
@@ -252,62 +252,62 @@ namespace accessibility
Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
const sal_Int32 nChildCount( getAccessibleChildCount() );
if ( ( i_nIndex < 0 ) || ( i_nIndex >= nChildCount ) )
throw IndexOutOfBoundsException( OUString(), *this );
// first "n" children are provided by the layouter
- const size_t nLayouterCount( m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
+ const size_t nLayouterCount( m_xImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
if ( size_t( i_nIndex ) < nLayouterCount )
- return m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChild(
+ return m_xImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChild(
size_t( i_nIndex ),
- m_pImpl->getOwnAccessible()
+ m_xImpl->getOwnAccessible()
);
// the last child is the XAccessible of the active panel
- return m_pImpl->getActivePanelAccessible();
+ return m_xImpl->getActivePanelAccessible();
}
Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleParent( ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
const Reference< XAccessible > xParent = implGetForeignControlledParent();
if ( xParent.is() )
return xParent;
- return m_pImpl->m_xAccessibleParent;
+ return m_xImpl->m_xAccessibleParent;
}
sal_Int16 SAL_CALL AccessibleToolPanelDeck::getAccessibleRole( ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
return AccessibleRole::PANEL;
}
Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
const ::Point aRequestedPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
// check the panel window itself
- const vcl::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() );
+ const vcl::Window& rActivePanelAnchor( m_xImpl->m_pPanelDeck->GetPanelWindowAnchor() );
const Rectangle aPanelAnchorArea( rActivePanelAnchor.GetPosPixel(), rActivePanelAnchor.GetOutputSizePixel() );
if ( aPanelAnchorArea.IsInside( aRequestedPoint ) )
// note that this assumes that the Window which actually implements the concrete panel covers
// the complete area of its "anchor" Window. But this is ensured by the ToolPanelDeck implementation.
- return m_pImpl->getActivePanelAccessible();
+ return m_xImpl->getActivePanelAccessible();
// check the XAccessible instances provided by the layouter
try
{
- const ::svt::PDeckLayouter pLayouter( m_pImpl->m_pPanelDeck->GetLayouter() );
+ const ::svt::PDeckLayouter pLayouter( m_xImpl->m_pPanelDeck->GetLayouter() );
ENSURE_OR_THROW( pLayouter.get() != NULL, "invalid layouter" );
const size_t nLayouterChildren = pLayouter->GetAccessibleChildCount();
for ( size_t i=0; i<nLayouterChildren; ++i )
{
- const Reference< XAccessible > xLayoutItemAccessible( pLayouter->GetAccessibleChild( i, m_pImpl->getOwnAccessible() ), UNO_SET_THROW );
+ const Reference< XAccessible > xLayoutItemAccessible( pLayouter->GetAccessibleChild( i, m_xImpl->getOwnAccessible() ), UNO_SET_THROW );
const Reference< XAccessibleComponent > xLayoutItemComponent( xLayoutItemAccessible->getAccessibleContext(), UNO_QUERY_THROW );
const ::Rectangle aLayoutItemBounds( VCLUnoHelper::ConvertToVCLRect( xLayoutItemComponent->getBounds() ) );
if ( aLayoutItemBounds.IsInside( aRequestedPoint ) )
@@ -324,14 +324,14 @@ namespace accessibility
void SAL_CALL AccessibleToolPanelDeck::grabFocus( ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
- m_pImpl->m_pPanelDeck->GrabFocus();
+ MethodGuard aGuard( *m_xImpl );
+ m_xImpl->m_pPanelDeck->GrabFocus();
}
void SAL_CALL AccessibleToolPanelDeck::disposing()
{
AccessibleToolPanelDeck_Base::disposing();
- m_pImpl->dispose();
+ m_xImpl->dispose();
}
Reference< XAccessible > AccessibleToolPanelDeck::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
@@ -345,7 +345,7 @@ namespace accessibility
void AccessibleToolPanelDeck::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
{
AccessibleToolPanelDeck_Base::FillAccessibleStateSet( i_rStateSet );
- if ( m_pImpl->isDisposed() )
+ if ( m_xImpl->isDisposed() )
{
i_rStateSet.AddState( AccessibleStateType::DEFUNC );
}
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 8554192..757c452 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -276,7 +276,7 @@ namespace accessibility
AccessibleToolPanelTabBar::AccessibleToolPanelTabBar( const Reference< XAccessible >& i_rAccessibleParent,
::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
:AccessibleToolPanelTabBar_Base( i_rTabBar.GetWindowPeer() )
- ,m_pImpl( new AccessibleToolPanelTabBar_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar ) )
+ ,m_xImpl( new AccessibleToolPanelTabBar_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar ) )
{
}
@@ -286,22 +286,22 @@ namespace accessibility
sal_Int32 SAL_CALL AccessibleToolPanelTabBar::getAccessibleChildCount( ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
- const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
- const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+ const bool bHasScrollBack = m_xImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+ const bool bHasScrollForward = m_xImpl->getTabBar()->GetScrollButton( true ).IsVisible();
- return m_pImpl->getPanelDeck()->GetPanelCount()
+ return m_xImpl->getPanelDeck()->GetPanelCount()
+ ( bHasScrollBack ? 1 : 0 )
+ ( bHasScrollForward ? 1 : 0 );
}
Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
- const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
- const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+ const bool bHasScrollBack = m_xImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+ const bool bHasScrollForward = m_xImpl->getTabBar()->GetScrollButton( true ).IsVisible();
const bool bScrollBackRequested = ( bHasScrollBack && ( i_nIndex == 0 ) );
const bool bScrollForwardRequested = ( bHasScrollForward && ( i_nIndex == getAccessibleChildCount() - 1 ) );
@@ -309,29 +309,29 @@ namespace accessibility
if ( bScrollBackRequested || bScrollForwardRequested )
{
- Reference< XAccessible > xScrollButtonAccessible( m_pImpl->getTabBar()->GetScrollButton( bScrollForwardRequested ).GetAccessible() );
+ Reference< XAccessible > xScrollButtonAccessible( m_xImpl->getTabBar()->GetScrollButton( bScrollForwardRequested ).GetAccessible() );
ENSURE_OR_RETURN( xScrollButtonAccessible.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible!", NULL );
#if OSL_DEBUG_LEVEL > 0
Reference< XAccessibleContext > xScrollButtonContext( xScrollButtonAccessible->getAccessibleContext() );
ENSURE_OR_RETURN( xScrollButtonContext.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible context!", xScrollButtonAccessible );
- OSL_ENSURE( xScrollButtonContext->getAccessibleParent() == m_pImpl->getOwnAccessible(),
+ OSL_ENSURE( xScrollButtonContext->getAccessibleParent() == m_xImpl->getOwnAccessible(),
"AccessibleToolPanelTabBar::getAccessibleChild: wrong parent at the button's accessible!" );
#endif
return xScrollButtonAccessible;
}
- return m_pImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) );
+ return m_xImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) );
}
Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleParent( ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
- return m_pImpl->getAccessibleParent();
+ MethodGuard aGuard( *m_xImpl );
+ return m_xImpl->getAccessibleParent();
}
sal_Int16 SAL_CALL AccessibleToolPanelTabBar::getAccessibleRole( ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
return AccessibleRole::PAGE_TAB_LIST;
}
@@ -346,29 +346,29 @@ namespace accessibility
Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception)
{
- MethodGuard aGuard( *m_pImpl );
+ MethodGuard aGuard( *m_xImpl );
// check the tab items
const UnoPoint aOwnScreenPos( getLocationOnScreen() );
const ::Point aRequestedScreenPoint( i_rPoint.X + aOwnScreenPos.X, i_rPoint.Y + aOwnScreenPos.Y );
- for ( size_t i=0; i<m_pImpl->getPanelDeck()->GetPanelCount(); ++i )
+ for ( size_t i=0; i<m_xImpl->getPanelDeck()->GetPanelCount(); ++i )
{
- const ::Rectangle aItemScreenRect( m_pImpl->getTabBar()->GetItemScreenRect(i) );
+ const ::Rectangle aItemScreenRect( m_xImpl->getTabBar()->GetItemScreenRect(i) );
if ( aItemScreenRect.IsInside( aRequestedScreenPoint ) )
- return m_pImpl->getAccessiblePanelItem(i);
+ return m_xImpl->getAccessiblePanelItem(i);
}
// check the scroll buttons
const ::Point aRequestedClientPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
- const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
- if ( bHasScrollBack && lcl_covers( m_pImpl->getTabBar()->GetScrollButton( false ), aRequestedClientPoint ) )
- return m_pImpl->getTabBar()->GetScrollButton( false ).GetAccessible();
+ const bool bHasScrollBack = m_xImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+ if ( bHasScrollBack && lcl_covers( m_xImpl->getTabBar()->GetScrollButton( false ), aRequestedClientPoint ) )
+ return m_xImpl->getTabBar()->GetScrollButton( false ).GetAccessible();
- const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
- if ( bHasScrollForward && lcl_covers( m_pImpl->getTabBar()->GetScrollButton( true ), aRequestedClientPoint ) )
- return m_pImpl->getTabBar()->GetScrollButton( true ).GetAccessible();
+ const bool bHasScrollForward = m_xImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+ if ( bHasScrollForward && lcl_covers( m_xImpl->getTabBar()->GetScrollButton( true ), aRequestedClientPoint ) )
+ return m_xImpl->getTabBar()->GetScrollButton( true ).GetAccessible();
// no hit
return NULL;
@@ -377,7 +377,7 @@ namespace accessibility
void SAL_CALL AccessibleToolPanelTabBar::disposing()
{
AccessibleToolPanelTabBar_Base::disposing();
- m_pImpl->dispose();
+ m_xImpl->dispose();
}
Reference< XAccessible > AccessibleToolPanelTabBar::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
@@ -393,8 +393,8 @@ namespace accessibility
AccessibleToolPanelTabBar_Base::FillAccessibleStateSet( i_rStateSet );
i_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
- ENSURE_OR_RETURN_VOID( !m_pImpl->isDisposed(), "AccessibleToolPanelTabBar::FillAccessibleStateSet: already disposed!" );
- if ( m_pImpl->getTabBar()->IsVertical() )
+ ENSURE_OR_RETURN_VOID( !m_xImpl->isDisposed(), "AccessibleToolPanelTabBar::FillAccessibleStateSet: already disposed!" );
+ if ( m_xImpl->getTabBar()->IsVertical() )
i_rStateSet.AddState( AccessibleStateType::VERTICAL );
else
i_rStateSet.AddState( AccessibleStateType::HORIZONTAL );
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index 0289189..33bca93 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -238,7 +238,7 @@ namespace accessibility
::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar, const size_t i_nItemPos )
: ::comphelper::OAccessibleExtendedComponentHelper(
new VCLExternalSolarLock)
- , m_pImpl(new AccessibleToolPanelDeckTabBarItem_Impl(*this,
+ , m_xImpl(new AccessibleToolPanelDeckTabBarItem_Impl(*this,
i_rAccessibleParent, i_rPanelDeck, i_rTabBar, i_nItemPos))
{
}
@@ -260,8 +260,8 @@ namespace accessibility
Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- return m_pImpl->getAccessibleParent();
+ ItemMethodGuard aGuard( *m_xImpl );
+ return m_xImpl->getAccessibleParent();
}
sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole( ) throw (RuntimeException, std::exception)
@@ -271,45 +271,45 @@ namespace accessibility
OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- return m_pImpl->getPanelDisplayName();
+ ItemMethodGuard aGuard( *m_xImpl );
+ return m_xImpl->getPanelDisplayName();
}
OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- return m_pImpl->getPanelDisplayName();
+ ItemMethodGuard aGuard( *m_xImpl );
+ return m_xImpl->getPanelDisplayName();
}
Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
+ ItemMethodGuard aGuard( *m_xImpl );
::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
return pRelationSet;
}
Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
+ ItemMethodGuard aGuard( *m_xImpl );
::utl::AccessibleStateSetHelper* pStateSet( new ::utl::AccessibleStateSetHelper );
pStateSet->AddState( AccessibleStateType::FOCUSABLE );
pStateSet->AddState( AccessibleStateType::SELECTABLE );
pStateSet->AddState( AccessibleStateType::ICONIFIED );
- if ( m_pImpl->getItemPos() == m_pImpl->getPanelDeck()->GetActivePanel() )
+ if ( m_xImpl->getItemPos() == m_xImpl->getPanelDeck()->GetActivePanel() )
{
pStateSet->AddState( AccessibleStateType::ACTIVE );
pStateSet->AddState( AccessibleStateType::SELECTED );
}
- if ( m_pImpl->getItemPos() == m_pImpl->getTabBar()->GetFocusedPanelItem() )
+ if ( m_xImpl->getItemPos() == m_xImpl->getTabBar()->GetFocusedPanelItem() )
pStateSet->AddState( AccessibleStateType::FOCUSED );
- if ( m_pImpl->getTabBar()->IsEnabled() )
+ if ( m_xImpl->getTabBar()->IsEnabled() )
pStateSet->AddState( AccessibleStateType::ENABLED );
- if ( m_pImpl->getTabBar()->IsVisible() )
+ if ( m_xImpl->getTabBar()->IsVisible() )
{
pStateSet->AddState( AccessibleStateType::SHOWING );
pStateSet->AddState( AccessibleStateType::VISIBLE );
@@ -320,7 +320,7 @@ namespace accessibility
Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
+ ItemMethodGuard aGuard( *m_xImpl );
// we do not have children ...
(void)i_rLocation;
return NULL;
@@ -328,28 +328,28 @@ namespace accessibility
void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() );
+ ItemMethodGuard aGuard( *m_xImpl );
+ m_xImpl->getTabBar()->FocusPanelItem( m_xImpl->getItemPos() );
}
::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+ ItemMethodGuard aGuard( *m_xImpl );
+ Reference< XAccessibleComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_SET_THROW );
return xParentComponent->getForeground();
}
::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+ ItemMethodGuard aGuard( *m_xImpl );
+ Reference< XAccessibleComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_SET_THROW );
return xParentComponent->getBackground();
}
Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- Reference< XAccessibleExtendedComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_QUERY_THROW );
+ ItemMethodGuard aGuard( *m_xImpl );
+ Reference< XAccessibleExtendedComponent > xParentComponent( m_xImpl->getParentAccessibleComponent(), UNO_QUERY_THROW );
// TODO: strictly, this is not correct: The TabBar implementation of the TabLayouter might use
// a different font ...
return xParentComponent->getFont();
@@ -357,24 +357,24 @@ namespace accessibility
OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
+ ItemMethodGuard aGuard( *m_xImpl );
// no support
return OUString();
}
OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText( ) throw (RuntimeException, std::exception)
{
- ItemMethodGuard aGuard( *m_pImpl );
- return m_pImpl->getPanelDisplayName();
+ ItemMethodGuard aGuard( *m_xImpl );
+ return m_xImpl->getPanelDisplayName();
}
UnoRectangle AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException)
{
- ItemMethodGuard aGuard( *m_pImpl );
+ ItemMethodGuard aGuard( *m_xImpl );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list