mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert sw/source/ui/inc/i*.hxx from String to OUString

Browse Source 
Change-Id: Ib850538920015fe3ef410449ff67cd9b15ae47f4
This commit is contained in:
Noel Grandin
2013-10-08 16:28:33 +02:00
parent 60d7c4b96d
commit d57c0f799c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sw/source/ui/inc/inputwin.hxx
View File

@@ -37,8 +37,8 @@ public:
InputEdit(Window* pParent, WinBits nStyle) : InputEdit(Window* pParent, WinBits nStyle) :
Edit(pParent , nStyle){} Edit(pParent , nStyle){}
void UpdateRange(const String& aSel, void UpdateRange(const OUString& aSel,
const String& aTblName ); const OUString& aTblName );
protected: protected:
virtual void KeyInput( const KeyEvent& ); virtual void KeyInput( const KeyEvent& );
@@ -57,7 +57,7 @@ friend class InputEdit;
SwWrtShell* pWrtShell; SwWrtShell* pWrtShell;
SwView* pView; SwView* pView;
SfxBindings* pBindings; SfxBindings* pBindings;
String aAktTableName, sOldFml; OUString aAktTableName, sOldFml;
sal_Bool bFirst : 1; // initialisations at first call sal_Bool bFirst : 1; // initialisations at first call
sal_Bool bActive : 1; // for hide/show when switching documents sal_Bool bActive : 1; // for hide/show when switching documents
@@ -96,7 +96,7 @@ public:
DECL_LINK( SelTblCellsNotify, SwWrtShell * ); 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;} const SwView* GetView() const{return pView;}
}; };
@@ -110,7 +110,7 @@ public:
SfxChildWinInfo* ); SfxChildWinInfo* );
~SwInputChild(); ~SwInputChild();
SFX_DECL_CHILDWINDOW_WITHID( 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( { ((SwInputWindow*)pWindow)->SetFormula(
rFormula, bDelSel ); } rFormula, bDelSel ); }
const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();} const SwView* GetView() const{return ((SwInputWindow*)pWindow)->GetView();}

14
sw/source/ui/ribbar/inputwin.cxx
View File

@@ -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('='); String sEdit = OUString('=');
if( rFormula.Len() ) if( !rFormula.isEmpty() )
{ {
if( '=' == rFormula.GetChar( 0 ) ) if( '=' == rFormula[0] )
sEdit = rFormula; sEdit = rFormula;
else else
sEdit += rFormula; sEdit += rFormula;
@@ -504,10 +504,10 @@ void InputEdit::KeyInput(const KeyEvent& rEvent)
Edit::KeyInput(rEvent); Edit::KeyInput(rEvent);
} }
void InputEdit::UpdateRange(const String& rBoxes, void InputEdit::UpdateRange(const OUString& rBoxes,
const String& rName ) const OUString& rName )
{ {
if( !rBoxes.Len() ) if( rBoxes.isEmpty() )
{ {
GrabFocus(); GrabFocus();
return; return;
@@ -515,7 +515,7 @@ void InputEdit::UpdateRange(const String& rBoxes,
const sal_Unicode cOpen = '<', cClose = '>', const sal_Unicode cOpen = '<', cClose = '>',
cOpenBracket = '('; cOpenBracket = '(';
String aPrefix = rName; String aPrefix = rName;
if(rName.Len()) if(!rName.isEmpty())
aPrefix += '.'; aPrefix += '.';
String aBoxes = aPrefix; String aBoxes = aPrefix;
aBoxes += rBoxes; aBoxes += rBoxes;