diff options
| author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2012-11-01 16:53:51 -0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-02 13:51:37 +0000 |
| commit | 89519528563a0e740fe22acaf9ab90f83af99695 (patch) | |
| tree | 02b0d38f5f4e1e93327c9962b93ebf6fc613d9e6 | |
| parent | 85b7df9800d8aded628a424ec7e19220a2967966 (diff) | |
fdo#38838 UniString replacement
Change-Id: I1323b2caf395c10b34e7467284402c0e3082f6a7
Reviewed-on: https://gerrit.libreoffice.org/965
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 2 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/cuifmsearch.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/svx/svxdlg.hxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 0e6ace4302de..225523be293f 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -83,7 +83,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) } //------------------------------------------------------------------------ -FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, +FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) :ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM)) ,m_flSearchFor (this, CUI_RES(FL_SEARCHFOR)) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ebd3d6449c42..41124d6b9d2e 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1503,7 +1503,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p } AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog - const String& strInitialText, + const OUString& strInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index d85f92339fbc..3c97f2ba7c7e 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -709,7 +709,7 @@ public: SfxBindings* pBindings, sal_uInt32 nResId); virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog - const String& strInitialText, + const OUString& strInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 36e5e0d70291..a220495d0fcc 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -114,7 +114,7 @@ public: (of course needed : the string number i in strUsedFields of a context must correspond with the interface number i in the arrFields of the context) */ - FmSearchDialog(Window* pParent, const String& strInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, + FmSearchDialog(Window* pParent, const OUString& strInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier); virtual ~FmSearchDialog(); diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index fdb75d346a8c..05c952d2e959 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -429,7 +429,7 @@ public: SfxBindings* pBindings, sal_uInt32 nResId)=0; virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog - const String& strInitialText, + const OUString& strInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier)=0; |