[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source dbaccess/source include/svtools include/svx oox/source reportdesign/source sal/osl svtools/source svx/inc svx/source sw/source
Caolán McNamara
caolanm at redhat.com
Thu Jul 11 06:32:12 PDT 2013
chart2/source/controller/dialogs/DataBrowser.cxx | 2 +-
chart2/source/controller/dialogs/DataBrowser.hxx | 2 +-
cui/source/options/connpooloptions.cxx | 6 +++---
dbaccess/source/ui/control/RelationControl.cxx | 6 +++---
dbaccess/source/ui/control/TableGrantCtrl.cxx | 2 +-
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 2 +-
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 2 +-
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 2 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 ++--
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 +-
dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 +-
include/svtools/accessibletableprovider.hxx | 2 +-
include/svtools/brwbox.hxx | 14 +++++++-------
include/svtools/ctrltool.hxx | 6 +++---
include/svtools/svtabbx.hxx | 2 +-
include/svx/galctrl.hxx | 2 +-
include/svx/gridctrl.hxx | 2 +-
oox/source/helper/propertymap.cxx | 8 ++++----
reportdesign/source/ui/dlg/GroupsSorting.cxx | 10 +++++-----
sal/osl/w32/process.cxx | 2 +-
svtools/source/brwbox/brwbox1.cxx | 14 +++++++-------
svtools/source/brwbox/brwbox3.cxx | 6 +++---
svtools/source/contnr/svtabbx.cxx | 6 +++---
svtools/source/control/ctrltool.cxx | 10 ++++------
svx/inc/svdibrow.hxx | 2 +-
svx/source/fmcomp/gridctrl.cxx | 4 ++--
svx/source/gallery2/galctrl.cxx | 4 ++--
svx/source/svdraw/svdibrow.cxx | 18 ++++++++----------
sw/source/ui/index/cnttab.cxx | 4 ++--
30 files changed, 73 insertions(+), 77 deletions(-)
New commits:
commit cf6a74af5340c2c4fbf270a95bad12479524d9d4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 11 13:52:33 2013 +0100
XubString->OUString
Change-Id: I1049249741f445ad7bd9c070f99812c4404597c9
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 86df2bb..6f9ced4 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -648,7 +648,7 @@ OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
return OUString::valueOf(nRow + 1);
}
-String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
+OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
{
OUString aResult;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index a5bfad0..31f471e 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -78,7 +78,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long nRow, sal_uInt16 nColId) const;
+ virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const;
/** returns the number in the given cell. If a cell is empty or contains a
string, the result will be Nan
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 0745f8f..bf64607 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -54,7 +54,7 @@ namespace offapp
virtual void Init();
void Update(const DriverPoolingSettings& _rSettings);
- virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
+ virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const;
// the handler will be called with a DriverPoolingSettings::const_iterator as parameter,
// or NULL if no valid current row exists
@@ -242,9 +242,9 @@ namespace offapp
}
//--------------------------------------------------------------------
- String DriverListControl::GetCellText( long nRow, sal_uInt16 nColId ) const
+ OUString DriverListControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
- String sReturn;
+ OUString sReturn;
if (nRow > m_aSettings.size())
{
OSL_FAIL("DriverListControl::GetCellText: don't ask me for such rows!");
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index d61d39e..4d6143d2 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -112,7 +112,7 @@ namespace dbaui
virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
virtual sal_Bool SeekRow( long nRow );
virtual sal_Bool SaveModified();
- virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
+ virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const;
virtual void CellModified();
@@ -286,10 +286,10 @@ namespace dbaui
}
//------------------------------------------------------------------------------
- String ORelationControl::GetCellText( long nRow, sal_uInt16 nColId ) const
+ OUString ORelationControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
DBG_CHKTHIS(ORelationControl,NULL);
- String sText;
+ OUString sText;
if ( m_pConnData->GetConnLineDataList()->size() > static_cast<size_t>(nRow) )
{
OConnectionLineDataRef pConnLineData = (*m_pConnData->GetConnLineDataList())[nRow];
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 9aca174..187cba2 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -274,7 +274,7 @@ sal_Bool OTableGrantControl::SaveModified()
}
//------------------------------------------------------------------------------
-String OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
+OUString OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
DBG_CHKTHIS(OTableGrantControl,NULL);
if(COL_TABLE_NAME == nColId)
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 74b6acd..b0c2eb8 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -454,7 +454,7 @@ DBG_NAME(IndexFieldsControl)
return 0L;
}
//------------------------------------------------------------------
- String IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
+ OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
{
ConstIndexFieldsIterator aRow = m_aFields.end();
if ( _nRow >= 0 )
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 6d916cf..da236d9 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -87,7 +87,7 @@ protected:
virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
virtual sal_Bool SeekRow( long nRow );
virtual sal_Bool SaveModified();
- virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
+ virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const;
virtual void CellModified();
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index f71d9f6..7f4dd8c 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -70,7 +70,7 @@ namespace dbaui
void SetModifyHdl(const Link& _rHdl) { m_aModifyHdl = _rHdl; }
Link GetModifyHdl() const { return m_aModifyHdl; }
- virtual String GetCellText(long _nRow,sal_uInt16 nColId) const;
+ virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const;
protected:
// EditBrowseBox overridables
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b54b381..8045c43 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2203,7 +2203,7 @@ void OSelectionBrowseBox::SetNoneVisbleRow(long nRows)
m_bVisibleRow[i] = !(nRows & nVisibleRowMask[i]);
}
//------------------------------------------------------------------------------
-String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
+OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
@@ -2212,7 +2212,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
OTableFieldDescRef pEntry = getFields()[nPos-1];
OSL_ENSURE(pEntry != NULL, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... ");
if ( pEntry->IsEmpty() )
- return String();
+ return OUString();
String aText;
switch (nRow)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 40cbfc7..65867fc 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -154,7 +154,7 @@ namespace dbaui
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
+ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const;
/** returns the description of the row.
@param _nRow
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 839b470..6786a38 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1243,7 +1243,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
}
//------------------------------------------------------------------------------
-String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
+OUString OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
OUString sCellText;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 8d24536..9239494 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -102,7 +102,7 @@ namespace dbaui
// return sal_False, verhindert Zellenwechsel
virtual void Undo();
virtual void Redo();
- virtual String GetCellText(long nRow, sal_uInt16 nColId) const;
+ virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId);
virtual void CopyRows();
diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx
index 775ac23..6f9d0be 100644
--- a/include/svtools/accessibletableprovider.hxx
+++ b/include/svtools/accessibletableprovider.hxx
@@ -87,7 +87,7 @@ public:
/** @return <TRUE/>, if the cell is visible. */
virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
- virtual String GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0;
+ virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0;
virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0;
virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0;
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 3005b21..207deed 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -335,7 +335,7 @@ public:
protected:
// fuer Anzeige im VScrollBar z.B. auf "?" oder setzen
- void SetRealRowCount( const String &rRealRowCount );
+ void SetRealRowCount( const OUString &rRealRowCount );
// Return Value muss immer sal_True sein - SeekRow *muss* klappen!
// (sonst ASSERT) MI: wer hat das eingebaut? Das darf nicht so sein!
@@ -468,10 +468,10 @@ public:
// inserting, changing, removing and freezing of columns
void InsertHandleColumn( sal_uLong nWidth );
- void InsertDataColumn( sal_uInt16 nItemId, const XubString& rText,
+ void InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
sal_uInt16 nPos = HEADERBAR_APPEND );
- void SetColumnTitle( sal_uInt16 nColumnId, const String &rTitle );
+ void SetColumnTitle( sal_uInt16 nColumnId, const OUString &rTitle );
void SetColumnWidth( sal_uInt16 nColumnId, sal_uLong nWidth );
void SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos );
void FreezeColumn( sal_uInt16 nColumnId, sal_Bool bFreeze = sal_True );
@@ -487,7 +487,7 @@ public:
virtual long GetTitleHeight() const;
// access to dynamic values of cursor row
- String GetColumnTitle( sal_uInt16 nColumnId ) const;
+ OUString GetColumnTitle( sal_uInt16 nColumnId ) const;
Rectangle GetFieldRect( sal_uInt16 nColumnId ) const;
sal_uLong GetColumnWidth( sal_uInt16 nColumnId ) const;
sal_uInt16 GetColumnId( sal_uInt16 nPos ) const;
@@ -581,7 +581,7 @@ public:
The width is calculated so that the text fits completely, plus som margin.
*/
- sal_uLong GetDefaultColumnWidth( const String& _rText ) const;
+ sal_uLong GetDefaultColumnWidth( const OUString& _rText ) const;
/** GetCellText returns the text at the given position
@param _nRow
@@ -591,7 +591,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
+ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const;
/** @return
the current column count
@@ -797,7 +797,7 @@ public:
virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const;
virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const;
virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
- virtual String GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const;
+ virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const;
virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const;
virtual void GrabFocus();
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 66de4f8..706dc37 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -83,7 +83,7 @@ Name generiert, der dem Anwender praesentiert werden kann.
--------------------------------------------------------------------------
-XubString FontList::GetFontMapText( const FontInfo& rInfo ) const;
+OUString FontList::GetFontMapText( const FontInfo& rInfo ) const;
Diese Methode gibt einen Matchstring zurueck, der dem Anwender
anzeigen soll, welche Probleme es mit diesem Font geben kann.
@@ -149,7 +149,7 @@ private:
OUString maMapScreenOnly;
OUString maMapSizeNotAvailable;
OUString maMapStyleNotAvailable;
- OUString maMapNotAvailable;
+ mutable OUString maMapNotAvailable;
OUString maLight;
OUString maLightItalic;
OUString maNormal;
@@ -178,7 +178,7 @@ public:
OutputDevice* GetDevice() const { return mpDev; }
OutputDevice* GetDevice2() const { return mpDev2; }
- XubString GetFontMapText( const FontInfo& rInfo ) const;
+ OUString GetFontMapText( const FontInfo& rInfo ) const;
const OUString& GetNormalStr() const { return maNormal; }
const OUString& GetItalicStr() const { return maNormalItalic; }
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 7bcd059..4a722fa 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -206,7 +206,7 @@ public:
/** @return <TRUE/>, if the cell is visible. */
virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
- virtual String GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const;
+ virtual OUString GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const;
virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True );
virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True );
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 782163a..3181016 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -155,7 +155,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
+ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const;
// from IAccessibleTableProvider
virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 9a14635..147683a 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -383,7 +383,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
+ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const;
void RemoveRows(sal_Bool bNewCursor);
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 2010932..4db90b4 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -138,7 +138,7 @@ protected:
virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
virtual sal_Bool SeekRow( long nRow );
virtual sal_Bool SaveModified();
- virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
+ virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const;
virtual RowStatus GetRowStatus(long nRow) const;
virtual void KeyInput(const KeyEvent& rEvt);
@@ -490,10 +490,10 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
return sal_True;
}
//------------------------------------------------------------------------------
-String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const
+OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
- String sText;
+ OUString sText;
if ( nRow != BROWSER_ENDOFSELECTION && m_aGroupPositions[nRow] != NO_GROUP )
{
try
@@ -510,9 +510,9 @@ String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ )
break;
}
}
- sText = sExpression;
+ sText = sExpression;
}
- catch(uno::Exception&)
+ catch (const uno::Exception&)
{
OSL_FAIL("Exception caught while getting expression value from the group");
}
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 0fbca4c..23f418d 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -212,7 +212,7 @@ void BrowseBox::DoHideCursor( const char * )
//-------------------------------------------------------------------
-void BrowseBox::SetRealRowCount( const String &rRealRowCount )
+void BrowseBox::SetRealRowCount( const OUString &rRealRowCount )
{
getDataWindow()->aRealRowCount = rRealRowCount;
}
@@ -228,7 +228,7 @@ void BrowseBox::SetFont( const Font& rNewFont )
//-------------------------------------------------------------------
-sal_uLong BrowseBox::GetDefaultColumnWidth( const String& _rText ) const
+sal_uLong BrowseBox::GetDefaultColumnWidth( const OUString& _rText ) const
{
return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4;
}
@@ -250,7 +250,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
}
#endif
- pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), String(), nWidth, GetZoom() ) );
+ pCols->insert( pCols->begin(), new BrowserColumn( 0, Image(), OUString(), nWidth, GetZoom() ) );
FreezeColumn( 0 );
// adjust headerbar
@@ -267,7 +267,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
//-------------------------------------------------------------------
-void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const XubString& rText,
+void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos )
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
@@ -532,7 +532,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
//-------------------------------------------------------------------
-void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const String& rTitle )
+void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle )
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
@@ -856,13 +856,13 @@ void BrowseBox::RemoveColumns()
//-------------------------------------------------------------------
-String BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
+OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
{
DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
sal_uInt16 nItemPos = GetColumnPos( nId );
if ( nItemPos >= pCols->size() )
- return String();
+ return OUString();
return (*pCols)[ nItemPos ]->Title();
}
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 6a30185..7b511c0 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -386,10 +386,10 @@ void BrowseBox::GrabTableFocus()
GrabFocus();
}
// -----------------------------------------------------------------------------
-String BrowseBox::GetCellText(long, sal_uInt16 ) const
+OUString BrowseBox::GetCellText(long, sal_uInt16 ) const
{
DBG_ASSERT(0,"This method has to be implemented by the derived classes! BUG!!");
- return String();
+ return OUString();
}
// -----------------------------------------------------------------------------
@@ -520,7 +520,7 @@ sal_Bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) con
return IsFieldVisible( _nRow, GetColumnId( _nColumnPos ) );
}
// -----------------------------------------------------------------------------
-String BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const
+OUString BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const
{
return GetCellText( _nRow, GetColumnId( _nColPos ) );
}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 3c8111f..053dfa2 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -900,9 +900,9 @@ sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const
return sal_True;
}
// -----------------------------------------------------------------------
-String SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const
+OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const
{
- return OUString( GetTabEntryText( _nRow, _nColumnPos ) );
+ return GetTabEntryText(_nRow, _nColumnPos);
}
// -----------------------------------------------------------------------
Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen )
@@ -1272,7 +1272,7 @@ Rectangle SvHeaderTabListBox::GetFieldCharacterBounds(sal_Int32,sal_Int32,sal_In
// -----------------------------------------------------------------------------
sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)
{
- String sText = GetAccessibleCellText( _nRow, static_cast< sal_uInt16 >( _nColumnPos ) );
+ OUString sText = GetAccessibleCellText( _nRow, static_cast< sal_uInt16 >( _nColumnPos ) );
MetricVector aRects;
if ( GetGlyphBoundRects(Point(0,0),sText,0,STRING_LEN,0,aRects) )
{
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 0684d9b..a4f2dcf 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -503,12 +503,11 @@ OUString FontList::GetStyleName(const FontInfo& rInfo) const
// -----------------------------------------------------------------------
-XubString FontList::GetFontMapText( const FontInfo& rInfo ) const
+OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
{
if ( !rInfo.GetName().Len() )
{
- XubString aEmptryStr;
- return aEmptryStr;
+ return OUString();
}
// Search Fontname
@@ -516,7 +515,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const
if ( !pData )
{
if (maMapNotAvailable.isEmpty())
- ((FontList*)this)->maMapNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_NOTAVAILABLE);
+ maMapNotAvailable = SVT_RESSTR(STR_SVT_FONTMAP_NOTAVAILABLE);
return maMapNotAvailable;
}
@@ -544,8 +543,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const
if ( bNoneAvailable )
{
- XubString aEmptryStr;
- return aEmptryStr;
+ return OUString();
}
else if ( !bNotSynthetic )
{
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index e1e51fa..04cfbfa 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -84,7 +84,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
+ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const;
const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
XubString GetNewEntryValue() const { return pEditControl->GetText(); }
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 1437ef2..1e623b0 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2689,11 +2689,11 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
}
}
// -----------------------------------------------------------------------------
-String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
+OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
{
size_t Location = GetModelColumnPos( _nColId );
DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
- String sRet;
+ OUString sRet;
if ( const_cast<DbGridControl*>(this)->SeekRow(_nRow) )
sRet = GetCurrentRowCellText(pColumn, m_xPaintRow);
return sRet;
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 3e08539..a96a34e 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -570,9 +570,9 @@ sal_Bool GalleryListView::SeekRow( long nRow )
return sal_True;
}
-String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const
+OUString GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const
{
- String sRet;
+ OUString sRet;
if( mpTheme && ( _nRow < static_cast< long >( mpTheme->GetObjectCount() ) ) )
{
SgaObject* pObj = mpTheme->AcquireObject( _nRow );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index a915915..a971800 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -298,9 +298,9 @@ sal_Bool _SdrItemBrowserControl::SeekRow(long nRow)
return sal_True;
}
-String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
+OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
{
- String sRet;
+ OUString sRet;
if ( _nRow >= 0 && _nRow < (sal_Int32)aList.size() )
{
ImpItemListRow* pEntry = ImpGetEntry(_nRow);
@@ -313,9 +313,7 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
}
else
{
- rtl_TextEncoding aTextEncoding = osl_getThreadTextEncoding();
-
- sRet = XubString("???", aTextEncoding);
+ sRet = OUString("???");
switch (_nColId)
{
case ITEMBROWSER_WHICHCOL_ID:
@@ -324,11 +322,11 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
{
switch (pEntry->eState)
{
- case SFX_ITEM_UNKNOWN : sRet=String("Uknown", aTextEncoding); break;
- case SFX_ITEM_DISABLED: sRet=String("Disabled", aTextEncoding); break;
- case SFX_ITEM_DONTCARE: sRet=String("DontCare", aTextEncoding); break;
- case SFX_ITEM_SET : sRet=String("Set", aTextEncoding); break;
- case SFX_ITEM_DEFAULT : sRet=String("Default", aTextEncoding); break;
+ case SFX_ITEM_UNKNOWN : sRet=OUString("Unknown"); break;
+ case SFX_ITEM_DISABLED: sRet=OUString("Disabled"); break;
+ case SFX_ITEM_DONTCARE: sRet=OUString("DontCare"); break;
+ case SFX_ITEM_SET : sRet=OUString("Set"); break;
+ case SFX_ITEM_DEFAULT : sRet=OUString("Default"); break;
} // switch
} break;
case ITEMBROWSER_TYPECOL_ID: sRet = pEntry->GetItemTypeStr(); break;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c752544..1dd3945 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -183,7 +183,7 @@ public:
sal_Bool IsModified()const;
- virtual String GetCellText( long nRow, sal_uInt16 nColumn ) const;
+ virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const;
virtual void Resize();
virtual Size GetOptimalSize() const;
};
@@ -4002,7 +4002,7 @@ sal_Bool SwEntryBrowseBox::SeekRow( long nRow )
return sal_True;
}
-String SwEntryBrowseBox::GetCellText(long nRow, sal_uInt16 nColumn) const
+OUString SwEntryBrowseBox::GetCellText(long nRow, sal_uInt16 nColumn) const
{
const String* pRet = &aEmptyStr;
if(static_cast<sal_uInt16>( aEntryArr.size() ) > nRow)
commit 8197518497ce5c538ea5db85168614f6025de2b5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 11 13:53:26 2013 +0100
Uknown -> Unknown
Change-Id: I06d48669804d2ae99c47a0df1ed3c6f45c87a57e
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 2351082..e168cbb 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -367,7 +367,7 @@ static void lclDumpAnyValue( Any value)
} else if( value >>= aWritingMode )
fprintf (stderr, "%d writing mode\n", aWritingMode);
else if( value >>= aTextVertAdj ) {
- const char* s = "uknown";
+ const char* s = "unknown";
switch( aTextVertAdj ) {
case TextVerticalAdjust_TOP:
s = "top";
@@ -387,7 +387,7 @@ static void lclDumpAnyValue( Any value)
}
fprintf (stderr, "%s\n", s);
} else if( value >>= aTextHorizAdj ) {
- const char* s = "uknown";
+ const char* s = "unknown";
switch( aTextHorizAdj ) {
case TextHorizontalAdjust_LEFT:
s = "left";
@@ -761,7 +761,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
} else if( value >>= aWritingMode )
fprintf (stderr, "%d writing mode\n", aWritingMode);
else if( value >>= aTextVertAdj ) {
- const char* s = "uknown";
+ const char* s = "unknown";
switch( aTextVertAdj ) {
case TextVerticalAdjust_TOP:
s = "top";
@@ -781,7 +781,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
}
fprintf (stderr, "%s\n", s);
} else if( value >>= aTextHorizAdj ) {
- const char* s = "uknown";
+ const char* s = "unknown";
switch( aTextHorizAdj ) {
case TextHorizontalAdjust_LEFT:
s = "left";
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index b775c62..920e77d 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -627,7 +627,7 @@ oslSocket SAL_CALL osl_receiveResourcePipe(oslPipe hPipe)
}
else
{
- OSL_TRACE("osl_receiveResourcePipe: UKNOWN");
+ OSL_TRACE("osl_receiveResourcePipe: UNKNOWN");
bRet = sal_False;
}
}
More information about the Libreoffice-commits
mailing list