convert sc/source/ui/Accessibility/*.cxx from String to OUString

Change-Id: I1841b98d49aa040f0a9448007df3bdd38bf8bf87

8 files changed, 26 insertions, 26 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index a1a901146221..84635248af11 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -203,7 +203,7 @@ OUString SAL_CALL
     ScAccessibleCellBase::createAccessibleDescription(void)
     throw (uno::RuntimeException)
 {
-    OUString sDescription = String(ScResId(STR_ACC_CELL_DESCR));
+    OUString sDescription = OUString(ScResId(STR_ACC_CELL_DESCR));
 
     return sDescription;
 }
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 08287635a055..cd119215d6bb 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -788,12 +788,12 @@ void ScAccessibleCsvRuler::SendCaretEvent()
 
 OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() throw( RuntimeException )
 {
-    return String( ScResId( STR_ACC_CSVRULER_NAME ) );
+    return OUString( ScResId( STR_ACC_CSVRULER_NAME ) );
 }
 
 OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleDescription() throw( RuntimeException )
 {
-    return String( ScResId( STR_ACC_CSVRULER_DESCR ) );
+    return OUString( ScResId( STR_ACC_CSVRULER_DESCR ) );
 }
 
 void ScAccessibleCsvRuler::ensureValidIndex( sal_Int32 nIndex ) const
@@ -1343,12 +1343,12 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI
 
 OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() throw( RuntimeException )
 {
-    return String( ScResId( STR_ACC_CSVGRID_NAME ) );
+    return OUString( ScResId( STR_ACC_CSVGRID_NAME ) );
 }
 
 OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleDescription() throw( RuntimeException )
 {
-    return String( ScResId( STR_ACC_CSVGRID_DESCR ) );
+    return OUString( ScResId( STR_ACC_CSVGRID_DESCR ) );
 }
 
 void ScAccessibleCsvGrid::ensureValidIndex( sal_Int32 nIndex ) const
@@ -1417,7 +1417,7 @@ OUString ScAccessibleCsvGrid::implGetCellText( sal_Int32 nRow, sal_Int32 nColumn
 {
     ScCsvGrid& rGrid = implGetGrid();
     sal_Int32 nLine = nRow + rGrid.GetFirstVisLine() - 1;
-    String aCellStr;
+    OUString aCellStr;
     if( (nColumn > 0) && (nRow > 0) )
         aCellStr = rGrid.GetCellText( lcl_GetGridColumn( nColumn ), nLine );
     else if( nRow > 0 )
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 44d6b46e88ed..f73172d21770 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1945,7 +1945,7 @@ OUString SAL_CALL
     ScAccessibleDocument::createAccessibleDescription(void)
     throw (uno::RuntimeException)
 {
-    OUString sDescription = String(ScResId(STR_ACC_DOC_DESCR));
+    OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR));
     return sDescription;
 }
 
@@ -1955,7 +1955,7 @@ OUString SAL_CALL
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
-    OUString sName = String(ScResId(STR_ACC_DOC_NAME));
+    OUString sName = OUString(ScResId(STR_ACC_DOC_NAME));
     sal_Int32 nNumber(sal_Int32(meSplitPos) + 1);
     sName += OUString::number(nNumber);
     return sName;
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index a2fce10ae39a..a3ab93dcb0c5 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -68,7 +68,7 @@ typedef std::list< uno::Reference< XAccessible > > ScXAccList;
 
 struct ScAccNote
 {
-    String      maNoteText;
+    OUString    maNoteText;
     Rectangle   maRect;
     ScAddress   maNoteCell;
     ::accessibility::AccessibleTextHelper* mpTextHelper;
@@ -100,7 +100,7 @@ private:
     sal_Int32               mnParagraphs;
     sal_Int32               mnOffset;
 
-    ::accessibility::AccessibleTextHelper* CreateTextHelper(const String& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset) const;
+    ::accessibility::AccessibleTextHelper* CreateTextHelper(const OUString& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset) const;
     sal_Int32 AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect, sal_Bool bMark, ScAccNotes& rNotes);
 
     sal_Int8 CompareCell(const ScAddress& aCell1, const ScAddress& aCell2);
@@ -135,7 +135,7 @@ ScNotesChildren::~ScNotesChildren()
     std::for_each(maMarks.begin(), maMarks.end(), DeleteAccNote());
 }
 
-::accessibility::AccessibleTextHelper* ScNotesChildren::CreateTextHelper(const String& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset) const
+::accessibility::AccessibleTextHelper* ScNotesChildren::CreateTextHelper(const OUString& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, sal_Bool bMarkNote, sal_Int32 nChildOffset) const
 {
     ::accessibility::AccessibleTextHelper* pTextHelper = NULL;
 
@@ -1629,14 +1629,14 @@ uno::Sequence<sal_Int8> SAL_CALL
 OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void)
                     throw (uno::RuntimeException)
 {
-    OUString sDescription = String(ScResId(STR_ACC_PREVIEWDOC_DESCR));
+    OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR));
     return sDescription;
 }
 
 OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void)
                     throw (uno::RuntimeException)
 {
-    OUString sName = String(ScResId(STR_ACC_PREVIEWDOC_NAME));
+    OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME));
     return sName;
 }
 
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 79b9e37c8e68..9aee5b9a94fd 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -224,13 +224,13 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void)
     switch (meAdjust)
     {
     case SVX_ADJUST_LEFT :
-        sDesc = String(ScResId(STR_ACC_LEFTAREA_DESCR));
+        sDesc = OUString(ScResId(STR_ACC_LEFTAREA_DESCR));
         break;
     case SVX_ADJUST_RIGHT:
-        sDesc = String(ScResId(STR_ACC_RIGHTAREA_DESCR));
+        sDesc = OUString(ScResId(STR_ACC_RIGHTAREA_DESCR));
         break;
     case SVX_ADJUST_CENTER:
-        sDesc = String(ScResId(STR_ACC_CENTERAREA_DESCR));
+        sDesc = OUString(ScResId(STR_ACC_CENTERAREA_DESCR));
         break;
     default:
         OSL_FAIL("wrong adjustment found");
@@ -246,13 +246,13 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void)
     switch (meAdjust)
     {
     case SVX_ADJUST_LEFT :
-        sName = String(ScResId(STR_ACC_LEFTAREA_NAME));
+        sName = OUString(ScResId(STR_ACC_LEFTAREA_NAME));
         break;
     case SVX_ADJUST_RIGHT:
-        sName = String(ScResId(STR_ACC_RIGHTAREA_NAME));
+        sName = OUString(ScResId(STR_ACC_RIGHTAREA_NAME));
         break;
     case SVX_ADJUST_CENTER:
-        sName = String(ScResId(STR_ACC_CENTERAREA_NAME));
+        sName = OUString(ScResId(STR_ACC_CENTERAREA_NAME));
         break;
     default:
         OSL_FAIL("wrong adjustment found");
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 1714379acba1..70640923cdf1 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -387,13 +387,13 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::Runt
 
 OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException)
 {
-    OUString sDescription = String(ScResId(STR_ACC_HEADERCELL_DESCR));
+    OUString sDescription = OUString(ScResId(STR_ACC_HEADERCELL_DESCR));
     return sDescription;
 }
 
 OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException)
 {
-    OUString sName = String(ScResId(STR_ACC_HEADERCELL_NAME));
+    OUString sName = OUString(ScResId(STR_ACC_HEADERCELL_NAME));
 
     if ( mbColumnHeader )
     {
@@ -430,7 +430,7 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper()
     {
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr < ScAccessibleTextData > pAccessiblePreviewHeaderCellTextData
-            (new ScAccessiblePreviewHeaderCellTextData(mpViewShell, String(getAccessibleName()), maCellPos, mbColumnHeader, mbRowHeader));
+            (new ScAccessiblePreviewHeaderCellTextData(mpViewShell, OUString(getAccessibleName()), maCellPos, mbColumnHeader, mbRowHeader));
         ::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessiblePreviewHeaderCellTextData));
         SAL_WNODEPRECATED_DECLARATIONS_POP
 
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index f0b17d6d00f6..118cc3641f69 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -608,8 +608,8 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId()
 OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void)
                     throw (uno::RuntimeException)
 {
-    String sDesc(ScResId(STR_ACC_TABLE_DESCR));
-    return OUString(sDesc);
+    OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
+    return sDesc;
 }
 
 OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName(void)
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 6272f06fd69c..60a008a637b9 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -350,8 +350,8 @@ OUString SAL_CALL
     ScAccessibleTableBase::createAccessibleDescription(void)
     throw (uno::RuntimeException)
 {
-    String sDesc(ScResId(STR_ACC_TABLE_DESCR));
-    return OUString(sDesc);
+    OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
+    return sDesc;
 }
 
 OUString SAL_CALL