summaryrefslogtreecommitdiff
path: root/sd/source/ui/unoidl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-01 10:32:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-01 15:19:24 +0100
commit4f95f23d8b9e0c5fcea663d7477c4c8aef7e2049 (patch)
tree160521c2621fe568294956ce56948101d1a7f42a /sd/source/ui/unoidl
parentf9d3edd9995d571f60f3205b1fc2b22d64b2ddef (diff)
drop static in favour of member variable
Diffstat (limited to 'sd/source/ui/unoidl')
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx14
1 files changed, 5 insertions, 9 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 3f07f0bb0334..6b67bcead477 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -66,12 +66,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace {
-static const ::com::sun::star::uno::Type saSelectionTypeIdentifier (
- ::getCppuType( (Reference<view::XSelectionChangeListener > *)0 ));
-
-} // end of anonymous namespace
-
namespace sd {
DrawController::DrawController (ViewShellBase& rBase) throw()
@@ -81,6 +75,8 @@ DrawController::DrawController (ViewShellBase& rBase) throw()
OMultiTypeInterfaceContainerHelper,
OMultiTypeInterfaceContainerHelper::keyType>& >(
BroadcastHelperOwner::maBroadcastHelper)),
+ m_aSelectionTypeIdentifier(
+ ::getCppuType( (Reference<view::XSelectionChangeListener > *)0 )),
mpBase(&rBase),
maLastVisArea(),
mpCurrentPage(NULL),
@@ -316,7 +312,7 @@ void SAL_CALL DrawController::addSelectionChangeListener(
if( mbDisposing )
throw lang::DisposedException();
- BroadcastHelperOwner::maBroadcastHelper.addListener (saSelectionTypeIdentifier, xListener);
+ BroadcastHelperOwner::maBroadcastHelper.addListener (m_aSelectionTypeIdentifier, xListener);
}
@@ -329,7 +325,7 @@ void SAL_CALL DrawController::removeSelectionChangeListener(
if (rBHelper.bDisposed)
throw lang::DisposedException();
- BroadcastHelperOwner::maBroadcastHelper.removeListener (saSelectionTypeIdentifier, xListener);
+ BroadcastHelperOwner::maBroadcastHelper.removeListener (m_aSelectionTypeIdentifier, xListener);
}
@@ -448,7 +444,7 @@ void DrawController::FireVisAreaChanged (const Rectangle& rVisArea) throw()
void DrawController::FireSelectionChangeListener() throw()
{
OInterfaceContainerHelper * pLC = BroadcastHelperOwner::maBroadcastHelper.getContainer(
- saSelectionTypeIdentifier);
+ m_aSelectionTypeIdentifier);
if( pLC )
{
Reference< XInterface > xSource( (XWeak*)this );