summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx8
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.hxx4
-rw-r--r--svx/source/accessibility/AccessibleTextEventQueue.cxx6
-rw-r--r--svx/source/accessibility/AccessibleTextEventQueue.hxx2
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx4
-rw-r--r--svx/source/form/fmshell.cxx6
-rw-r--r--svx/source/form/fmvwimp.cxx8
-rw-r--r--svx/source/inc/formcontrolfactory.hxx2
-rw-r--r--svx/source/inc/formcontroller.hxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx18
10 files changed, 20 insertions, 40 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 123e0b2f07e1..cb31bd0e001a 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -269,12 +269,8 @@ namespace accessibility
if( mrObj.GetModel() )
EndListening( *mrObj.GetModel() );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< SvxEditSource > pProxySource( new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow) );
- ::std::auto_ptr< SvxEditSource > tmp = mpEditSource;
- SAL_WNODEPRECATED_DECLARATIONS_POP
- mpEditSource = pProxySource;
- pProxySource = tmp;
+ ::std::unique_ptr< SvxEditSource > pProxySource( new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow) );
+ mpEditSource.swap(pProxySource);
// register as listener
StartListening( mpEditSource->GetBroadcaster() );
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index e0f5b01252d0..2138c76824b1 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -77,9 +77,7 @@ namespace accessibility
@dyn
*/
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< SvxEditSource > mpEditSource;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ std::unique_ptr< SvxEditSource > mpEditSource;
SdrObject& mrObj;
SdrView& mrView;
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index 985f4929d819..05ace5f490f3 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -67,14 +67,12 @@ namespace accessibility
maEventQueue.push_back( new SvxEditSourceHint( rHint ) );
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< SfxHint > AccessibleTextEventQueue::PopFront()
+ ::std::unique_ptr< SfxHint > AccessibleTextEventQueue::PopFront()
{
- ::std::auto_ptr< SfxHint > aRes( *(maEventQueue.begin()) );
+ ::std::unique_ptr< SfxHint > aRes( *(maEventQueue.begin()) );
maEventQueue.pop_front();
return aRes;
}
- SAL_WNODEPRECATED_DECLARATIONS_POP
bool AccessibleTextEventQueue::IsEmpty() const
{
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx
index 74cf7e09d06f..ba3859fe6bdd 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.hxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx
@@ -60,7 +60,7 @@ namespace accessibility
return first queue element, ownership transfers to caller
*/
- ::std::auto_ptr< SfxHint > PopFront();
+ ::std::unique_ptr< SfxHint > PopFront();
/** Apply functor to every queue member
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 97a62ced63f2..751cb0df06cd 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1222,9 +1222,7 @@ namespace accessibility
while( !maEventQueue.IsEmpty() )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< SfxHint > pHint( maEventQueue.PopFront() );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< SfxHint > pHint( maEventQueue.PopFront() );
if( pHint.get() )
{
const SfxHint& rHint = *(pHint.get());
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 31ce9bcac9f8..1383fed692eb 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1377,17 +1377,15 @@ namespace
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
+::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
{
- ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter;
+ ::std::unique_ptr< ::svx::ISdrObjectFilter > pFilter;
if ( !i_rView.IsDesignMode() )
pFilter.reset( new FocusableControlsFilter( i_rView, i_rDevice ) );
return pFilter;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index ba83abac5989..653feff1774a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1548,9 +1548,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
bool bNeedLabel = ( _nControlObjectID != OBJ_FM_CHECKBOX );
// the label
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< SdrUnoObj > pLabel;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr< SdrUnoObj > pLabel;
Reference< XPropertySet > xLabelModel;
if ( bNeedLabel )
{
@@ -1581,10 +1579,8 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
}
// the control
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< SdrUnoObj > pControl( dynamic_cast< SdrUnoObj* >(
+ ::std::unique_ptr< SdrUnoObj > pControl( dynamic_cast< SdrUnoObj* >(
SdrObjFactory::MakeNewObject( _nInventor, _nControlObjectID, _pControlPage, _pModel ) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
OSL_ENSURE( pControl.get(), "FmXFormView::createControlLabelPair: could not create the control!" );
if ( !pControl.get() )
return false;
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index 4888a4959554..470a4ef8700e 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -98,7 +98,7 @@ namespace svxform
);
private:
- ::std::auto_ptr< FormControlFactory_Data > m_pData;
+ ::std::unique_ptr< FormControlFactory_Data > m_pData;
};
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 8d794458b869..5ecc4be782ca 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -182,7 +182,7 @@ namespace svxform
::svxform::DelayedEvent m_aActivationEvent;
::svxform::DelayedEvent m_aDeactivationEvent;
- ::std::auto_ptr< ColumnInfoCache >
+ ::std::unique_ptr< ColumnInfoCache >
m_pColumnInfoCache;
sal_Int32 m_nCurrentFilterPosition; // current level for filtering (or-criteria)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 774749db83d7..16d9a5466d11 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -18,6 +18,8 @@
*/
#include <string>
+#include <utility>
+
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
@@ -165,9 +167,7 @@ class SvxFontNameBox_Impl : public FontNameBox
using Window::Update;
private:
const FontList* pFontList;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<FontList> m_aOwnFontList;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<FontList> m_aOwnFontList;
vcl::Font aCurFont;
Size aLogicalSize;
OUString aCurText;
@@ -210,9 +210,7 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- void SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; }
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ void SetOwnFontList(::std::unique_ptr<FontList> && _aOwnFontList) { m_aOwnFontList = std::move(_aOwnFontList); }
};
// SelectHdl needs the Modifiers, get them in MouseButtonUp
@@ -745,11 +743,9 @@ static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl
(SvxFontListItem*)pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST );
else
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<FontList> aFontList(new FontList( pBox ));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<FontList> aFontList(new FontList( pBox ));
*ppFontList = aFontList.get();
- pBox->SetOwnFontList(aFontList);
+ pBox->SetOwnFontList(std::move(aFontList));
bChanged = true;
}
@@ -1021,7 +1017,7 @@ void SvxFontNameBox_Impl::Select()
FontNameBox::Select();
Sequence< PropertyValue > aArgs( 1 );
- std::auto_ptr<SvxFontItem> pFontItem;
+ std::unique_ptr<SvxFontItem> pFontItem;
if ( pFontList )
{
vcl::FontInfo aInfo( pFontList->Get( GetText(),
generated by cgit (git 2.34.1) at 2024-07-14 14:32:05 +0000