diff options
| author | Gergő Mocsi <gmocsi91@gmail.com> | 2013-03-05 12:57:54 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-15 01:03:35 +0000 |
| commit | 59bc10eb4609c5729f46308becc5a3de893ac77e (patch) | |
| tree | a6363e24a5b342a2c733a1152474fc0ca90de21d /svx | |
| parent | fbaad98be26889bd0e278093f95a14bdb13786b6 (diff) | |
fdo#38838, String to OUString, in dbaccess/source/ui/browser
Applied fdo#38838 in dbaccess/source/ui/browser, +
RTL_CONSTASCII_USTRINGPARAM removals
Change-Id: I8a565cdae7fd9da1de05525c602ce011542ab4d5
Reviewed-on: https://gerrit.libreoffice.org/2538
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/svxdlg.hxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 8 | ||||
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index ba27a6f181a6..379e15824ff8 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -421,7 +421,7 @@ public: sal_uInt32 nResId)=0; virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, //add for FmSearchDialog const OUString& strInitialText, - const ::std::vector< String >& _rContexts, + const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index f5dc1c5f1193..722614098bb8 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1516,7 +1516,7 @@ void FmXFormShell::ExecuteSearch() // eine Sammlung aller (logischen) Formulare FmFormArray aEmpty; m_aSearchForms.swap( aEmpty ); - ::std::vector< String > aContextNames; + ::std::vector< OUString > aContextNames; impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), ::rtl::OUString(), m_aSearchForms, aContextNames ); OSL_POSTCOND( m_aSearchForms.size() == aContextNames.size(), "FmXFormShell::ExecuteSearch: nonsense!" ); @@ -1526,9 +1526,9 @@ void FmXFormShell::ExecuteSearch() // filter out the forms which do not contain valid controls at all { FmFormArray aValidForms; - ::std::vector< String > aValidContexts; + ::std::vector< OUString > aValidContexts; FmFormArray::const_iterator form = m_aSearchForms.begin(); - ::std::vector< String >::const_iterator contextName = aContextNames.begin(); + ::std::vector< OUString >::const_iterator contextName = aContextNames.begin(); for ( ; form != m_aSearchForms.end(); ++form, ++contextName ) { FmSearchContext aTestContext; @@ -2949,7 +2949,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod //------------------------------------------------------------------------------ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint, - const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< String >& _out_rNames ) + const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ) { try { diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 9a4a96a0d765..142a6d4999ed 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -345,7 +345,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxStartingPoint, const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, - ::std::vector< String >& _out_rNames ); + ::std::vector< OUString >& _out_rNames ); /** checks whether the instance is already disposed, if so, this is reported as assertion error (debug builds only) and <TRUE/> is returned. |