diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 18:44:15 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 18:48:14 +0200 |
commit | 1eb35713bc985dea2e8db7a082f03b34fd4b45d2 (patch) | |
tree | eab4cb6ddab0382ebdefa069ae18b769a97e1037 /sd | |
parent | 3dc108c8e3df0ec26ef33e83c481eff6d629e5b7 (diff) |
Remove leftover SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP
...from times when code used std::auto_ptr.
Change-Id: Ia4eca8b0b95a8846886884404009e895daba8a22
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/framework/factories/ChildWindowPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index f69ea2644bfb..7e6da77b9cbf 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::drawing::framework; namespace sd { namespace framework { -SAL_WNODEPRECATED_DECLARATIONS_PUSH ChildWindowPane::ChildWindowPane ( const Reference<XResourceId>& rxPaneId, sal_uInt16 nChildWindowId, @@ -88,7 +87,6 @@ ChildWindowPane::ChildWindowPane ( } } } -SAL_WNODEPRECATED_DECLARATIONS_POP ChildWindowPane::~ChildWindowPane (void) { diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index b233c1598ed6..247e9f55ef1b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -686,7 +686,6 @@ void MasterPagesSelector::InvalidateItem (MasterPageContainer::Token aToken) } } -SAL_WNODEPRECATED_DECLARATIONS_PUSH void MasterPagesSelector::UpdateItemList (::std::unique_ptr<ItemList> && pNewItemList) { const ::osl::MutexGuard aGuard (maMutex); @@ -724,7 +723,6 @@ void MasterPagesSelector::UpdateItemList (::std::unique_ptr<ItemList> && pNewIte if (mxSidebar.is()) mxSidebar->requestLayout(); } -SAL_WNODEPRECATED_DECLARATIONS_POP css::ui::LayoutSize MasterPagesSelector::GetHeightForWidth (const sal_Int32 nWidth) { |