diff options
Diffstat (limited to 'sc')
3 files changed, 13 insertions, 19 deletions
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 40555e2fa975..4b6f9bcabbea 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -19,9 +19,6 @@ #include <sal/config.h> -#include <memory> -#include <utility> - #include <tools/gen.hxx> #include "AccessiblePageHeaderArea.hxx" #include "AccessibleText.hxx" @@ -300,9 +297,10 @@ void ScAccessiblePageHeaderArea::CreateTextHelper() { if (!mpTextHelper) { - ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(o3tl::make_unique<ScAccessibleHeaderTextData>(mpViewShell, mpEditObj, mbHeader, meAdjust))); - - mpTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); + mpTextHelper = new ::accessibility::AccessibleTextHelper( + o3tl::make_unique<ScAccessibilityEditSource>( + o3tl::make_unique<ScAccessibleHeaderTextData>( + mpViewShell, mpEditObj, mbHeader, meAdjust))); mpTextHelper->SetEventSource(this); } } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 89c735ca0472..5383e688bfcf 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -19,9 +19,6 @@ #include <sal/config.h> -#include <memory> -#include <utility> - #include "scitems.hxx" #include <editeng/eeitem.hxx> #include <tools/gen.hxx> @@ -283,9 +280,10 @@ void ScAccessiblePreviewCell::CreateTextHelper() { if (!mpTextHelper) { - ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(o3tl::make_unique<ScAccessiblePreviewCellTextData>(mpViewShell, maCellAddress))); - - mpTextHelper = new ::accessibility::AccessibleTextHelper( std::move(pEditSource) ); + mpTextHelper = new ::accessibility::AccessibleTextHelper( + o3tl::make_unique<ScAccessibilityEditSource>( + o3tl::make_unique<ScAccessiblePreviewCellTextData>( + mpViewShell, maCellAddress))); mpTextHelper->SetEventSource( this ); // paragraphs in preview are transient diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 816a78dc4b72..3aed647783de 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -19,9 +19,6 @@ #include <sal/config.h> -#include <memory> -#include <utility> - /* Somehow, under same circumstances, MSVC creates object code for 2 * inlined functions. Nobody here uses them, so simply define them away * so that there be no dupplicate symbols anymore. @@ -420,10 +417,11 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper() { if (!mpTextHelper) { - - ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(o3tl::make_unique<ScAccessiblePreviewHeaderCellTextData>(mpViewShell, OUString(getAccessibleName()), maCellPos, mbColumnHeader, mbRowHeader))); - - mpTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); + mpTextHelper = new ::accessibility::AccessibleTextHelper( + o3tl::make_unique<ScAccessibilityEditSource>( + o3tl::make_unique<ScAccessiblePreviewHeaderCellTextData>( + mpViewShell, OUString(getAccessibleName()), maCellPos, + mbColumnHeader, mbRowHeader))); mpTextHelper->SetEventSource(this); } } |