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

convert sc/source/ui/inc/h*.hxx from String to OUString

Change-Id: I261d23e42b46e8f7641a9780217847c1adeda0c5
üst 2dba88c6
...@@ -41,8 +41,8 @@ public: ...@@ -41,8 +41,8 @@ public:
~ScColBar(); ~ScColBar();
virtual SCCOLROW GetPos(); virtual SCCOLROW GetPos();
virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ); virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo );
virtual String GetEntryText( SCCOLROW nEntryNo ); virtual OUString GetEntryText( SCCOLROW nEntryNo );
virtual sal_Bool IsLayoutRTL(); // only for columns virtual sal_Bool IsLayoutRTL(); // only for columns
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
virtual void DrawInvert( long nDragPos ); virtual void DrawInvert( long nDragPos );
virtual String GetDragHelp( long nVal ); virtual OUString GetDragHelp( long nVal );
sal_Bool UseNumericHeader() const; sal_Bool UseNumericHeader() const;
}; };
...@@ -74,8 +74,8 @@ public: ...@@ -74,8 +74,8 @@ public:
~ScRowBar(); ~ScRowBar();
virtual SCCOLROW GetPos(); virtual SCCOLROW GetPos();
virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ); virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo );
virtual String GetEntryText( SCCOLROW nEntryNo ); virtual OUString GetEntryText( SCCOLROW nEntryNo );
virtual sal_Bool IsMirrored(); // only for columns virtual sal_Bool IsMirrored(); // only for columns
virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns
...@@ -90,7 +90,7 @@ public: ...@@ -90,7 +90,7 @@ public:
virtual void DrawInvert( long nDragPos ); virtual void DrawInvert( long nDragPos );
virtual String GetDragHelp( long nVal ); virtual OUString GetDragHelp( long nVal );
}; };
......
...@@ -83,7 +83,7 @@ protected: ...@@ -83,7 +83,7 @@ protected:
virtual SCCOLROW GetPos() = 0; // current position (Scrolling) virtual SCCOLROW GetPos() = 0; // current position (Scrolling)
virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) = 0; // width / height (Pixel) virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) = 0; // width / height (Pixel)
virtual String GetEntryText( SCCOLROW nEntryNo ) = 0; virtual OUString GetEntryText( SCCOLROW nEntryNo ) = 0;
virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ); virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo );
virtual sal_Bool IsLayoutRTL(); virtual sal_Bool IsLayoutRTL();
...@@ -96,7 +96,7 @@ protected: ...@@ -96,7 +96,7 @@ protected:
virtual void SelectWindow(); virtual void SelectWindow();
virtual sal_Bool IsDisabled(); virtual sal_Bool IsDisabled();
virtual sal_Bool ResizeAllowed(); virtual sal_Bool ResizeAllowed();
virtual String GetDragHelp( long nVal ); virtual OUString GetDragHelp( long nVal );
virtual void DrawInvert( long nDragPos ); virtual void DrawInvert( long nDragPos );
virtual void Command( const CommandEvent& rCEvt ); virtual void Command( const CommandEvent& rCEvt );
......
...@@ -25,18 +25,18 @@ ...@@ -25,18 +25,18 @@
class ScHintWindow : public Window class ScHintWindow : public Window
{ {
private: private:
String aTitle; OUString aTitle;
String aMessage; OUString aMessage;
Point aTextStart; Point aTextStart;
long nTextHeight; long nTextHeight;
Font aTextFont; Font aTextFont;
Font aHeadFont; Font aHeadFont;
protected: protected:
virtual void Paint( const Rectangle& rRect ); virtual void Paint( const Rectangle& rRect );
public: public:
ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ); ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg );
~ScHintWindow(); ~ScHintWindow();
}; };
......
...@@ -89,7 +89,7 @@ sal_uInt16 ScColBar::GetEntrySize( SCCOLROW nEntryNo ) ...@@ -89,7 +89,7 @@ sal_uInt16 ScColBar::GetEntrySize( SCCOLROW nEntryNo )
return (sal_uInt16) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() ); return (sal_uInt16) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() );
} }
String ScColBar::GetEntryText( SCCOLROW nEntryNo ) OUString ScColBar::GetEntryText( SCCOLROW nEntryNo )
{ {
return UseNumericHeader() return UseNumericHeader()
? OUString::number(nEntryNo + 1) //FIXME remove String again ? OUString::number(nEntryNo + 1) //FIXME remove String again
...@@ -211,7 +211,7 @@ void ScColBar::DrawInvert( long nDragPosP ) ...@@ -211,7 +211,7 @@ void ScColBar::DrawInvert( long nDragPosP )
pViewData->GetView()->InvertVertical(eWhich,nDragPosP); pViewData->GetView()->InvertVertical(eWhich,nDragPosP);
} }
String ScColBar::GetDragHelp( long nVal ) OUString ScColBar::GetDragHelp( long nVal )
{ {
long nTwips = (long) ( nVal / pViewData->GetPPTX() ); long nTwips = (long) ( nVal / pViewData->GetPPTX() );
return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) ); return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) );
...@@ -255,7 +255,7 @@ sal_uInt16 ScRowBar::GetEntrySize( SCCOLROW nEntryNo ) ...@@ -255,7 +255,7 @@ sal_uInt16 ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
nTab ), pViewData->GetPPTY() ); nTab ), pViewData->GetPPTY() );
} }
String ScRowBar::GetEntryText( SCCOLROW nEntryNo ) OUString ScRowBar::GetEntryText( SCCOLROW nEntryNo )
{ {
return OUString::number( nEntryNo + 1 ); return OUString::number( nEntryNo + 1 );
} }
...@@ -375,7 +375,7 @@ void ScRowBar::DrawInvert( long nDragPosP ) ...@@ -375,7 +375,7 @@ void ScRowBar::DrawInvert( long nDragPosP )
pViewData->GetView()->InvertHorizontal(eWhich,nDragPosP); pViewData->GetView()->InvertHorizontal(eWhich,nDragPosP);
} }
String ScRowBar::GetDragHelp( long nVal ) OUString ScRowBar::GetDragHelp( long nVal )
{ {
long nTwips = (long) ( nVal / pViewData->GetPPTY() ); long nTwips = (long) ( nVal / pViewData->GetPPTY() );
return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) ); return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) );
......
...@@ -991,7 +991,7 @@ void ScHeaderControl::DrawInvert( long /* nDragPos */ ) ...@@ -991,7 +991,7 @@ void ScHeaderControl::DrawInvert( long /* nDragPos */ )
{ {
} }
String ScHeaderControl::GetDragHelp( long /* nVal */ ) OUString ScHeaderControl::GetDragHelp( long /* nVal */ )
{ {
return EMPTY_STRING; return EMPTY_STRING;
} }
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
//================================================================== //==================================================================
ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ) : ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) :
Window( pParent, WinBits( WB_BORDER ) ), Window( pParent, WinBits( WB_BORDER ) ),
aTitle( rTit ), aTitle( rTit ),
aMessage( convertLineEnd(rMsg, LINEEND_CR) ) aMessage( convertLineEnd(rMsg, LINEEND_CR) )
...@@ -49,7 +49,7 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r ...@@ -49,7 +49,7 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r
sal_Int32 nIndex = 0; sal_Int32 nIndex = 0;
while ( nIndex != -1 ) while ( nIndex != -1 )
{ {
String aLine = aMessage.GetToken( 0, CHAR_CR, nIndex ); String aLine = aMessage.getToken( 0, CHAR_CR, nIndex );
Size aLineSize( GetTextWidth( aLine ), GetTextHeight() ); Size aLineSize( GetTextWidth( aLine ), GetTextHeight() );
nTextHeight = aLineSize.Height(); nTextHeight = aLineSize.Height();
aTextSize.Height() += nTextHeight; aTextSize.Height() += nTextHeight;
...@@ -82,7 +82,7 @@ void ScHintWindow::Paint( const Rectangle& /* rRect */ ) ...@@ -82,7 +82,7 @@ void ScHintWindow::Paint( const Rectangle& /* rRect */ )
Point aLineStart = aTextStart; Point aLineStart = aTextStart;
while ( nIndex != -1 ) while ( nIndex != -1 )
{ {
String aLine = aMessage.GetToken( 0, CHAR_CR, nIndex ); String aLine = aMessage.getToken( 0, CHAR_CR, nIndex );
DrawText( aLineStart, aLine ); DrawText( aLineStart, aLine );
aLineStart.Y() += nTextHeight; aLineStart.Y() += nTextHeight;
} }
......
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