summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-20 13:17:54 +0200
committerNoel Grandin <noel@peralex.com>2013-08-22 10:49:29 +0200
commitc758c9cda0478f7e99e78d127e42114c89809dcd (patch)
tree62cd97f46be33f7ee3add2dfbf739f4c62048e64
parent34792b8e1763ee9973b3f0671388f84bf869c975 (diff)
convert svtools/source/brwbox/datwin.hxx from String to OUString
Change-Id: I6fe337f7bce4edcd7e9b2225bfe0b3e952ae010e
-rw-r--r--svtools/source/brwbox/datwin.cxx12
-rw-r--r--svtools/source/brwbox/datwin.hxx20
2 files changed, 16 insertions, 16 deletions
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 29ae1b53c574..32bd4059b221 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -58,7 +58,7 @@ void ButtonFrame::Draw( OutputDevice& rDev )
rDev.DrawLine( aRect.BottomRight(), Point( aRect.Left(), aRect.Bottom() ) );
}
- if ( aText.Len() )
+ if ( !aText.isEmpty() )
{
OUString aVal = rDev.GetEllipsisString(aText,aInnerRect.GetWidth() - 2*MIN_COLUMNWIDTH);
@@ -103,7 +103,7 @@ void ButtonFrame::Draw( OutputDevice& rDev )
//-------------------------------------------------------------------
BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage,
- const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom )
+ const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom )
: _nId( nItemId ),
_nWidth( nWidthPixel ),
_aImage( rImage ),
@@ -139,7 +139,7 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos
{
// paint handle column
ButtonFrame( rPos, Size( Width()-1, rBox.GetDataRowHeight()-1 ),
- String(), sal_False, bCurs, false ).Draw( rDev );
+ "", sal_False, bCurs, false ).Draw( rDev );
Color aOldLineColor = rDev.GetLineColor();
rDev.SetLineColor( Color( COL_BLACK ) );
rDev.DrawLine(
@@ -724,9 +724,9 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt )
sal_uLong nPos = GetThumbPos();
if ( nPos != _nLastPos )
{
- String aTip( OUString::number(nPos) );
- aTip += '/';
- if ( _pDataWin->GetRealRowCount().Len() )
+ OUString aTip( OUString::number(nPos) );
+ aTip += "/";
+ if ( !_pDataWin->GetRealRowCount().isEmpty() )
aTip += _pDataWin->GetRealRowCount();
else
aTip += OUString::number(GetRangeMax());
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index b66822750d16..c1198265695d 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -39,14 +39,14 @@ class ButtonFrame
{
Rectangle aRect;
Rectangle aInnerRect;
- String aText;
+ OUString aText;
sal_Bool bPressed;
sal_Bool bCurs;
sal_Bool m_bDrawDisabled;
public:
ButtonFrame( const Point& rPt, const Size& rSz,
- const String &rText,
+ const OUString &rText,
sal_Bool bPress,
sal_Bool bCursor,
sal_Bool _bDrawDisabled)
@@ -71,21 +71,21 @@ class BrowserColumn
sal_uLong _nOriginalWidth;
sal_uLong _nWidth;
Image _aImage;
- String _aTitle;
+ OUString _aTitle;
sal_Bool _bFrozen;
public:
BrowserColumn( sal_uInt16 nItemId, const Image &rImage,
- const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom );
+ const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom );
virtual ~BrowserColumn();
- sal_uInt16 GetId() const { return _nId; }
+ sal_uInt16 GetId() const { return _nId; }
- sal_uLong Width() { return _nWidth; }
+ sal_uLong Width() { return _nWidth; }
Image& GetImage() { return _aImage; }
- String& Title() { return _aTitle; }
+ OUString& Title() { return _aTitle; }
- sal_Bool IsFrozen() const { return _bFrozen; }
+ sal_Bool IsFrozen() const { return _bFrozen; }
void Freeze( sal_Bool bFreeze = sal_True ) { _bFrozen = bFreeze; }
virtual void Draw( BrowseBox& rBox, OutputDevice& rDev,
@@ -111,7 +111,7 @@ public:
MouseEvent aRepeatEvt; // a MouseEvent to repeat
Point aLastMousePos; // verhindert pseudo-MouseMoves
- String aRealRowCount; // zur Anzeige im VScrollBar
+ OUString aRealRowCount; // zur Anzeige im VScrollBar
RectangleList aInvalidRegion; // invalidated Rectangles during !UpdateMode
bool bInPaint; // TRUE while in Paint
@@ -163,7 +163,7 @@ public:
void Repaint();
BrowseBox* GetParent() const
{ return (BrowseBox*) Window::GetParent(); }
- const String& GetRealRowCount() const { return aRealRowCount; }
+ const OUString& GetRealRowCount() const { return aRealRowCount; }
void SetUpdateMode( sal_Bool bMode );
bool GetUpdateMode() const { return bUpdateMode; }