diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-09 11:50:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:04 +0200 |
| commit | 3acd7ab515ab6e97c9110b89d13136d94be5eef6 (patch) | |
| tree | ecdce8beb3fd0be63b22305d937b043d931fcea1 /sw/source/ui/inc | |
| parent | convert sw/source/ui/inc/e*.hxx from String to OUString (diff) | |
| download | core-3acd7ab515ab6e97c9110b89d13136d94be5eef6.tar.gz core-3acd7ab515ab6e97c9110b89d13136d94be5eef6.zip | |
convert sw/source/ui/inc/d*.hxx from String to OUString
Change-Id: I5ef0592411169884693d01dc497c53897c0b5928
Diffstat (limited to 'sw/source/ui/inc')
| -rw-r--r-- | sw/source/ui/inc/dbinsdlg.hxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/dbtree.hxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/inc/dbui.hxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index 0257e55d8bd8..fb1de9ed9d28 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -65,7 +65,7 @@ struct SwInsDBColumn sal_Bool bHasFmt : 1; sal_Bool bIsDBFmt : 1; - SwInsDBColumn( const String& rStr, sal_uInt16 nColumn ) + SwInsDBColumn( const OUString& rStr, sal_uInt16 nColumn ) : sColumn( rStr ), nDBNumFmt( 0 ), nUsrNumFmt( 0 ), @@ -126,7 +126,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem const SwDBData aDBData; Link aOldNumFmtLnk; - String sNoTmpl; + OUString sNoTmpl; SwView* pView; SwTableAutoFmt* pTAutoFmt; @@ -144,7 +144,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem DECL_LINK( DblClickHdl, ListBox* ); DECL_LINK( HeaderHdl, Button* ); - bool SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, sal_Bool bInsField ); + bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, sal_Bool bInsField ); using SfxModalDialog::Notify; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index 04091560a4c6..28406cdc2a32 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.hxx @@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox Image aTableBMP; Image aQueryBMP; - String sDefDBName; + OUString sDefDBName; bool bInitialized; sal_Bool bShowColumns; @@ -58,13 +58,13 @@ public: OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0); - void Select( const String& rDBName, const String& rTableName, - const String& rColumnName ); + void Select( const OUString& rDBName, const OUString& rTableName, + const OUString& rColumnName ); void ShowColumns(sal_Bool bShowCol); void SetWrtShell(SwWrtShell& rSh); - void AddDataSource(const String& rSource); + void AddDataSource(const OUString& rSource); }; #endif diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index b0558cdbb2d3..bfb9fb83c49f 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -62,9 +62,9 @@ private: //member FixedText m_aCounting; CancelButton m_aCancelButton; - String m_sCountingPattern; - String m_sVariable_Total; - String m_sVariable_Position; + OUString m_sCountingPattern; + OUString m_sVariable_Total; + OUString m_sVariable_Position; sal_Int32 m_nTotalCount; sal_Int32 m_nCurrentPosition; }; |