summaryrefslogtreecommitdiff
path: root/sc/source/ui/Accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/Accessibility')
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx3
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx4
8 files changed, 20 insertions, 1 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 83a7fb511cd7..881a895f5404 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -358,6 +358,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell)
return pDoc;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > ScAccessibleCell::CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos)
{
::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData
@@ -366,6 +367,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell)
return pEditSource;
}
+SAL_WNODEPRECATED_DECLARATIONS_POP
void ScAccessibleCell::FillDependends(utl::AccessibleRelationSetHelper* pRelationSet)
{
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 742bc9112dc8..cbe5c701f508 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1645,6 +1645,7 @@ Rectangle ScAccessibleCsvCell::implGetBoundingBox() const
return aRect;
}
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SvxEditSource > ScAccessibleCsvCell::implCreateEditSource()
{
ScCsvGrid& rGrid = implGetGrid();
@@ -1657,7 +1658,7 @@ Rectangle ScAccessibleCsvCell::implGetBoundingBox() const
::std::auto_ptr< SvxEditSource > pEditSource( new ScAccessibilityEditSource( pCsvTextData ) );
return pEditSource;
}
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
// ============================================================================
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index f8ef24858d6a..41db2d6e5576 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -150,9 +150,11 @@ ScNotesChilds::~ScNotesChilds()
{
::accessibility::AccessibleTextHelper* pTextHelper = NULL;
+ 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
pTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource);
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 9bedb9126725..7d06a69fdb5b 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -316,7 +316,9 @@ void ScAccessibleEditObject::CreateTextHelper()
{
if (!mpTextHelper)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > pAccessibleTextData;
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if (meObjectType == CellInEditMode || meObjectType == EditControl)
{
pAccessibleTextData.reset
@@ -328,7 +330,9 @@ 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 );
mpTextHelper->SetEventSource(this);
mpTextHelper->SetFocus(mbHasFocus);
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 452acbabb153..42e86b70daab 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -312,9 +312,11 @@ void ScAccessiblePageHeaderArea::CreateTextHelper()
{
if (!mpTextHelper)
{
+ 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
mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource );
mpTextHelper->SetEventSource(this);
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index d7fd8b64202e..38b9d7b57d36 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -298,9 +298,11 @@ void ScAccessiblePreviewCell::CreateTextHelper()
{
if (!mpTextHelper)
{
+ 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
mpTextHelper = new ::accessibility::AccessibleTextHelper( pEditSource );
mpTextHelper->SetEventSource( this );
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 8e9af0dc45af..5c1abf1a9210 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -414,9 +414,11 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper()
{
if (!mpTextHelper)
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData
(new ScAccessiblePreviewHeaderCellTextData(mpViewShell, String(getAccessibleName()), maCellPos, mbColumnHeader, mbRowHeader));
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData));
+ SAL_WNODEPRECATED_DECLARATIONS_POP
mpTextHelper = new ::accessibility::AccessibleTextHelper(pEditSource );
mpTextHelper->SetEventSource(this);
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 2e85f48b44bc..36e90728b912 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -970,7 +970,9 @@ IMPL_LINK(ScAccessibleCellTextData, NotifyHdl, EENotify*, aNotify)
{
if( aNotify )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( aHint.get() )
GetBroadcaster().Broadcast( *aHint.get() );
@@ -1082,7 +1084,9 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify*, aNotify)
{
if( aNotify )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( aHint.get() )
GetBroadcaster().Broadcast( *aHint.get() );