summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorMark Page <aptitude@btconnect.com>2016-06-07 11:59:24 +0100
committerNoel Grandin <noelgrandin@gmail.com>2016-06-08 11:09:44 +0000
commit22fa9289fdc6fd8d82d754adfef39fee3fd3c52f (patch)
tree9adcbeb8394912bd45f6c346d2dac3144c621593 /svtools
parentf595e70cfee85a423f592190c607231cb00e3180 (diff)
tdf#96099 Remove various smart pointer typedefs
Change-Id: I76843139e43ca1c158a977e24d210d5af93e4d0f Reviewed-on: https://gerrit.libreoffice.org/26014 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/misc/dialogcontrolling.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index b630caae6ece..aa1f6043d94c 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -129,7 +129,7 @@ namespace svt
struct ControlDependencyManager_Data
{
- ::std::vector< PDialogController > aControllers;
+ ::std::vector< std::shared_ptr<DialogController> > aControllers;
};
@@ -149,9 +149,9 @@ namespace svt
namespace
{
- struct ResetDialogController : public ::std::unary_function< const PDialogController&, void >
+ struct ResetDialogController : public ::std::unary_function< const std::shared_ptr<DialogController>&, void >
{
- void operator()( const PDialogController& _pController )
+ void operator()( const std::shared_ptr<DialogController>& _pController )
{
_pController->reset();
}
@@ -166,7 +166,7 @@ namespace svt
}
- void ControlDependencyManager::addController( const PDialogController& _pController )
+ void ControlDependencyManager::addController( const std::shared_ptr<DialogController>& _pController )
{
OSL_ENSURE( _pController.get() != nullptr, "ControlDependencyManager::addController: invalid controller, this will crash, sooner or later!" );
m_pImpl->aControllers.push_back( _pController );
@@ -175,7 +175,7 @@ namespace svt
void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow )
{
- PDialogController pController( new RadioDependentEnabler( _rRadio ) );
+ std::shared_ptr<DialogController> pController( new RadioDependentEnabler( _rRadio ) );
pController->addDependentWindow( _rDependentWindow );
m_pImpl->aControllers.push_back( pController );
}
@@ -183,7 +183,7 @@ namespace svt
void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 )
{
- PDialogController pController( new RadioDependentEnabler( _rRadio ) );
+ std::shared_ptr<DialogController> pController( new RadioDependentEnabler( _rRadio ) );
pController->addDependentWindow( _rDependentWindow1 );
pController->addDependentWindow( _rDependentWindow2 );
m_pImpl->aControllers.push_back( pController );
@@ -192,7 +192,7 @@ namespace svt
void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3 )
{
- PDialogController pController( new RadioDependentEnabler( _rRadio ) );
+ std::shared_ptr<DialogController> pController( new RadioDependentEnabler( _rRadio ) );
pController->addDependentWindow( _rDependentWindow1 );
pController->addDependentWindow( _rDependentWindow2 );
pController->addDependentWindow( _rDependentWindow3 );
@@ -202,7 +202,7 @@ namespace svt
void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4, vcl::Window& _rDependentWindow5 )
{
- PDialogController pController( new RadioDependentEnabler( _rRadio ) );
+ std::shared_ptr<DialogController> pController( new RadioDependentEnabler( _rRadio ) );
pController->addDependentWindow( _rDependentWindow1 );
pController->addDependentWindow( _rDependentWindow2 );
pController->addDependentWindow( _rDependentWindow3 );
@@ -214,7 +214,7 @@ namespace svt
void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow )
{
- PDialogController pController( new RadioDependentEnabler( _rBox ) );
+ std::shared_ptr<DialogController> pController( new RadioDependentEnabler( _rBox ) );
pController->addDependentWindow( _rDependentWindow );
m_pImpl->aControllers.push_back( pController );
}
@@ -222,7 +222,7 @@ namespace svt
void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 )
{
- PDialogController pController( new RadioDependentEnabler( _rBox ) );
+ std::shared_ptr<DialogController> pController( new RadioDependentEnabler( _rBox ) );
pController->addDependentWindow( _rDependentWindow1 );
pController->addDependentWindow( _rDependentWindow2 );
m_pImpl->aControllers.push_back( pController );
@@ -231,7 +231,7 @@ namespace svt
void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4 )
{
- PDialogController pController( new RadioDependentEnabler( _rBox ) );
+ std::shared_ptr<DialogController> pController( new RadioDependentEnabler( _rBox ) );
pController->addDependentWindow( _rDependentWindow1 );
pController->addDependentWindow( _rDependentWindow2 );
pController->addDependentWindow( _rDependentWindow3 );