summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui/report/DesignView.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-22 15:00:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-22 15:01:05 +0100
commit871426533f7afe31bc451fa6b407b83db8e52827 (patch)
treeed60cee61ebee91994eaffc9c9a3638836ed2ab4 /reportdesign/source/ui/report/DesignView.cxx
parent5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff)
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'reportdesign/source/ui/report/DesignView.cxx')
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 26aa98a447d1..c7940bae74a1 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -196,7 +196,9 @@ ODesignView::~ODesignView()
if ( m_pPropWin )
{
notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pPropWin);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pPropWin = NULL;
}
if ( m_pAddField )
@@ -204,7 +206,9 @@ ODesignView::~ODesignView()
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) );
aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pAddField);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pAddField = NULL;
}
if ( m_pReportExplorer )
@@ -212,11 +216,15 @@ ODesignView::~ODesignView()
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) );
aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pReportExplorer);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pReportExplorer = NULL;
}
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<Window> aTemp2(m_pTaskPane);
+ SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTaskPane = NULL;
}
}