diff options
Diffstat (limited to 'sc')
5 files changed, 31 insertions, 12 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index aaae4ef6649a..9a4013aba71d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -53,6 +53,7 @@ #include <sfx2/docfile.hxx> #include <comphelper/servicehelper.hxx> +#include <utility> #include <vector> #include <list> #include <algorithm> @@ -144,10 +145,10 @@ ScNotesChildren::~ScNotesChildren() SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData (new ScAccessibleNoteTextData(mpViewShell, rString, aCellPos, bMarkNote)); - ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData)); SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData)); - pTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource); + pTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); if (pTextHelper) { diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 6981ece98856..364ddab5fbe0 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -17,6 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <memory> +#include <utility> + #include "AccessibleEditObject.hxx" #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -366,10 +371,8 @@ void ScAccessibleEditObject::CreateTextHelper() (new ScAccessibleEditLineTextData(NULL, mpWindow)); } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleTextData)); - SAL_WNODEPRECATED_DECLARATIONS_POP - mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource ); + ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleTextData)); + mpTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); mpTextHelper->SetEventSource(this); mpTextHelper->SetFocus(mbHasFocus); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 68682e0675c2..b261af665925 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -17,6 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <memory> +#include <utility> + #include <tools/gen.hxx> #include "AccessiblePageHeaderArea.hxx" #include "AccessibleText.hxx" @@ -298,10 +303,10 @@ void ScAccessiblePageHeaderArea::CreateTextHelper() SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessibleHeaderTextData (new ScAccessibleHeaderTextData(mpViewShell, mpEditObj, mbHeader, meAdjust)); - ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleHeaderTextData)); SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleHeaderTextData)); - mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource ); + mpTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); mpTextHelper->SetEventSource(this); } } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 68e8cd664340..ef0f0cfae5cf 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -17,6 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <memory> +#include <utility> + #include "scitems.hxx" #include <editeng/eeitem.hxx> #include <tools/gen.hxx> @@ -281,10 +286,10 @@ void ScAccessiblePreviewCell::CreateTextHelper() SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewCellTextData (new ScAccessiblePreviewCellTextData(mpViewShell, maCellAddress)); - ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewCellTextData)); SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewCellTextData)); - mpTextHelper = new ::accessibility::AccessibleTextHelper( pEditSource ); + mpTextHelper = new ::accessibility::AccessibleTextHelper( std::move(pEditSource) ); 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 4b50e6383f4a..b42a305861f5 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -17,6 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#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. @@ -425,10 +430,10 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper() SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData (new ScAccessiblePreviewHeaderCellTextData(mpViewShell, OUString(getAccessibleName()), maCellPos, mbColumnHeader, mbRowHeader)); - ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData)); SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData)); - mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource ); + mpTextHelper = new ::accessibility::AccessibleTextHelper(std::move(pEditSource)); mpTextHelper->SetEventSource(this); } } |