Kaydet (Commit) c758c9cd authored tarafından Noel Grandin's avatar Noel Grandin

convert svtools/source/brwbox/datwin.hxx from String to OUString

Change-Id: I6fe337f7bce4edcd7e9b2225bfe0b3e952ae010e
üst 34792b8e
...@@ -58,7 +58,7 @@ void ButtonFrame::Draw( OutputDevice& rDev ) ...@@ -58,7 +58,7 @@ void ButtonFrame::Draw( OutputDevice& rDev )
rDev.DrawLine( aRect.BottomRight(), Point( aRect.Left(), aRect.Bottom() ) ); 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); OUString aVal = rDev.GetEllipsisString(aText,aInnerRect.GetWidth() - 2*MIN_COLUMNWIDTH);
...@@ -103,7 +103,7 @@ void ButtonFrame::Draw( OutputDevice& rDev ) ...@@ -103,7 +103,7 @@ void ButtonFrame::Draw( OutputDevice& rDev )
//------------------------------------------------------------------- //-------------------------------------------------------------------
BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage, 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 ), : _nId( nItemId ),
_nWidth( nWidthPixel ), _nWidth( nWidthPixel ),
_aImage( rImage ), _aImage( rImage ),
...@@ -139,7 +139,7 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos ...@@ -139,7 +139,7 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos
{ {
// paint handle column // paint handle column
ButtonFrame( rPos, Size( Width()-1, rBox.GetDataRowHeight()-1 ), 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(); Color aOldLineColor = rDev.GetLineColor();
rDev.SetLineColor( Color( COL_BLACK ) ); rDev.SetLineColor( Color( COL_BLACK ) );
rDev.DrawLine( rDev.DrawLine(
...@@ -724,9 +724,9 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt ) ...@@ -724,9 +724,9 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt )
sal_uLong nPos = GetThumbPos(); sal_uLong nPos = GetThumbPos();
if ( nPos != _nLastPos ) if ( nPos != _nLastPos )
{ {
String aTip( OUString::number(nPos) ); OUString aTip( OUString::number(nPos) );
aTip += '/'; aTip += "/";
if ( _pDataWin->GetRealRowCount().Len() ) if ( !_pDataWin->GetRealRowCount().isEmpty() )
aTip += _pDataWin->GetRealRowCount(); aTip += _pDataWin->GetRealRowCount();
else else
aTip += OUString::number(GetRangeMax()); aTip += OUString::number(GetRangeMax());
......
...@@ -39,14 +39,14 @@ class ButtonFrame ...@@ -39,14 +39,14 @@ class ButtonFrame
{ {
Rectangle aRect; Rectangle aRect;
Rectangle aInnerRect; Rectangle aInnerRect;
String aText; OUString aText;
sal_Bool bPressed; sal_Bool bPressed;
sal_Bool bCurs; sal_Bool bCurs;
sal_Bool m_bDrawDisabled; sal_Bool m_bDrawDisabled;
public: public:
ButtonFrame( const Point& rPt, const Size& rSz, ButtonFrame( const Point& rPt, const Size& rSz,
const String &rText, const OUString &rText,
sal_Bool bPress, sal_Bool bPress,
sal_Bool bCursor, sal_Bool bCursor,
sal_Bool _bDrawDisabled) sal_Bool _bDrawDisabled)
...@@ -71,21 +71,21 @@ class BrowserColumn ...@@ -71,21 +71,21 @@ class BrowserColumn
sal_uLong _nOriginalWidth; sal_uLong _nOriginalWidth;
sal_uLong _nWidth; sal_uLong _nWidth;
Image _aImage; Image _aImage;
String _aTitle; OUString _aTitle;
sal_Bool _bFrozen; sal_Bool _bFrozen;
public: public:
BrowserColumn( sal_uInt16 nItemId, const Image &rImage, 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(); 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; } 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; } void Freeze( sal_Bool bFreeze = sal_True ) { _bFrozen = bFreeze; }
virtual void Draw( BrowseBox& rBox, OutputDevice& rDev, virtual void Draw( BrowseBox& rBox, OutputDevice& rDev,
...@@ -111,7 +111,7 @@ public: ...@@ -111,7 +111,7 @@ public:
MouseEvent aRepeatEvt; // a MouseEvent to repeat MouseEvent aRepeatEvt; // a MouseEvent to repeat
Point aLastMousePos; // verhindert pseudo-MouseMoves Point aLastMousePos; // verhindert pseudo-MouseMoves
String aRealRowCount; // zur Anzeige im VScrollBar OUString aRealRowCount; // zur Anzeige im VScrollBar
RectangleList aInvalidRegion; // invalidated Rectangles during !UpdateMode RectangleList aInvalidRegion; // invalidated Rectangles during !UpdateMode
bool bInPaint; // TRUE while in Paint bool bInPaint; // TRUE while in Paint
...@@ -163,7 +163,7 @@ public: ...@@ -163,7 +163,7 @@ public:
void Repaint(); void Repaint();
BrowseBox* GetParent() const BrowseBox* GetParent() const
{ return (BrowseBox*) Window::GetParent(); } { return (BrowseBox*) Window::GetParent(); }
const String& GetRealRowCount() const { return aRealRowCount; } const OUString& GetRealRowCount() const { return aRealRowCount; }
void SetUpdateMode( sal_Bool bMode ); void SetUpdateMode( sal_Bool bMode );
bool GetUpdateMode() const { return bUpdateMode; } bool GetUpdateMode() const { return bUpdateMode; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment