diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-03-01 21:47:10 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-07 12:48:10 +0000 |
| commit | 3cad6c806e5247ce20b78eb688551aa5d872b934 (patch) | |
| tree | bfd58c0b2ccb6c9c2427d0dd5a5e34113032d474 /vcl/inc | |
| parent | fix canvas bitmap rendering (argb32 pixmaps) fixes color issue in n#780830 (diff) | |
| download | core-3cad6c806e5247ce20b78eb688551aa5d872b934.tar.gz core-3cad6c806e5247ce20b78eb688551aa5d872b934.zip | |
Replace (Xub)String with OUString in vcl(field)
Change-Id: I62fba60a4c6e1db870443a796e6338cddc934352
Reviewed-on: https://gerrit.libreoffice.org/2229
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/vcl/field.hxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index 0f47d5f6696f..ec661c63b104 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -51,7 +51,7 @@ private: sal_Bool mbDefaultLocale; protected: - SAL_DLLPRIVATE void ImplSetText( const XubString& rText, Selection* pNewSel = NULL ); + SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection* pNewSel = NULL ); SAL_DLLPRIVATE sal_Bool ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; } void SetEmptyFieldValueData( sal_Bool bValue ) { mbEmptyFieldValue = bValue; } @@ -103,18 +103,18 @@ public: class VCL_DLLPUBLIC PatternFormatter : public FormatterBase { private: - rtl::OString m_aEditMask; - XubString maFieldString; - XubString maLiteralMask; - sal_uInt16 mnFormatFlags; - sal_Bool mbSameMask; - sal_Bool mbInPattKeyInput; + OString m_aEditMask; + OUString maFieldString; + OUString maLiteralMask; + sal_uInt16 mnFormatFlags; + sal_Bool mbSameMask; + sal_Bool mbInPattKeyInput; protected: PatternFormatter(); - SAL_DLLPRIVATE void ImplSetMask(const rtl::OString& rEditMask, - const XubString& rLiteralMask); + SAL_DLLPRIVATE void ImplSetMask(const OString& rEditMask, + const OUString& rLiteralMask); SAL_DLLPRIVATE sal_Bool ImplIsSameMask() const { return mbSameMask; } SAL_DLLPRIVATE sal_Bool& ImplGetInPattKeyInput() { return mbInPattKeyInput; } @@ -123,16 +123,16 @@ public: virtual void Reformat(); - void SetMask(const rtl::OString& rEditMask, const XubString& rLiteralMask ); - const rtl::OString& GetEditMask() const { return m_aEditMask; } - const XubString& GetLiteralMask() const { return maLiteralMask; } + void SetMask(const OString& rEditMask, const OUString& rLiteralMask ); + const OString& GetEditMask() const { return m_aEditMask; } + const OUString& GetLiteralMask() const { return maLiteralMask; } void SetFormatFlags( sal_uInt16 nFlags ) { mnFormatFlags = nFlags; } sal_uInt16 GetFormatFlags() const { return mnFormatFlags; } - void SetString( const XubString& rStr ); - XubString GetString() const; - sal_Bool IsStringModified() const { return !(GetString().Equals( maFieldString )); } + void SetString( const OUString& rStr ); + OUString GetString() const; + sal_Bool IsStringModified() const { return !(GetString() == maFieldString ); } }; // -------------------- @@ -242,7 +242,7 @@ public: virtual void SetUnit( FieldUnit meUnit ); FieldUnit GetUnit() const { return meUnit; } - void SetCustomUnitText( const XubString& rStr ); + void SetCustomUnitText( const OUString& rStr ); const OUString& GetCustomUnitText() const { return maCustomUnitText; } const OUString& GetCurUnitText() const { return maCurUnitText; } |