summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-08 16:28:33 +0200
committerNoel Grandin <noel@peralex.com>2013-10-10 09:19:03 +0200
commitd57c0f799cf67d447071c20e95b466fa950e33f6 (patch)
treed5902bba14098ca74cab30a115193d772ac73129 /sw
parent60d7c4b96dc9541c581946c9e1b2f0b5aeb2ea85 (diff)
convert sw/source/ui/inc/i*.hxx from String to OUString
Change-Id: Ib850538920015fe3ef410449ff67cd9b15ae47f4
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/inc/inputwin.hxx10
-rw-r--r--sw/source/ui/ribbar/inputwin.cxx14
2 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx
index 5f00e5702272..8b6e7483a738 100644
--- a/sw/source/ui/inc/inputwin.hxx
+++ b/sw/source/ui/inc/inputwin.hxx
@@ -37,8 +37,8 @@ public:
InputEdit(Window* pParent, WinBits nStyle) :
Edit(pParent , nStyle){}
- void UpdateRange(const String& aSel,
- const String& aTblName );
+ void UpdateRange(const OUString& aSel,
+ const OUString& aTblName );
protected:
virtual void KeyInput( const KeyEvent& );
@@ -57,7 +57,7 @@ friend class InputEdit;
SwWrtShell* pWrtShell;
SwView* pView;
SfxBindings* pBindings;
- String aAktTableName, sOldFml;
+ OUString aAktTableName, sOldFml;
sal_Bool bFirst : 1; // initialisations at first call
sal_Bool bActive : 1; // for hide/show when switching documents
@@ -96,7 +96,7 @@ public:
DECL_LINK( SelTblCellsNotify, SwWrtShell * );
- void SetFormula( const String& rFormula, sal_Bool bDelSel = sal_True );
+ void SetFormula( const OUString& rFormula, sal_Bool bDelSel = sal_True );
const SwView* GetView() const{return pView;}
};
@@ -110,7 +110,7 @@ public:
SfxChildWinInfo* );
~SwInputChild();
SFX_DECL_CHILDWINDOW_WITHID( SwInputChild );
- void SetFormula( const String& rFormula, sal_Bool bDelSel = sal_True )
+ void SetFormula( const OUString& rFormula, sal_Bool bDelSel = sal_True )
{ ((SwInputWindow*)pWindow)->SetFormula(
rFormula, bDelSel ); }
const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();}
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 375c280aa300..7cf674111a9e 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -443,12 +443,12 @@ IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
}
-void SwInputWindow::SetFormula( const String& rFormula, sal_Bool bDelFlag )
+void SwInputWindow::SetFormula( const OUString& rFormula, sal_Bool bDelFlag )
{
String sEdit = OUString('=');
- if( rFormula.Len() )
+ if( !rFormula.isEmpty() )
{
- if( '=' == rFormula.GetChar( 0 ) )
+ if( '=' == rFormula[0] )
sEdit = rFormula;
else
sEdit += rFormula;
@@ -504,10 +504,10 @@ void InputEdit::KeyInput(const KeyEvent& rEvent)
Edit::KeyInput(rEvent);
}
-void InputEdit::UpdateRange(const String& rBoxes,
- const String& rName )
+void InputEdit::UpdateRange(const OUString& rBoxes,
+ const OUString& rName )
{
- if( !rBoxes.Len() )
+ if( rBoxes.isEmpty() )
{
GrabFocus();
return;
@@ -515,7 +515,7 @@ void InputEdit::UpdateRange(const String& rBoxes,
const sal_Unicode cOpen = '<', cClose = '>',
cOpenBracket = '(';
String aPrefix = rName;
- if(rName.Len())
+ if(!rName.isEmpty())
aPrefix += '.';
String aBoxes = aPrefix;
aBoxes += rBoxes;