summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-26 17:00:23 +0200
committerNoel Grandin <noel@peralex.com>2013-10-04 08:48:58 +0200
commit5eec4e7d2a5369f9d84b2a50cb47ca918d55d25d (patch)
treebd6be8f41b33352405b68fed50e7653f104af50f
parent55d0f9b63fdcf0dd0573e7dae568713257c41e97 (diff)
convert sc/source/ui/inc/gridwin.hxx from String to OUString
Change-Id: Ib2b5185dfb803a8b8321f6025ab7b91d2d5af65a
-rw-r--r--sc/source/ui/inc/gridwin.hxx10
-rw-r--r--sc/source/ui/view/gridwin.cxx14
-rw-r--r--sc/source/ui/view/gridwin5.cxx2
3 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 4288342524bd..1fb0fc8e8f3c 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -236,12 +236,12 @@ class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHe
bool IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab );
void ExecFilter( sal_uLong nSel, SCCOL nCol, SCROW nRow,
- const String& aValue, bool bCheckForDates );
+ const OUString& aValue, bool bCheckForDates );
void FilterSelect( sal_uLong nSel );
- void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr );
+ void ExecDataSelect( SCCOL nCol, SCROW nRow, const OUString& rStr );
- void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const String& rStr );
+ void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const OUString& rStr );
bool HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange );
@@ -273,9 +273,9 @@ class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHe
void DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, OutputDevice* pContentDev );
bool GetEditUrl( const Point& rPos,
- String* pName=0, String* pUrl=0, String* pTarget=0 );
+ OUString* pName=0, OUString* pUrl=0, OUString* pTarget=0 );
bool GetEditUrlOrError( bool bSpellErr, const Point& rPos,
- String* pName=0, String* pUrl=0, String* pTarget=0 );
+ OUString* pName=0, OUString* pUrl=0, OUString* pTarget=0 );
bool HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex = NULL,
SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3042dd30ae35..d437bee9d2f1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -569,7 +569,7 @@ IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo*, pInfo )
return 0;
}
-void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const String& rStr )
+void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const OUString& rStr )
{
//! gridwin2 ?
@@ -1361,9 +1361,9 @@ void ScGridWindow::FilterSelect( sal_uLong nSel )
GrabFocus(); // unter OS/2 stimmt der Focus sonst nicht
}
-void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr )
+void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const OUString& rStr )
{
- if ( rStr.Len() )
+ if ( !rStr.isEmpty() )
{
SCTAB nTab = pViewData->GetTabNo();
ScViewFunc* pView = pViewData->GetView();
@@ -1377,7 +1377,7 @@ void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr )
void ScGridWindow::ExecFilter( sal_uLong nSel,
SCCOL nCol, SCROW nRow,
- const String& aValue, bool bCheckForDates )
+ const OUString& aValue, bool bCheckForDates )
{
SCTAB nTab = pViewData->GetTabNo();
ScDocument* pDoc = pViewData->GetDocument();
@@ -2301,7 +2301,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
{
// beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war
- String aName, aUrl, aTarget;
+ OUString aName, aUrl, aTarget;
if ( GetEditUrl( rMEvt.GetPosPixel(), &aName, &aUrl, &aTarget ) )
{
nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen
@@ -5107,13 +5107,13 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, sal_Bool bUp )
//------------------------------------------------------------------------
bool ScGridWindow::GetEditUrl( const Point& rPos,
- String* pName, String* pUrl, String* pTarget )
+ OUString* pName, OUString* pUrl, OUString* pTarget )
{
return GetEditUrlOrError( false, rPos, pName, pUrl, pTarget );
}
bool ScGridWindow::GetEditUrlOrError( bool bSpellErr, const Point& rPos,
- String* pName, String* pUrl, String* pTarget )
+ OUString* pName, OUString* pUrl, OUString* pTarget )
{
//! nPosX/Y mit uebergeben?
SCsCOL nPosX;
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index ee357f629d61..d1f0856dd52e 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -370,7 +370,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
if ( !aHelpText.Len() ) // Text-URL
{
- String aUrl;
+ OUString aUrl;
if ( GetEditUrl( aPosPixel, NULL, &aUrl, NULL ) )
{
aHelpText = INetURLObject::decode( aUrl, INET_HEX_ESCAPE,