diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-21 14:32:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-21 20:48:35 +0000 |
| commit | e3f11c10d8cc759d01afa4b8fd8bd98c81a03119 (patch) | |
| tree | 36191c6d90da559009161a1199d1176cf6a2bbba /sfx2/inc | |
| parent | 87f9d7da00857c649784a7d9eca046bf6e71ae3c (diff) | |
Changed SetText() / GetText() to take/return OUString
replaced lots of Len() with isEmpty()
Change-Id: I6b82d48245ee2a0782e05a326f7934e9357227d0
Reviewed-on: https://gerrit.libreoffice.org/1795
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/sfx2/controlwrapper.hxx | 2 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/progress.hxx | 3 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxdlg.hxx | 4 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/titledockwin.hxx | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx index c6fb432d3012..0a429b906638 100644 --- a/sfx2/inc/sfx2/controlwrapper.hxx +++ b/sfx2/inc/sfx2/controlwrapper.hxx @@ -580,7 +580,7 @@ void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) template< typename ValueT > bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const { - return this->GetControl().GetText().Len() == 0; + return this->GetControl().GetText().isEmpty(); } template< typename ValueT > diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx index 124e2293e01f..285360272d30 100644 --- a/sfx2/inc/sfx2/progress.hxx +++ b/sfx2/inc/sfx2/progress.hxx @@ -24,6 +24,7 @@ #include "sal/types.h" #include <tools/solar.h> #include <tools/link.hxx> +#include <rtl/ustring.hxx> class String; class SfxObjectShell; @@ -46,7 +47,7 @@ public: sal_Bool bWait = sal_True ); virtual ~SfxProgress(); - virtual void SetText( const String& rText ); + virtual void SetText( const OUString& rText ); sal_Bool SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 ); virtual sal_Bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 ); sal_uIntPtr GetState() const { return nVal; } diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index d119eb772216..2f69d442495b 100644 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -59,8 +59,8 @@ class SfxAbstractDialog : virtual public VclAbstractDialog { public: virtual const SfxItemSet* GetOutputItemSet() const = 0; - virtual void SetText( const XubString& rStr ) = 0; - virtual String GetText() const = 0; + virtual void SetText( const OUString& rStr ) = 0; + virtual OUString GetText() const = 0; }; class SfxAbstractTabDialog : virtual public SfxAbstractDialog diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index 923583e3404c..00131fcedd61 100644 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -98,7 +98,7 @@ namespace sfx2 virtual void Resize(); virtual void StateChanged( StateChangedType i_nType ); virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ); - virtual void SetText( const String& i_rText ); + virtual void SetText( const OUString& i_rText ); // DockingWindow overridables void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); @@ -129,7 +129,7 @@ namespace sfx2 void impl_scheduleLayout(); private: - String m_sTitle; + OUString m_sTitle; ToolBox m_aToolbox; Window m_aContentWindow; |